Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs
@@ -40,13 +40,22 @@ } } if (vNetData.EquipIndex == (int)RoleEquipType.retClothes || vNetData.EquipIndex == (int)RoleEquipType.retHat || vNetData.EquipIndex == (int)RoleEquipType.retShoes || vNetData.EquipIndex == (int)RoleEquipType.retTrousers || vNetData.EquipIndex == (int)RoleEquipType.retBelt) { _player.ChangeEquip(_equipInfo); } if (vNetData.EquipIndex == (int)RoleEquipType.retWeapon) { _player.SwitchWeapon(vNetData.EquipID); _player.SwitchWeapon(vNetData.EquipID, vNetData.EquipIndex); } else if (vNetData.EquipIndex == (int)RoleEquipType.retClothes) { _player.SwitchClothes(vNetData.EquipID); _player.SwitchClothes(vNetData.EquipID, vNetData.EquipIndex); } else if (vNetData.EquipIndex == (int)RoleEquipType.retWing) { @@ -63,7 +72,7 @@ } else if (vNetData.EquipIndex == (int)RoleEquipType.retWeapon2) { _player.SwitchSecondary(vNetData.EquipID); _player.SwitchSecondary(vNetData.EquipID, vNetData.EquipIndex); } else if (vNetData.EquipIndex == (int)RoleEquipType.mount) { @@ -73,6 +82,18 @@ _player.OnHorse(1); } } else if (vNetData.EquipIndex == (int)RoleEquipType.retFashionClothes) { _player.SwitchClothes(vNetData.EquipID, vNetData.EquipIndex); } else if (vNetData.EquipIndex == (int)RoleEquipType.retFashionWeapon) { _player.SwitchWeapon(vNetData.EquipID, vNetData.EquipIndex); } else if (vNetData.EquipIndex == (int)RoleEquipType.retFashionWeapon2) { _player.SwitchSecondary(vNetData.EquipID, vNetData.EquipIndex); } if (vNetData.EquipIndex == (int)RoleEquipType.retClothes || vNetData.EquipIndex == (int)RoleEquipType.retHat @@ -80,8 +101,7 @@ || vNetData.EquipIndex == (int)RoleEquipType.retTrousers || vNetData.EquipIndex == (int)RoleEquipType.retBelt) { _player.ChangeEquip(_equipInfo); _player.SyncSuitEffect(); } } } Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0415_tagPlayerUnEquipItem.cs
@@ -24,32 +24,6 @@ if (_player != null) { if (vNetData.EquipIndex == (int)RoleEquipType.retWeapon) { _player.SwitchWeapon(0); } else if (vNetData.EquipIndex == (int)RoleEquipType.retClothes) { _player.SwitchClothes(0); } else if (vNetData.EquipIndex == (int)RoleEquipType.retWing) { _player.SwitchWing(0); } else if (vNetData.EquipIndex == (int)RoleEquipType.retWeapon2) { _player.SwitchSecondary(0); } else if (vNetData.EquipIndex == (int)RoleEquipType.retSpiritAnimal) { _player.SwitchGuard(0); var _p = _player as GA_Player; if (_p != null) { _p.serverGuardId = 0; } } if (vNetData.EquipIndex == (int)RoleEquipType.retClothes || vNetData.EquipIndex == (int)RoleEquipType.retHat || vNetData.EquipIndex == (int)RoleEquipType.retShoes @@ -66,6 +40,53 @@ // 脱下衣服 _player.ChangeEquip(_equipInfo); } if (vNetData.EquipIndex == (int)RoleEquipType.retWeapon) { _player.SwitchWeapon(0, vNetData.EquipIndex); } else if (vNetData.EquipIndex == (int)RoleEquipType.retClothes) { _player.SwitchClothes(0, vNetData.EquipIndex); } else if (vNetData.EquipIndex == (int)RoleEquipType.retWing) { _player.SwitchWing(0); } else if (vNetData.EquipIndex == (int)RoleEquipType.retWeapon2) { _player.SwitchSecondary(0, vNetData.EquipIndex); } else if (vNetData.EquipIndex == (int)RoleEquipType.retSpiritAnimal) { _player.SwitchGuard(0); var _p = _player as GA_Player; if (_p != null) { _p.serverGuardId = 0; } } else if (vNetData.EquipIndex == (int)RoleEquipType.retFashionClothes) { _player.SwitchClothes(0, vNetData.EquipIndex); } else if (vNetData.EquipIndex == (int)RoleEquipType.retFashionWeapon) { _player.SwitchWeapon(0, vNetData.EquipIndex); } else if (vNetData.EquipIndex == (int)RoleEquipType.retFashionWeapon2) { _player.SwitchSecondary(0, vNetData.EquipIndex); } if (vNetData.EquipIndex == (int)RoleEquipType.retClothes || vNetData.EquipIndex == (int)RoleEquipType.retHat || vNetData.EquipIndex == (int)RoleEquipType.retShoes || vNetData.EquipIndex == (int)RoleEquipType.retTrousers || vNetData.EquipIndex == (int)RoleEquipType.retBelt) { _player.SyncSuitEffect(); } } }
@@ -42,7 +42,7 @@ if (PlayerDatas.Instance.hero != null && vNetData.Result == 1) { PlayerDatas.Instance.hero.ChangeEquip(default(GActorPlayerBase.EquipInfo)); PlayerDatas.Instance.hero.SyncSuitEffect(); } }
@@ -26,7 +26,7 @@ GA_Hero _hero = PlayerDatas.Instance.hero; if (_hero != null) { _hero.ChangeEquip(default(GActorPlayerBase.EquipInfo)); _hero.SyncSuitEffect(); } }
@@ -175,7 +175,7 @@ } } public override void ChangeEquip(EquipInfo equipInfo) public override void SyncSuitEffect() { var _equipModel = PlayerBackModel.GetSinglePackModel(PackType.rptEquip);
@@ -91,8 +91,6 @@ SyncHelpPlayerInfo(); } public sealed override void ChangeEquip(EquipInfo equipInfo) { } public void SyncHelpPlayerInfo() { int _clothesId = -1; @@ -319,4 +317,8 @@ { m_CmdManager.Clear(); } public override void SyncSuitEffect() { } } Fight/GameActor/GA_NpcFightZZPlayer.cs
@@ -84,10 +84,6 @@ } } public override void ChangeEquip(EquipInfo equipInfo) { } public void SyncHelpPlayerInfo() { var _valueInfo = LocalSave.GetString("GA_NpcFightZZPlayer_" + m_H0406.ObjID); @@ -421,4 +417,8 @@ { m_CmdManager.Clear(); } public override void SyncSuitEffect() { } } Fight/GameActor/GA_Player.cs
@@ -19,8 +19,6 @@ private int m_ComAtkIndex;// 普攻索引 protected Dictionary<int, EquipInfo> m_EquipDict = new Dictionary<int, EquipInfo>(); protected override void OnInit(GameNetPackBasic package) { m_H0434 = package as H0434_tagAreaPlayerAppearEx; @@ -123,7 +121,7 @@ } } ChangeEquip(default(EquipInfo)); SyncSuitEffect(); if (ActorInfo.horseItemID != 0 && m_H0434.PlayerState == 2) { @@ -191,17 +189,8 @@ } } public override void ChangeEquip(EquipInfo equipInfo) public override void SyncSuitEffect() { // 传入ID为0代表脱下了装备 if (equipInfo.itemID == 0 && equipInfo.place != 0) { if (m_EquipDict.ContainsKey(equipInfo.place)) { m_EquipDict.Remove(equipInfo.place); } } var _suitCount = 0; int _start = (int)RoleEquipType.retHat; Fight/GameActor/GA_PlayerClient.cs
@@ -134,10 +134,6 @@ RequestName(); } public override void ChangeEquip(EquipInfo equipInfo) { } public sealed override void Destroy() { } @@ -315,4 +311,8 @@ m_LastUseSkillTime = Time.time; } public override void SyncSuitEffect() { } } Fight/GameActor/GA_PlayerXMZZ.cs
@@ -152,10 +152,6 @@ IdleImmediate(); } public override void ChangeEquip(EquipInfo equipInfo) { } public override void Destroy() { } @@ -304,4 +300,8 @@ { m_CmdManager.Clear(); } public override void SyncSuitEffect() { } } Fight/GameActor/GActorPlayerBase.cs
@@ -37,6 +37,8 @@ } } protected Dictionary<int, EquipInfo> m_EquipDict = new Dictionary<int, EquipInfo>(); private ActorShadowCaster m_ShadowCaster = null; private SFXController m_Shadow; protected HeadUpName m_HeadUpName = null; @@ -508,7 +510,7 @@ m_HeadUpName.SetGrayName(on); } public void SwitchWeapon(uint itemID) public void SwitchWeapon(uint itemID, int index = (int)RoleEquipType.retWeapon) { // 相同的装备, 不做处理 if (itemID == WeaponItemID) @@ -517,6 +519,29 @@ } int _resID = JobSetup.BaseEquip[1]; EquipInfo _equipInfo; // 如果是套装位置 if (index == (int)RoleEquipType.retFashionWeapon) { // 脱下套装 if (itemID == 0) { // 寻找原身上装备, 如果有的话就重置此次要换装的道具id if (m_EquipDict.TryGetValue((int)RoleEquipType.retWeapon, out _equipInfo)) { itemID = _equipInfo.itemID; } } } else if (index == (int)RoleEquipType.retWeapon) { if (m_EquipDict.ContainsKey((int)RoleEquipType.retFashionWeapon)) { return; } } ItemConfig _itemConfig = null; @@ -603,7 +628,7 @@ ShowWeaponEffect(); } public void SwitchSecondary(uint itemID) public void SwitchSecondary(uint itemID, int index = (int)RoleEquipType.retWeapon2) { // 相同的装备, 不做处理 if (itemID == SecondaryID) @@ -612,6 +637,29 @@ } int _resID = JobSetup.BaseEquip[2]; EquipInfo _equipInfo; // 如果是套装位置 if (index == (int)RoleEquipType.retFashionWeapon2) { // 脱下套装 if (itemID == 0) { // 寻找原身上装备, 如果有的话就重置此次要换装的道具id if (m_EquipDict.TryGetValue((int)RoleEquipType.retWeapon2, out _equipInfo)) { itemID = _equipInfo.itemID; } } } else if (index == (int)RoleEquipType.retWeapon2) { if (m_EquipDict.ContainsKey((int)RoleEquipType.retFashionWeapon2)) { return; } } ItemConfig _clothesItemConfig = Config.Instance.Get<ItemConfig>((int)ClothesItemID); if (JobSetup.Job == 1) @@ -813,7 +861,7 @@ WingItemID = itemID; } public void SwitchClothes(uint itemID) public void SwitchClothes(uint itemID, int index = (int)RoleEquipType.retClothes) { // 相同的装备, 不做处理 if (itemID == ClothesItemID) @@ -821,8 +869,31 @@ return; } EquipInfo _equipInfo; // 换装ID int _resID = JobSetup.BaseEquip[0]; // 如果是套装位置 if (index == (int)RoleEquipType.retFashionClothes) { // 脱下套装 if (itemID == 0) { // 寻找原身上装备, 如果有的话就重置此次要换装的道具id if (m_EquipDict.TryGetValue((int)RoleEquipType.retClothes, out _equipInfo)) { itemID = _equipInfo.itemID; } } } else if (index == (int)RoleEquipType.retClothes) { if (m_EquipDict.ContainsKey((int)RoleEquipType.retFashionClothes)) { return; } } ItemConfig _itemConfig = null; @@ -1549,7 +1620,22 @@ } } public abstract void ChangeEquip(EquipInfo equipInfo); public void ChangeEquip(EquipInfo equipInfo) { // 传入ID为0代表脱下了装备 if (equipInfo.itemID == 0 && equipInfo.place != 0) { if (m_EquipDict.ContainsKey(equipInfo.place)) { m_EquipDict.Remove(equipInfo.place); } } else { m_EquipDict[equipInfo.place] = equipInfo; } } public abstract void SyncSuitEffect(); private bool TryRequest(uint itemID, ref GameObject model) { Fight/Stage/StageManager.cs
@@ -510,16 +510,15 @@ PlayerPackModel _packModel = ModelCenter.Instance.GetModel<PlayerPackModel>(); SinglePackModel _equipModel = _packModel.GetSinglePackModel(PackType.rptEquip); byte _suitLevel = 0; ItemModel _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.retClothes); ItemModel _fashion = _equipModel.GetItemModelByIndex((int)RoleEquipType.retFashionClothes); if (_itemModel != null) if (_fashion != null) { if (_itemModel.itemInfo.IsSuite == 1) { _suitLevel = (byte)_itemModel.useDataDict[30][0]; } _hero.SwitchClothes((uint)_fashion.itemInfo.ItemID); } else if(_itemModel != null) { _hero.SwitchClothes((uint)_itemModel.itemInfo.ItemID); } else @@ -528,8 +527,13 @@ } _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.retWeapon); _fashion = _equipModel.GetItemModelByIndex((int)RoleEquipType.retFashionWeapon); if (_itemModel != null) if (_fashion != null) { _hero.SwitchWeapon((uint)_fashion.itemInfo.ItemID); } else if (_itemModel != null) { _hero.SwitchWeapon((uint)_itemModel.itemInfo.ItemID); } @@ -539,8 +543,13 @@ } _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.retWeapon2); _fashion = _equipModel.GetItemModelByIndex((int)RoleEquipType.retFashionWeapon2); if (_itemModel != null) if (_fashion != null) { _hero.SwitchSecondary((uint)_fashion.itemInfo.ItemID); } else if (_itemModel != null) { _hero.SwitchSecondary((uint)_itemModel.itemInfo.ItemID); } @@ -578,7 +587,7 @@ _hero.SwitchGuard((uint)_itemModel.itemInfo.ItemID); } _hero.ChangeEquip(default(GActorPlayerBase.EquipInfo)); _hero.SyncSuitEffect(); _hero.IdleImmediate();
