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

client_linchunjie

2018-12-28 b5d06e488541ffd992b2ce1d7b24bbb8b7250d9b

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

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

@@ -61,9 +61,9 @@
                _actor.ActorInfo.ResetHp(-1, -1, (int)vNetData.Value);
            }

            if(_actor is GActorNpcFight)
            if (_actor is GActorNpcFight)
            {
                if((PlayerDataRefresh)vNetData.RefreshType == PlayerDataRefresh.Speed)
                if ((PlayerDataRefresh)vNetData.RefreshType == PlayerDataRefresh.Speed)
                {
                    _actor.ActorInfo.moveSpeed = 500f / vNetData.Value;
                }

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

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

        }

#endif



        // 跨服竞技场不检测反击逻辑

        if(PlayerDatas.Instance.baseData.MapID == 31340)

        {

            return;

        }



        // 是否反击

        if (_sTarget.ObjID == PlayerDatas.Instance.PlayerId)

        {


 Fight/GameActor/GA_Hero.cs

@@ -328,7 +328,7 @@
#if UNITY_EDITOR

            && RuntimeLogUtility.s_forceAutoFight

#endif

            )

            && PlayerDatas.Instance.baseData.MapID != 31340)

        {

            if (!aiHandler.IsAuto() && !BossShowModel.Instance.BossShowing)

            {


 System/CrossServerOneVsOne/CrossServerRewardModel.cs

@@ -349,7 +349,6 @@
    {

        var match = new CC104_tagCMExitCrossRealm();

        GameNetSystem.Instance.SendToCrossServer(match);

        SetPkType();

    }



    private static int pkDanLvNow = 0;

@@ -409,9 +408,17 @@
        set { m_PkType = value; }

    }



    private static void SetPkType()

    public  static void SetPkType()

    {

        DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)m_PkType);

        if (m_PkType != 1)

        {

            DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)m_PkType);

        }

        else

        {

            DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)0);

        }

      
    }

}




 System/CrossServerOneVsOne/CrossServerSettlementWin.cs

@@ -93,6 +93,7 @@

        protected override void OnPreClose()
        {
            CrossServerRewardModel.SetPkType(); 
        }

        protected override void OnAfterClose()

 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -142,8 +142,8 @@
            }

            else

            {

                var surplus = dungeonEndTime - DateTime.Now;

                m_CountdownText.text = ((int)surplus.TotalSeconds).ToString();

                var surplus = dungeonEndTime - DateTime.Now;              
                m_CountdownText.text = (Mathf.CeilToInt((float)surplus.TotalSeconds)).ToString();

            }



        }