Merge commit '72e9f78c364db3173ec1d5e0a37092d42de32a34'

MacBuilder

2018-08-23 9f1102900faf6adf5994cf6e870ce0716a06a09c

Merge commit '72e9f78c364db3173ec1d5e0a37092d42de32a34'

 System/Dungeon/DungeonModel.cs

@@ -464,6 +464,10 @@
                            {

                                CheckGroupEnterDungeon(_dungeon);

                            }

                            else

                            {

                                GroupCancelEnterDungeon(_dungeon.mapId);

                            }

                        });

                    }

                    else if (teamModel.myTeam.memberCount - teamModel.myTeam.GetOnlineMemberCnt() > 0)

@@ -488,6 +492,21 @@
            }

        }



        private void GroupCancelEnterDungeon(int _mapId)

        {

            switch (_mapId)

            {

                case RealmModel.REALM_DUNGEON_ID:

                    if (!WindowCenter.Instance.CheckOpen<TeamFrameWin>())

                    {

                        var teamModel = ModelCenter.Instance.GetModel<TeamModel>();

                        teamModel.missionBuf = teamModel.currentMission = new TeamMission(31110, 1);

                        WindowCenter.Instance.Open<TeamFrameWin>(false, teamModel.myTeam.inTeam ? 1 : 0);

                    }

                    break;

            }

        }



        private string GroupChallengeOnlyOneTip(int _mapId)

        {

            switch (_mapId)


 System/FindPrecious/BossHomeModel.cs

@@ -89,25 +89,33 @@
        public int GetRecommendFloor()

        {

            var vipLevel = PlayerDatas.Instance.baseData.VIPLv;

            var maxFloor = 1;

            var vipNeedFloor1 = GetFloorVipRequirement(1);

            var myLevel = PlayerDatas.Instance.baseData.LV;



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

            {

                var bossId = sortedBosses[i];

                var config = Config.Instance.Get<NPCConfig>(bossId);

                var bossHomeConfig = Config.Instance.Get<BossHomeConfig>(bossId);



                if (bossHomeConfig.FloorNum > maxFloor)

                if (vipLevel < vipNeedFloor1)

                {

                    maxFloor = bossHomeConfig.FloorNum;

                    if (config.NPCLV > myLevel)

                    {

                        var bossHomeConfig = Config.Instance.Get<BossHomeConfig>(bossId);

                        return bossHomeConfig.FloorNum;

                    }

                }

                else

                {

                    var bossHomeConfig = Config.Instance.Get<BossHomeConfig>(bossId);

                    if (vipLevel >= GetFloorVipRequirement(bossHomeConfig.FloorNum) && myLevel < config.NPCLV)

                    {

                        return bossHomeConfig.FloorNum;

                    }

                }



                if (vipLevel >= GetFloorVipRequirement(bossHomeConfig.FloorNum) && PlayerDatas.Instance.baseData.LV < config.NPCLV)

                {

                    return bossHomeConfig.FloorNum;

                }

            }



            return maxFloor;

            return 1;

        }



        public int GetFloorVipRequirement(int _floor)


 System/FindPrecious/FindPreciousBossRebornBehaviour.cs

@@ -176,14 +176,14 @@
                            {

                                if (_ok)

                                {

                                    EnterBossHome(config.FloorNum);

                                    EnterBossHome(config.FloorNum, _bossId);

                                }

                            }

                            );

                    }

                    else

                    {

                        EnterBossHome(config.FloorNum);

                        EnterBossHome(config.FloorNum, _bossId);

                    }

                }

            }

@@ -194,7 +194,7 @@


                if (mapConfig.MapFBType == (int)MapType.OpenCountry)

                {

                    EnterBossHome(config.FloorNum);

                    EnterBossHome(config.FloorNum,_bossId);

                }

                else

                {

@@ -244,12 +244,13 @@


        }



        private void EnterBossHome(int _floor)

        private void EnterBossHome(int _floor,int _bossId)

        {

            var error = 0;

            if (TestEnterBossHomeDungeon(_floor, out error))

            {

                bossHomeModel.selectedFloor = _floor;

                bossHomeModel.selectedBoss = _bossId;

                dungeonModel.SingleChallengeDungeon(BossHomeModel.BOSSHOME_MAPID, bossHomeModel.selectedFloor - 1);

            }

            else


 System/FindPrecious/FindPreciousModel.cs

@@ -452,14 +452,9 @@
            foreach (var boss in bossInfos.Values)

            {

                var bossId = boss.bossId;



                if (!IsBossAlive(bossId))

                if (Config.Instance.ContainKey<DemonJarConfig>(bossId))

                {

                    RemoveOneBossRebornNotify(bossId);

                }

                else

                {

                    if (Config.Instance.ContainKey<DemonJarConfig>(bossId))

                    if (IsBossAlive(bossId))

                    {

                        var config = Config.Instance.Get<DemonJarConfig>(bossId);

                        var grade = dungeonModel.GetDungeonGrade(new Dungeon(DemonJarModel.DEMONJAR_MAPID, config.LineID));

@@ -470,16 +465,21 @@
                    }

                    else

                    {

                        if ((bossInfos[bossId].refreshTime - DateTime.Now).TotalSeconds < PREPOSE_SECONDS)

                        {

                            AddOneBossRebornNotify(bossId);

                        }

                        else

                        {

                            FindPreciousTimer.Instance.AddClock(bossId, bossInfos[bossId].refreshTime);

                        }

                        RemoveOneBossRebornNotify(bossId);

                    }

                }

                else

                {

                    if (IsBossAlive(bossId) || (bossInfos[bossId].refreshTime - DateTime.Now).TotalSeconds < PREPOSE_SECONDS)

                    {

                        AddOneBossRebornNotify(bossId);

                    }

                    else

                    {

                        FindPreciousTimer.Instance.AddClock(bossId, bossInfos[bossId].refreshTime);

                    }

                }



            }

        }




 System/HappyXB/BestXBWin.cs

@@ -18,9 +18,11 @@
        [SerializeField] Button xbBtn;

        [SerializeField] Text xbBtnText;

        [SerializeField] Text xbBtnMoneyText;

        [SerializeField] Text xbOneDesText;

        [SerializeField] Button xbManyBtn;

        [SerializeField] Text xbManyBtnText;

        [SerializeField] Text xbManyMoneyText;

        [SerializeField] Text xbManyDesText;

        [SerializeField] Button freeXbBtn;

        [SerializeField] Text luckText;

        [SerializeField] GameObject luckDesObj;

@@ -182,6 +184,8 @@
                xbManyMoneyText.text = funcSet.xbPrices[1].ToString();

                xbOneMoney = funcSet.xbPrices[0];

                xbManyMoney = funcSet.xbPrices[1];

                xbOneDesText.text = Language.Get("HappyXB106", funcSet.costToolNums[0]);

                xbManyDesText.text = Language.Get("HappyXB106", funcSet.costToolNums[1]);

                ItemConfig itemConfig1 = Config.Instance.Get<ItemConfig>(funcSet.costToolIds[0]);

                ItemConfig itemConfig2 = Config.Instance.Get<ItemConfig>(funcSet.costToolIds[1]);

                if(itemConfig1 != null)


 System/HappyXB/HappyXBModel.cs

@@ -838,6 +838,7 @@
            {

                bestXBOneRed.state = RedPointState.None;

                bestXBManyRed.state = RedPointState.None;

                bestXBRed.state = RedPointState.None;

            }



            if (IsHaveFreeXB(2))

@@ -860,6 +861,7 @@
            {

                runeXBOneRed.state = RedPointState.None;

                runeXBManyRed.state = RedPointState.None;

                runeXBRed.state = RedPointState.None;

            }

        }




 System/HappyXB/RuneXBWin.cs

@@ -17,10 +17,12 @@
        [SerializeField] Transform verRightContent;

        [SerializeField] Button xbBtn;

        [SerializeField] Text xbBtnText;

        [SerializeField] Text xbOneDesText;

        [SerializeField] Text xbBtnMoneyText;

        [SerializeField] Button xbManyBtn;

        [SerializeField] Text xbManyBtnText;

        [SerializeField] Text xbManyMoneyText;

        [SerializeField] Text xbManyDesText;

        [SerializeField] Button freeXbBtn;

        [SerializeField] GameObject luckDesObj;

        [SerializeField] Text luckText;

@@ -193,6 +195,8 @@
                xbManyMoneyText.text = funcSet.xbPrices[1].ToString();

                xbOneMoney = funcSet.xbPrices[0];

                xbManyMoney = funcSet.xbPrices[1];

                xbOneDesText.text = Language.Get("HappyXB106", funcSet.costToolNums[0]);

                xbManyDesText.text = Language.Get("HappyXB106", funcSet.costToolNums[1]);

                ItemConfig itemConfig1 = Config.Instance.Get<ItemConfig>(funcSet.costToolIds[0]);

                ItemConfig itemConfig2 = Config.Instance.Get<ItemConfig>(funcSet.costToolIds[1]);

                if (itemConfig1 != null)


 System/KnapSack/Logic/PackModelInterface.cs

@@ -1173,7 +1173,8 @@
                        for (i = 0; i < itemlist.Count; i++)

                        {

                            bool isOverdue = IsOverdue(itemlist[i].itemInfo.ItemGUID, itemlist[i].itemInfo.ItemID, itemlist[i].useDataDict);

                            if (itemlist[i].equipScore > putOnDic[key].equipScore && !isOverdue)

                            bool isRealm = PlayerDatas.Instance.baseData.realmLevel >= itemlist[i].chinItemModel.RealmLimit ? true : false;

                            if (itemlist[i].equipScore > putOnDic[key].equipScore && !isOverdue && isRealm)

                            {

                                return true;

                            }


 System/MainInterfacePanel/TopRightTip.cs

@@ -51,6 +51,10 @@
            {

                ModelCenter.Instance.GetModel<DailyQuestModel>().currentDailyQuest = (int)DailyQuestType.Trial;

            }

            if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 29)//仙界秘境功能开启引导

            {

                ModelCenter.Instance.GetModel<DailyQuestModel>().currentDailyQuest = (int)DailyQuestType.FairyLand;

            }

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<DailyQuestWin>();

        }


 System/Skill/SkillPassWin.cs

@@ -35,6 +35,7 @@
        [SerializeField] ScrollerController scrollerController;

        [SerializeField] RectTransform m_ContainerGetWay;

        [SerializeField] ClickScreenOtherSpace clickOtherSpace;

        [SerializeField, Header("特效时长")] float m_EffectDuration = 1f;

        private List<SkillConfig> skillListPass = new List<SkillConfig>();

        private int presentSltEquipIndex = -1;

        Coroutine cacheCoroutine = null;

@@ -193,7 +194,8 @@


        IEnumerator Co_UnlockEffectComplete()

        {

            yield return WaitingForSecondConst.WaitMS800;

            var duration = m_EffectDuration > 0f ? m_EffectDuration : 1.0f;

            yield return WaitingForSecondConst.GetWaitForSeconds(duration);

            SysNotifyMgr.Instance.ShowTip("PassNewHole");

            UpdateEquipPassSkill();

        }


 System/Strengthening/GodBeastAttributes.cs

@@ -25,7 +25,9 @@
        DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }
        private Dictionary<int, int> QualityLimit = new Dictionary<int, int>();

        PlayerPackModel _playerPack;

        PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }
        PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }

        ItemTipsModel _itemTipsModel;

        ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }

        private int GodBeastNumber=0;//神兽编号
        private int GodBeastPart = 0;//神兽装备ID

@@ -83,8 +85,14 @@
                    {

                        if (itemModel[i].EquipPlace == GodBeastPart)

                        {

                            ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, 1);

                            ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, itemModel[i].itemInfo.IsBind);

                            m_ItemCell.Init(ItemModel);

                            m_ItemCell.cellBtn.RemoveAllListeners();

                            int type = i;

                            m_ItemCell.cellBtn.AddListener(()=> 
                            {

                                itemTipsModel.SetItemTipsModel(PackType.rptDogzEquip, itemModel[type].itemInfo.ItemGUID);

                            });

                        }

                    }

                }


 System/Strengthening/GodBeastEntry.cs

@@ -37,7 +37,7 @@
                {

                    if (itemModel[i].EquipPlace == godBeastPart)

                    {

                        ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, 1);

                        ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, itemModel[i].itemInfo.IsBind);

                        m_itemCell.Init(ItemModel);

                        var itemConfig = Config.Instance.Get<ItemConfig>(itemModel[i].itemId);

                        var IudetDogzEquipPlus = itemModel[i].GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);// 神兽装备强化信息列表 [强化等级, 强化熟练度]