Merge branch 'master' into HazyRegion_1

client_linchunjie

2019-05-21 a78e2f06f4fde07608940c0b2fa4557b09642658

Merge branch 'master' into HazyRegion_1

 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs

@@ -283,7 +283,7 @@
                            ObjID = _sTarget.ObjID,

                            clientInstID = GAMgr.Instance.GetCIDBySID(_cTarget.ServerInstID),

                            ObjType = _sTarget.ObjType,

                            HurtHP = _sTarget.HurtHP,

                            HurtHP = (uint)(_cTarget.ActorInfo.RealHp - (_sTarget.CurHP + _sTarget.CurHPEx * GActorInfo.FullHp)),

                            CurHP = _sTarget.CurHP,

                            AttackType = _sTarget.AttackType

                        };

@@ -721,7 +721,7 @@
                    ObjID = _sTarget.ObjID,

                    clientInstID = GAMgr.Instance.GetCIDBySID(_cTarget.ServerInstID),

                    ObjType = _sTarget.ObjType,

                    HurtHP = _sTarget.HurtHP,

                    HurtHP = (uint)(_cTarget.ActorInfo.RealHp - (_sTarget.CurHP + _sTarget.CurHPEx * GActorInfo.FullHp)),

                    CurHP = _sTarget.CurHP,

                    AttackType = _sTarget.AttackType

                };


 Fight/GameActor/GA_NpcClientFightBoss.cs

@@ -45,6 +45,11 @@

    protected override sealed void UpdateTimeDialogueBubble()
    {
        if (!MP_Stun)
        {
            return;
        }

        // 瞎BB逻辑
        if (Time.realtimeSinceStartup - m_LastTalkTime > 5)
        {

 Fight/GameActor/GA_NpcClientFightNorm.cs

@@ -366,6 +366,10 @@

    protected override void UpdateTimeDialogueBubble()
    {
        if (!MP_Name)
        {
            return;
        }
        // 瞎BB逻辑
        if (Time.realtimeSinceStartup - m_LastTalkTime > 5)
        {

 Fight/GameActor/GA_NpcFightBoss.cs

@@ -64,6 +64,10 @@

    protected override sealed void UpdateTimeDialogueBubble()
    {
        if (!MP_Stun)
        {
            return;
        }
        // 瞎BB逻辑
        if (Time.realtimeSinceStartup - m_LastTalkTime > 5)
        {

 Fight/GameActor/GA_NpcFightNorm.cs

@@ -258,6 +258,10 @@


    protected override void UpdateTimeDialogueBubble()

    {

        if (!MP_Name)

        {

            return;

        }

        // 瞎BB逻辑

        if (Time.realtimeSinceStartup - m_LastTalkTime > 5)

        {


 Fight/GameActor/GA_Pet.cs

@@ -146,6 +146,10 @@


    protected override void UpdateTimeDialogueBubble()

    {

        if (!MP_Name)

        {

            return;

        }

        // 瞎BB逻辑

        if (Time.realtimeSinceStartup - m_LastTalkTime > 5)

        {

@@ -179,7 +183,7 @@
            m_LastTalkTime = Time.realtimeSinceStartup;

        }

    }

    


    public sealed override bool CanAtked()

    {

        return false;


 Fight/MapTransferUtility.cs

@@ -327,7 +327,6 @@
                        yield return null;

                    }

                }



                _hero.MoveToPosition(_destPostion, 1);

                yield break;

            }

@@ -1299,7 +1298,7 @@
        {

            float _fightConfigDist = _findLocation ? _npcLocation.scope : 4;



            if (_chkDistSqrt < Mathf.Pow(_fightConfigDist, 2) || _npc != null)// 这里的2M是暂定值

            if (_chkDistSqrt < Mathf.Pow(_fightConfigDist, 2) || (_npc != null && PathFinder.WalkAble(_hero.Pos, _npc.Pos)))// 这里的2M是暂定值

            {

                _hero.Behaviour.StartHandupAI();

                Clear();


 System/Alchemy/AlchemyStoveBehaviour.cs

@@ -144,13 +144,14 @@
            m_ContainerUnGrasp.gameObject.SetActive(!grasp);

            if (grasp)

            {

                m_Func.gameObject.SetActive(state != 2);

                switch (state)

                {

                    case 0:

                        m_FuncLabel.text = Language.Get("AlchemyStoveStart");

                        break;

                    case 1:

                        m_FuncLabel.text = Language.Get("AlchemyStoveStop");

                        //m_FuncLabel.text = Language.Get("AlchemyStoveStop");

                        break;

                    case 2:

                        m_FuncLabel.text = Language.Get("AlchemyStoveGet");

@@ -291,7 +292,7 @@
                    var config = AlchemyConfig.Get(model.selectAlchemy);

                    var startTime = TimeUtility.GetTime(tick);

                    var seconds = config.NeedTime - (float)(TimeUtility.ServerNow - startTime).TotalSeconds;

                    m_TimeSlider.value = Mathf.Clamp01(1 - seconds / config.NeedTime);

                    m_TimeSlider.value = Mathf.Clamp01(seconds / config.NeedTime);

                }

            }

        }


 System/Auction/AuctionModel.cs

@@ -448,6 +448,8 @@


        public void ReceivePackage(HB502_tagGCPlayerAuctionItemInfo package)//拍卖行玩家拍卖中的物品信息

        {

            bool isPushAuctionItem = false;



            for (int i = 0; i < package.AuctionItemCount; i++)

            {

                var data = package.AuctionItemList[i];

@@ -458,6 +460,8 @@
                {

                    item = new AuctionItem(guid);

                    PushAuctionItem(item);



                    isPushAuctionItem = true;

                }



                item.itemGuid = UIHelper.ServerStringTrim(data.ItemGUID);

@@ -479,6 +483,17 @@
            {

                myAuctionRefresh();

            }



            if (isPushAuctionItem && isServerPrepare)

            {

                if (!NewBieCenter.Instance.inGuiding && !WindowCenter.Instance.IsOpen<LoadingWin>()

                && StageLoad.Instance.stageType == Stage.E_StageType.Dungeon)

                {

                    WindowJumpMgr.Instance.ClearJumpData();

                    WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.BaseAndCustom);

                    WindowCenter.Instance.Open<AuctionHouseWin>(false, 2);

                }

            }

        }



        public void ReceivePackage(HB503_tagGCPlayerAuctionRecordInfo package)//拍卖行玩家拍卖记录


 System/FindPrecious/LootPreciousFrameWin.cs

@@ -18,7 +18,6 @@
        {
            base.AddListeners();
            SetFunctionListener(1, ShowRidingPetContention);
            SetFunctionListener(2, ShowDogzDungeon);
            SetFunctionListener(3, AllianceBoss);
        }


@@ -27,13 +26,6 @@
            CloseSubWindows();
        }
        #endregion

        private void ShowDogzDungeon()
        {
            CloseSubWindows();
            WindowCenter.Instance.Open<DogzDungeonWin>();
            functionOrder = 2;
        }

        private void ShowRidingPetContention()

        {


 System/FindPrecious/WorldBossModel.cs

@@ -35,9 +35,7 @@
            get { return m_WearyValue; }

            set {

                m_WearyValue = value;

                var count = GeneralDefine.bossWearyValues[0] + extraBossWearyValue - m_WearyValue;

                worldBossRedPoint.count = count;

                worldBossRedPoint.state = count > 0 ? RedPointState.Quantity : RedPointState.None;

                UpdateRedpoint();

                if (bossWearyValueChangeEvent != null)

                {

                    bossWearyValueChangeEvent();

@@ -67,10 +65,12 @@
        public override void Init()

        {

            ParseConfig();

            FuncOpen.Instance.OnFuncStateChangeEvent += OnFunctionChange;

        }



        public override void UnInit()

        {

            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFunctionChange;

        }



        public bool TryGetBossData(int _bossId, out WorldBossData _data)

@@ -172,6 +172,28 @@
            return false;

        }



        private void OnFunctionChange(int id)

        {

            if (id == 21)

            {

                UpdateRedpoint();

            }

        }



        private void UpdateRedpoint()

        {

            if (FuncOpen.Instance.IsFuncOpen(21))

            {

                var count = GeneralDefine.bossWearyValues[0] + extraBossWearyValue - m_WearyValue;

                worldBossRedPoint.count = count;

                worldBossRedPoint.state = count > 0 ? RedPointState.Quantity : RedPointState.None;

            }

            else

            {

                worldBossRedPoint.state = RedPointState.None;

            }

        }



        private void ParseConfig()

        {

            var worldBossConfigs = WorldBossConfig.GetValues();


 System/ItemDrop/DropItem.cs

@@ -7,23 +7,23 @@


public class DropItem : HUDBehaviour

{

 


    public static event Action<Vector3> onDropItemDisappear;



    public static DropItem Drop(int _id, Vector3 _position, Camera _camera)

    {

        var dropItemType = ItemToDropType(_id);



        var _valiPos = _position;

        GActor.TryGetValidPos(_position, ref _valiPos);

        var dropItem = DropItemPool.RequireDropItem(dropItemType);

        dropItem.transform.SetParentEx(HUDCenter.hudRoot.dropItemCanvas.transform, Vector3.zero, Quaternion.identity, Vector3.one);

        dropItem.DropAt(_id, _position, _camera);

        dropItem.DropAt(_id, _valiPos, _camera);

        return dropItem;

    }



    public static DropItem DropFake(int _id, Vector3 _position, Camera _camera, float time = 2f)

    {

        var dropItemType = ItemToDropType(_id);



        var dropItem = DropItemPool.RequireDropItem(dropItemType);

        dropItem.transform.SetParentEx(HUDCenter.hudRoot.dropItemCanvas.transform, Vector3.zero, Quaternion.identity, Vector3.one);

        dropItem.DropAt(_id, _position, time, _camera);


 System/NewBieGuidance/FunctionalGuideBehaviour.cs

@@ -20,6 +20,7 @@
        [SerializeField] RectTransform m_ContainerRight;

        [SerializeField] Text m_DialogueLeft;

        [SerializeField] Text m_DialogueRight;

        [SerializeField] UIEffect m_Effect;



        [SerializeField] RectTransform m_ContainerArrow;

        [SerializeField] Image m_Arrow;

@@ -135,6 +136,7 @@
            clickTargetName = string.Empty;

            m_ClickTarget = null;

            m_ClickHintRoot.gameObject.SetActive(false);

            StopEffect();

            FindClickTarget();

            protectTimer = 0f;

        }

@@ -229,16 +231,19 @@
                        if (screenPoint.x < 1f && screenPoint.x > 0f && screenPoint.y < 1f && screenPoint.y > 0f)

                        {

                            m_ClickHintRoot.gameObject.SetActive(true);

                            PlayEffect();

                            m_ClickHintRoot.position = m_ClickTarget.position;

                        }

                        else

                        {

                            StopEffect();

                            m_ClickHintRoot.gameObject.SetActive(false);

                        }

                    }

                }

                else

                {

                    StopEffect();

                    m_ClickHintRoot.gameObject.SetActive(false);

                }



@@ -291,6 +296,43 @@
            }

        }



        private void PlayEffect()

        {

            var guideConfig = GuideConfig.Get(guide);

            var effectId = 0;

            if (guideConfig != null)

            {

                var stepConfig = ScriptableObjectLoader.LoadSoFunctionalGuideStep(guideConfig.Steps[0]);

                if (stepConfig != null)

                {

                    effectId = stepConfig.effect2;

                }

            }



            if (effectId != 0)

            {

                if (!m_Effect.IsPlaying)

                {

                    m_Effect.Play();

                }

            }

            else

            {

                if (m_Effect.IsPlaying)

                {

                    m_Effect.Stop();

                }

            }

        }



        private void StopEffect()

        {

            if (m_Effect.IsPlaying)

            {

                m_Effect.Stop();

            }

        }



    }



    public class FunctionalGuideBehaviourPool


 System/Skill/ExpertSkillSelectWin.cs

@@ -461,7 +461,7 @@


                var selectExpertSkill = 0;

                model.TryGetExpertSkill(ExpertSkillSelectWin.selectSkillId, out selectExpertSkill);

                m_Use.gameObject.SetActive(selectExpertSkill == skillId);

                m_Use.gameObject.SetActive(false);



                TreasurePotential expert;

                model.TryGetPotential(skillId, out expert);


 UI/HUD/PopUpNum.cs

@@ -339,6 +339,14 @@
            PetThumpHit = 47,                        //宠物重击                      

            EnemyThumpHit = 48,                   //敌人重击



            PlayerYinji = 49,                    //玩家印记

            PetYinj = 50,                        //宠物印记                      
            EnemyYinjt = 51,                   //敌人印记



            PlayerBurning = 52,                    //玩家灼烧

            PetBurning = 53,                        //宠物灼烧                      
            EnemyBurning = 54,                   //敌人灼烧



            BuffAddDefense = 101,//+防御buff

            BuffAddAttack = 102,//+攻击buff

            BuffAddAttackSpeed = 103,//+攻速buff


 Utility/EnumHelper.cs

@@ -1246,34 +1246,36 @@
    /** 普通伤害 */

    Normal = 1,

    /** 恢复 */

    Recovery,

    Recovery=2,

    /** 反弹伤害 */

    BounceHurt,

    BounceHurt=3,

    /** 留血 */

    Bleed,

    Bleed=4,

    /** 抵御 */

    Parry,

    Parry=5,

    /** 连击 */

    DoubleHit,

    DoubleHit=6,

    /** 暴击 */

    SuperHit,

    SuperHit=7,

    /** 会心一击 */

    LuckyHit,

    LuckyHit=8,

    /** 闪避 */

    Miss,

    Miss=9,

    /** 免疫 */

    Immune,

    Immune=10,

    /** 压制 */

    Suppress,

    Suppress=11,

    /**斩杀**/

    ZhanSha,

    ZhanSha=12,

    /** 诛仙一击 */

    ZhuXianAtk,

    ZhuXianAtk=13,

    /** 终极斩杀 */

    FinalKill,

    FinalKill=14,

    /*致命一击*/

    DeadlyHit,

    ThumpHit,// 重击

    DeadlyHit=15,

    ThumpHit=16,// 重击

    Yinji = 16,// 印记

    Burning = 17,// 灼烧

}



[XLua.LuaCallCSharp]