| Fight/GameActor/GA_Hero.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GA_NpcFightNorm.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GA_NpcFunc.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GActor.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/GatheringSoul/GatheringSoulModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/GameActor/GA_Hero.cs
@@ -440,13 +440,21 @@ }); var _collect = _list[0] as GA_NpcCollect; if (_collect != null) { if ((SelectTarget == null || SelectTarget is GA_NpcCollect) && SelectTarget != _collect) var _dist = MathUtility.DistanceSqrtXZ(_collect.Pos, Pos); if (_dist < 16) { SelectTarget = _collect; _collect.Arrive(); if ((SelectTarget == null || SelectTarget is GA_NpcCollect) && SelectTarget != _collect) { SelectTarget = _collect; _collect.Arrive(); } } } } } Fight/GameActor/GA_NpcFightNorm.cs
@@ -57,7 +57,7 @@ else { // 初始化坐标 AdjustPos(_h0406.PosX, _h0406.PosY); AdjustPos(_h0406.PosX, _h0406.PosY,false); } GAStaticDefine.NPCLocation _npcLocation; Fight/GameActor/GA_NpcFunc.cs
@@ -504,7 +504,11 @@ GA_Hero _hero = PlayerDatas.Instance.hero; Vector3 _forward = MathUtility.ForwardXZ(Pos, _hero.Pos); _hero.Forward = _forward; if (NpcConfig.NPCID != GeneralDefine.GatherSoulDZ) { _hero.Forward = _forward; } if (NpcConfig.AutomaticFace == 1) { Fight/GameActor/GActor.cs
@@ -32,9 +32,9 @@ { m_Root.position = m_Pos; } //if (this is GA_Player) //if (this is GA_NpcFightNorm) //{ // Debug.Log("坐标改变....." + value); // Debug.Log("坐标改变.....: " + value); //} } } @@ -55,18 +55,20 @@ m_Root.rotation = m_Rotation; } // if (ServerInstID == PlayerDatas.Instance.PlayerId) // { // System.Diagnostics.StackTrace st = new System.Diagnostics.StackTrace(); // System.Diagnostics.StackFrame[] sfs = st.GetFrames(); // string _content = ""; // for (int u = 0; u < sfs.Length; ++u) // { // System.Reflection.MethodBase mb = sfs[u].GetMethod(); // _content += string.Format("[CALL STACK][{0}]: {1}.{2}\r\n", u, mb.DeclaringType.FullName, mb.Name); // } // Debug.Log(_content); // } if (ServerInstID == PlayerDatas.Instance.PlayerId) { //System.Diagnostics.StackTrace st = new System.Diagnostics.StackTrace(); //System.Diagnostics.StackFrame[] sfs = st.GetFrames(); //string _content = ""; //for (int u = 0; u < sfs.Length; ++u) //{ // System.Reflection.MethodBase mb = sfs[u].GetMethod(); // _content += string.Format("[CALL STACK][{0}]: {1}.{2}\r\n", u, mb.DeclaringType.FullName, mb.Name); //} //Debug.Log(_content); //Debug.Log("转向了.......: " + m_Forward); } } } } @@ -624,13 +626,11 @@ /// <param name="sPosY">服务端坐标Y</param> public void AdjustPos(ushort sPosX, ushort sPosY, bool chkNavmesh = true) { //Debug.LogFormat("sPosX: {0} - MapOffsetX: {1} = {2}", sPosX, GA_Hero.MapOffset.x, sPosX - (ushort)GA_Hero.MapOffset.x); //Debug.LogFormat("sPosY: {0} - MapOffsetY: {1} = {2}", sPosY, GA_Hero.MapOffset.z, sPosY - (ushort)GA_Hero.MapOffset.z); sPosX -= (ushort)GA_Hero.MapOffset.x; sPosY -= (ushort)GA_Hero.MapOffset.z; Vector3 _clntPos = new Vector3(sPosX * .5f, 0, sPosY * .5f); Vector3 _adjustPos = Vector3.zero; if (!chkNavmesh) System/GatheringSoul/GatheringSoulModel.cs
@@ -613,8 +613,8 @@ { continue; } if (!item.ExistSameProperty(compare.id) || item.Compare(compare) != 1) if (item.ExistSameProperty(compare.id) && item.itemColor < compare.itemColor) { return false; } @@ -633,8 +633,8 @@ { continue; } if (!item.ExistSameProperty(compare.id) || item.Compare(compare) != 1) if (item.ExistSameProperty(compare.id) && item.itemColor < compare.itemColor) { return false; } @@ -666,7 +666,8 @@ break; case ItemWinBtnType.split: case ItemWinBtnType.Resolve: if (IsBestSoul(item, item.placeType, item.index)) if (type == ItemWinBtnType.Resolve && IsBestSoul(item, item.placeType, item.index)) { ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("BestGatherSoulResolveConfirm"), (bool isOk) => { @@ -1455,6 +1456,8 @@ public int placeType { get; private set; }//0-背包 1-装备 public int itemColor { get; private set; } GatheringSoulModel model { get { return ModelCenter.Instance.GetModel<GatheringSoulModel>(); } @@ -1471,6 +1474,7 @@ base.ParsePackItem(index, data); var itemConfig = Config.Instance.Get<ItemConfig>(id); itemType = itemConfig.Type; itemColor = itemConfig.ItemColor; if (itemType == GatheringSoulModel.GATHERSOUL_SOUL_TYPE) { gatherSoulType = GatherSoulType.Soul;
