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

client_Hale

2018-09-13 7e0beacae51221710d043b52d895fc9b42253812

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

 System/BlastFurnace/LingDanTips.cs

@@ -107,15 +107,7 @@


        private void ClickPrayDrugBtn()

        {

            if(FurnaceModel.StoveLV < prayModel.prayPushLv)

            {

                SysNotifyMgr.Instance.ShowTip("PrayforDrug102",prayModel.prayPushLv);

            }

            else if(prayModel.GetPrayDruglist().Count < 1)

            {

                SysNotifyMgr.Instance.ShowTip("PrayforDrug101");

            }

            else

            if(prayModel.CheckPrayDrugIsOpen())

            {

                WindowCenter.Instance.Open<PrayforDrugWin>();

            }


 System/BlastFurnace/PrayForDurgModel.cs

@@ -67,6 +67,26 @@
            UpdatePrayDanRedpoint();

        }



        public bool CheckPrayDrugIsOpen()

        {

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

            {

                return false;

            }

            else if (blastModel.StoveLV < prayPushLv)

            {

                SysNotifyMgr.Instance.ShowTip("PrayforDrug102",prayPushLv);

                return false;

            }

            else if (GetPrayDruglist().Count < 1)

            {

                SysNotifyMgr.Instance.ShowTip("PrayforDrug101");

                return false;

            }



            return true;

        }



        #region 读取本地配置

        public int costMoney { get; private set; }

        public int everyDayNum { get; private set; }


 System/FairyAu/FairyGrabBossHintWin.cs

@@ -19,6 +19,8 @@
        [SerializeField] RectTransform m_ContainerKilling;

        [SerializeField] RectTransform m_ContainerKilled;

        [SerializeField] FairyGrabBossRankBehaviour[] m_RankBehaviours;

        [SerializeField] Text m_FairyRank;

        [SerializeField] Text m_FairyPercent;

        [SerializeField] Text m_Progress;

        [SerializeField] Text m_SurplusTime;



@@ -163,6 +165,11 @@
                        index++;

                    }

                }

                DisplayFairyHurt(fairyGrabBossInfo.hurtInfos);

            }

            else

            {

                DisplayFairyHurt(null);

            }

            if (currentHp <= 0)

            {

@@ -174,6 +181,26 @@
            }

        }



        void DisplayFairyHurt(List<FairyGrabBossModel.BossHurtInfo> list)

        {

            var rank = 0;

            var percent = 0;

            if (list != null)

            {

                for (int i = 0; i < list.Count; i++)

                {

                    if (list[i].FamilyID == PlayerDatas.Instance.baseData.Family)

                    {

                        rank = i + 1;

                        percent = (int)(((float)list[i].totalHurt / totalHp) * 100);

                        break;

                    }

                }

            }

            m_FairyRank.text = rank == 0 ? Language.Get("Market_Text_33") : Language.Get("GuardSkyRank", rank);

            m_FairyPercent.text = StringUtility.Contact(percent, "%");

        }



        private void DisplayTimer()

        {

            var seconds = model.surplusSeconds;


 System/KnapSack/Logic/PlayerPackModels.cs

@@ -55,7 +55,7 @@
                    makeDruglist.Add(fruitlist[i]);

                }

            }



            makeDruglist.Sort(CompareMakeDrug);

            StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;



            SetDevourEquipPlace();

@@ -81,9 +81,7 @@
            InitBagGridCnt = int.Parse(Config.Instance.Get<FuncConfigConfig>("InitBagCellCount").Numerical1);

            MaxBagGridCnt = int.Parse(Config.Instance.Get<FuncConfigConfig>("MaxBagCellCount").Numerical1);

            MaxDepotGridCnt = int.Parse(Config.Instance.Get<FuncConfigConfig>("MaxDepotCellCount").Numerical1);



        }

        
        public void OnBeforePlayerDataInitialize()

        {

            LocalSave.DeleteKey(RecordKnapsackTitle);

@@ -1574,6 +1572,22 @@
        #endregion



        #region 丹药逻辑处理



        private int CompareMakeDrug(AttrFruitConfig start, AttrFruitConfig end)

        {

            ItemConfig configS = Config.Instance.Get<ItemConfig>(start.ID);

            ItemConfig configE = Config.Instance.Get<ItemConfig>(end.ID);

            if (configS.RealmLimit.CompareTo(configE.RealmLimit) != 0)

            {

                return configS.RealmLimit.CompareTo(configE.RealmLimit);

            }

            if (configS.LV.CompareTo(configE.LV) != 0)

            {

                return configS.LV.CompareTo(configE.LV);

            }

            return 0;

        }



        List<AttrFruitConfig> drugOrderlist = new List<AttrFruitConfig>();

        public List<AttrFruitConfig> GetDrugOrderByCnt()

        {


 System/MainInterfacePanel/FeatureNoticeModel.cs

@@ -117,6 +117,7 @@
            {

                int faBaoID = funcoPenConfig.LimitMagicWeapon / 100;

                MagicWeapon(faBaoID, funcID);

                return;

            }

            else if (funcoPenConfig.LimitMissionID != 0)//任务

            {

@@ -124,7 +125,7 @@
                {

                    return;

                }

                if (PlayerDatas.Instance.baseData.LV - functionForecastConfig.RedPointLV >= funcoPenConfig.LimitLV)

                if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.RedPointLV)

                {

                    RedPointChange = true;

                    IsRedPoint = true;

@@ -146,7 +147,7 @@
            {

                return;

            }

            if (PlayerDatas.Instance.baseData.LV - functionForecastConfig.RedPointLV >= funcoPenConfig.LimitLV)

            if (PlayerDatas.Instance.baseData.LV>= functionForecastConfig.RedPointLV)

            {

                RedPointChange = true;

                IsRedPoint = true;

@@ -166,7 +167,25 @@
    private void MagicWeapon(int fabaoID,int funcID)

    {

        var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(funcID);

        Treasure treasure;

        if (functionForecastConfig.RedPointLV >0)//根据填的等级来

        {

            if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.RedPointLV)

            {

                RedPointChange = true;

                IsRedPoint = true;

            }

            if (IsRedPoint)

            {

                redPointStre1.state = RedPointState.Simple;

            }

            else

            {

                redPointStre1.state = RedPointState.None;

            }

            return;

        }

        Treasure treasure;//根据解锁法宝的百分比



        if (treasureModel.TryGetTreasure(fabaoID, out treasure)

              && treasure.state == TreasureState.Collected)

        {

@@ -183,8 +202,8 @@
            }

            if (treasure.stage == funcStage - 1 || funcStage == 0)

            {

                float exp = (treasure.exp / treasure.treasureStages[funcStage].exp)*100;

                if (functionForecastConfig.RedPointPercentage > 0)

                float exp = ((float)treasure.exp / treasure.treasureStages[funcStage].exp)*100;

                if (functionForecastConfig.RedPointPercentage > -1)

                {

                    if (exp >= functionForecastConfig.RedPointPercentage)

                    {


 System/MainInterfacePanel/FeatureNoticeWin.cs

@@ -248,29 +248,24 @@
            m_RawImage3.gameObject.SetActive(false);

            m_RawImage4.gameObject.SetActive(false);

            m_FeaturesImage.gameObject.SetActive(false);

            UI3DModelExhibition.Instance.StopShowNPC();

            UI3DModelExhibition.Instance.StopShowHourse();

            UI3DModelExhibition.Instance.StopShowWing();

            UI3DTreasureExhibition.Instance.StopShow();

            var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(ClickFuncID);

            switch (funcID)

            {

                case (int)FeatureNoticeEnum.Pet:

                    UI3DModelExhibition.Instance.StopShowHourse();

                    UI3DModelExhibition.Instance.StopShowWing();

                    UI3DTreasureExhibition.Instance.StopShow();

                case (int)FeatureNoticeEnum.Pet:                  
                    m_RawImage1.gameObject.SetActive(true);

                    var npcConfig = Config.Instance.Get<NPCConfig>(50106001);

                    UI3DModelExhibition.Instance.BeginShowNPC(50106001, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImage1);

                    break;

                case (int)FeatureNoticeEnum.Horse:

                    UI3DModelExhibition.Instance.StopShowNPC();

                    UI3DModelExhibition.Instance.StopShowWing();

                    UI3DTreasureExhibition.Instance.StopShow();

                    m_RawImage2.gameObject.SetActive(true);

                    HorseConfig _model = Config.Instance.Get<HorseConfig>(100);

                    UI3DModelExhibition.Instance.BeginShowHourse(_model.Model, m_RawImage2);

                    break;

                case (int)FeatureNoticeEnum.Wing:

                    UI3DModelExhibition.Instance.StopShowNPC();

                    UI3DModelExhibition.Instance.StopShowHourse();

                    UI3DTreasureExhibition.Instance.StopShow();

                    m_RawImage3.gameObject.SetActive(true);

                    var vec3 = new Vector3(0,90,-90);

                    int job = PlayerDatas.Instance.baseData.Job;

@@ -288,15 +283,13 @@
                    }

                    break;

                case (int)FeatureNoticeEnum.GossipFurnace:

                    UI3DModelExhibition.Instance.StopShowNPC();

                    UI3DModelExhibition.Instance.StopShowHourse();

                    UI3DModelExhibition.Instance.StopShowWing();

                    m_RawImage4.gameObject.SetActive(true);

                    UI3DTreasureExhibition.Instance.BeginShowTreasure(301, m_RawImage4);

                    break;

                default:

                    m_FeaturesImage.gameObject.SetActive(true);

                    m_FeaturesImage.SetSprite(functionForecastConfig.Icon);

                    m_FeaturesImage.SetNativeSize();

                    break;



            }


 System/MainInterfacePanel/HighSettingFadeInFadeOut.cs

@@ -538,32 +538,8 @@
                        int IndexOf = GroupLowIndexList.IndexOf(highBtnRecord.Index);

                        if (IndexOf == 0)

                        {

                            if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && limitedTimePackageItemModel.IsExpired())//限时礼包

                            {

                                if (AnimationFadeOutDicLow.Count < 6)//------第二层

                                {

                                    SelectCaseRequest selectCaseRequest = new SelectCaseRequest();

                                    selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);

                                    selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;

                                    selectCaseRequest.Index = highBtnRecord.Index;

                                    AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest);

                                }

                                else//------第三层

                                {

                                    SelectCaseRequest selectCaseRequest = new SelectCaseRequest();

                                    selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);

                                    selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;

                                    selectCaseRequest.Index = highBtnRecord.Index;

                                    AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);

                                }



                            }



                        }

                        else if (IndexOf == 1)

                        {

                            var _funcOrder = 0;

                            if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//开服活动

                            if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//精彩活动

                            {

                                if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index))

                                {

@@ -586,6 +562,30 @@
                                }

                            }





                        }

                        else if (IndexOf == 1)

                        {                          
                            if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && limitedTimePackageItemModel.IsExpired())//限时礼包

                            {

                                if (AnimationFadeOutDicLow.Count < 6)//------第二层

                                {

                                    SelectCaseRequest selectCaseRequest = new SelectCaseRequest();

                                    selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);

                                    selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;

                                    selectCaseRequest.Index = highBtnRecord.Index;

                                    AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest);

                                }

                                else//------第三层

                                {

                                    SelectCaseRequest selectCaseRequest = new SelectCaseRequest();

                                    selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);

                                    selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;

                                    selectCaseRequest.Index = highBtnRecord.Index;

                                    AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);

                                }



                            }

                        }

                        else if (IndexOf == 2)

                        {


 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -84,10 +84,10 @@
            if (functionOrder == 0 && !WindowJumpMgr.Instance.IsJumpState && !force)

            {

                functionOrder = GetDefaultSelect();

                for (int i = 0; i < m_SortArray.Count; i++)

                {

                    m_ActivitySpreadDict[m_SortArray[i]] = m_SortArray[i] == functionOrder;

                }

                //for (int i = 0; i < m_SortArray.Count; i++)

                //{

                //    m_ActivitySpreadDict[m_SortArray[i]] = m_SortArray[i] == functionOrder;

                //}

                UpdateFunctionBtns();

            }

            else

@@ -96,10 +96,10 @@
                {

                    functionOrder = GetDefaultSelect();

                }

                for (int i = 0; i < m_SortArray.Count; i++)

                {

                    m_ActivitySpreadDict[m_SortArray[i]] = m_SortArray[i] == functionOrder;

                }

                //for (int i = 0; i < m_SortArray.Count; i++)

                //{

                //    m_ActivitySpreadDict[m_SortArray[i]] = m_SortArray[i] == functionOrder;

                //}

                if (functionOrder == 2)

                {

                    envelopeModel.selectType = envelopeModel.JumpType != 0 ? envelopeModel.JumpType : 1;


 System/Rune/RuneModel.cs

@@ -1094,11 +1094,15 @@
            return false;

        }



        public int GetOpenTowerCnt()

        public int GetOpenTowerCnt(bool includeSpecial = false)

        {

            int Cnt = 0;

            for (int i = 0; i < RUNE_HOLE_COUNT; i++)

            {

                if (IsSpeicalHole(i) && !includeSpecial)

                {

                    continue;

                }

                if (IsRuneHoleOpen(i))

                {

                    Cnt++;


 System/TaiChi/TaichiGetRewardWin.cs

@@ -30,6 +30,7 @@
        Text name3Text;



        [SerializeField] List<Button> awardbtnlist = new List<Button>();

        [SerializeField] List<Image> awardBglist = new List<Image>();



        TaiChiModel _taiChiModel;

        TaiChiModel taiChiModel

@@ -89,10 +90,13 @@
            for(int i = 0; i < awardbtnlist.Count; i++)

            {

                int index = i;

                int itemId = taiChiModel.diceReweardIdlist[index];

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

                awardBglist[i].SetItemBackGround(itemConfig.ItemColor);

                awardbtnlist[i].RemoveAllListeners();

                awardbtnlist[i].AddListener(()=>

                {

                    ItemAttrData attrData = new ItemAttrData(taiChiModel.diceReweardIdlist[index],true);

                    ItemAttrData attrData = new ItemAttrData(itemId, true);

                    ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData);

                });

            }


 System/Treasure/TreasureComponent.cs

@@ -50,7 +50,7 @@


        static Dictionary<TreasureCategory, GameObjectPoolManager.GameObjectPool> m_BottomPoolDict = new Dictionary<TreasureCategory, GameObjectPoolManager.GameObjectPool>();

        static Dictionary<TreasureState, GameObjectPoolManager.GameObjectPool> m_StatePoolDict = new Dictionary<TreasureState, GameObjectPoolManager.GameObjectPool>();

        static GameObjectPoolManager.GameObjectPool m_ConditionPool;

        static Dictionary<TreasureCategory, GameObjectPoolManager.GameObjectPool> m_ConditionPoolDict = new Dictionary<TreasureCategory, GameObjectPoolManager.GameObjectPool>();

        static Vector3 m_CacheBottomScale = Vector3.zero;



        TreasureModel m_Model;

@@ -597,42 +597,54 @@
        {

            RecycleCondition();



            if (category != TreasureCategory.Human)

            if (category != TreasureCategory.Human && category != TreasureCategory.Demon)

            {

                return;

            }



            string displayStr = string.Empty;

            if (model.IsVersionUnOpenTreasure(treasureId))

            switch (category)

            {

                displayStr = "=";

            }

            else

            {

                Achievement achievement = null;

                var achievementId = 0;

                var unlock = false;

                if (model.TryGetTreasureUnlockAchievement(treasureId, out achievementId))

                {

                    if (achievementModel.TryGetAchievement(achievementId, out achievement))

                case TreasureCategory.Human:

                    if (model.IsVersionUnOpenTreasure(treasureId))

                    {

                        unlock = true;

                        displayStr = "=";

                    }

                }

                if (unlock && !achievement.completed)

                {

                    var _achievementConfig = Config.Instance.Get<SuccessConfig>(achievementId);

                    var _missionId = _achievementConfig.Condition[0];

                    var _taskConfig = Config.Instance.Get<PyTaskConfig>(_missionId);

                    if (_taskConfig == null)

                    else

                    {

                        return;

                        Achievement achievement = null;

                        var achievementId = 0;

                        var unlock = false;

                        if (model.TryGetTreasureUnlockAchievement(treasureId, out achievementId))

                        {

                            if (achievementModel.TryGetAchievement(achievementId, out achievement))

                            {

                                unlock = true;

                            }

                        }

                        if (unlock && !achievement.completed)

                        {

                            var _achievementConfig = Config.Instance.Get<SuccessConfig>(achievementId);

                            var _missionId = _achievementConfig.Condition[0];

                            var _taskConfig = Config.Instance.Get<PyTaskConfig>(_missionId);

                            if (_taskConfig == null)

                            {

                                return;

                            }

                            if (_achievementConfig.Type == 3)

                            {

                                displayStr = StringUtility.Contact(_taskConfig.lv, "+");

                            }

                        }

                    }

                    if (_achievementConfig.Type == 3)

                    break;

                case TreasureCategory.Demon:

                    var config = Config.Instance.Get<TreasureConfig>(treasureId);

                    if (config != null)

                    {

                        displayStr = StringUtility.Contact(_taskConfig.lv, "+");

                        displayStr = StringUtility.Contact(config.ChallengeLevel, "+");

                    }

                }

                    break;

            }



            if (string.IsNullOrEmpty(displayStr))

@@ -640,12 +652,14 @@
                return;

            }



            if (m_ConditionPool == null)

            GameObjectPoolManager.GameObjectPool pool;

            if (m_ConditionPoolDict.TryGetValue(category, out pool) == false)

            {

                var _prefab = UILoader.LoadPrefab("TreasureCondition");

                m_ConditionPool = GameObjectPoolManager.Instance.RequestPool(_prefab);

                var _prefab = UILoader.LoadPrefab(StringUtility.Contact(category, "TreasureCondition"));

                pool = GameObjectPoolManager.Instance.RequestPool(_prefab);

                m_ConditionPoolDict.Add(category, pool);

            }

            condition = m_ConditionPool.Request().GetComponent<TextMesh>();

            condition = pool.Request().GetComponent<TextMesh>();

            condition.gameObject.SetActive(true);

            condition.transform.SetParent(root);

            condition.transform.localPosition = Vector3.zero;

@@ -658,9 +672,10 @@


        void RecycleCondition()

        {

            if (m_ConditionPool != null && condition != null)

            if (m_ConditionPoolDict.ContainsKey(category) && condition != null)

            {

                m_ConditionPool.Release(condition.gameObject);

                var pool = m_ConditionPoolDict[category];

                pool.Release(condition.gameObject);

                condition = null;

            }

        }


 System/Vip/FairyJadeInvestmentWin.cs

@@ -111,7 +111,14 @@
            IsInvestment();

            GetMoney();

            SetIconKeyImage();

            m_TextNumber.text = fairyJadeInvestmentModel.SelectNumber.ToString();

            if (fairyJadeInvestmentModel.InvestGold >= fairyJadeInvestmentModel.RecordSelectNumberMax)

            {

                m_TextNumber.text = fairyJadeInvestmentModel.RecordSelectNumberMax.ToString();

            }

            else

            {

                m_TextNumber.text = (fairyJadeInvestmentModel.SelectNumber - fairyJadeInvestmentModel.InvestGold).ToString();

            }

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//数据的刷新(h0418)

            FairyJadeInvestmentModel.FairyJadeInfoSeriorsUpdate += FairyJadeInfoSeriorsUpdate;

            FairyJadeInvestmentTipWin.SelectNumberRefresh += SelectNumberRefresh;

@@ -143,7 +150,14 @@


        private void SelectNumberRefresh()

        {

            m_TextNumber.text = fairyJadeInvestmentModel.SelectNumber.ToString();

            if (fairyJadeInvestmentModel.InvestGold >= fairyJadeInvestmentModel.RecordSelectNumberMax)

            {

                m_TextNumber.text = fairyJadeInvestmentModel.RecordSelectNumberMax.ToString();

            }

            else

            {

                m_TextNumber.text = (fairyJadeInvestmentModel.SelectNumber - fairyJadeInvestmentModel.InvestGold).ToString();

            }

            SetIconKeyImage();

            if (fairyJadeInvestmentModel.InvestGold >= fairyJadeInvestmentModel.RecordSelectNumberMax)

            {

@@ -191,7 +205,14 @@
                m_JadeText.text = string.Format(Language.Get("FairyJadeInvestment_9"), fairyJadeInvestmentModel.SelectNumber - fairyJadeInvestmentModel.InvestGold);

            }



            m_TextNumber.text = fairyJadeInvestmentModel.SelectNumber.ToString();

            if (fairyJadeInvestmentModel.InvestGold >= fairyJadeInvestmentModel.RecordSelectNumberMax)

            {

                m_TextNumber.text = fairyJadeInvestmentModel.RecordSelectNumberMax.ToString();

            }

            else

            {

                m_TextNumber.text = (fairyJadeInvestmentModel.SelectNumber - fairyJadeInvestmentModel.InvestGold).ToString();

            }

            IsInvestment();

            m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见

        }


 System/WindowJump/WindowJumpMgr.cs

@@ -169,6 +169,13 @@
                    return;

                }

                break;

            case JumpUIType.PrayforDrug:

                var prayModel = ModelCenter.Instance.GetModel<PrayForDurgModel>();

                if(!prayModel.CheckPrayDrugIsOpen())

                {

                    return;

                }

                break;

            case JumpUIType.FaBaoSoul_BenYuan:

            case JumpUIType.FaBaoSoul_FengMo:

            case JumpUIType.FaBaoSoul_Strength:

@@ -775,6 +782,9 @@
            case JumpUIType.FirstRecharge:

                SetJumpLogic<FirstRechargeWin>(_tagWinSearchModel.TABID, true);

                break;

            case JumpUIType.PrayforDrug:

                SetJumpLogic<PrayforDrugWin>(_tagWinSearchModel.TABID);

                break;

            default:

                DebugEx.Log("未添加此跳转界面：" + jumpType);

                IsJumpState = false;

@@ -1246,7 +1256,7 @@
    Kylin4 = 231,//麒麟之府的4层

    Kylin5= 232,//麒麟之府的5层

    Kylin6 = 233,//麒麟之府的6层



    PrayforDrug = 234, //炼丹祈福（太上老君的馈赠）

    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面

    GyzTs = 1003,//鬼牙刃功法提升界面