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

client_linchunjie

2019-04-22 96b4026b300653455c92bdaf5902b7e8a0788da8

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

 Fight/GameActor/GA_Hero.cs

@@ -685,7 +685,8 @@
         || State == E_ActorState.Mocked

         || IsDaZuo()

         || BossShowModel.Instance.BossShowing

         || heavenBattleModel.IsBattlePrepare)

         || heavenBattleModel.IsBattlePrepare

         || BeBeating)

        {

            return false;

        }

@@ -731,7 +732,7 @@
            && State != E_ActorState.Roll

            && !s_MapSwitching

            && !heavenBattleModel.IsBattlePrepare

            && !m_Beating;

            && !BeBeating;

    }



    public bool CanCastSkill()

@@ -745,7 +746,7 @@
            && State != E_ActorState.Mocked

            && !s_MapSwitching

            && !heavenBattleModel.IsBattlePrepare

            && !m_Beating;

            && !BeBeating;

    }



    public void StopAll()


 Fight/GameActor/GActorFight.cs

@@ -196,7 +196,7 @@
    private Vector3 m_StartBeatPos;

    private float m_Factor;

    private float m_BeatStartTime;

    protected bool m_Beating;

    public bool BeBeating { get; protected set; }

    private Vector3 m_BeatDirection;

    private bool m_PushOrPull;

    private uint m_AttackerSID;

@@ -251,13 +251,13 @@


        m_StartBeatPos = Pos;

        m_BeatStartTime = Time.time;

        m_Beating = true;

        BeBeating = true;

        needSyncGroundHeight = false;

    }



    private void UpdateBeatBack()

    {

        if (!m_Beating)

        if (!BeBeating)

        {

            return;

        }

@@ -266,7 +266,7 @@
         || m_BeatCurve == null

         || ActorInfo.serverDie)

        {

            m_Beating = false;

            BeBeating = false;

            return;

        }



@@ -281,7 +281,7 @@


        if (_attacker == null)

        {

            m_Beating = false;

            BeBeating = false;

            return;

        }



@@ -309,7 +309,7 @@
            {

                _end = _attacker.Pos - m_BeatDirection * m_LimitDistance;

                needSyncGroundHeight = true;

                m_Beating = false;

                BeBeating = false;

            }

        }



@@ -331,7 +331,7 @@
        if (Time.time - m_BeatStartTime > m_BeatTime)

        {

            needSyncGroundHeight = true;

            m_Beating = false;

            BeBeating = false;

        }

    }




 Fight/Stage/StageLoadProcessor.cs

@@ -401,12 +401,12 @@
                    break;
                case DemonJarModel.DEMONJAR_SINGLEMAPID:
                    stage = stageGameObject.AddComponent<FakeDemonJarDungeonStage>();
                    break;

                case HazyDemonKingModel.Client_MapID:

                    break;
                case HazyDemonKingModel.Client_MapID:
                    stage = stageGameObject.AddComponent<ClientHazyDemonKingStage>();
                    break;

                case HazyGrassModel.Client_FairyGrassMapID:

                case HazyGrassModel.Client_ReikiGrassMapID:

                    break;
                case HazyGrassModel.Client_FairyGrassMapID:
                case HazyGrassModel.Client_ReikiGrassMapID:
                    stage = stageGameObject.AddComponent<ClientHazyGrassStage>();
                    break;
                default:
@@ -529,15 +529,16 @@
            WindowCenter.Instance.Close<LoadingWin>();
            SystemSetting.Instance.SetGameFps(SystemSetting.Instance.GetGameFps());

            GAMgr.Instance.DoReAdjustPos();
            GAMgr.Instance.ClearReJustActor();

            done = true;
        }

        public override void End()
        {
            Application.backgroundLoadingPriority = ThreadPriority.BelowNormal;

            GAMgr.Instance.DoReAdjustPos();
            GAMgr.Instance.ClearReJustActor();

            DebugEx.LogFormat("StageLoad => Load Scene : {0} Finished.", command.toMapId);
        }