| Core/NetworkPackage/ServerPack/H04_Scene/H0434_tagAreaPlayerAppearEx.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/SDK/SDKUtility.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GA_Player.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/AttentionWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/FamilyAuctioncell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/FullServiceAuctioncell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/MyFocusCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Equip/CandidateEquipWidget.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Equip/EquipModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/ItemLogicUtility.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/New/EquipPlaceCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/EnumHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/NetworkPackage/ServerPack/H04_Scene/H0434_tagAreaPlayerAppearEx.cs
@@ -94,11 +94,7 @@ for (int i = 0; i < EquipCount; i++) { EquipInfo[i] = new tagEquipInfo(); TransBytes(out EquipInfo[i].Place, vBytes, NetDataType.BYTE); TransBytes(out EquipInfo[i].ItemID, vBytes, NetDataType.DWORD); TransBytes(out EquipInfo[i].IsSuite, vBytes, NetDataType.BYTE); TransBytes(out EquipInfo[i].UserDataLen, vBytes, NetDataType.DWORD); TransBytes(out EquipInfo[i].UserData, vBytes, NetDataType.Chars, EquipInfo[i].UserDataLen); } TransBytes(out IsVisible, vBytes, NetDataType.BYTE); TransBytes(out EquipShowSwitch, vBytes, NetDataType.DWORD); @@ -127,11 +123,7 @@ public struct tagEquipInfo { public byte Place; //装备位置 public uint ItemID; //物品ID public byte IsSuite; //是否已经套装化 public uint UserDataLen; public string UserData; // 附加数据 } public struct tagAreaPlayerBuff Core/SDK/SDKUtility.cs
@@ -987,7 +987,7 @@ m_Json["serverName"] = ServerListCenter.Instance.currentServer.name; m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName; m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString(); m_Json["money"] = PlayerDatas.Instance.baseData.Gold.ToString(); m_Json["money"] = PlayerDatas.Instance.baseData.copper.ToString(); m_Json["gameName"] = VersionConfig.Get().productName; m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
@@ -59,33 +59,24 @@ Dictionary<int, List<int>> _userDataDict; EquipInfo _info; ItemConfig _itemConfig; // 因为衣服是所有装备的父节点, 需要预先处理衣服 for (int i = 0; i < m_H0434.EquipCount; ++i) { _equipInfo = m_H0434.EquipInfo[i]; _itemConfig = ItemConfig.Get((int)_equipInfo.ItemID); _info = new EquipInfo { itemID = _equipInfo.ItemID }; if (_equipInfo.UserDataLen > 2) { _userDataDict = ConfigParse.Analysis(_equipInfo.UserData); if (_userDataDict != null && _userDataDict.ContainsKey(25)) { _info.suitLV_1 = (byte)_userDataDict[25][0]; _info.suitLV_2 = (byte)_userDataDict[25][1]; } } m_EquipDict[_equipInfo.Place] = _info; m_EquipDict[_itemConfig.EquipPlace] = _info; if (_equipInfo.Place == (byte)RoleEquipType.FashionClothes) if (_itemConfig.EquipPlace == (byte)RoleEquipType.FashionClothes) { SwitchClothes(_equipInfo.ItemID, _equipInfo.Place); SwitchClothes(_equipInfo.ItemID, _itemConfig.EquipPlace); } else if (_equipInfo.Place == (byte)RoleEquipType.Clothes) else if (_itemConfig.EquipPlace == (byte)RoleEquipType.Clothes) { SwitchClothes(_equipInfo.ItemID); } @@ -101,33 +92,34 @@ for (int i = 0; i < m_H0434.EquipCount; ++i) { _equipInfo = m_H0434.EquipInfo[i]; if (_equipInfo.Place == (int)RoleEquipType.FashionWeapon) _itemConfig = ItemConfig.Get((int)_equipInfo.ItemID); if (_itemConfig.EquipPlace == (int)RoleEquipType.FashionWeapon) { SwitchWeapon(_equipInfo.ItemID, _equipInfo.Place); SwitchWeapon(_equipInfo.ItemID, _itemConfig.EquipPlace); continue; } else if (_equipInfo.Place == (int)RoleEquipType.Weapon) else if (_itemConfig.EquipPlace == (int)RoleEquipType.Weapon) { SwitchWeapon(_equipInfo.ItemID); continue; } if (_equipInfo.Place == (int)RoleEquipType.FashionWeapon2) if (_itemConfig.EquipPlace == (int)RoleEquipType.FashionWeapon2) { SwitchSecondary(_equipInfo.ItemID, _equipInfo.Place); SwitchSecondary(_equipInfo.ItemID, _itemConfig.EquipPlace); continue; } else if (_equipInfo.Place == (int)RoleEquipType.Weapon2) else if (_itemConfig.EquipPlace == (int)RoleEquipType.Weapon2) { SwitchSecondary(_equipInfo.ItemID); continue; } if (_equipInfo.Place == (int)RoleEquipType.Wing) if (_itemConfig.EquipPlace == (int)RoleEquipType.Wing) { SwitchWing(_equipInfo.ItemID); } else if (_equipInfo.Place == (int)RoleEquipType.Guard1) else if (_itemConfig.EquipPlace == (int)RoleEquipType.Guard1) { var _index = BattleEffectPlayRule.Instance.GetIndex(ServerInstID); if (_index != -1 && _index < BattleEffectPlayRule.Instance.petLimit) @@ -136,7 +128,7 @@ } serverGuardId = (int)_equipInfo.ItemID; } else if (_equipInfo.Place == (int)RoleEquipType.Mount) else if (_itemConfig.EquipPlace == (int)RoleEquipType.Mount) { ActorInfo.horseItemID = _equipInfo.ItemID; } System/Auction/AttentionWin.cs
@@ -21,7 +21,7 @@ [SerializeField] Button m_CloseButton; AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } } AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } } List<AuctionItemConfig> auctionItemList; List<AuctionItemConfig> auctionItemList=new List<AuctionItemConfig>(); int ItemType = 1; #region Built-in enum AttentionType @@ -109,7 +109,7 @@ DebugEx.LogError("物品表没有找到该物品，物品ID为" + auctionItem.ItemID); return; } ItemCellModel cellModel = new ItemCellModel(itemConfig.ID, true, (ulong)1, itemConfig.BindType); ItemCellModel cellModel = new ItemCellModel(itemConfig.ID, true, (ulong)1,0); itemCell.Init(cellModel); textName.text = itemConfig.ItemName; if (model.AttentionAuctionItemIDdic.ContainsKey(auctionItem.ItemID)) System/Auction/FamilyAuctioncell.cs
@@ -99,7 +99,15 @@ needJade = familyAuctionItem.BidderPrice + auctionItem.BiddingAdd; } m_JadeNumber.text = (needJade).ToString(); m_JadeNumber1.text = auctionItem.BuyoutPrice.ToString(); m_JadeNumber1.text = auctionItem.BuyoutPrice.ToString(); if (auctionItem.BuyoutPrice == 0) { m_PriceButton.gameObject.SetActive(false); } else { m_PriceButton.gameObject.SetActive(true); } m_PriceButton.SetListener(() => //一口价 { int jade = (int)PlayerDatas.Instance.baseData.diamond; System/Auction/FullServiceAuctioncell.cs
@@ -118,6 +118,14 @@ } m_JadeNumber.text = needJade.ToString(); m_JadeNumber1.text = auctionItem.BuyoutPrice.ToString(); if (auctionItem.BuyoutPrice == 0) { m_PriceButton.gameObject.SetActive(false); } else { m_PriceButton.gameObject.SetActive(true); } m_PriceButton.SetListener(() => //一口价 { int jade = (int)PlayerDatas.Instance.baseData.diamond; System/Auction/MyFocusCell.cs
@@ -108,6 +108,14 @@ needJade = myAuction.BidderPrice + auctionItem.BiddingAdd; } m_JadeNumber.text = (needJade).ToString(); if (auctionItem.BuyoutPrice == 0) { m_PriceButton.gameObject.SetActive(false); } else { m_PriceButton.gameObject.SetActive(true); } m_JadeNumber1.text = auctionItem.BuyoutPrice.ToString(); m_PriceButton.SetListener(() => //一口价 { System/Equip/CandidateEquipWidget.cs
@@ -14,8 +14,13 @@ [SerializeField] RectTransform m_GetWayContainer; [SerializeField] WayCell[] m_GetWayCells; EquipModel model { get { return ModelCenter.Instance.GetModel<EquipModel>(); } } int place = 0; public void Display(int place, List<CandidateEquip> candidates) { this.place = place; if (place == 0) { m_Title.text = "全部"; @@ -46,7 +51,12 @@ private void DisplayGetWays() { var getWays = new List<int>(); var getWays = model.GetGetWays(model.selectedLevel.value, place); if (getWays == null) { return; } for (var i = 0; i < m_GetWayCells.Length; i++) { var behaviour = m_GetWayCells[i]; System/Equip/EquipModel.cs
@@ -300,6 +300,37 @@ return equipSets[level].GetFightPoint(); } public List<int> GetGetWays(int level, int place) { if (level == 0) { return null; } if (place != 0) { var config = EquipControlConfig.Get(level, place); return new List<int>(config.getWays); } else { var getWays = new List<int>(); for (int i = 1; i <= 12; i++) { var config = EquipControlConfig.Get(level, i); foreach (int getWay in config.getWays) { if (!getWays.Contains(getWay)) { getWays.Add(getWay); } } } return getWays; } } public void PutOn(string equipGuid) { var item = packModel.GetItemByGuid(equipGuid); System/KnapSack/Logic/ItemLogicUtility.cs
@@ -144,6 +144,10 @@ public void AddBaseProperties(int itemId, List<int> reference) { var config = ItemConfig.Get(itemId); if (config == null) { return; } if (config.Effect1 != 0 && reference.Contains(config.Effect1)) { properties.Add(config.Effect1, config.EffectValueA1); System/KnapSack/New/EquipPlaceCell.cs
@@ -17,7 +17,7 @@ public void Display(RoleEquipType equipType) { this.equipType = equipType; var item = packModel.GetItemByIndex(PackType.Equip, (int)equipType); var item = packModel.GetItemByIndex(PackType.Equip, EquipSet.ClientPlaceToServerPlace(0, (int)equipType)); if (item == null) { m_ItemCell.gameObject.SetActive(false); @@ -43,7 +43,7 @@ private void AddEqup() { var item = packModel.GetItemByIndex(PackType.Equip, (int)equipType); if (item!=null) if (item != null) { return; } Utility/EnumHelper.cs
@@ -370,13 +370,12 @@ FairyCan1 = 10, //仙器 FairyCan2 = 11, //仙器 Jade = 12, //玉佩 Wing = 13, //翅膀 Guard1 = 14, //守护1 Guard2 = 15, //守护2 Wing=13, //翅膀 Guard1=14, //守护1 Guard2=15, //守护2 PeerlessWeapon1=16,//绝世武器 PeerlessWeapon2=17,//绝世副手 PeerlessWeapon1 = 16,//绝世武器 PeerlessWeapon2 = 17,//绝世副手 Mount = 19, //当前的坐骑
