Merge remote-tracking branch 'origin/master' into LuaOrgan

client_Lhy

2019-07-01 bbc28bb827a5b52ed7a3c35b153c5d444062eca9

Merge remote-tracking branch 'origin/master' into LuaOrgan

 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0423_tagObjPropertyRefreshView.cs

@@ -52,14 +52,15 @@

        GAStaticDefine.PopHp(_attacker, _target, vNetData.AttackType, (int)vNetData.DiffValue);

        var _realValue = (uint)Mathf.Abs(_target.ActorInfo.RealHp - vNetData.HP);

        if (vNetData.AttackType == (byte)HurtAttackType.Recovery)
        {
            var _realValue = (uint)Mathf.Abs(vNetData.HP - _target.ActorInfo.RealHp);
            _target.ActorInfo.IncreaseHp(_realValue);
        }
        else
        {
            var _realValue = (uint)Mathf.Abs(_target.ActorInfo.RealHp - vNetData.HP);
            _target.ActorInfo.ReduceHp(_realValue);
        }


 System/Alchemy/AlchemyModel.cs

@@ -81,7 +81,7 @@
        public void OnBeforePlayerDataInitialize()

        {

            m_AlchemyTimes.Clear();

            stoveLevel = 0;

            stoveLevel = 1;

            stoveExp = 0;

            foreach (var item in m_AlchemyDrugUseLimits.Values)

            {


 System/HazyRegion/HazyGrassModel.cs

@@ -224,24 +224,27 @@
                    var hintId = dungeonModel.GetDungeonHintId(config.dungeonId, config.lineId);
                    var hintConfig = DungeonHintConfig.Get(hintId);

                    if (hintConfig.NPC1ID.Length > 1

                        && Array.IndexOf(hintConfig.NPC1ID, npcId) != -1)

                    if (hintConfig != null)

                    {

                        collectCount = 0;

                        for (int i = 0; i < hintConfig.NPC1ID.Length; i++)

                        if (hintConfig.NPC1ID.Length > 1

                            && Array.IndexOf(hintConfig.NPC1ID, npcId) != -1)

                        {

                            collectCount += dungeonModel.GetDugneonNpcCollectCount(hintConfig.NPC1ID[i]);

                            collectCount = 0;

                            for (int i = 0; i < hintConfig.NPC1ID.Length; i++)

                            {

                                collectCount += dungeonModel.GetDugneonNpcCollectCount(hintConfig.NPC1ID[i]);

                            }

                            return collectCount < hintConfig.targetValue1[0];

                        }

                        return collectCount < hintConfig.targetValue1[0];

                    }

                    if (hintConfig.NPC1ID.Length > 0 && hintConfig.NPC1ID[0] == npcId)

                    {

                        return collectCount < hintConfig.targetValue1[0];

                    }
                    else if (hintConfig.NPC2ID.Length > 0 && hintConfig.NPC2ID[0] == npcId)

                    {

                        return collectCount < hintConfig.targetValue2[0];



                        if (hintConfig.NPC1ID.Length > 0 && hintConfig.NPC1ID[0] == npcId)

                        {

                            return collectCount < hintConfig.targetValue1[0];

                        }

                        else if (hintConfig.NPC2ID.Length > 0 && hintConfig.NPC2ID[0] == npcId)

                        {

                            return collectCount < hintConfig.targetValue2[0];

                        }

                    }
                }

            }


 System/HazyRegion/HazyRegionModel.cs

@@ -663,7 +663,7 @@
            var satisfyIncident = false;

            if (FuncOpen.Instance.IsFuncOpen(173) || FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.HazyRegion))

            {

                satisfyEntrance = !playing && dailyQuestModel.usableActivePoint >= openActviePoint;

                satisfyEntrance = dailyQuestModel.usableActivePoint >= openActviePoint;



                if (playing)

                {


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -566,7 +566,14 @@
                m_InGamePusher.gameObject.SetActive(false);

                IsShowTaskPanel();

                m_MailObj.SetActive(false);

                m_MainPositionTween.SwitchFunctions(new MainPositionTween.SwitchParam() { showDefault = true, immediately = true });

                m_MainPositionTween.SwitchFunctions(

                    new MainPositionTween.SwitchParam()

                    {

                        showDefault = true,

                        immediately = true,

                        bottomState = MainPositionTween.RightBottomState.Skill,

                        manual = true,

                    });

            }

            else

            {


 System/MainInterfacePanel/TaskModel.cs

@@ -1393,12 +1393,11 @@
        }
    }

    private PackModel m_PlayerBackModel;
    private PackModel PlayerBackModel
    private PackModel packModel
    {
        get
        {
            return m_PlayerBackModel ?? (m_PlayerBackModel = ModelCenter.Instance.GetModel<PackModel>());
            return ModelCenter.Instance.GetModel<PackModel>();
        }
    }

@@ -1410,17 +1409,17 @@
        {
            yield break;
        }
        while (_hero.SkillMgr.CurCastSkill != null &&
        while (_hero != null && _hero.SkillMgr.CurCastSkill != null &&
               _hero.SkillMgr.CurCastSkill.SkillCompelete == false)
        {
            yield return null;
        }

        yield return WaitingForSecondConst.WaitMS500;

        var _singleModel = PlayerBackModel.GetSinglePack(PackType.Equip);
        // 如果有守护, 则不拾取
        var _itemModel = _singleModel.GetItemByIndex((int)RoleEquipType.Guard);
        yield return WaitingForSecondConst.WaitMS500;



        // 如果有守护, 则不拾取

        var equipIndex = EquipSet.ClientPlaceToServerPlace(new Int2(0, (int)RoleEquipType.Guard));
        var _itemModel = packModel.GetItemByIndex(PackType.Equip, equipIndex);
        if (_itemModel == null || !GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))
        {
            float _chkDistanceSqrt;

 System/Realm/RealmAnimationBehaviour.cs

@@ -73,8 +73,11 @@
                    {

                        m_EffectLines[i].effect = model.GetRealmLineEffect(realms[i]);

                        m_EffectLines[i].Play();

                        var animator = m_EffectLines[i].target.GetAnimator();

                        animator.Play("idle", 0, 0);

                        if (m_EffectLines[i].target != null)

                        {

                            var animator = m_EffectLines[i].target.GetAnimator();

                            animator.Play("idle", 0, 0);

                        }

                    }

                }

            }

@@ -202,10 +205,13 @@
        {

            m_EffectLines[index].effect = model.GetRealmLineEffect(model.displayRealmLevel - 1);

            m_EffectLines[index].Play();

            var animator = m_EffectLines[index].target.GetAnimator();

            animator.Play("open", 0, 0);

            yield return WaitingForSecondConst.WaitMS500;

            animator.Play("idle", 0);

            if (m_EffectLines[index].target != null)

            {

                var animator = m_EffectLines[index].target.GetAnimator();

                animator.Play("open", 0, 0);

                yield return WaitingForSecondConst.WaitMS500;

                animator.Play("idle", 0);

            }



            var realmStage = GetRealmStageBeha(index + 1);

            if (realmStage != null)


 System/Store/StoreModel.cs

@@ -1452,7 +1452,8 @@
                                {

                                    break;

                                }

                                if (PlayerDatas.Instance.baseData.FamilyId == 0)

                                if (PlayerDatas.Instance.baseData.FamilyId == 0

                                    || PlayerDatas.Instance.fairyData.fairy == null)

                                {

                                    break;

                                }


 System/SystemSetting/SystemSetting.cs

@@ -67,7 +67,7 @@


    public GameFps GetGameFps()

    {

        return (GameFps)LocalSave.GetInt(GAMEFRAME_KEY, (int)GameFps.Full);

        return (GameFps)LocalSave.GetInt(GAMEFRAME_KEY, (int)GameFps.Half);

    }



    public void SetSystemSettingSwitch(SystemSwitch type, bool _value)

@@ -190,14 +190,13 @@
            if (!LocalSave.HasKey(QUALITY_LEVEL_KEY))

            {

                var defaultQuality = GameQuality.High;



                if (DeviceUtility.cpu >= 4 && DeviceUtility.memory > 3.2f * 1024)

                {

                    defaultQuality = GameQuality.High;

                }

                else if (DeviceUtility.cpu >= 4 && DeviceUtility.memory > 2.5f * 1024)

                {

                    defaultQuality = GameQuality.Medium; ;

                    defaultQuality = GameQuality.Medium;

                }

                else if (DeviceUtility.cpu > 1 && DeviceUtility.memory > 1.5f * 1024)

                {

@@ -216,8 +215,6 @@
            return (GameQuality)LocalSave.GetInt(QUALITY_LEVEL_KEY, (int)GameQuality.High);

        }

    }







    public void LetFPSUnLimit()

    {


 System/WindowJump/WindowJumpMgr.cs

@@ -720,6 +720,7 @@
                SetJumpLogic<RankFrameWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.AllianceBoss1:

            case JumpUIType.AllianceBoss2:

                SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.FairyAuction: