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

client_linchunjie

2018-12-03 24c58fbf9fff0584641d1c7672dbbd18ea161868

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

 Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA127_tagMCStartChangeMap.cs

@@ -117,7 +117,7 @@
        }
        LocalSave.SetInt(RECORDPREMAPID_KEY, PlayerDatas.Instance.baseData.MapID);


        BattleEffectPlayRule.Instance.sortPlayerList.Clear();
        DEBUG_STEP = 3;

        PlayerDatas.Instance.baseData.MapID = (ushort)package.MapID;

 Fight/Actor/State/SMB/STM_BaseAttack.cs

@@ -223,7 +223,7 @@
        if (_fight == null)

        {

#if UNITY_EDITOR

            Debug.LogError("owner类型问题: " + owner.GetType());

            Debug.LogErrorFormat("owner: {0} 类型问题: {1}" ,owner.ServerInstID, owner.GetType());

#endif

            return;

        }


 Fight/GameActor/GActorNpcFight.cs

@@ -295,10 +295,10 @@
            {

                m_Animator.Play(GAStaticDefine.State_IdleHash);

            }

            if (this is GA_Pet)

            {

                Debug.LogFormat("调用了 {0} 的立即站立", ServerInstID);

            }

            //if (this is GA_Pet)

            //{

            //    Debug.LogFormat("调用了 {0} 的立即站立", ServerInstID);

            //}

        }

    }