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

client_Zxw

2018-08-20 c2ab65510d7cfc0b2640d316a08cdb200f4493ef

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

 System/BlastFurnace/BlastFurnaceModel.cs

@@ -849,8 +849,7 @@
    {

        if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.BlastFurnace)) return;



        List<ItemModel> itemModels = GetRecycleDanlist();

        if(itemModels != null && itemModels.Count > 0)

        if(IsRecycleDanDrug())

        {

            recycleBtnRedpoint.state = RedPointState.Simple;

        }

@@ -858,7 +857,16 @@
        {

            recycleBtnRedpoint.state = RedPointState.None;

        }

    }



    public bool IsRecycleDanDrug()

    {

        List<ItemModel> itemModels = GetRecycleDanlist();

        if(itemModels != null && itemModels.Count > 0)

        {

            return true;

        }

        return false;

    }

    #endregion




 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -616,7 +616,7 @@
            RedEnvelopeModel.RedEnvelope _envelope;

            if (envelopeModel.TryGetLatestEnvelope(out _envelope))

            {

                if (OSEnvelopeModel.m_OpenServerGetRedpin.state == RedPointState.Simple)

                if (OSEnvelopeModel.m_OpenServerGetRedpin.state == RedPointState.GetReward)

                {

                    WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

                    ModelCenter.Instance.GetModel<OSRedEnvelopeModel>().JumpType = 2;


 System/MainInterfacePanel/PlayerMainDate.cs

@@ -339,7 +339,7 @@
        bool IsBool = false;

        var State1 = RedpointCenter.Instance.GetRedpointState(201);//福利

        var State2 = RedpointCenter.Instance.GetRedpointState(210);

        if (State1 == RedPointState.Simple || State2 == RedPointState.Simple)

        if (State1 == RedPointState.Simple || State1 == RedPointState.GetReward || State2 == RedPointState.Simple)

        {

            IsBool = true;

        }


 System/NewBieGuidance/NewBieCenter.cs

@@ -54,6 +54,7 @@
        PlayerDeadModel playerDeadModel { get { return ModelCenter.Instance.GetModel<PlayerDeadModel>(); } }

        TeamModel teamModel { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }

        DailyQuestModel dailyModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }

        BlastFurnaceModel blastFurnaceModel { get { return ModelCenter.Instance.GetModel<BlastFurnaceModel>(); } }



        public event Action guideStepChangeEvent;

        public event Action guideBeginEvent;

@@ -361,6 +362,8 @@
                case GuideTriggerType.TrialExchange:

                    var trialCompleteTimes = dailyModel.GetDailyQuestCompletedTimes((int)DailyQuestType.Trial);

                    return trialCompleteTimes >= 3;

                case GuideTriggerType.MedicineRecycle:

                    return blastFurnaceModel.IsRecycleDanDrug();

                default:

                    return false;

            }


 System/OpenServerActivity/ImpactRankModel.cs

@@ -569,7 +569,7 @@
                        var _complete = _playerData.value >= (_cfg as OSCBillTagAwardConfig).Condition;

                        if (_complete)

                        {

                            _redpoint.state = RedPointState.Simple;

                            _redpoint.state = RedPointState.GetReward;

                            return;

                        }

                    }

@@ -582,7 +582,7 @@
                    if (_rank != -1 && _rank >= _start

                        && _rank <= _end && !_playerData.billAwardGet)

                    {

                        _redpoint.state = RedPointState.Simple;

                        _redpoint.state = RedPointState.GetReward;

                        return;

                    }

                }

@@ -613,7 +613,8 @@
            }

            foreach (var _key in m_Redpoints.Keys)

            {

                if (m_Redpoints[_key].state == RedPointState.Simple)

                if (m_Redpoints[_key].state == RedPointState.GetReward

                    || m_Redpoints[_key].state == RedPointState.Simple)

                {

                    return _key;

                }

@@ -632,7 +633,8 @@
        {

            foreach (var _key in m_Redpoints.Keys)

            {

                if (m_Redpoints[_key].state == RedPointState.Simple)

                if (m_Redpoints[_key].state == RedPointState.GetReward

                    || m_Redpoints[_key].state == RedPointState.Simple)

                {

                    return true;

                }


 System/OpenServerActivity/OSRedEnvelopeModel.cs

@@ -228,11 +228,11 @@


        public void UpdateRedpackRedpoint(bool _checkVoice = false)

        {

            bool hasRed = m_OpenServerGetRedpin.state == RedPointState.Simple;

            bool hasRed = m_OpenServerGetRedpin.state == RedPointState.GetReward;

            m_OpenServerGetRedpin.state = RedPointState.None;

            if (CanGetEnvelope())

            {

                m_OpenServerGetRedpin.state = RedPointState.Simple;

                m_OpenServerGetRedpin.state = RedPointState.GetReward;

                if (_checkVoice && !hasRed && servereInited && HasOtherRedpack() && !HasSelfRedpack())

                {

                    CheckRedEnvelopeVoice();

@@ -425,7 +425,7 @@
            get

            {

                return m_RedAchieveRedpoint.state == RedPointState.Simple

                    || m_OpenServerGetRedpin.state == RedPointState.Simple;

                    || m_OpenServerGetRedpin.state == RedPointState.GetReward;

            }

        }




 System/Treasure/FunctionUnlockFlyObject.cs

@@ -64,6 +64,10 @@
                    m_FunctionIcon.SetSprite(skillConfig.IconName);

                    originalScale = 1f;

                    break;

                case FunctionUnlockType.TreasureFunc:

                    UI3DTreasureExhibition.Instance.BeginShowTreasure(m_Id, m_TreasureIcon);

                    originalScale = 9f;

                    break;

            }



            this.transform.localScale = Vector3.one * originalScale;

@@ -189,6 +193,7 @@
                    {

                        case FunctionUnlockType.Treasure:

                        case FunctionUnlockType.TreasureSkill:

                        case FunctionUnlockType.TreasureFunc:

                            UI3DTreasureExhibition.Instance.StopShow();

                            break;

                        case FunctionUnlockType.Normal:


 System/Treasure/TreasureData.cs

@@ -409,12 +409,6 @@
                var id = achievements[i];

                Achievement achievement;



                var config = ConfigManager.Instance.GetTemplate<SuccessConfig>(id);

                if (config == null || PlayerDatas.Instance.baseData.LV < config.Condition3)

                {

                    continue;

                }



                if (model.TryGetAchievement(id, out achievement) && !achievement.completed)

                {

                    return id;


 System/Treasure/TreasureModel.cs

@@ -1060,20 +1060,6 @@


            foreach (var achievementGroup in treasure.achievementGroups.Values)

            {

                if ((TreasureCategory)config.Category == TreasureCategory.Human)

                {

                    Achievement doingAchievement;

                    if (achievementModel.TryGetAchievement(achievementGroup.GetDoingAchievement(), out doingAchievement))

                    {

                        var successConfig = ConfigManager.Instance.GetTemplate<SuccessConfig>(doingAchievement.id);

                        if (successConfig.Condition3 > 0 && PlayerDatas.Instance.baseData.LV < successConfig.Condition3)

                        {

                            treasure.achievementRedpoint.state = RedPointState.None;

                            continue;

                        }

                    }

                }



                if (achievementGroup.IsAwardable())

                {

                    treasure.achievementRedpoint.state = RedPointState.Simple;


 System/Treasure/TreasureNewGotWin.cs

@@ -362,15 +362,16 @@
                            m_Story.text = string.Format(config.Verse[0], killNpcConfig.MaxAtk);

                        }

                        break;

                    //case 304://签到相关配置移到功能配置表

                    //    var _specialData = treasure.specialData;

                    //    if (_specialData != null)

                    //    {

                    //        var _keyValue = _specialData.propertyDict.First();

                    //        var _propertyConfig = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_keyValue.Key);

                    //        m_Story.text = string.Format(config.Verse[0], _keyValue.Value, _propertyConfig.Name);

                    //    }

                    //    break;

                    case 304://签到相关配置移到功能配置表

                        var soulModel = ModelCenter.Instance.GetModel<TreasureSoulModel>();

                        var _propertyDict = soulModel.signAddProperty;

                        if (_propertyDict != null)

                        {

                            var _keyValue = _propertyDict.First();

                            var _propertyConfig = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_keyValue.Key);

                            m_Story.text = string.Format(config.Verse[0], _keyValue.Value, _propertyConfig.Name);

                        }

                        break;

                }

                flyObject = unlockFlyObject1;

            }


 System/Treasure/TreasureSoulModel.cs

@@ -284,7 +284,8 @@
                if (beforeFinishCount < special.presentFinishCount && serverInited && special.active

                    && !WindowCenter.Instance.CheckOpen<TreasureSoulActiveWin>()

                    && WindowCenter.Instance.CheckOpen<TreasureSoulWin>()

                    && !WindowCenter.Instance.CheckOpen<RealmPropertyUpWin>())

                    && !WindowCenter.Instance.CheckOpen<RealmPropertyUpWin>()

                    && !NewBieCenter.Instance.inGuiding)

                {

                    ActivateShow.TreasureSoulGetReward((int)_data.PriID, beforeFinishCount, special.presentFinishCount);

                }


 System/Treasure/TreasureStageUpTriggerWin.cs

@@ -174,7 +174,7 @@
            var instance = UIUtility.CreateWidget("TreasureUnlockFlyObject_1", "TreasureUnlockFlyObject_1");

            instance.transform.SetParentEx(m_FurnacesFlyContainer, Vector3.zero, Quaternion.identity, Vector3.one);

            flyObject = instance.GetComponent<FunctionUnlockFlyObject>();

            flyObject.SetContent(FunctionUnlockType.Treasure, 301);

            flyObject.SetContent(FunctionUnlockType.TreasureFunc, 301);

            flyObject.transform.localScale = Vector3.one * m_FurnacesScale;

            flyObject.SetScale(m_FurnacesScale);




 System/Welfare/ConsumeRebateModel.cs

@@ -57,7 +57,7 @@
        {

            get

            {

                return consumeRebateRedpoint.state == RedPointState.Simple;

                return consumeRebateRedpoint.state == RedPointState.GetReward;

            }

        }



@@ -208,7 +208,7 @@
                        {

                            continue;

                        }

                        consumeRebateRedpoint.state = RedPointState.Simple;

                        consumeRebateRedpoint.state = RedPointState.GetReward;

                        break;

                    }

                }


 System/Welfare/LevelGiftModel.cs

@@ -212,13 +212,13 @@
                }

                if (PlayerDatas.Instance.baseData.LV >= _cfg.LV && !_got)

                {

                    redpoint.state = RedPointState.Simple;

                    redpoint.state = RedPointState.GetReward;

                    break;

                }

                if (PlayerDatas.Instance.baseData.LV >= _cfg.LV &&

                    PlayerDatas.Instance.baseData.VIPLv >= _cfg.VIPLimit && !_vipGot)

                {

                    redpoint.state = RedPointState.Simple;

                    redpoint.state = RedPointState.GetReward;

                    break;

                }

            }


 System/Welfare/PrayerModel.cs

@@ -324,7 +324,7 @@
            {

                if (CanFreeCoinPrayer())

                {

                    redpoint.state = RedPointState.Simple;

                    redpoint.state = RedPointState.GetReward;

                }

            }

            if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.ExpPray))

@@ -332,7 +332,7 @@
                var _expRuneCnt = playerPack.GetItemCountByID(PackType.rptItem, prayerExpRune);

                if (_expRuneCnt > 0)

                {

                    redpoint.state = RedPointState.Simple;

                    redpoint.state = RedPointState.GetReward;

                }

            }

        }


 System/Welfare/SignInModel.cs

@@ -108,7 +108,7 @@
                redpoint.state = RedPointState.None;

                return;

            }

            redpoint.state = todaySign ? RedPointState.None : RedPointState.Simple;

            redpoint.state = todaySign ? RedPointState.None : RedPointState.GetReward;

        }



        public override void Init()


 System/Welfare/WelfareCenter.cs

@@ -25,7 +25,7 @@
            {

                functionOrder = 1;

            }

            else if (signInModel.redpoint.state == RedPointState.Simple)

            else if (signInModel.redpoint.state == RedPointState.GetReward)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<WelfareWin>(false, 0);

@@ -38,7 +38,7 @@
            {

                functionOrder = 2;

            }

            else if (prayerModel.redpoint.state == RedPointState.Simple)

            else if (prayerModel.redpoint.state == RedPointState.GetReward)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<WelfareWin>(false, 1);

@@ -56,7 +56,7 @@
                return;

            }



            if (levelGiftModel.redpoint.state == RedPointState.Simple)

            if (levelGiftModel.redpoint.state == RedPointState.GetReward)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<WelfareWin>(false, 3);

@@ -80,7 +80,7 @@
            {

                functionOrder = 1;

            }

            else if (signInModel.redpoint.state == RedPointState.Simple)

            else if (signInModel.redpoint.state == RedPointState.GetReward)

            {

                return 0;

            }

@@ -91,7 +91,7 @@
            {

                functionOrder = 2;

            }

            else if (prayerModel.redpoint.state == RedPointState.Simple)

            else if (prayerModel.redpoint.state == RedPointState.GetReward)

            {

                return 1;

            }

@@ -105,7 +105,7 @@
                return 2;

            }



            if (levelGiftModel.redpoint.state == RedPointState.Simple)

            if (levelGiftModel.redpoint.state == RedPointState.GetReward)

            {

                return 3;

            }


 Utility/EnumHelper.cs

@@ -1033,6 +1033,7 @@
    Normal = 2,

    TreasureSkill = 3,

    Skill = 4,

    TreasureFunc = 5,

}



public enum RedPointState

@@ -1181,6 +1182,7 @@
    FairyLandBuyTimes = 20,//仙界秘境购买次数

    TeamAutoAccept = 21,//自动接受组队邀请

    TrialExchange = 22,//宗门试炼兑换材料

    MedicineRecycle = 23,//丹药回收引导



    QuestCanAccept = 100,//任务可接

    QuestCanDo = 101,//任务可进行