| Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0439_tagPlayerChangeDienstgrad.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GA_Hero.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GA_Player.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GActorPlayerBase.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Stage/StageManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Dungeon/DungeonData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/PackSendQuestMgr.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Role/RoleModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Role/RoleRenameWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Strengthening/GodBeastAttributes.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Strengthening/GodBeastReinforcementWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Strengthening/GodBeastSlidingList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI/HUD/HeadUpName.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0439_tagPlayerChangeDienstgrad.cs
@@ -1,38 +1,39 @@ using UnityEngine; using System.Collections; using System; using Snxxz.UI; //04 39 周围玩家当前装备头衔刷新#tagPlayerChangeDienstgrad public class DTC0439_tagPlayerChangeDienstgrad : DtcBasic { public static event Action<int, int> playerDienstgradChangeEvent; public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); H0439_tagPlayerChangeDienstgrad vNetData = vNetPack as H0439_tagPlayerChangeDienstgrad; if (vNetData != null) { if (vNetData.PlayerID == PlayerDatas.Instance.baseData.PlayerID) { ModelCenter.Instance.GetModel<TitleModel>().OnRoleTitleRefresh(vNetData); } } if (playerDienstgradChangeEvent != null) { playerDienstgradChangeEvent((int)vNetData.PlayerID, (int)vNetData.GradID); } GActorPlayerBase _player = GAMgr.Instance.GetBySID(vNetData.PlayerID) as GActorPlayerBase; if (_player != null) { _player.SwitchTitle(vNetData.GradID); } } } using UnityEngine; using System.Collections; using System; using Snxxz.UI; //04 39 周围玩家当前装备头衔刷新#tagPlayerChangeDienstgrad public class DTC0439_tagPlayerChangeDienstgrad : DtcBasic { public static event Action<int, int> playerDienstgradChangeEvent; public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); H0439_tagPlayerChangeDienstgrad vNetData = vNetPack as H0439_tagPlayerChangeDienstgrad; if (vNetData != null) { if (vNetData.PlayerID == PlayerDatas.Instance.baseData.PlayerID) { ModelCenter.Instance.GetModel<TitleModel>().OnRoleTitleRefresh(vNetData); } } if (playerDienstgradChangeEvent != null) { playerDienstgradChangeEvent((int)vNetData.PlayerID, (int)vNetData.GradID); } 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); } } }
@@ -395,7 +395,8 @@ var titleModel = ModelCenter.Instance.GetModel<TitleModel>(); var _title = titleModel.GetTitleEquip(); uint _titleID = 0; if (_title != null && titleModel.IsTitleGain(_title.id)) if (_title != null && titleModel.IsTitleGain(_title.id) && PlayerDatas.Instance.baseData.MapID != 31160)//上古战场不显示称号 { _titleID = (uint)_title.id; } @@ -415,6 +416,7 @@ } base.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON); CheckAncientHeadUp(); } public sealed override void SwitchRedName(bool on) Fight/GameActor/GA_Player.cs
@@ -352,7 +352,8 @@ m_HeadUpName = HeadUpName.RequireHeadUpName(HeadUpName.Pattern.Player, MP_Name, 0, CameraController.Instance.CameraObject); } m_HeadUpName.SetPlayerInfo((int)ActorInfo.realm, ActorInfo.titleID, ActorInfo.PlayerName, ActorInfo.familyName, m_H0434.State == 1); 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); if (StatusMgr.Instance.IsExist(ServerInstID, StatusMgr.Instance.bossBelongBuffID)) { @@ -360,6 +361,7 @@ } base.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON); CheckAncientHeadUp(); } public sealed override void SwitchRedName(bool on) Fight/GameActor/GActorPlayerBase.cs
@@ -43,6 +43,8 @@ public JobSetupConfig JobSetup { get; protected set; } DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } public override int NextAction { get @@ -216,6 +218,7 @@ MovingState = E_MovingState.Normal; SystemSetting.Instance.qualityLevelChangeEvent += OnGameQualityChange; dungeonModel.updateMissionEvent += CheckAncientHeadUp; base.OnInit(package); } @@ -337,6 +340,7 @@ JobSetup = null; SystemSetting.Instance.qualityLevelChangeEvent -= OnGameQualityChange; dungeonModel.updateMissionEvent -= CheckAncientHeadUp; base.OnUnit(); } @@ -346,6 +350,21 @@ protected override void OnLateUpdate() { 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); } } #region 装备穿戴相关 @@ -435,6 +454,26 @@ m_HeadUpName.SetFairyLeague(on, ActorInfo.faction); } public void SwitchAncientKing(bool on) { if (m_HeadUpName == null) { return; } m_HeadUpName.SetAncientKing(on); } public void SwitchAncientEnemy(bool on) { if (m_HeadUpName == null) { return; } m_HeadUpName.SetAncientEnemy(on); } public virtual void SwitchYellowName(bool on) { if (m_HeadUpName == null) Fight/Stage/StageManager.cs
@@ -559,6 +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); // 判断buff if (StatusMgr.Instance.IsExist(PlayerDatas.Instance.PlayerId, StatusMgr.Instance.redNameBuffID)) System/Dungeon/DungeonData.cs
@@ -106,6 +106,8 @@ public int leaderID; public FairyFeastRank[] familyPartyRank; public FairyFeastTop familyPartyTop; public int topPlayerID; public int enemyID; public long totalExp { System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -865,7 +865,7 @@ SendMakeUseQuest(itemModel.itemInfo.ItemPlace); } break; case 953: case RoleRenameWin.renameToolId: WindowCenter.Instance.Open<RoleRenameWin>(); break; default: System/Role/RoleModel.cs
@@ -57,8 +57,13 @@ case RoleRenameResult.RenameFailErr: break; case RoleRenameResult.RenameSuccess: string info = StringUtility.Contact("我是",UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName),"现在改名为",playerRename); string info = Language.Get("RenameText_02", UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName), playerRename); friendsModel.SendChatInfoByGroup(GroupType.Friend,info); SysNotifyMgr.Instance.ShowTip("RenameSuccess01", playerRename); if(WindowCenter.Instance.IsOpen<RoleRenameWin>()) { WindowCenter.Instance.CloseImmediately<RoleRenameWin>(); } GameNetSystem.Instance.Reconnect(); break; } System/Role/RoleRenameWin.cs
@@ -16,7 +16,8 @@ PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } } ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } } RoleModel roleModel { get { return ModelCenter.Instance.GetModel<RoleModel>(); } } GetItemPathModel pathModel { get { return ModelCenter.Instance.GetModel<GetItemPathModel>(); } } public const int renameToolId = 953; protected override void BindController() { @@ -45,21 +46,31 @@ private void OnDisplay() { ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(953); ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(renameToolId); if (itemConfig == null) return; ItemCellModel cellModel = new ItemCellModel(953,false,(ulong)GetRenameToolNum()); ItemCellModel cellModel = new ItemCellModel(renameToolId, false,(ulong)GetRenameToolNum()); itemCell.Init(cellModel); if(GetRenameToolNum() > 0) { itemCell.countText.text = StringUtility.Contact(UIHelper.GetTextColorByItemColor(TextColType.Green,GetRenameToolNum().ToString()), "/",1); } else { itemCell.countText.text = StringUtility.Contact(UIHelper.GetTextColorByItemColor(TextColType.Red,0.ToString()), "/", 1); } itemCell.cellBtn.RemoveAllListeners(); itemCell.cellBtn.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(953); ItemAttrData attrData = new ItemAttrData(renameToolId); tipsModel.SetItemTipsModel(attrData); }); } private int GetRenameToolNum() { return playerPack.GetItemCountByID(PackType.rptItem,953); return playerPack.GetItemCountByID(PackType.rptItem, renameToolId); } private int GetRenameToolIndex() @@ -67,7 +78,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem); if (singlePack == null) return 0; List<int> indexlist = singlePack.ItemIndexlist(953,1); List<int> indexlist = singlePack.ItemIndexlist(renameToolId, 1); if(indexlist.Count > 0) { return indexlist[0] + 1; @@ -84,7 +95,7 @@ } if(GetRenameToolNum() < 1) { MessageWin.Inst.ShowFixedTip("角色改名卡不足"); pathModel.SetChinItemModel(renameToolId); return; } @@ -105,7 +116,7 @@ return; } ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), StringUtility.Contact("确定改名为", renameInput.text), (bool isOk) => ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),Language.Get("RenameText_01", renameInput.text), (bool isOk) => { if (isOk) { @@ -117,7 +128,7 @@ { roleModel.SetRename(name); CA122_tagUpdatePlayerName renamePlayerName = new CA122_tagUpdatePlayerName(); renamePlayerName.NewNameLen = (byte)name.Length; renamePlayerName.NewNameLen = (byte)ChatCtrl.GetUTF8InfoLen(name); renamePlayerName.NewName = name; renamePlayerName.ItemIndex = (byte)GetRenameToolIndex(); renamePlayerName.ServerID = (uint)ServerListCenter.Instance.currentServer.region_flag; System/Strengthening/GodBeastAttributes.cs
@@ -243,11 +243,12 @@ m_ExpSlider.ResetStage(); m_ExpSlider.value = 1; m_Slider.gameObject.SetActive(false); int NeedExp = DogzEquipConfig.upExpTotal; int NeedExp =0; if (DogZLv > 0) { var Dogz_EquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, DogZLv - 1); NeedExp -= Dogz_EquipConfig.upExpTotal; var Dogz_EquipConfig_1 = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, DogZLv - 1); var Dogz_EquipConfig_2 = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, DogZLv - 2); NeedExp = Dogz_EquipConfig_1.upExpTotal- Dogz_EquipConfig_2.upExpTotal; } m_ExpNum.text = NeedExp + "/" + NeedExp; } System/Strengthening/GodBeastReinforcementWin.cs
@@ -101,7 +101,6 @@ { JumpIndex = 0; godBeastModel.ItemPlace = -1; // godBeastModel.Absorption_Dic.Clear(); playerPack.RefreshItemCountAct -= RefreshItemCountAct; m_ScrollerController.OnRefreshCell -= OnRefreshGridCell; DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent -= MakeItemAnswerEvent; @@ -119,7 +118,6 @@ { if (arg1 == PackType.rptDogzEquip) { //OnCreateGridLineCell(m_ScrollerController); m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见 m_GodBeastSlidingList.Init(); m_GodBeastAttributes.Init(); System/Strengthening/GodBeastSlidingList.cs
@@ -112,21 +112,21 @@ } private void OnEnable() { playerPack.RefreshItemCountAct += RefreshItemCountAct; playerPack.ItemCntReduceAct += ItemCntReduceAct; DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent += MakeItemAnswerEvent; godBeastModel.AbsorbEvent += AbsorbEvent; playerPack.ItemCntAddAct += RefreshItemCountAct; } private void OnDisable() { playerPack.RefreshItemCountAct -= RefreshItemCountAct; playerPack.ItemCntReduceAct -= ItemCntReduceAct; DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent -= MakeItemAnswerEvent; godBeastModel.AbsorbEvent -= AbsorbEvent; playerPack.ItemCntAddAct -= RefreshItemCountAct; } public void Init() { @@ -152,21 +152,13 @@ { m_ScrollerController.OnRefreshCell -= OnRefreshGridCell; } private void ItemCntReduceAct(PackType arg1, int arg2, int arg3) private void MakeItemAnswerEvent(H0721_tagMakeItemAnswer obj) { if (arg1 == PackType.rptDogzItem) if ((int)obj.MakeType == (int)MakeType.Def_mitDogzEquipPlus) { if (m_ToggleAll.isOn) { m_ToggleAll.isOn = false; } GetGodBeastBag(); FilterQuality(); godBeastModel.AbsorbEventUpdate(); m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见 } } private void RefreshItemCountAct(PackType arg1, int arg2, int arg3) { if (arg1 == PackType.rptDogzItem) UI/HUD/HeadUpName.cs
@@ -27,6 +27,8 @@ [SerializeField] TextImage m_AllianceName; [SerializeField] TextImage m_FairyTitle; [SerializeField] TextImage m_FairyFlag; [SerializeField] TextImage m_AncientKing; [SerializeField] TextImage m_AncientEnemy; [SerializeField] ElderGodAngerBehaviour m_ElderAnger; [SerializeField] IceCrystalScoreBehaviour m_IceCrystalScore; [SerializeField] Transform m_BossDropout; @@ -144,6 +146,34 @@ } } public void SetAncientKing(bool isAncientKing) { if (m_AncientKing == null) { return; } m_AncientKing.gameObject.SetActive(isAncientKing); if (isAncientKing) { m_AncientKing.SetSprite("IntegralKing"); m_AncientKing.SetNativeSize(); } } public void SetAncientEnemy(bool isAncientEnemy) { if (m_AncientEnemy == null) { return; } m_AncientEnemy.gameObject.SetActive(isAncientEnemy); if (isAncientEnemy) { m_AncientEnemy.SetSprite("Enemy"); m_AncientEnemy.SetNativeSize(); } } public void SetAlliance(string _alliance) { if (string.IsNullOrEmpty(_alliance) || _alliance.Length == 0 || _alliance == "")
