Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0439_tagPlayerChangeDienstgrad.cs
@@ -30,8 +30,8 @@ GActorPlayerBase _player = GAMgr.Instance.GetBySID(vNetData.PlayerID) as GActorPlayerBase; if (_player != null) { var titleId = PlayerDatas.Instance.baseData.MapID == 31160 ? 0 : vNetData.GradID;//上古战场不显示称号 _player.SwitchTitle(titleId); //var titleId = PlayerDatas.Instance.baseData.MapID == 31160 ? 0 : vNetData.GradID;//上古战场不显示称号 _player.SwitchTitle(vNetData.GradID); } }
@@ -418,8 +418,7 @@ var titleModel = ModelCenter.Instance.GetModel<TitleModel>(); var _title = titleModel.GetTitleEquip(); uint _titleID = 0; if (_title != null && titleModel.IsTitleGain(_title.id) && PlayerDatas.Instance.baseData.MapID != 31160)//上古战场不显示称号 if (_title != null && titleModel.IsTitleGain(_title.id))//上古战场不显示称号 { _titleID = (uint)_title.id; } @@ -439,7 +438,6 @@ } base.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON); CheckAncientHeadUp(); } public sealed override void SwitchRedName(bool on) Fight/GameActor/GA_Player.cs
@@ -352,8 +352,7 @@ m_HeadUpName = HeadUpName.RequireHeadUpName(HeadUpName.Pattern.Player, MP_Name, 0, CameraController.Instance.CameraObject); } var titleId = PlayerDatas.Instance.baseData.MapID == 31160 ? 0 : ActorInfo.titleID; m_HeadUpName.SetPlayerInfo((int)ActorInfo.realm, titleId, ActorInfo.PlayerName, ActorInfo.familyName, m_H0434.State == 1); m_HeadUpName.SetPlayerInfo((int)ActorInfo.realm, ActorInfo.titleID, ActorInfo.PlayerName, ActorInfo.familyName, m_H0434.State == 1); if (StatusMgr.Instance.IsExist(ServerInstID, StatusMgr.Instance.bossBelongBuffID)) { @@ -361,7 +360,6 @@ } base.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON); CheckAncientHeadUp(); } public sealed override void SwitchRedName(bool on) Fight/GameActor/GActorPlayerBase.cs
@@ -43,8 +43,6 @@ public JobSetupConfig JobSetup { get; protected set; } DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } public override int NextAction { get @@ -218,7 +216,6 @@ MovingState = E_MovingState.Normal; SystemSetting.Instance.qualityLevelChangeEvent += OnGameQualityChange; dungeonModel.updateMissionEvent += CheckAncientHeadUp; base.OnInit(package); } @@ -340,7 +337,6 @@ JobSetup = null; SystemSetting.Instance.qualityLevelChangeEvent -= OnGameQualityChange; dungeonModel.updateMissionEvent -= CheckAncientHeadUp; base.OnUnit(); } @@ -352,20 +348,20 @@ UpdateRush(); } public void CheckAncientHeadUp() { if (PlayerDatas.Instance.baseData.MapID == 31160) { var help = dungeonModel.mission; SwitchAncientKing(help.topPlayerID == ServerInstID); SwitchAncientEnemy(help.enemyID == ServerInstID && ServerInstID != PlayerDatas.Instance.baseData.PlayerID); } else { SwitchAncientKing(false); SwitchAncientEnemy(false); } } //public void CheckAncientHeadUp() //{ // if (PlayerDatas.Instance.baseData.MapID == 31160) // { // var help = dungeonModel.mission; // SwitchAncientKing(help.topPlayerID == ServerInstID); // SwitchAncientEnemy(help.enemyID == ServerInstID && ServerInstID != PlayerDatas.Instance.baseData.PlayerID); // } // else // { // SwitchAncientKing(false); // SwitchAncientEnemy(false); // } //} #region 装备穿戴相关
@@ -559,15 +559,15 @@ _hero.IdleImmediate(); _hero.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON); _hero.CheckAncientHeadUp(); var titleId = 0; if (PlayerDatas.Instance.baseData.MapID != 31160) { var titelModel = ModelCenter.Instance.GetModel<TitleModel>(); var title = titelModel.GetTitleEquip(); titleId = title != null && titelModel.IsTitleGain(title.id) ? title.id : 0; } _hero.SwitchTitle((uint)titleId); //_hero.CheckAncientHeadUp(); //var titleId = 0; //if (PlayerDatas.Instance.baseData.MapID != 31160) //{ // var titelModel = ModelCenter.Instance.GetModel<TitleModel>(); // var title = titelModel.GetTitleEquip(); // titleId = title != null && titelModel.IsTitleGain(title.id) ? title.id : 0; //} //_hero.SwitchTitle((uint)titleId); // 判断buff if (StatusMgr.Instance.IsExist(PlayerDatas.Instance.PlayerId, StatusMgr.Instance.redNameBuffID)) System/Dogz/DogzModel.cs
@@ -271,6 +271,21 @@ return false; } public bool CheckIsPutOn(int id) { ItemConfig config = Config.Instance.Get<ItemConfig>(id); if (config == null) return false; int index = config.EquipPlace % 100 - 1; int color = GetDogzEquipLimitByIndex(presentSelectDogz, index); if (config.ItemColor >= color) { return true; } SysNotifyMgr.Instance.ShowTip("DogzQualityAsk", GetDogzPartNameByIndex(index), GetItemColorName(color)); return false; } #region 协议 public int addAssistCnt { get; private set; } //额外购买的助战数 System/Dogz/DogzPackWin.cs
@@ -208,14 +208,7 @@ } else { ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("DogzFunc101"), (bool isOk)=> { if(isOk) { } return; }); ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("DogzFunc101")); } } @@ -306,6 +299,19 @@ { dogzModel.SendPutOnEquip(indexlist); } else { if(dogzModel.GetDogzEquips(dogzModel.presentSelectDogz) != null && dogzModel.GetDogzEquips(dogzModel.presentSelectDogz).Count == 5) { SysNotifyMgr.Instance.ShowTip("DogzOneKeyBest"); } else { SysNotifyMgr.Instance.ShowTip("DogzOneKeyNone"); } } } private void ClickStarSelect() System/Dungeon/DungeonAncientTargetWin.cs
@@ -1,57 +1,55 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { public class DungeonAncientTargetWin : Window { [SerializeField] Text m_DungeonName; [SerializeField] DungeonTargetBehaviour m_DungeonTargetBehaviour; DungeonModel m_Model; DungeonModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>()); } } protected override void AddListeners() { } protected override void BindController() { } protected override void OnAfterClose() { } protected override void OnAfterOpen() { } protected override void OnPreClose() { //model.updateMissionEvent -= UpdateTargets; } protected override void OnPreOpen() { //model.updateMissionEvent += UpdateTargets; var line = PlayerDatas.Instance.baseData.FBID + 1; m_DungeonName.text = StringUtility.Contact(Language.Get("AncientBattle"), "（", Language.Get("FBLine", line), "）"); m_DungeonTargetBehaviour.Init(31160); //UpdateTargets(); } private void UpdateTargets() { //var _help = model.mission; //m_DungeonTargets[0].text = _help.topName; //m_DungeonTargets[1].text = UIHelper.ReplaceLargeNum(_help.topScore); } } } using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { public class DungeonAncientTargetWin : Window { [SerializeField] List<Text> m_DungeonTargets; [SerializeField] DungeonTargetBehaviour m_DungeonTargetBehaviour; DungeonModel m_Model; DungeonModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>()); } } protected override void AddListeners() { } protected override void BindController() { } protected override void OnAfterClose() { } protected override void OnAfterOpen() { } protected override void OnPreClose() { model.updateMissionEvent -= UpdateTargets; } protected override void OnPreOpen() { model.updateMissionEvent += UpdateTargets; m_DungeonTargetBehaviour.Init(31160); UpdateTargets(); } private void UpdateTargets() { var _help = model.mission; m_DungeonTargets[0].text = _help.topName; m_DungeonTargets[1].text = UIHelper.ReplaceLargeNum(_help.topScore); } } }
@@ -27,7 +27,6 @@ [SerializeField] RectTransform m_ContainerResPoint; [SerializeField] RectTransform m_ContainerAncient; [SerializeField] Button m_AncientBtn; [SerializeField] Button m_AncientKing; [SerializeField] DungeonItemCollect m_ItemCollect; [SerializeField] DungeonGuardSkyBehaviour m_GuardSky; [SerializeField] DungeonBossBriefInfoContainer m_BossInfosContainer; @@ -56,7 +55,6 @@ { m_ExitDungeon.AddListener(ExitDungeon); m_AncientBtn.onClick.AddListener(OnAncientBtn); m_AncientKing.onClick.AddListener(AncientKing); } protected override void OnPreOpen() @@ -319,18 +317,6 @@ else { WindowCenter.Instance.Open<DungeonAncientAchieveWin>(); } } private void AncientKing() { if (WindowCenter.Instance.IsOpen<DungeonAncientKingWin>()) { WindowCenter.Instance.CloseImmediately<DungeonAncientKingWin>(); } else { WindowCenter.Instance.Open<DungeonAncientKingWin>(); } }
@@ -846,40 +846,54 @@ private void SetBottomUI() { if(itemAttrData.packType != PackType.rptDogzItem && itemAttrData.packType != PackType.rptDogzEquip) switch (itemAttrData.itemConfig.EquipPlace) { if (dogzEquipDesText != null) { dogzEquipDesText.gameObject.SetActive(false); } if (itemAttrData.itemConfig.Description == "" || string.IsNullOrEmpty(itemAttrData.itemConfig.Description)) { equipSourceNormal.gameObject.SetActive(true); case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 12: if (dogzEquipDesText != null) { dogzEquipDesText.gameObject.SetActive(false); } if (itemAttrData.itemConfig.Description == "" || string.IsNullOrEmpty(itemAttrData.itemConfig.Description)) { equipSourceNormal.gameObject.SetActive(true); equipSourceDes.gameObject.SetActive(false); equipSourceText.gameObject.SetActive(false); SetBottomText(equipSourceNormal); } else { equipSourceNormal.gameObject.SetActive(false); equipSourceDes.gameObject.SetActive(true); equipSourceText.gameObject.SetActive(true); SetBottomText(equipSourceDes); equipSourceText.text = itemAttrData.itemConfig.Description; } break; case 101: case 102: case 103: case 104: case 105: equipSourceNormal.gameObject.SetActive(false); equipSourceDes.gameObject.SetActive(false); equipSourceText.gameObject.SetActive(false); SetBottomText(equipSourceNormal); } else { equipSourceNormal.gameObject.SetActive(false); equipSourceDes.gameObject.SetActive(true); equipSourceText.gameObject.SetActive(true); SetBottomText(equipSourceDes); equipSourceText.text = itemAttrData.itemConfig.Description; } if (dogzEquipDesText != null) { dogzEquipDesText.gameObject.SetActive(true); dogzEquipDesText.text = itemAttrData.itemConfig.Description; } break; } else { equipSourceNormal.gameObject.SetActive(false); equipSourceDes.gameObject.SetActive(false); equipSourceText.gameObject.SetActive(false); if (dogzEquipDesText != null) { dogzEquipDesText.gameObject.SetActive(true); dogzEquipDesText.text = itemAttrData.itemConfig.Description; } } } private void SetBottomText(EquipSource source) System/KnapSack/Logic/ItemTipsModel.cs
@@ -815,9 +815,13 @@ { case ItemWinType.equipWin: attrData.SetTipsFuncBtn(ItemWinBtnType.putOn, (ItemWinBtnType, ItemAttrData) => { List<int> indexlist = new List<int>(); indexlist.Add(attrData.index); dogzModel.SendPutOnEquip(indexlist); if(dogzModel.CheckIsPutOn(attrData.itemId)) { List<int> indexlist = new List<int>(); indexlist.Add(attrData.index); dogzModel.SendPutOnEquip(indexlist); } }); break; } System/Message/BattleHint.cs
@@ -16,15 +16,15 @@ public void OnStageLoadFinish() { Clear(); var mapId = PlayerDatas.Instance.baseData.MapID; if (cacheMapId != 0 && cacheMapId != 31160 && mapId == 31160) { SnxxzGame.Instance.StartCoroutine(Co_LoadFinish()); } var help = dungeonModel.mission; ancientKing = mapId != 31160 ? 0 : help.topPlayerID; cacheMapId = PlayerDatas.Instance.baseData.MapID; //var mapId = PlayerDatas.Instance.baseData.MapID; //if (cacheMapId != 0 && cacheMapId != 31160 // && mapId == 31160) //{ // SnxxzGame.Instance.StartCoroutine(Co_LoadFinish()); //} //var help = dungeonModel.mission; //ancientKing = mapId != 31160 ? 0 : help.topPlayerID; //cacheMapId = PlayerDatas.Instance.baseData.MapID; } public event Action battleHintUpdate; @@ -56,7 +56,7 @@ && ancientKing != help.topPlayerID) { ancientKing = help.topPlayerID; Receive(1); //Receive(1); } } ancientKing = help.topPlayerID; @@ -71,24 +71,24 @@ } if (msg.Equals("AncientBattlefield_8")) { Receive(2); //Receive(2); } } public void Receive(int ancientType) { battleHints.Enqueue(ancientType); if (!WindowCenter.Instance.IsOpen<BattleHintWin>()) { WindowCenter.Instance.Open<BattleHintWin>(); } else { if (battleHintUpdate != null) { battleHintUpdate(); } } //battleHints.Enqueue(ancientType); //if (!WindowCenter.Instance.IsOpen<BattleHintWin>()) //{ // WindowCenter.Instance.Open<BattleHintWin>(); //} //else //{ // if (battleHintUpdate != null) // { // battleHintUpdate(); // } //} } public void ReceiveEvenKill(string message, ArrayList list) System/Message/SysNotifyMgr.cs
@@ -220,7 +220,7 @@ } break; case SysNotifyType.SysEvenKill: BattleHint.Instance.ReceiveEvenKill(msg, tipInfoList); //BattleHint.Instance.ReceiveEvenKill(msg, tipInfoList); break; } } System/Role/RolePanel.cs
@@ -104,7 +104,8 @@ } private void OnRenameClick() { WindowCenter.Instance.Open<RoleRenameWin>(); SysNotifyMgr.Instance.ShowTip("JadeInvestmentLimit1"); //WindowCenter.Instance.Open<RoleRenameWin>(); } private void OnElixirClick() System/Role/RoleRenameWin.cs
@@ -50,6 +50,7 @@ if (itemConfig == null) return; ItemCellModel cellModel = new ItemCellModel(renameToolId, false,(ulong)GetRenameToolNum()); itemCell.Init(cellModel); itemCell.countText.gameObject.SetActive(true); if(GetRenameToolNum() > 0) { itemCell.countText.text = StringUtility.Contact(UIHelper.GetTextColorByItemColor(TextColType.Green,GetRenameToolNum().ToString()), System/Strengthening/GodBeastModel.cs
@@ -75,6 +75,10 @@ private void UpdateAssistDogzEvent() { foreach (var key in GodBeastRedPointDic.Keys) { GodBeastRedPointDic[key].state = RedPointState.None; } SetRedPointID(); GodBeastRedPoint(); } System/Strengthening/GodBeastReinforcementWin.cs
@@ -86,6 +86,7 @@ { JumpIndex = i; CurrentlySelected = GodBeastList[i].LocationMarker; GetDogZBagIndex(); } } } UI/HUD/HeadUpName.cs
@@ -152,12 +152,12 @@ { return; } m_AncientKing.gameObject.SetActive(isAncientKing); if (isAncientKing) { m_AncientKing.SetSprite("IntegralKing"); m_AncientKing.SetNativeSize(); } //m_AncientKing.gameObject.SetActive(isAncientKing); //if (isAncientKing) //{ // m_AncientKing.SetSprite("IntegralKing"); // m_AncientKing.SetNativeSize(); //} } public void SetAncientEnemy(bool isAncientEnemy) @@ -166,12 +166,12 @@ { return; } m_AncientEnemy.gameObject.SetActive(isAncientEnemy); if (isAncientEnemy) { m_AncientEnemy.SetSprite("Enemy"); m_AncientEnemy.SetNativeSize(); } //m_AncientEnemy.gameObject.SetActive(isAncientEnemy); //if (isAncientEnemy) //{ // m_AncientEnemy.SetSprite("Enemy"); // m_AncientEnemy.SetNativeSize(); //} } public void SetAlliance(string _alliance)
