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

Client_PangDeRong

2018-08-23 afd325438317bd95feb2305cd1f883326c6a31e8

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

 Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs

@@ -387,6 +387,7 @@
            GUILayout.EndHorizontal();



            EditorGUILayout.Space();

#endif

            GUILayout.BeginHorizontal();

            EditorGUILayout.TextField("SDK Project Path", ClientPackage.SDK_PLUGIN_PROJECT);

            if (GUILayout.Button("Browse", GUILayout.MaxWidth(75f)))

@@ -396,7 +397,6 @@
            GUILayout.EndHorizontal();



            EditorGUILayout.Space();

#endif



            publishers = EditorGUILayout.TextField("Publishers", publishers, GUILayout.Height(50));




 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/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();

        }

@@ -258,7 +260,7 @@
                }

                else if (_limit.OpenSkillSlots > 0 && !model.IsTaskHoleUnlock(_limit.OpenSkillSlots))

                {

                    return true;

                    return false;

                }

            }

            return false;

@@ -532,7 +534,7 @@
                            }

                        }

                        SysNotifyMgr.Instance.ShowTip("PassEquipLimitTask", taskName);

                        m_GetWayBtn.gameObject.SetActive(true);

                        m_GetWayBtn.gameObject.SetActive(false);

                    }

                }

            }


 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);// 神兽装备强化信息列表 [强化等级, 强化熟练度]


 System/SystemSetting/SystemSetting.cs

@@ -139,7 +139,7 @@
    public void SetQualityLevel(GameQuality _quality, bool _disabeCamera = true)

    {

        LocalSave.SetInt(QUALITY_LEVEL_KEY, Mathf.Clamp((int)_quality, 0, 2));



        QualitySettings.SetQualityLevel(Mathf.Clamp((int)_quality, 0, 2));

        switch (_quality)

        {

            case GameQuality.Low: