| Core/GameEngine/Model/Config/HazyRegionConfig.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/GameEngine/Model/Config/HazyRegionConfig.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Lua/Gen/HazyRegionConfigWrap.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Dungeon/DungeonRewardItem.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Dungeon/DungeonSlayerVictoryWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairyAu/FairyAuTaskWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyRegionIncidentBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyRegionModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Model/Config/HazyRegionConfig.cs
@@ -1,41 +1,41 @@ //-------------------------------------------------------- // [Author]: Fish // [ Date ]: Wednesday, May 15, 2019 //-------------------------------------------------------- using System.Collections.Generic; using System.IO; using System.Threading; using System; using UnityEngine; [XLua.LuaCallCSharp] public partial class HazyRegionConfig { //-------------------------------------------------------- // [Author]: Fish // [ Date ]: Monday, May 20, 2019 //-------------------------------------------------------- using System.Collections.Generic; using System.IO; using System.Threading; using System; using UnityEngine; [XLua.LuaCallCSharp] public partial class HazyRegionConfig { public readonly int id; public readonly int incidentType; public readonly string name; public readonly int dungeonId; public readonly int lineId; public readonly int npcId; public readonly int crossServer; public readonly int dungeonType; public readonly int point; public readonly int alchemyLevel; public readonly int[] reward; public readonly int[] rewardState; public readonly string PortraitID; public HazyRegionConfig() { } public HazyRegionConfig(string input) { try { var tables = input.Split('\t'); public readonly string PortraitID; public HazyRegionConfig() { } public HazyRegionConfig(string input) { try { var tables = input.Split('\t'); int.TryParse(tables[0],out id); int.TryParse(tables[1],out incidentType); @@ -48,7 +48,7 @@ int.TryParse(tables[5],out npcId); int.TryParse(tables[6],out crossServer); int.TryParse(tables[6],out dungeonType); int.TryParse(tables[7],out point); @@ -68,176 +68,175 @@ int.TryParse(rewardStateStringArray[i],out rewardState[i]); } PortraitID = tables[11]; } catch (Exception ex) { DebugEx.Log(ex); } } static Dictionary<string, HazyRegionConfig> configs = new Dictionary<string, HazyRegionConfig>(); public static HazyRegionConfig Get(string id) { if (!inited) { Debug.Log("HazyRegionConfig 还未完成初始化。"); return null; } if (configs.ContainsKey(id)) { return configs[id]; } HazyRegionConfig config = null; if (rawDatas.ContainsKey(id)) { config = configs[id] = new HazyRegionConfig(rawDatas[id]); rawDatas.Remove(id); } return config; } public static HazyRegionConfig Get(int id) { return Get(id.ToString()); } public static List<string> GetKeys() { var keys = new List<string>(); keys.AddRange(configs.Keys); keys.AddRange(rawDatas.Keys); return keys; } public static List<HazyRegionConfig> GetValues() { var values = new List<HazyRegionConfig>(); values.AddRange(configs.Values); var keys = new List<string>(rawDatas.Keys); foreach (var key in keys) { values.Add(Get(key)); } return values; } public static bool Has(string id) { return configs.ContainsKey(id) || rawDatas.ContainsKey(id); } public static bool Has(int id) { return Has(id.ToString()); } public static bool inited { get; private set; } protected static Dictionary<string, string> rawDatas = new Dictionary<string, string>(); public static void Init(bool sync=false) { inited = false; var path = string.Empty; if (AssetSource.refdataFromEditor) { path = ResourcesPath.CONFIG_FODLER +"/HazyRegion.txt"; } else { path = AssetVersionUtility.GetAssetFilePath("config/HazyRegion.txt"); } configs.Clear(); var tempConfig = new HazyRegionConfig(); var preParse = tempConfig is IConfigPostProcess; if (sync) { var lines = File.ReadAllLines(path); if (!preParse) { rawDatas = new Dictionary<string, string>(lines.Length - 3); } for (int i = 3; i < lines.Length; i++) { try { var line = lines[i]; var index = line.IndexOf("\t"); if (index == -1) { continue; } var id = line.Substring(0, index); if (preParse) { var config = new HazyRegionConfig(line); configs[id] = config; (config as IConfigPostProcess).OnConfigParseCompleted(); } else { rawDatas[id] = line; } } catch (System.Exception ex) { Debug.LogError(ex); } } inited = true; } else { ThreadPool.QueueUserWorkItem((object _object) => { var lines = File.ReadAllLines(path); if (!preParse) { rawDatas = new Dictionary<string, string>(lines.Length - 3); } for (int i = 3; i < lines.Length; i++) { try { var line = lines[i]; var index = line.IndexOf("\t"); if (index == -1) { continue; } var id = line.Substring(0, index); if (preParse) { var config = new HazyRegionConfig(line); configs[id] = config; (config as IConfigPostProcess).OnConfigParseCompleted(); } else { rawDatas[id] = line; } } catch (System.Exception ex) { Debug.LogError(ex); } } inited = true; }); } } } PortraitID = tables[11]; } catch (Exception ex) { DebugEx.Log(ex); } } static Dictionary<string, HazyRegionConfig> configs = new Dictionary<string, HazyRegionConfig>(); public static HazyRegionConfig Get(string id) { if (!inited) { Debug.Log("HazyRegionConfig 还未完成初始化。"); return null; } if (configs.ContainsKey(id)) { return configs[id]; } HazyRegionConfig config = null; if (rawDatas.ContainsKey(id)) { config = configs[id] = new HazyRegionConfig(rawDatas[id]); rawDatas.Remove(id); } return config; } public static HazyRegionConfig Get(int id) { return Get(id.ToString()); } public static List<string> GetKeys() { var keys = new List<string>(); keys.AddRange(configs.Keys); keys.AddRange(rawDatas.Keys); return keys; } public static List<HazyRegionConfig> GetValues() { var values = new List<HazyRegionConfig>(); values.AddRange(configs.Values); var keys = new List<string>(rawDatas.Keys); foreach (var key in keys) { values.Add(Get(key)); } return values; } public static bool Has(string id) { return configs.ContainsKey(id) || rawDatas.ContainsKey(id); } public static bool Has(int id) { return Has(id.ToString()); } public static bool inited { get; private set; } protected static Dictionary<string, string> rawDatas = new Dictionary<string, string>(); public static void Init(bool sync=false) { inited = false; var path = string.Empty; if (AssetSource.refdataFromEditor) { path = ResourcesPath.CONFIG_FODLER +"/HazyRegion.txt"; } else { path = AssetVersionUtility.GetAssetFilePath("config/HazyRegion.txt"); } var tempConfig = new HazyRegionConfig(); var preParse = tempConfig is IConfigPostProcess; if (sync) { var lines = File.ReadAllLines(path); if (!preParse) { rawDatas = new Dictionary<string, string>(lines.Length - 3); } for (int i = 3; i < lines.Length; i++) { try { var line = lines[i]; var index = line.IndexOf("\t"); if (index == -1) { continue; } var id = line.Substring(0, index); if (preParse) { var config = new HazyRegionConfig(line); configs[id] = config; (config as IConfigPostProcess).OnConfigParseCompleted(); } else { rawDatas[id] = line; } } catch (System.Exception ex) { Debug.LogError(ex); } } inited = true; } else { ThreadPool.QueueUserWorkItem((object _object) => { var lines = File.ReadAllLines(path); if (!preParse) { rawDatas = new Dictionary<string, string>(lines.Length - 3); } for (int i = 3; i < lines.Length; i++) { try { var line = lines[i]; var index = line.IndexOf("\t"); if (index == -1) { continue; } var id = line.Substring(0, index); if (preParse) { var config = new HazyRegionConfig(line); configs[id] = config; (config as IConfigPostProcess).OnConfigParseCompleted(); } else { rawDatas[id] = line; } } catch (System.Exception ex) { Debug.LogError(ex); } } inited = true; }); } } } Core/GameEngine/Model/Config/HazyRegionConfig.cs.meta
@@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 3404c0f308cb2174bb7b93e12c3110bd timeCreated: 1557892243 timeCreated: 1558343195 licenseType: Pro MonoImporter: serializedVersion: 2 Lua/Gen/HazyRegionConfigWrap.cs
@@ -31,7 +31,6 @@ Utils.RegisterFunc(L, Utils.GETTER_IDX, "dungeonId", _g_get_dungeonId); Utils.RegisterFunc(L, Utils.GETTER_IDX, "lineId", _g_get_lineId); Utils.RegisterFunc(L, Utils.GETTER_IDX, "npcId", _g_get_npcId); Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossServer", _g_get_crossServer); Utils.RegisterFunc(L, Utils.GETTER_IDX, "point", _g_get_point); Utils.RegisterFunc(L, Utils.GETTER_IDX, "alchemyLevel", _g_get_alchemyLevel); Utils.RegisterFunc(L, Utils.GETTER_IDX, "reward", _g_get_reward); @@ -362,20 +361,6 @@ HazyRegionConfig gen_to_be_invoked = (HazyRegionConfig)translator.FastGetCSObj(L, 1); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.npcId); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 1; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_crossServer(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); HazyRegionConfig gen_to_be_invoked = (HazyRegionConfig)translator.FastGetCSObj(L, 1); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.crossServer); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } System/Dungeon/DungeonRewardItem.cs
@@ -31,7 +31,7 @@ private void ShowItemTip() { ItemTipUtility.Show(serverItem.ItemID); ItemTipUtility.Show(itemId); } private void RequestSfx() System/Dungeon/DungeonSlayerVictoryWin.cs
@@ -1,18 +1,141 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; namespace Snxxz.UI { public class DungeonSlayerVictoryWin : DungeonVictoryWin { protected override void Display() { m_ContainerPoivt.gameObject.SetActive(true); base.RequireDungeonExit(); base.DrawPassTime(); base.DrawGetExp(); base.DrawItemRewards(); } } } using System.Collections; using System.Collections.Generic; using UnityEngine; namespace Snxxz.UI { public class DungeonSlayerVictoryWin : DungeonVictoryWin { List<Item> items = new List<Item>(); protected override void Display() { m_ContainerPoivt.gameObject.SetActive(true); base.RequireDungeonExit(); base.DrawPassTime(); m_ContainerExp.gameObject.SetActive(false); var result = dungeonModel.dungeonResult; items.Clear(); if (result.totalExp > 0) { items.Add(new Item() { itemId = GeneralDefine.expDisplayId, count = result.totalExp, }); } if (result.money != null && result.money.Length > 0) { for (int i = 0; i < result.money.Length; i++) { var moneyType = result.money[i].moneyType; if (GeneralDefine.moneyDisplayIds.ContainsKey(moneyType)) { items.Add(new Item() { itemId = GeneralDefine.moneyDisplayIds[moneyType], count = result.money[i].moneyValue, }); } } } if (result.itemInfo != null) { for (int i = 0; i < result.itemInfo.Length; i++) { items.Add(new Item() { itemId = result.itemInfo[i].ItemID, count = result.itemInfo[i].Count, }); } } DrawItemRewards(); } protected override void DrawItemRewards() { var merged = false; var hasReward = items.Count > 0; m_ContainerReward.gameObject.SetActive(hasReward); m_RewardIndexs.Clear(); if (m_RewardTweens != null && m_RewardTweens.Length > 0) { for (int i = 0; i < m_RewardTweens.Length; i++) { m_RewardTweens[i].SetEndState(); } } if (items.Count > 0) { var itemModels = new List<ItemCellModel>(); for (int i = 0; i < items.Count; i++) { if (!merged && items[i].itemId == dungeonModel.specialItemCollectRecord.id) { itemModels.Add(new ItemCellModel(items[i].itemId, true, (ulong)items[i].count + (ulong)dungeonModel.specialItemCollectRecord.count)); merged = true; } else { itemModels.Add(new ItemCellModel(items[i].itemId, true, (ulong)items[i].count)); } } for (int i = 0; i < passRewardBehaviours.Length; i++) { var behaviour = passRewardBehaviours[i]; if (i < itemModels.Count) { behaviour.transform.parent.gameObject.SetActive(true); behaviour.gameObject.SetActive(false); behaviour.Init(itemModels[i]); m_RewardIndexs.Add(m_SpecialItemCollect == null ? i : i + 1); } else { behaviour.transform.parent.gameObject.SetActive(false); behaviour.gameObject.SetActive(false); } } if (m_SpecialItemCollect != null) { if (!merged && dungeonModel.specialItemCollectRecord.count > 0) { m_SpecialItemCollect.transform.parent.gameObject.SetActive(true); m_SpecialItemCollect.gameObject.SetActive(false); m_SpecialItemCollect.SetItem(dungeonModel.specialItemCollectRecord); m_RewardIndexs.Insert(0, 0); } else { m_SpecialItemCollect.transform.parent.gameObject.SetActive(false); m_SpecialItemCollect.gameObject.SetActive(false); } } } if (m_RewardIndexs.Count > 0 && m_RewardTweens != null && m_RewardTweens.Length > 0) { PlayRewardTween(0); } } public struct Item { public int itemId; public long count; } } } System/FairyAu/FairyAuTaskWin.cs
@@ -366,24 +366,24 @@ } void RewardInformationDisplay(List<RewardAnalysis.RewardInfo> rewardList)//奖励信息 { if (_Grid.childCount != 0) { for (int i = 0; i < _Grid.childCount; i++) { DestroyObject(_Grid.GetChild(i).gameObject); } } if (rewardList.Count == 0) return; var index = 0; for (int i = 0; i < rewardList.Count; i++) { GameObject go = GameObject.Instantiate(UILoader.LoadPrefab("ItemCell")); GameObject go = null; if (i >= _Grid.childCount) { go = GameObject.Instantiate(UILoader.LoadPrefab("ItemCell")); go.transform.SetParent(_Grid); go.transform.localScale = Vector3.one; Vector3 pos = go.transform.localPosition; go.transform.localPosition = pos.SetZ(0); } else { go = _Grid.GetChild(i).gameObject; } go.gameObject.SetActive(true); ItemCell itemcell = go.GetComponent<ItemCell>(); go.transform.SetParent(_Grid); go.transform.localScale = Vector3.one; Vector3 pos = go.transform.localPosition; go.transform.localPosition = pos.SetZ(0); Button _button = go.transform.GetComponent<Button>(); ItemCellModel cellModel = new ItemCellModel(rewardList[i].itemCfg.ID, true, (ulong)rewardList[i].num); itemcell.Init(cellModel); itemcell.button.RemoveAllListeners(); @@ -392,6 +392,12 @@ { ItemTipUtility.Show(rewardList[tab].itemCfg.ID); }); index = i + 1; } for (int i = index; i < _Grid.childCount; i++) { _Grid.GetChild(i).gameObject.SetActive(false); } } void FairyAuRefresh()//仙盟任务的刷新或添加 System/HazyRegion/HazyRegionIncidentBehaviour.cs
@@ -145,7 +145,7 @@ m_Icon.SetSprite(config.PortraitID); m_Icon.SetNativeSize(); m_Icon.material = m_SmoothMask.imageMaterials[0]; m_ContainerCrossServer.gameObject.SetActive(!model.InFakeHazyRegion && config.crossServer == 1); m_ContainerCrossServer.gameObject.SetActive(!model.InFakeHazyRegion && config.dungeonType == 2); m_ContainerMustSign.gameObject.SetActive(false); } System/HazyRegion/HazyRegionModel.cs
@@ -514,7 +514,7 @@ void SendGotoIncidentDungeon(HazyRegionConfig config) { if (config.crossServer == 1) if (config.dungeonType == 2) { var pak = new CC105_tagCMEnterCrossServer(); pak.DataMapID = (uint)config.dungeonId;