Core/GameEngine/Model/Config/SpiritWeaponConfig.cs
@@ -19,8 +19,11 @@ public readonly int[] AttrValueList; public readonly int[] AttrColorList; public readonly int AttrScore; public SpiritWeaponConfig() public readonly Int2[] UpCostItem; public readonly int NextItemID; static HashSet<int> RelatedItems = new HashSet<int>(); public SpiritWeaponConfig() { } @@ -31,6 +34,10 @@ var tables = input.Split('\t'); int.TryParse(tables[0],out ItemID); if(!RelatedItems.Contains(ItemID)) { RelatedItems.Add(ItemID); } int.TryParse(tables[1],out Level); @@ -56,12 +63,37 @@ } int.TryParse(tables[5],out AttrScore); string[] UpCostItemAry = tables[6].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries); UpCostItem = new Int2[UpCostItemAry.Length]; for (int i = 0; i < UpCostItem.Length; i++) { UpCostItem[i] = new Int2(); var UpCostItemInfo = UpCostItemAry[i].Split('_'); int.TryParse(UpCostItemInfo[0], out UpCostItem[i].x); int.TryParse(UpCostItemInfo[1], out UpCostItem[i].y); if (!RelatedItems.Contains(UpCostItem[i].x)) { RelatedItems.Add(UpCostItem[i].x); } } int.TryParse(tables[7], out NextItemID); } catch (Exception ex) { DebugEx.Log(ex); } } public static HashSet<int> GetAllRelatedItems() { if(!inited) { return RelatedItems; } return RelatedItems; } static Dictionary<string, SpiritWeaponConfig> configs = new Dictionary<string, SpiritWeaponConfig>(); public static SpiritWeaponConfig Get(string id) Core/NetworkPackage/ClientPack/ClientToMapServer/CA3_Item/CA318_tagCMLingQiEquipBreak.cs
New file @@ -0,0 +1,17 @@ using UnityEngine; using System.Collections; // A3 18 灵器突破 #tagCMLingQiEquipBreak public class CA318_tagCMLingQiEquipBreak : GameNetPackBasic { public uint ItemID; //突破的物品ID public CA318_tagCMLingQiEquipBreak () { _cmd = (ushort)0xA318; } public override void WriteToBytes () { WriteBytes (ItemID, NetDataType.DWORD); } } Core/NetworkPackage/ClientPack/ClientToMapServer/CA3_Item/CA318_tagCMLingQiEquipBreak.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 78addae3ab8b82a4ea0514205e5aa0f6 timeCreated: 1561964930 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/DTCFile/ServerPack/HA8_Item/DTCA815_tagMCLingQiEquipBreakResult.cs
New file @@ -0,0 +1,11 @@ using UnityEngine; using System.Collections; // A8 15 灵器突破结果 #tagMCLingQiEquipBreakResult public class DTCA815_tagMCLingQiEquipBreakResult : DtcBasic { public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); HA815_tagMCLingQiEquipBreakResult vNetData = vNetPack as HA815_tagMCLingQiEquipBreakResult; } } Core/NetworkPackage/DTCFile/ServerPack/HA8_Item/DTCA815_tagMCLingQiEquipBreakResult.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: a3a17d32b682e9d4ca01dc9fde0e2043 timeCreated: 1561964524 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta
File was deleted Core/NetworkPackage/ServerPack/HA8_Item/HA815_tagMCLingQiEquipBreakResult.cs
New file @@ -0,0 +1,17 @@ using UnityEngine; using System.Collections; // A8 15 灵器突破结果 #tagMCLingQiEquipBreakResult public class HA815_tagMCLingQiEquipBreakResult : GameNetPackBasic { public uint MakeItemID; //突破后的物品ID public HA815_tagMCLingQiEquipBreakResult () { _cmd = (ushort)0xA815; } public override void ReadFromBytes (byte[] vBytes) { TransBytes (out MakeItemID, vBytes, NetDataType.DWORD); } } Core/NetworkPackage/ServerPack/HA8_Item/HA815_tagMCLingQiEquipBreakResult.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 4f8c886b827967144b9419984631a90b timeCreated: 1561964524 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta
File was deleted Core/NetworkPackage/ServerPack/HAE_Truck.meta
File was deleted Core/NetworkPackage/ServerPack/HAF_Merge.meta
File was deleted System/FairyAu/ExchangeActiveTokenModel.cs
@@ -29,7 +29,6 @@ public override void Init() { Debug.Log("init"); ChoseEquips = new HashSet<ItemModel>(); ParseConfig(); m_PackModel.refreshItemCountEvent += RefreshRealmEquIsAllMaxStarDicAndRedPoint; System/WindowBase/OneLevelWin.cs
@@ -50,7 +50,7 @@ m_SubWindowContainer = this.GetComponent<RectTransform>("Pivot/Container_SubWindow"); var name = this.GetType().Name; var name = this.gameObject.name; var infos = WindowConfig.GetWindowFunctionInfos(name); foreach (var info in infos) {
