Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0428_tagPlayerRideHorse.cs
@@ -32,6 +32,11 @@ return; } if (ClientDungeonStageUtility.isClientDungeon) { return; } if (_hero == null || _hero.MovingState == E_MovingState.Ride || _hero.IsPolyMorph Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
@@ -148,48 +148,58 @@ StatusMgr.Instance.GetBuffIds(vNetData.ObjID, ref _skill.cacheBuffList); _skill.OnRecv_SkillCast(); if (!(_attacker is GA_Player) || BattleEffectPlayRule.Instance.CanPlay(vNetData.ObjID)) if (!(_skill.skillInfo.config.SkillType == (int)E_SkillType.Passive || _skill.skillInfo.config.SkillType == (int)E_SkillType.PassiveBuff || _skill.skillInfo.config.SkillType == (int)E_SkillType.PassiveContinuousGain || _skill.skillInfo.config.SkillType == (int)E_SkillType.PassiveControlBuff || _skill.skillInfo.config.SkillType == (int)E_SkillType.PassiveGainBuff || _skill.skillInfo.config.SkillType == (int)E_SkillType.PassiveReductionBuff || _skill.skillInfo.config.SkillType == (int)E_SkillType.PassiveSustainedReduction || (_skill.skillInfo.config.Skillactmark > 100 || _skill.skillInfo.config.Skillactmark < 10))) { // 这里播放配置的技能特效 if (_skill.skillInfo.config.EffectName > 0) if (!(_attacker is GA_Player) || BattleEffectPlayRule.Instance.CanPlay(vNetData.ObjID)) { bool _playEffect = true; if (vNetData.ObjID != PlayerDatas.Instance.PlayerId) // 这里播放配置的技能特效 if (_skill.skillInfo.config.EffectName > 0) { if (!_attacker.ShowOrHide || SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.Low) { _playEffect = false; } } bool _playEffect = true; if (_playEffect) { if (_skill.warnPosList.Count > 1) if (vNetData.ObjID != PlayerDatas.Instance.PlayerId) { for (int i = 0; i < _skill.warnPosList.Count; ++i) if (!_attacker.ShowOrHide || SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.Low) { SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _skill.warnPosList[i], Vector3.forward); _playEffect = false; } } else if (_playEffect) { if ((_skill.skillInfo.config.Tag % 10) == 0 || (_skill.skillInfo.config.Tag % 10) == 1 || _attacker is GActorNpcFight) if (_skill.warnPosList.Count > 1) { SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _attacker); for (int i = 0; i < _skill.warnPosList.Count; ++i) { SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _skill.warnPosList[i], Vector3.forward); } } else { Vector3 _pos = new Vector3((vNetData.PosX - GA_Hero.MapOffset.x) * .5f, _attacker.Pos.y, (vNetData.PosY - GA_Hero.MapOffset.z) * .5f); if ((_skill.skillInfo.config.Tag % 10) == 0 || (_skill.skillInfo.config.Tag % 10) == 1 || _attacker is GActorNpcFight) { SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _attacker); } else { Vector3 _pos = new Vector3((vNetData.PosX - GA_Hero.MapOffset.x) * .5f, _attacker.Pos.y, (vNetData.PosY - GA_Hero.MapOffset.z) * .5f); Vector3 _dir = MathUtility.ForwardXZ(_pos, _attacker.Pos); Vector3 _dir = MathUtility.ForwardXZ(_pos, _attacker.Pos); SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _pos, _dir); SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _pos, _dir); } } } } @@ -206,23 +216,20 @@ || _skill.skillInfo.config.SkillType == (int)E_SkillType.PassiveSustainedReduction || (_skill.skillInfo.config.Skillactmark > 100 || _skill.skillInfo.config.Skillactmark < 10)) { if (vNetData.ObjID == PlayerDatas.Instance.PlayerId) if (GeneralDefine.PassiveSkillShow.Contains(_skill.id)) { if (GeneralDefine.PassiveSkillShow.Contains(_skill.id)) { HeadUpSkillName.Popup(_skill.id, _attacker.MP_Name1.position, CameraController.Instance.CameraObject); } HeadUpSkillName.Popup(_skill.id, _attacker.MP_Name1.position, CameraController.Instance.CameraObject); } if (_skill.skillInfo.config.EffectName > 0) if (_skill.skillInfo.config.EffectName > 0) { int _skillEffectId = _skill.skillInfo.config.EffectName; int _replaceEffectId = JobSetupConfig.GetExpertSkillChangeEffect(_skill.id); if (_replaceEffectId > 0) { int _skillEffectId = _skill.skillInfo.config.EffectName; int _replaceEffectId = JobSetupConfig.GetExpertSkillChangeEffect(_skillEffectId); if (_replaceEffectId > 0) { _skillEffectId = _replaceEffectId; } SFXPlayUtility.Instance.PlayBattleEffect(_skillEffectId, _attacker); _skillEffectId = _replaceEffectId; } SFXPlayUtility.Instance.PlayBattleEffect(_skillEffectId, _attacker); } BuildHurtList(vNetData, _skill); Fight/Actor/AI/Process/PN_DieNoFall.cs
@@ -8,8 +8,6 @@ public sealed override void Init() { m_Target.dieNoFall = true; m_Target.ActorInfo.SyncServerHp = 0; m_Target.ActorInfo.ReduceHp(GActorInfo.FullHp); m_Target.Die(); #if UNITY_EDITOR if (RuntimeLogUtility.s_LogProcessInfo) Fight/Actor/AI/Process/PN_FallAndRelease.cs
@@ -9,6 +9,8 @@ { m_Target.dieNoFall = false; m_Target.ActorInfo.serverDie = true; m_Target.ActorInfo.SyncServerHp = 0; m_Target.ActorInfo.ReduceHp(GActorInfo.FullHp); GAMgr.Instance.ServerDie(m_Target.ServerInstID); m_Target.Die(); GAMgr.Instance.DoDelayDie(m_Target); Fight/ClientCollectUtility.cs
@@ -285,7 +285,7 @@ } } if (!_hero.IsIdle() && !_hero.IsCollect()) if (!_hero.IsIdle() && !_hero.IsCollect() && !(_hero.NextAction == GAStaticDefine.Act_Collect)) { StopCollect(); } System/Alchemy/AlchemyBaseWin.cs
@@ -27,6 +27,10 @@ protected override void OnActived() { base.OnActived(); if (WindowCenter.Instance.IsOpen<AlchemyDrugLimitWin>()) { WindowCenter.Instance.Close<AlchemyDrugLimitWin>(); } } protected override void OnPreClose() System/DailyQuest/DailyQuestData.cs
@@ -853,6 +853,18 @@ return null; } public List<HourMinute> GetNormalHourMinutes() { foreach (var hourMinutes in openTimes.Values) { if (hourMinutes != null) { return hourMinutes; } } return null; } } public struct HourMinute System/ItemTip/EquipTipWin.cs
@@ -297,6 +297,7 @@ if (!getWaysWidget.gameObject.activeSelf) { getWaysWidget.Display(getWay); getWaysWidget.Bind("EquipTipWin"); } else { System/ItemTip/ItemTipWin.cs
@@ -167,6 +167,7 @@ if (!m_GetWaysWidget.gameObject.activeSelf) { m_GetWaysWidget.Display(getWay); m_GetWaysWidget.Bind("ItemTipWin"); } else { System/ItemTip/PetMountTipWin.cs
@@ -203,6 +203,7 @@ if (!m_GetWaysWidget.gameObject.activeSelf) { m_GetWaysWidget.Display(getWay); m_GetWaysWidget.Bind("PetMountTipWin"); } else { System/ItemTip/SpiritWeaponTipWin.cs
@@ -122,6 +122,7 @@ if (!m_GetWaysWidget.gameObject.activeSelf) { m_GetWaysWidget.Display(getWay); m_GetWaysWidget.Bind("SpiritWeaponTipWin"); } else { System/ItemTip/TipGetWaysWidget.cs
@@ -6,7 +6,8 @@ using System.Collections; using UnityEngine.UI; using DG.Tweening; using System; namespace Snxxz.UI { @@ -14,6 +15,8 @@ { [SerializeField] WayCell[] m_GetWays; [SerializeField] CanvasGroup m_AlphaTween; string windowName; public void Display(ItemTipUtility.GetWay getWay) { @@ -25,6 +28,8 @@ var way = getWay.ways[i]; behaviour.gameObject.SetActive(true); behaviour.Display(way); behaviour.RemoveAllListeners(); behaviour.AddListener(OnGetWay); } else { @@ -35,7 +40,20 @@ this.gameObject.SetActive(true); m_AlphaTween.alpha = 0; m_AlphaTween.DOFade(1, 0.5f); } } public void Bind(string windowName) { this.windowName = windowName; } private void OnGetWay() { if (!string.IsNullOrEmpty(windowName)) { WindowCenter.Instance.Close(windowName); } } public void Hide() { System/ItemTip/WingTipWin.cs
@@ -137,6 +137,7 @@ if (!m_GetWaysWidget.gameObject.activeSelf) { m_GetWaysWidget.Display(getWay); m_GetWaysWidget.Bind("WingTipWin"); } else { System/OpenServerActivity/OSGiftModel.cs
@@ -244,7 +244,7 @@ { for (int i = 0; i < alreadyOpens.Count; i++) { if (gifts[i].payType == jumpGiftId) if (gifts[alreadyOpens[i]].payType == jumpGiftId) { jumpGiftId = 0; return alreadyOpens[i]; System/Role/RolePanel.cs
@@ -12,6 +12,30 @@ { public class RolePanel : OneLevelWin { Dictionary<int, FunctionButton> m_FunctionButtons = new Dictionary<int, FunctionButton>(); protected override void BindController() { m_TitleIcon = this.GetComponent<Image>("Pivot/Container_BackGround/Img_Title"); m_Group = this.GetComponent<FunctionButtonGroup>("Pivot/Container_Functions"); m_Left = this.GetComponent<Button>("Pivot/Container_Buttons/Btn_Left"); m_Right = this.GetComponent<Button>("Pivot/Container_Buttons/Btn_Right"); m_Close = this.GetComponent<Button>("Pivot/Container_Buttons/Btn_Close"); m_SubWindowContainer = this.GetComponent<RectTransform>("Pivot/Container_SubWindow"); var name = this.GetType().Name; var infos = WindowConfig.GetWindowFunctionInfos(name); foreach (var info in infos) { m_FunctionButtons.Add(info.order, m_Group.AddFunction("FunctionButton_Pattern_1", info.order, info.functionId, Language.Get(info.titleKey), info.redPointId)); } m_TitleIcon.SetSprite(WindowConfig.GetTitleIconKey(name)); m_TitleIcon.SetNativeSize(); } protected override void AddListeners() { base.AddListeners(); @@ -22,6 +46,13 @@ SetFunctionListener(4, GatherSoul); } protected override void OnPreOpen() { base.OnPreOpen(); var functionId = m_FunctionButtons[4].functionId; m_FunctionButtons[4].gameObject.SetActive(functionId == 0 || FuncOpen.Instance.IsFuncOpen(functionId)); } protected override void OnActived() { base.OnActived(); System/SystemSetting/SetPrivateModel.cs
@@ -445,28 +445,23 @@ title = config.Title; times = new List<string>(); for (int i = 0; i < 7; i++) var hourMinutelist = dailyQuestOpenTime.GetNormalHourMinutes(); if (hourMinutelist != null) { var hourMinutelist = dailyQuestOpenTime.GetHourMinuteByWeek(i); if (hourMinutelist != null) if (id == (int)DailyQuestType.FairyFeast || id == (int)DailyQuestType.FairyLeague) { if (id == (int)DailyQuestType.FairyFeast ||id==(int)DailyQuestType.FairyLeague) var time = StringUtility.Contact(hourMinutelist[0].hourBegin > 9 ? hourMinutelist[0].hourBegin.ToString() : "0" + hourMinutelist[0].hourBegin, ":", hourMinutelist[0].minuteBegin > 9 ? hourMinutelist[0].minuteBegin.ToString() : "0" + hourMinutelist[0].minuteBegin); times.Add(time); } else { for (int j = 0; j < hourMinutelist.Count; j++) { var time = StringUtility.Contact(hourMinutelist[0].hourBegin > 9 ? hourMinutelist[0].hourBegin.ToString() : "0" + hourMinutelist[0].hourBegin, ":", hourMinutelist[0].minuteBegin > 9 ? hourMinutelist[0].minuteBegin.ToString() : "0" + hourMinutelist[0].minuteBegin); var time = StringUtility.Contact(hourMinutelist[j].hourBegin > 9 ? hourMinutelist[j].hourBegin.ToString() : "0" + hourMinutelist[j].hourBegin, ":", hourMinutelist[j].minuteBegin > 9 ? hourMinutelist[j].minuteBegin.ToString() : "0" + hourMinutelist[j].minuteBegin); times.Add(time); break; } else { for (int j = 0; j < hourMinutelist.Count; j++) { var time = StringUtility.Contact(hourMinutelist[j].hourBegin > 9 ? hourMinutelist[j].hourBegin.ToString() : "0" + hourMinutelist[j].hourBegin, ":", hourMinutelist[j].minuteBegin > 9 ? hourMinutelist[j].minuteBegin.ToString() : "0" + hourMinutelist[j].minuteBegin); times.Add(time); } break; } } }
