Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs
@@ -32,12 +32,15 @@ switch (vNetData.socketType) { case GameNetSystem.SocketType.Main: if (loginModel.reconnectBackGround || StageManager.Instance.socketType != GameNetSystem.SocketType.Main) if (loginModel.reconnectBackGround || StageManager.Instance.socketType != GameNetSystem.SocketType.Main || DTCA127_tagMCStartChangeMap.isChangeLine) { var mapOk = new C0107_tagCInitMapOK(); mapOk.MapID = PlayerDatas.Instance.baseData.MapID; mapOk.Type = 0; GameNetSystem.Instance.SendInfo(mapOk); DTCA127_tagMCStartChangeMap.isChangeLine = false; } break; case GameNetSystem.SocketType.CrossSever: Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
@@ -467,8 +467,7 @@ #endif // 跨服竞技场不检测反击逻辑 if(PlayerDatas.Instance.baseData.MapID == 32010 || PlayerDatas.Instance.baseData.MapID == 32011) if(CrossServerRewardModel.IsCrossServerOneVsOne()) { return; } Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA127_tagMCStartChangeMap.cs
@@ -17,6 +17,7 @@ public static readonly Dictionary<int, int> mapIdDict = new Dictionary<int, int>(); public static int LineID = 0; public static bool isChangeLine = false; public static MapResourcesConfig GetMapResourcesConfig() { @@ -137,6 +138,9 @@ #if UNITY_EDITOR Debug.LogFormat("DTCA127_tagMCStartChangeMap出现加载相同地图行为:" + _mapResConfig.ID); #endif isChangeLine = true; return; }
@@ -180,8 +180,11 @@ ParticleSystem.MainModule _mainModule; for (int i = 0; i < m_CacheParticleSystem.Length; ++i) { _mainModule = m_CacheParticleSystem[i].main; _mainModule.simulationSpeed = m_ParticleProperties[i].simulationSpeed * speed; if (m_CacheParticleSystem[i]) { _mainModule = m_CacheParticleSystem[i].main; _mainModule.simulationSpeed = m_ParticleProperties[i].simulationSpeed * speed; } } } } Fight/Actor/AI/HeroAI_Auto.cs
@@ -153,7 +153,7 @@ } } if (_hero.IsCollect() && m_UserClickSkillID == 0) if (_hero.IsCollect() && m_UserClickSkillID <= 0) { return; } Fight/Actor/AI/HeroAI_D5_Hlyy.cs
@@ -39,8 +39,7 @@ string _chkKey = (PlayerDatas.Instance.baseData.MapID * 100 + PlayerDatas.Instance.baseData.dungeonLineId).ToString(); if (PlayerDatas.Instance.baseData.MapID == 32010 || PlayerDatas.Instance.baseData.MapID == 32011) if (CrossServerRewardModel.IsCrossServerOneVsOne()) { _chkKey = (PlayerDatas.Instance.baseData.MapID * 100).ToString(); } @@ -104,7 +103,7 @@ // 未到达路点则寻路至路点 if (_chkDistSqrt > .25f) { _hero.MoveToPosition(m_PointList[m_Index]); _hero.MoveToPosition(m_PointList[m_Index], 0, CrossServerRewardModel.IsCrossServerOneVsOne()); } // 到达路点就去往下一个路点 else Fight/Actor/Skill/SkillManager.cs
@@ -41,6 +41,23 @@ m_SkillList = new List<int>(); } public void ResetAllCD() { foreach (var _skill in m_SkillDict.Values) { if (_skill != null && _skill.skillInfo != null && _skill.skillInfo.config != null) { if (_skill.RefreshCD != null) { _skill.cd = 0; _skill.RefreshCD(0, _skill.skillInfo.config.CoolDownTime * Constants.F_GAMMA); } } } } public Skill Get(int id) { if (id <= 0) Fight/GameActor/GA_Hero.cs
@@ -328,8 +328,7 @@ #if UNITY_EDITOR && RuntimeLogUtility.s_forceAutoFight #endif && PlayerDatas.Instance.baseData.MapID != 32010 && PlayerDatas.Instance.baseData.MapID != 32011) && !CrossServerRewardModel.IsCrossServerOneVsOne()) { if (!aiHandler.IsAuto() && !BossShowModel.Instance.BossShowing) { Fight/GameActor/GActor.cs
@@ -305,11 +305,12 @@ } } public void MoveToPosition(Vector3 destPos, float keepDist = 0) public void MoveToPosition(Vector3 destPos, float keepDist = 0,bool force = false) { if (PathFindStatus == E_PathFindStatus.Moving && m_SearchType == E_SearchType.Static && MathUtility.DistanceSqrtXZ(DestPos, destPos) < 0.01f) && MathUtility.DistanceSqrtXZ(DestPos, destPos) < 0.01f && !force) { Run(); return; Fight/Stage/Dungeon/DungeonStage.cs
@@ -101,6 +101,11 @@ WindowCenter.Instance.Open<AntiAddictionWin>(); } if (CrossServerRewardModel.IsCrossServerOneVsOne()) { _hero.SkillMgr.ResetAllCD(); } GA_Hero.s_MapSwitching = false; }
@@ -148,6 +148,7 @@ { if (PlayerDatas.Instance.baseData.ExAttr5 != 1) return; var hero = PlayerDatas.Instance.hero; var mission = dungeonModel.mission; if(mission.prepareTime > 0) { @@ -156,6 +157,11 @@ { WindowCenter.Instance.Open<CrossServerOneVsOneRoundWin>(); } if(hero != null) { hero.Behaviour.StopHandupAI(true); } } DebugEx.LogFormat("副本帮助信息回合是否开始：：{0}",mission.isStart); if (mission.isStart == 1) @@ -169,6 +175,10 @@ { WindowCenter.Instance.Open<CrossServerOneVsOneStartFightWin>(); } if (hero != null) { hero.Behaviour.StartHandupAI(); } } }
@@ -50,8 +50,17 @@ PlayerBuffDatas m_BuffModel; PlayerBuffDatas Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>()); } } float timer = 0f; private int WinSorce = 0; private int FailureSorce = 0; protected override void BindController() { { var configNum1 = Config.Instance.Get<FuncConfigConfig>("CrossRealmPKScore").Numerical2; var _jsonDataC = LitJson.JsonMapper.ToObject(configNum1); if (_jsonDataC.Count > 0) { WinSorce = int.Parse(_jsonDataC[0].ToString()); FailureSorce= int.Parse(_jsonDataC[1].ToString()); } } protected override void AddListeners() @@ -133,6 +142,7 @@ m_RoundWinThree.SetActive(false); m_SessionObj.SetActive(false); m_SegmentObj.SetActive(false); int WinnerID = crossServerModel.pkResultInfo.WinnerID; int PlayerId = (int)PlayerDatas.Instance.baseData.PlayerID; for (int i = 0; i < crossServerModel.pkResultInfo.RoundCount; i++) { @@ -197,11 +207,18 @@ } if (crossServerModel.pkResultInfo.WinStreak > 1) { m_SorceText.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore); m_SorceText.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.AddScore, (crossServerModel.pkResultInfo.AddScore- WinSorce)); } else { m_SorceText.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore); if (WinnerID == PlayerId) { m_SorceText.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore); } else { m_SorceText.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore); } } } @@ -240,11 +257,18 @@ } if (crossServerModel.pkResultInfo.WinStreak > 1) { m_Sorce_Txt.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore); m_Sorce_Txt.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.AddScore, (crossServerModel.pkResultInfo.AddScore- WinSorce)); } else { m_Sorce_Txt.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore); if(WinnerID == playerID) { m_Sorce_Txt.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore); } else { m_Sorce_Txt.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore); } } } } System/CrossServerOneVsOne/FightingPKWin.cs
@@ -225,7 +225,7 @@ } private void OnRefreshPlayerLifeBar(uint _instanceId, ulong _hp, ulong _maxHp) { // DebugEx.LogError("最大血量"+ _maxHp+"当前血量"+ _hp); DebugEx.LogError("最大血量"+ _maxHp+"当前血量"+ _hp); if (positionType == 1) { m_RoleInformation2.SetHeroHP((int)_maxHp, (int)_hp); System/Login/CrossServerLogin.cs
@@ -45,7 +45,7 @@ roomId = matchOK.RoomID, waitForLoginCrossServer = true, validTimeLimited = Time.time + 30f, autoEnsureTime = Time.time + 5f, autoEnsureTime = Time.time + 3f, myName = matchOK.PlayerName, myJob = PlayerDatas.Instance.baseData.Job, myBornPoint = matchOK.Number,
