| Lua/Gen/SnxxzUIItemOperateUtilityWrap.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/ItemTip/EquipTipUtility.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/ItemTip/EquipTipWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/ItemTip/TipLegendPropertyWidget.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/ItemTip/TipStarPropertyWidget.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/ItemTip/TipSuitBriefWidget.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/ItemTip/TipSuitBriefWidget.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/ItemModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/ItemOperateUtility.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/ItemTipsModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/New/BagWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Lua/Gen/SnxxzUIItemOperateUtilityWrap.cs
@@ -569,7 +569,7 @@ { string _guid = LuaAPI.lua_tostring(L, 2); gen_to_be_invoked.PutAwayItem( _guid ); gen_to_be_invoked.PutAway( _guid );
@@ -13,14 +13,13 @@ public enum TipType { Normal = 1, Compare = 2, Good = 3, Good = 2, } public class EquipTipUtility { public struct TipData public class TipData { public int itemId; public string guid; @@ -34,6 +33,7 @@ public GemInfo gemInfo; public TrainProperty trainProperty; public List<ItemOperateType> operates; } public struct BaseInfo @@ -110,7 +110,7 @@ public static void Show(TipType type, int itemId) { tipType = type; secondaryData = default(TipData); secondaryData = null; mainTipData = new TipData() { itemId = itemId, @@ -134,7 +134,7 @@ } } public static void Show(TipType type, string guid) public static void Show(string guid) { var item = packModel.GetItemByGuid(guid); if (item == null) @@ -142,8 +142,53 @@ return; } tipType = type; mainTipData = new TipData() secondaryData = null; var packType = item.packType; switch (packType) { case PackType.Equip: tipType = TipType.Normal; mainTipData = CreateEquipData(guid); break; default: tipType = TipType.Normal; if (item.isAuction) { mainTipData = CreateAuctionData(guid); secondaryData = default(TipData); } else { mainTipData = CreateEquipData(guid); var equipedGuid = equipModel.GetEquip(new Int2(item.config.LV, item.config.EquipPlace)); if (equipedGuid != guid) { secondaryData = CreateEquipData(equipedGuid); } } break; } switch (tipType) { case TipType.Normal: WindowCenter.Instance.Open<EquipTipWin>(); break; case TipType.Good: WindowCenter.Instance.Open<GoodTipWin>(); break; } } static TipData CreateEquipData(string guid) { var item = packModel.GetItemByGuid(guid); if (item == null) { return default(TipData); } return new TipData() { itemId = item.itemId, guid = guid, @@ -159,49 +204,27 @@ trainProperty = GetTrainProperty(guid), operates = GetOperates(guid), }; } if (tipType == TipType.Compare) static TipData CreateAuctionData(string guid) { var item = packModel.GetItemByGuid(guid); if (item == null) { var equipedGuid = equipModel.GetEquip(new Int2(item.config.LV, item.config.EquipPlace)); var equipedItem = packModel.GetItemByGuid(equipedGuid); if (equipedItem == null) { tipType = TipType.Normal; secondaryData = default(TipData); } else { secondaryData = new TipData() { itemId = equipedItem.itemId, guid = equipedGuid, baseInfo = GetBaseInfo(equipedGuid), baseProperty = GetBaseProperty(equipedGuid), legendProperty = GetLegendProperty(equipedGuid), suitInfo = GetSuitInfo(equipedGuid), starInfo = GetStarInfo(equipedItem.itemId), strengthenProperty = GetStrengthenProperty(equipedGuid), gemInfo = GetGemInfo(equipedGuid), trainProperty = GetTrainProperty(equipedGuid) }; } } else { secondaryData = default(TipData); return default(TipData); } switch (type) return new TipData() { case TipType.Normal: case TipType.Compare: WindowCenter.Instance.Open<EquipTipWin>(); break; case TipType.Good: WindowCenter.Instance.Open<GoodTipWin>(); break; } itemId = item.itemId, guid = guid, baseInfo = GetBaseInfo(guid), baseProperty = GetBaseProperty(item.itemId), legendProperty = GetLegendProperty(item.itemId), suitInfo = GetSuitInfo(item.itemId), operates = GetOperates(guid), }; } public static void Operate(ItemOperateType type, string guid) @@ -213,6 +236,9 @@ break; case ItemOperateType.putOff: ItemOperateUtility.Instance.PutOffEquip(guid); break; case ItemOperateType.putAway: ItemOperateUtility.Instance.PutAway(guid); break; case ItemOperateType.sell: break; @@ -351,56 +377,17 @@ var job = config.JobLimit / 100; var twoConfigs = EquipSuitConfig.GetConfigs(job, config.LV, EquipSuitType.TwoSuit); var fiveConfigs = EquipSuitConfig.GetConfigs(job, config.LV, EquipSuitType.FiveSuit); var name = twoConfigs[0].name; var level = config.LV; var maxSuitLevel = EquipStarModel.GetMaxStarLevel(level); var twoSuitProperties = new Dictionary<int, EquipSuitPropertyEntry>(); var fiveSuitProperties = new Dictionary<int, EquipSuitPropertyEntry>(); var eightSuits = new Dictionary<int, bool>(); for (var i = 0; i <= maxSuitLevel; i++) { if (i == 0 || i == 3 || i == 6 || i == 9) { var twoSuitEntry = new EquipSuitPropertyEntry(); twoSuitEntry.actived = false; twoSuitEntry.type = EquipSuitType.TwoSuit; foreach (var item in twoConfigs) { if (item.star == i) { twoSuitEntry.properties.AddRange(item.attr); } } var fiveSuitEntry = new EquipSuitPropertyEntry(); fiveSuitEntry.actived = false; fiveSuitEntry.type = EquipSuitType.FiveSuit; foreach (var item in fiveConfigs) { if (item.star == i) { fiveSuitEntry.properties.AddRange(item.attr); } } eightSuits[i] = false; } } var places = new List<int>(); places.Add(config.EquipPlace); var suitInfo = new SuitInfo() { name = name, level = level, job = job, maxSuitLevel = maxSuitLevel, twoSuitProperties = twoSuitProperties, fiveSuitProperties = fiveSuitProperties, eightSuits = eightSuits places = places, }; return suitInfo; @@ -610,14 +597,23 @@ } var operates = new List<ItemOperateType>(); var equip = equipModel.GetEquip(new Int2(item.config.LV, item.config.EquipPlace)); if (equip == guid) var packType = item.packType; switch (packType) { operates.Add(ItemOperateType.putOff); } else { operates.Add(ItemOperateType.putOn); case PackType.Equip: operates.Add(ItemOperateType.putOff); break; default: if (item.isAuction) { operates.Add(ItemOperateType.putAway); secondaryData = default(TipData); } else { operates.Add(ItemOperateType.putOn); } break; } return operates; System/ItemTip/EquipTipWin.cs
@@ -55,7 +55,7 @@ private void DisplayTipInfo() { if (EquipTipUtility.tipType == TipType.Compare) if (EquipTipUtility.secondaryData != null) { m_MainWidgetGroup.SetActive(true); m_MainWidgetGroup.SetPosition(m_RightPoint.position); @@ -117,6 +117,7 @@ public TipBaseInfoWidget baseInfoWidget; public TipBasePropertyWidget basePropertyWidget; public TipLegendPropertyWidget legendPropertyWidget; public TipSuitBriefWidget suitBriefWidget; public TipSuitPropertyWidget suitPropertyWidget; public TipGemInfoWidget gemInfoWidget; public TipStarPropertyWidget starInfoWidget; @@ -153,11 +154,26 @@ legendPropertyWidget.Display(data.legendProperty); } var hasSuit = !data.suitInfo.twoSuitProperties.IsNullOrEmpty(); suitPropertyWidget.gameObject.SetActive(hasSuit); var hasSuit = data.suitInfo.places != null; if (hasSuit) { suitPropertyWidget.Display(data.suitInfo); if (data.suitInfo.twoSuitProperties != null && data.suitInfo.fiveSuitProperties != null && data.suitInfo.eightSuits != null) { suitPropertyWidget.gameObject.SetActive(true); suitBriefWidget.gameObject.SetActive(false); suitPropertyWidget.Display(data.suitInfo); } else { suitPropertyWidget.gameObject.SetActive(false); suitBriefWidget.gameObject.SetActive(true); suitBriefWidget.Display(data.suitInfo); } } else { suitPropertyWidget.gameObject.SetActive(false); suitBriefWidget.gameObject.SetActive(false); } var hasStar = data.starInfo.maxLevel > 0; @@ -237,6 +253,9 @@ case ItemOperateType.putOff: this.title.text = "脱下"; break; case ItemOperateType.putAway: this.title.text = "上架"; break; default: this.title.text = ""; break; System/ItemTip/TipLegendPropertyWidget.cs
@@ -25,7 +25,7 @@ var quality = LegendPropertyConfig.Get(property.x).quality; if (data.isPreview) { lines[i] = UIHelper.AppendColor(quality, string.Format("[推荐]{0}+{1}", config.Name, value)); lines[i] = UIHelper.AppendColor(quality, string.Format("【推荐】{0}+{1}", config.Name, value)); } else { System/ItemTip/TipStarPropertyWidget.cs
@@ -60,7 +60,7 @@ foreach (var property in config.StarAttrInfo) { var propertyConfig = PlayerPropertyConfig.Get(property.x); var description = string.Format("{0} +{1} （{2}激活）", propertyConfig.Name, PlayerPropertyConfig.GetPropertyDescription(property.x, property.y), config.Star); var description = string.Format("{0} +{1} （{2}星激活）", propertyConfig.Name, PlayerPropertyConfig.GetPropertyDescription(property.x, property.y), config.Star); lines.Add(UIHelper.AppendColor(TextColType.Gray, description)); } } System/ItemTip/TipSuitBriefWidget.cs
New file @@ -0,0 +1,38 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Saturday, March 16, 2019 //-------------------------------------------------------- using UnityEngine; using System.Collections; using UnityEngine.UI; namespace Snxxz.UI { public class TipSuitBriefWidget : MonoBehaviour { [SerializeField] Text m_SuitName; [SerializeField] Text[] m_SuitEquipNames; public void Display(EquipTipUtility.SuitInfo suitInfo) { m_SuitName.text = suitInfo.name; var setName = EquipModel.GetSuitName(suitInfo.level); for (int i = 0; i < m_SuitEquipNames.Length; i++) { m_SuitEquipNames[i].text = setName + EquipSuitNameConfig.GetSuitName(suitInfo.level, i + 1, suitInfo.job); var hasSuit = suitInfo.places.Contains(i + 1); m_SuitEquipNames[i].color = UIHelper.GetUIColor(hasSuit ? TextColType.Green : TextColType.White, true); } } public void Dispose() { } } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: b3f7542edaedfe540b15b90b6d13d99d timeCreated: 1552718931 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/KnapSack/Logic/ItemModel.cs
@@ -39,7 +39,7 @@ if (createTime > 0) { var overdueTime = TimeUtility.GetTime((uint)createTime) + new TimeSpan(GeneralDefine.acutionItemHour * TimeSpan.TicksPerHour); return (int)(overdueTime).Subtract(DateTime.Now).TotalSeconds; return (int)(overdueTime).Subtract(TimeUtility.ServerNow).TotalSeconds; } else { System/KnapSack/Logic/ItemOperateUtility.cs
@@ -697,13 +697,17 @@ #endregion #region 上架 public void PutAwayItem(string guid) public void PutAway(string guid) { var itemModel = packModel.GetItemByGuid(guid); if (itemModel == null || itemModel.packType != PackType.Item) { return; } var auctionHelpModel = ModelCenter.Instance.GetModel<AuctionHelpModel>(); auctionHelpModel.ItemModel = itemModel; WindowCenter.Instance.Open<AuctionShelfWin>(); } #endregion
@@ -590,11 +590,11 @@ case ItemWinType.equipWin: if (curAttrData.isPreview) { EquipTipUtility.Show(curAttrData.isCompare ? TipType.Compare : TipType.Normal, curAttrData.itemId); EquipTipUtility.Show(TipType.Normal, curAttrData.itemId); } else { EquipTipUtility.Show(curAttrData.isCompare ? TipType.Compare : TipType.Normal, curAttrData.guid); EquipTipUtility.Show(curAttrData.guid); } break; case ItemWinType.wingsWin: @@ -798,11 +798,6 @@ if (attrData.itemConfig.Type == 25 && attrData.itemConfig.Effect1 == 225) { attrData.SetTipsFuncBtn(ItemOperateType.inlay, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.GotoInlayItem(attrData.guid); }); } if (attrData.itemConfig.CanTrade == 1) { attrData.SetTipsFuncBtn(ItemOperateType.putAway, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.PutAwayItem(attrData.guid); }); } if ((ItemType)attrData.itemConfig.Type == ItemType.WingsMat) System/KnapSack/New/BagWin.cs
@@ -279,19 +279,9 @@ { gridCell.itemCellBtn.OnOneParaClick = (int info) => { if (itemModel.itemInfo.isAuction== 1) { AuctionHelpModel auctionHelpModel = ModelCenter.Instance.GetModel<AuctionHelpModel>(); auctionHelpModel.ItemModel = itemModel; WindowCenter.Instance.Open<AuctionShelfWin>(); } else { itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true); itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData); itemTipsModel.ShowUICtrl(); } itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true); itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData); itemTipsModel.ShowUICtrl(); }; }
