| Core/NetworkPackage/DTCFile/ServerPack/H05_PlayerMove/DTC0501_tagObjMove.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/Skill/AttackHandler.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GA_Hero.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GA_Pet.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Stage/StageManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/RankingWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/GMCommand/GMInputWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServiceAchievementModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/NetworkPackage/DTCFile/ServerPack/H05_PlayerMove/DTC0501_tagObjMove.cs
@@ -58,8 +58,11 @@ else { GActorNpcFight _npcFight = _actor as GActorNpcFight; _npcFight.ActorInfo.moveSpeed = 500f / vNetData.Speed; _npcFight.MoveToPosition(_destPosition); if (_npcFight != null && _npcFight.ActorInfo != null) { _npcFight.ActorInfo.moveSpeed = 500f / vNetData.Speed; _npcFight.MoveToPosition(_destPosition); } } } } Fight/Actor/Skill/AttackHandler.cs
@@ -36,10 +36,18 @@ if (_hitEffectId != -1) { SFXController _controller = SFXPlayUtility.Instance.PlayEffectAsync(_hitEffectId, target.MP_Hit.position, Vector3.forward); _controller.transform.rotation = CameraController.Instance.CameraObject.transform.rotation * Quaternion.Euler(0, 0, Random.Range(0, 360)); SFXController _controller = target.MP_Hit ? SFXPlayUtility.Instance.PlayEffectAsync(_hitEffectId, target.MP_Hit.position, Vector3.forward) : SFXPlayUtility.Instance.PlayEffectAsync(_hitEffectId, target.Root.position, Vector3.forward); if (CameraController.Instance.CameraObject) { _controller.transform.rotation = CameraController.Instance.CameraObject.transform.rotation * Quaternion.Euler(0, 0, Random.Range(0, 360)); } // 播放受击音效 if (target.ActorType == GameObjType.gotNPC) @@ -62,11 +70,13 @@ if (soConfig.hitEffectId != 0) { SFXController _controller = SFXPlayUtility.Instance.PlayEffectAsync(soConfig.hitEffectId, target.MP_Hit.position, Vector3.forward); _controller.transform.rotation = CameraController.Instance.CameraObject.transform.rotation * Quaternion.Euler(0, 0, Random.Range(0, 360)); SFXController _controller = target.MP_Hit ? SFXPlayUtility.Instance.PlayEffectAsync(soConfig.hitEffectId, target.MP_Hit.position, Vector3.forward) : SFXPlayUtility.Instance.PlayEffectAsync(soConfig.hitEffectId, target.Root.position, Vector3.forward); // 播放受击音效 if (target.ActorType == GameObjType.gotNPC) { Fight/GameActor/GA_Hero.cs
@@ -107,7 +107,12 @@ { return; } #if UNITY_EDITOR if (base.SelectTarget is GActorPlayerBase && value is GActorPlayerBase) { Debug.LogFormat("<color=yellow>在当前选择目标是玩家的时候切换到了另一个玩家: {0} => {1}</color>", base.SelectTarget.ServerInstID, value.ServerInstID); } #endif IOtherSelectable _selectable = base.SelectTarget as IOtherSelectable; if (_selectable != null) { Fight/GameActor/GA_Pet.cs
@@ -179,7 +179,7 @@ m_LastTalkTime = Time.realtimeSinceStartup; } } public sealed override bool CanAtked() { return false; @@ -211,14 +211,11 @@ } public sealed override void OnSelect() { throw new System.NotImplementedException(); } public sealed override void OnUnSelect() { throw new System.NotImplementedException(); } public sealed override void OnClick() { throw new System.NotImplementedException(); } } Fight/Stage/StageManager.cs
@@ -374,11 +374,6 @@ break; } } // var _mapData = H2Engine.MapData.LoadFormFile("map_" + _stageId); // if (_mapData != null) // { // // } } else { System/CrossServerOneVsOne/RankingWin.cs
@@ -44,7 +44,7 @@ { m_ScrollerController.OnRefreshCell += OnRefreshGridCell; m_ScrollerController1.OnRefreshCell += OnRefreshGridCell_Z;//赛区 m_ScrollerController2.OnRefreshCell += OnRefreshGridCell_S;//赛区 m_ScrollerController2.OnRefreshCell += OnRefreshGridCell_S;//赛季 var configNum1 = Config.Instance.Get<FuncConfigConfig>("CrossRealmPKCfg").Numerical1; var _jsonDataC = LitJson.JsonMapper.ToObject(configNum1); if (_jsonDataC.Count > 0) @@ -170,10 +170,6 @@ } } } //for (int i = 1; i <= CrossServerOneVsOnePKSeason.Instance.SeasonID; i++) //{ // gridCtrl.AddCell(ScrollerDataType.Header, i); //} gridCtrl.Restart(); } private void OnRefreshGridCell(ScrollerDataType type, CellView cell) @@ -202,7 +198,22 @@ } crossServerRewardModel.ZoneID = Id; crossServerRewardModel.ZoneName = UIHelper.ServerStringTrim(Name); crossServerRewardModel.SeasonID = 1; int _SeasonID = 1; for (int i = 0; i < CrossServerOneVsOnePKSeason.Instance.ZoneCount; i++) { if (CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].ZoneID == crossServerRewardModel.ZoneID) { var list = CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].SeasonList; for (int j = 0; j < list.Count; j++) { if (list[j].SeasonID > _SeasonID) { _SeasonID = list[j].SeasonID; } } } } crossServerRewardModel.SeasonID = _SeasonID; m_ClickScreenOtherSpace1.SetActive(false); crossServerRewardModel.ViewCrossPKBillboard(crossServerRewardModel.ZoneID, crossServerRewardModel.SeasonID);//关于赛季查询 }); System/GMCommand/GMInputWin.cs
@@ -91,6 +91,10 @@ { OnClickSendBtn(); } if (Input.GetKeyDown(KeyCode.P)) { WindowCenter.Instance.Open<JadeDynastyKnapSackWin>(); } } private void CreateCmdCell() System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -20,7 +20,7 @@ public int DayIndex;//第X天 public int Point;//积分 public int AwardRecord;//领奖记录 public ActionTypeClass[] ActionType;//领奖信息 public List<ActionTypeClass> ActionType;//领奖信息 } public class TimeDayClass { @@ -154,30 +154,36 @@ WeekPartyDayInfoClass WeekPartyDayInfo = new WeekPartyDayInfoClass(); WeekPartyDayInfo.DayIndex = (int)DayInfo.DayIndex; WeekPartyDayInfo.Point = (int)DayInfo.Point; WeekPartyDayInfo.AwardRecord = (int)DayInfo.AwardRecord; WeekPartyDayInfo.AwardRecord = (int)DayInfo.AwardRecord; if (WeekPartyDayInfoDic.ContainsKey((int)DayInfo.DayIndex)) { var dit = WeekPartyDayInfoDic[(int)DayInfo.DayIndex]; dit.DayIndex= (int)DayInfo.DayIndex; dit.Point = (int)DayInfo.Point; dit.AwardRecord= (int)DayInfo.AwardRecord; for (int j = 0; j < dit.ActionType.Length; j++) for (int j = 0; j < DayInfo.ACount; j++) { if (dit.ActionType[j].TemplateID == DayInfo.TaskList[0].TemplateID) var taskList = DayInfo.TaskList[j]; int Index = dit.ActionType.FindIndex(s=>s.TemplateID== taskList.TemplateID); if (Index != -1) { dit.ActionType[Index].CurTimes = taskList.CurTimes; dit.ActionType[Index].GotTimes = taskList.GotTimes; } else { ActionTypeClass ActionType = new ActionTypeClass(); ActionType.TemplateID = DayInfo.TaskList[0].TemplateID; ActionType.CurTimes = DayInfo.TaskList[0].CurTimes; ActionType.GotTimes = DayInfo.TaskList[0].GotTimes; dit.ActionType[j] = ActionType; } ActionType.TemplateID = taskList.TemplateID; ActionType.CurTimes = taskList.CurTimes; ActionType.GotTimes = taskList.GotTimes; dit.ActionType.Add(ActionType); } } WeekPartyDayInfoDic[(int)DayInfo.DayIndex] = dit; } else { WeekPartyDayInfo.ActionType = new ActionTypeClass[DayInfo.ACount]; WeekPartyDayInfo.ActionType = new List<ActionTypeClass>(); for (int k = 0; k < DayInfo.ACount; k++) { var Task = DayInfo.TaskList[k]; @@ -185,7 +191,7 @@ ActionType.TemplateID = Task.TemplateID; ActionType.CurTimes = Task.CurTimes; ActionType.GotTimes = Task.GotTimes; WeekPartyDayInfo.ActionType[k] = ActionType; WeekPartyDayInfo.ActionType.Add(ActionType); } WeekPartyDayInfoDic.Add((int)DayInfo.DayIndex, WeekPartyDayInfo); } @@ -298,7 +304,7 @@ { var WeekPartyDay = WeekPartyDayInfoDic[Day]; for (int i = 0; i < WeekPartyDay.ActionType.Length; i++) for (int i = 0; i < WeekPartyDay.ActionType.Count; i++) { var ActionType = WeekPartyDay.ActionType[i]; if (ID == ActionType.TemplateID) @@ -316,7 +322,7 @@ { var WeekPartyDay = WeekPartyDayInfoDic[Day]; for (int i = 0; i < WeekPartyDay.ActionType.Length; i++) for (int i = 0; i < WeekPartyDay.ActionType.Count; i++) { var ActionType = WeekPartyDay.ActionType[i]; if (ID == ActionType.TemplateID)
