| Lua/Gen/SnxxzUITreasureModelWrap.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/AuctionHouseWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/FamilyAuctioncell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/FullServiceAuctioncell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/MyFocusCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/MyFocusWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/FairyTreasureCollectPanelPattern5.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/TreasureAchievement.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/TreasureModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/TreasureUnlockCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/TreasureUnlockCell.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Lua/Gen/SnxxzUITreasureModelWrap.cs
@@ -62,9 +62,7 @@ Utils.RegisterFunc(L, Utils.METHOD_IDX, "demonTreasureDungeonUpdate", _e_demonTreasureDungeonUpdate); Utils.RegisterFunc(L, Utils.METHOD_IDX, "demonDungeonChallengeNext", _e_demonDungeonChallengeNext); Utils.RegisterFunc(L, Utils.GETTER_IDX, "stoveRedpoint", _g_get_stoveRedpoint); Utils.RegisterFunc(L, Utils.GETTER_IDX, "selectedTreasure", _g_get_selectedTreasure); Utils.RegisterFunc(L, Utils.GETTER_IDX, "treasureStepUpShow", _g_get_treasureStepUpShow); Utils.RegisterFunc(L, Utils.GETTER_IDX, "treasureStageUpShow", _g_get_treasureStageUpShow); Utils.RegisterFunc(L, Utils.GETTER_IDX, "currentCategory", _g_get_currentCategory); Utils.RegisterFunc(L, Utils.GETTER_IDX, "collectingHuman", _g_get_collectingHuman); @@ -80,11 +78,9 @@ Utils.RegisterFunc(L, Utils.GETTER_IDX, "treasureBackLvLimit", _g_get_treasureBackLvLimit); Utils.RegisterFunc(L, Utils.GETTER_IDX, "exitRecord", _g_get_exitRecord); Utils.RegisterFunc(L, Utils.GETTER_IDX, "entranceOpenCondition", _g_get_entranceOpenCondition); Utils.RegisterFunc(L, Utils.GETTER_IDX, "cacheGotAchievements", _g_get_cacheGotAchievements); Utils.RegisterFunc(L, Utils.GETTER_IDX, "vipKillNPCTreasure", _g_get_vipKillNPCTreasure); Utils.RegisterFunc(L, Utils.SETTER_IDX, "selectedTreasure", _s_set_selectedTreasure); Utils.RegisterFunc(L, Utils.SETTER_IDX, "treasureStepUpShow", _s_set_treasureStepUpShow); Utils.RegisterFunc(L, Utils.SETTER_IDX, "treasureStageUpShow", _s_set_treasureStageUpShow); Utils.RegisterFunc(L, Utils.SETTER_IDX, "currentCategory", _s_set_currentCategory); Utils.RegisterFunc(L, Utils.SETTER_IDX, "collectingHuman", _s_set_collectingHuman); @@ -984,22 +980,6 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_stoveRedpoint(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1); translator.Push(L, gen_to_be_invoked.stoveRedpoint); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 1; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_selectedTreasure(RealStatePtr L) { @@ -1008,20 +988,6 @@ Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.selectedTreasure); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 1; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_treasureStepUpShow(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1); LuaAPI.lua_pushboolean(L, gen_to_be_invoked.treasureStepUpShow); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } @@ -1239,20 +1205,6 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_cacheGotAchievements(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1); translator.Push(L, gen_to_be_invoked.cacheGotAchievements); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 1; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_vipKillNPCTreasure(RealStatePtr L) { try { @@ -1288,21 +1240,6 @@ Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1); gen_to_be_invoked.selectedTreasure = LuaAPI.xlua_tointeger(L, 2); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 0; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _s_set_treasureStepUpShow(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1); gen_to_be_invoked.treasureStepUpShow = LuaAPI.lua_toboolean(L, 2); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); System/Auction/AuctionHouseWin.cs
@@ -67,8 +67,7 @@ } protected override void OnPreClose() { CloseImmediately(); { if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>()) { WindowCenter.Instance.Open<MainInterfaceWin>(); System/Auction/FamilyAuctioncell.cs
@@ -64,8 +64,9 @@ return; } AuctionItem = auctionItem; var jobBool = itemConfig.JobLimit == PlayerDatas.Instance.baseData.Job; var equipNeedBool = auctionHelpModel.WhetherEquipped(itemConfig.LV, itemConfig.EquipPlace); if (!equipNeedBool)//是否需要 if (!equipNeedBool && jobBool)//是否需要 { m_NeedImage.SetActive(true); } @@ -217,8 +218,8 @@ } if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0) { m_PriceButton.interactable = false; m_PriceImage.gray = true; m_BiddingButton.interactable = false; m_BiddingImage.gray = true; } int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60); m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds)); System/Auction/FullServiceAuctioncell.cs
@@ -86,8 +86,9 @@ return; } AuctionItem = auctionItem; var jobBool = itemConfig.JobLimit == PlayerDatas.Instance.baseData.Job; var equipNeedBool = auctionHelpModel.WhetherEquipped(itemConfig.LV, itemConfig.EquipPlace); if (!equipNeedBool) if (!equipNeedBool && jobBool) { m_NeedImage.SetActive(true); } @@ -241,8 +242,8 @@ } if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0) { m_PriceButton.interactable = false; m_PriceImage.gray = true; m_BiddingButton.interactable = false; m_BiddingImage.gray = true; } int seconds = AuctionItem.WorldSaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60); m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds)); System/Auction/MyFocusCell.cs
@@ -76,8 +76,9 @@ return; } AuctionItem = auctionItem; var jobBool = itemConfig.JobLimit == PlayerDatas.Instance.baseData.Job; var equipNeedBool = auctionHelpModel.WhetherEquipped(itemConfig.LV, itemConfig.EquipPlace); if (!equipNeedBool)//是否需要 if (!equipNeedBool && jobBool)//是否需要 { m_NeedImage.SetActive(true); } @@ -222,8 +223,8 @@ } if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0) { m_PriceButton.interactable = false; m_PriceImage.gray = true; m_BiddingButton.interactable = false; m_BiddingImage.gray = true; } if (!m_BiddingTextObj.activeSelf) { System/Auction/MyFocusWin.cs
@@ -40,20 +40,24 @@ protected override void OnAfterOpen() { model.AttentionAuctionItemUdate += Reset; model.ClearAuctionUpdate += Reset; model.AttentionAuctionItemUdate += ResetUpdate; model.ClearAuctionUpdate += ResetUpdate; model.RefreshAuctionItemUpdate -= AuctionItemUpdate;//刷新 model.FamilyAuctionItemUpdate += Reset; model.FamilyAuctionItemUpdate += ResetUpdate; model.AddAuctionItemInfoUpdate += AddAuctionItemInfoUpdate; model.BiddingItemInfoUpdate += ResetUpdate; } protected override void OnPreClose() { model.AttentionAuctionItemUdate -= Reset; model.ClearAuctionUpdate -= Reset; model.AttentionAuctionItemUdate -= ResetUpdate; model.ClearAuctionUpdate -= ResetUpdate; model.RefreshAuctionItemUpdate -= AuctionItemUpdate;//刷新 model.FamilyAuctionItemUpdate -= Reset; model.FamilyAuctionItemUpdate -= ResetUpdate; model.AddAuctionItemInfoUpdate -= AddAuctionItemInfoUpdate; model.BiddingItemInfoUpdate -= ResetUpdate; } @@ -63,7 +67,12 @@ } #endregion private void Reset() private void AddAuctionItemInfoUpdate() { AuctionInquiry.Instance.SendQueryAttentionAuctionItem();//查询拍卖行的关注物品 ResetUpdate(); } private void ResetUpdate() { GetMyFocusList(); ListSotr(); System/Treasure/FairyTreasureCollectPanelPattern5.cs
@@ -198,10 +198,6 @@ if (_effect != null) { var _index = i; if (_index == m_FurnacesIcons.Length - 1) { model.treasureStepUpShow = true; } _effect.OnComplete = () => { _effect.OnComplete = null; @@ -238,16 +234,11 @@ StartCoroutine(Co_Fly()); }; } else { model.treasureStepUpShow = false; } } IEnumerator Co_Fly() { yield return WaitingForSecondConst.WaitMS300; model.treasureStepUpShow = false; BeginFly(); }
@@ -126,7 +126,7 @@ private void GotoComplete() { if (m_TreasureCyclicScroll.showing || treasureModel.treasureStepUpShow) if (m_TreasureCyclicScroll.showing) { return; } @@ -150,15 +150,11 @@ private void GetAward() { if (m_TreasureCyclicScroll.showing || treasureModel.treasureStepUpShow) if (m_TreasureCyclicScroll.showing) { return; } model.GetAchievementReward(achievement.id); if (!treasureModel.cacheGotAchievements.Contains(achievement.id)) { treasureModel.cacheGotAchievements.Add(achievement.id); } } private void OnAchievementProgressUpdate(int _achievementId) System/Treasure/TreasureModel.cs
@@ -32,8 +32,6 @@ Redpoint elderGodRedpoint = new Redpoint(TREASURE_REDPOINTID, CATEGORY_REDPOINTIDS[(int)TreasureCategory.King - 1]); Redpoint zergRedpoint = new Redpoint(TREASURE_REDPOINTID, CATEGORY_REDPOINTIDS[(int)TreasureCategory.Zerg - 1]); public Redpoint stoveRedpoint { get; private set; } public event Action<int> treasureCollectProgressUpdateEvent; public event Action<int> treasureSelectedEvent; public event Action<TreasureCategory> collectingTreasureChangeEvent; @@ -58,8 +56,6 @@ } } } public bool treasureStepUpShow { get; set; } public bool treasureStageUpShow { get; set; } @@ -135,8 +131,6 @@ public int exitRecord { get; set; } public int entranceOpenCondition { get; private set; } public List<int> cacheGotAchievements { get { return m_CacheGotAchievements; } } AchievementModel achievementModel { get { return ModelCenter.Instance.GetModel<AchievementModel>(); } } VIPKillNPCTreasure m_VIPKillNPCTreasure; @@ -204,7 +198,6 @@ playerLevelRefresh = false; needDisplayReguluLevelUp = false; treasureUnlockShowDict.Clear(); cacheGotAchievements.Clear(); foreach (var treasure in treasures.Values) { treasure.state = TreasureState.Locked; @@ -474,8 +467,6 @@ } } } UpdateStoveRedpoint(); } private void OnAchievementProgressUpdate(int _achievement) @@ -493,11 +484,6 @@ { UpdateTreasureCollectProgress(treasure); } } if (eightFurnacesAchievements.Contains(_achievement)) { UpdateStoveRedpoint(); } } @@ -573,16 +559,6 @@ treasureDungeon.challengeRedpoint.state = RedPointState.Simple; } } } } private void UpdateStoveRedpoint() { Treasure treasure; if (TryGetTreasure(301, out treasure)) { stoveRedpoint.state = RedPointState.None; return; } } @@ -709,11 +685,6 @@ } } } } if (eightFurnacesAchievements.Contains(_achievementId)) { UpdateStoveRedpoint(); } } @@ -859,8 +830,6 @@ funcConfig = FuncConfigConfig.Get("OpenFabao"); entranceOpenCondition = int.Parse(funcConfig.Numerical1); stoveRedpoint = new Redpoint(CATEGORY_REDPOINTIDS[(int)TreasureCategory.Fairy - 1], TREASURE_REDPOINTBASE + redpointIndex++); var treasureDungeonConfigs = TreasureDungeonConfig.GetValues(); foreach (var config in treasureDungeonConfigs) System/Treasure/TreasureUnlockCell.cs
File was deleted System/Treasure/TreasureUnlockCell.cs.meta
File was deleted
