Core/NetworkPackage/DTCFile/ServerPack/HC0_CrossRealm/DTCC004_tagGCCrossRealmPKSeason.cs
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HC0_CrossRealm/DTCC004_tagGCCrossRealmPKSeason.cs.meta
File was deleted Core/NetworkPackage/ServerPack/HC0_CrossRealm/HC004_tagGCCrossRealmPKSeason.cs
File was deleted Core/NetworkPackage/ServerPack/HC0_CrossRealm/HC004_tagGCCrossRealmPKSeason.cs.meta
File was deleted System/Compose/New/ComposeFirstTypeCell.cs
@@ -27,7 +27,8 @@ unlockTypeName.text = itemCompound.secondTypeName; arrowImg.gameObject.SetActive(thirdType != 0); UpdateBtnImg(selectSecondType); if (composeModel.secondTypeRedDict.ContainsKey(secondType)) if (firstType == (int)ComposeFuncType.Item && composeModel.secondTypeRedDict.ContainsKey(secondType)) { redpoint.gameObject.SetActive(true); redpoint.redpointId = composeModel.secondTypeRedDict[secondType].id; System/Compose/New/ComposeSecondTypeCell.cs
@@ -34,7 +34,8 @@ lockTypeName.text = itemCompound.thirdTypeName; lockLevel.text = StringUtility.Contact(itemCompound.levelNeed,Language.Get("Z1041")); string key = StringUtility.Contact(secondType, 10,thirdType); if (composeModel.thirdTypeRedDict.ContainsKey(key)) if (firstType == (int)ComposeFuncType.Item && composeModel.thirdTypeRedDict.ContainsKey(key)) { redpoint.gameObject.SetActive(true); redpoint.redpointId = composeModel.thirdTypeRedDict[key].id; System/Compose/New/ComposeToolsWin.cs
@@ -162,6 +162,8 @@ composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Item, curSecondType, curThirdType, out thirdTypeData); if (thirdTypeData != null) { preSecondType = curSecondType; preThirdType = curThirdType; RefreshUI(thirdTypeData.itemCompound); if (isJumpTo) { System/Compose/New/ComposeWinModel.cs
@@ -52,12 +52,12 @@ public void OnPlayerLoginOk() { RefreshComposeRed(); playerPack.RefreshItemCountAct -= OnItemCntRefresh; playerPack.RefreshItemCountAct += OnItemCntRefresh; PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerLvUpdate; PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerLvUpdate; UpdateComposeDataByLevel(); RefreshComposeRed(); } public void ResetModel() System/MainInterfacePanel/HeadPortraitTip.cs
@@ -212,14 +212,23 @@ bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域 if (atkInt.Length > 1) { if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool)//御剑山庄boss区域特殊处理（可切换状态） if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool)//逍遥城boss区域特殊处理（可切换状态） { WindowCenter.Instance.Open<CombatModeWin>(); if (WindowCenter.Instance.IsOpen<FunctionForecastWin>()) if (fairyGrabBossModel.grabBossHintOpen)//活动Boss不让切状态 { WindowCenter.Instance.Close<FunctionForecastWin>(); return; } return; else { WindowCenter.Instance.Open<CombatModeWin>(); if (WindowCenter.Instance.IsOpen<FunctionForecastWin>()) { WindowCenter.Instance.Close<FunctionForecastWin>(); } return; } } var activityline = 0; fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline); System/MainInterfacePanel/MainInterfaceWin.cs
@@ -574,17 +574,36 @@ int mapID = PlayerDatas.Instance.baseData.MapID; var config = Config.Instance.Get<MapConfig>(mapID); int[] atkInt = pKModel.GetArea(config.AtkType).ToArray(); if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID)) bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域 if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID))//前三只Boss和活动Boss特殊处理 { } else { if (fairyGrabBossModel.grabBossHintOpen && atkInt.Length > 1 && Buffmodel.PkType != 5) if (mapID == 10040) { onMainModel.AreaState = Buffmodel.PkType; DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5); if (!fairyGrabBossModel.grabBossHintOpen && IsBossBool)//boss区域可以切换状态 { onMainModel.AreaState = Buffmodel.PkType; DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5); } else if (fairyGrabBossModel.grabBossHintOpen && IsBossBool)//活动boss不让切 { DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)onMainModel.AreaState); } } else { if (IsBossBool && atkInt.Length > 1 && Buffmodel.PkType != 5) { onMainModel.AreaState = Buffmodel.PkType; DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5); } } } } System/Strengthening/PlayerStrengthengDatas.cs
@@ -500,6 +500,10 @@ //DesignDebug.LogError(LowestZbw); //DesignDebug.LogError(DicEquip[LowestZbw].CurrentLevel); if (!DicEquip.ContainsKey(LowestZbw)) { return; } int Lv = ClassifyJudge(DicEquip[LowestZbw].CurrentLevel); RedPointPart(Lv); System/Vip/VipInvest/RotatePointer.cs
@@ -7,6 +7,7 @@ using UnityEngine.UI; using DG.Tweening; using System; using TableConfig; namespace Snxxz.UI { @@ -18,6 +19,7 @@ private float Acceleration = 0;//加速度 private float _time; private bool IsRotateBool = false;//是否进行旋转 private int BindJadeWheelNotice = 0;//所需提示的金额 public static event Action<bool> IsButtonShow; [Header("总旋转时间")] public float ContinuousTime = 4;//旋转时间 @@ -40,6 +42,11 @@ transform.localRotation = Quaternion.Euler(0, 0, -Angle); Acceleration = (MaxSpeed - MinSpeed) / SpeedTime; m_CheckDisplay.CloseAll(); if (BindJadeWheelNotice <= 0) { var config = Config.Instance.Get<FuncConfigConfig>("BindJadeWheelNotice").Numerical1; BindJadeWheelNotice = int.Parse(config); } } private void OnEnable() { @@ -63,7 +70,11 @@ m_CheckDisplay.ShowSelected(wheelOfFortuneModel.Lattice); int money = ((int)UIHelper.GetMoneyCnt(2) - FairyJade); string str=UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName); SysNotifyMgr.Instance.ShowTip("BindJadeNotice", str, money); if (money>=BindJadeWheelNotice) { SysNotifyMgr.Instance.ShowTip("BindJadeNotice", str, money); } FairyJade = (int)UIHelper.GetMoneyCnt(2); if (IsButtonShow != null) { @@ -119,7 +130,10 @@ m_CheckDisplay.ShowSelected(wheelOfFortuneModel.Lattice); int money = ((int)UIHelper.GetMoneyCnt(2) - FairyJade); string str = UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName); SysNotifyMgr.Instance.ShowTip("BindJadeNotice", str, money); if (money >= BindJadeWheelNotice) { SysNotifyMgr.Instance.ShowTip("BindJadeNotice", str, money); } FairyJade = (int)UIHelper.GetMoneyCnt(2); }); IsRotateBool = false;
