| Lua/Gen/SnxxzUIDailyQuestModelWrap.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Lua/Gen/SnxxzUIDailyQuestModelWrap.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Achievement/AchievementGotoPart1.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/DailyQuest/DailyQuestActiveRewardTooltip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/DailyQuest/DailyQuestModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/DailyQuest/DailyQuestWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/ItemTip/TipLegendPropertyWidget.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Tip/NearDeathWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Lua/Gen/SnxxzUIDailyQuestModelWrap.cs
@@ -21,7 +21,7 @@ { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); System.Type type = typeof(Snxxz.UI.DailyQuestModel); Utils.BeginObjectRegister(type, L, translator, 0, 28, 8, 4); Utils.BeginObjectRegister(type, L, translator, 0, 27, 7, 4); Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init); Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit); @@ -50,14 +50,12 @@ Utils.RegisterFunc(L, Utils.METHOD_IDX, "activeValueRewardGotEvent", _e_activeValueRewardGotEvent); Utils.RegisterFunc(L, Utils.METHOD_IDX, "dailyQuestProgressUpdateEvent", _e_dailyQuestProgressUpdateEvent); Utils.RegisterFunc(L, Utils.METHOD_IDX, "totalActiveValueUpdateEvent", _e_totalActiveValueUpdateEvent); Utils.RegisterFunc(L, Utils.METHOD_IDX, "realmPointUpdateEvent", _e_realmPointUpdateEvent); Utils.RegisterFunc(L, Utils.METHOD_IDX, "currentActiveValueUpdateEvent", _e_currentActiveValueUpdateEvent); Utils.RegisterFunc(L, Utils.GETTER_IDX, "dailyQuestTotalActiveValue", _g_get_dailyQuestTotalActiveValue); Utils.RegisterFunc(L, Utils.GETTER_IDX, "currentDailyQuest", _g_get_currentDailyQuest); Utils.RegisterFunc(L, Utils.GETTER_IDX, "currentRewardStageIndex", _g_get_currentRewardStageIndex); Utils.RegisterFunc(L, Utils.GETTER_IDX, "totalActiveValue", _g_get_totalActiveValue); Utils.RegisterFunc(L, Utils.GETTER_IDX, "gotableRealmPoint", _g_get_gotableRealmPoint); Utils.RegisterFunc(L, Utils.GETTER_IDX, "currentActiveValue", _g_get_currentActiveValue); Utils.RegisterFunc(L, Utils.GETTER_IDX, "everyDayRedpoint", _g_get_everyDayRedpoint); Utils.RegisterFunc(L, Utils.GETTER_IDX, "timeLimitRedpoint", _g_get_timeLimitRedpoint); Utils.RegisterFunc(L, Utils.GETTER_IDX, "trialExchangeRedpoint", _g_get_trialExchangeRedpoint); @@ -886,27 +884,13 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_totalActiveValue(RealStatePtr L) static int _g_get_currentActiveValue(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.DailyQuestModel gen_to_be_invoked = (Snxxz.UI.DailyQuestModel)translator.FastGetCSObj(L, 1); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.totalActiveValue); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 1; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_gotableRealmPoint(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.DailyQuestModel gen_to_be_invoked = (Snxxz.UI.DailyQuestModel)translator.FastGetCSObj(L, 1); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.gotableRealmPoint); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.currentActiveValue); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } @@ -1088,7 +1072,7 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _e_totalActiveValueUpdateEvent(RealStatePtr L) static int _e_currentActiveValueUpdateEvent(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); @@ -1103,13 +1087,13 @@ { if (LuaAPI.xlua_is_eq_str(L, 2, "+")) { gen_to_be_invoked.totalActiveValueUpdateEvent += gen_delegate; gen_to_be_invoked.currentActiveValueUpdateEvent += gen_delegate; return 0; } if (LuaAPI.xlua_is_eq_str(L, 2, "-")) { gen_to_be_invoked.totalActiveValueUpdateEvent -= gen_delegate; gen_to_be_invoked.currentActiveValueUpdateEvent -= gen_delegate; return 0; } @@ -1117,41 +1101,7 @@ } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.DailyQuestModel.totalActiveValueUpdateEvent!"); return 0; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _e_realmPointUpdateEvent(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); int gen_param_count = LuaAPI.lua_gettop(L); Snxxz.UI.DailyQuestModel gen_to_be_invoked = (Snxxz.UI.DailyQuestModel)translator.FastGetCSObj(L, 1); System.Action gen_delegate = translator.GetDelegate<System.Action>(L, 3); if (gen_delegate == null) { return LuaAPI.luaL_error(L, "#3 need System.Action!"); } if (gen_param_count == 3) { if (LuaAPI.xlua_is_eq_str(L, 2, "+")) { gen_to_be_invoked.realmPointUpdateEvent += gen_delegate; return 0; } if (LuaAPI.xlua_is_eq_str(L, 2, "-")) { gen_to_be_invoked.realmPointUpdateEvent -= gen_delegate; return 0; } } } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.DailyQuestModel.realmPointUpdateEvent!"); LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.DailyQuestModel.currentActiveValueUpdateEvent!"); return 0; }
@@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ae62cfdc8e15c2745a9e011e71cea13f timeCreated: 1550120584 timeCreated: 1552879283 licenseType: Pro MonoImporter: serializedVersion: 2 System/Achievement/AchievementGotoPart1.cs
@@ -257,7 +257,7 @@ DailyQuestActiveValueReward rewardData; if (dailyQuestModel.TryGetActiveValueRewardData(int.Parse(key), out rewardData)) { if (!rewardData.got && dailyQuestModel.totalActiveValue >= config.Liveness) if (!rewardData.got && dailyQuestModel.currentActiveValue >= config.Liveness) { rewardable = true; break; System/DailyQuest/DailyQuestActiveRewardTooltip.cs
@@ -49,8 +49,8 @@ m_GotSign.gameObject.SetActive(rewardRecord.got); } model.totalActiveValueUpdateEvent -= UpdateAwardableEffect; model.totalActiveValueUpdateEvent += UpdateAwardableEffect; model.currentActiveValueUpdateEvent -= UpdateAwardableEffect; model.currentActiveValueUpdateEvent += UpdateAwardableEffect; model.activeValueRewardGotEvent -= OnGotActiveValueReward; model.activeValueRewardGotEvent += OnGotActiveValueReward; } @@ -58,7 +58,7 @@ public void Dispose() { model.activeValueRewardGotEvent -= OnGotActiveValueReward; model.totalActiveValueUpdateEvent -= UpdateAwardableEffect; model.currentActiveValueUpdateEvent -= UpdateAwardableEffect; } public void UpdateAwardableEffect() @@ -136,7 +136,7 @@ private bool TestActiveValueGotable(out int _error) { var config = DailyLivenessRewardConfig.Get(rewardId); if (model.totalActiveValue < config.Liveness) if (model.currentActiveValue < config.Liveness) { _error = 1; return false; System/DailyQuest/DailyQuestModel.cs
@@ -45,37 +45,19 @@ private set { m_CurrentRewardStageIndex = value; } } int m_TotalActiveValue = 0; public int totalActiveValue { get { return m_TotalActiveValue; } int m_CurrentActiveValue = 0; public int currentActiveValue { get { return m_CurrentActiveValue; } private set { if (m_TotalActiveValue != value) if (m_CurrentActiveValue != value) { m_TotalActiveValue = value; m_CurrentActiveValue = value; if (totalActiveValueUpdateEvent != null) if (currentActiveValueUpdateEvent != null) { totalActiveValueUpdateEvent(); currentActiveValueUpdateEvent(); } } } } int m_GotableRealmPoint; public int gotableRealmPoint { get { return m_GotableRealmPoint; } private set { if (m_GotableRealmPoint != value) { m_GotableRealmPoint = value; realmPointRedpoint.state = FuncOpen.Instance.IsFuncOpen(12) && m_GotableRealmPoint > 0 ? RedPointState.Simple : RedPointState.None; if (realmPointUpdateEvent != null) { realmPointUpdateEvent(); } } } } @@ -88,14 +70,12 @@ Dictionary<int, Dictionary<int, List<int>>> questCalendar = new Dictionary<int, Dictionary<int, List<int>>>(); DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } FairyLeagueModel fairyLeagueModel { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } } FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } } AllianceBossModel allianceBossModel { get { return ModelCenter.Instance.GetModel<AllianceBossModel>(); } } public event Action<int> activeValueRewardGotEvent; public event Action<int> dailyQuestProgressUpdateEvent; public event Action totalActiveValueUpdateEvent; public event Action realmPointUpdateEvent; public event Action currentActiveValueUpdateEvent; public override void Init() { @@ -138,8 +118,7 @@ public void OnBeforePlayerDataInitialize() { totalActiveValue = 0; gotableRealmPoint = 0; currentActiveValue = 0; } public void OnMapInitOk() @@ -391,8 +370,7 @@ public void OnDailyQuestActiveValueInfoUpdate(HA333_tagMCDailyActivityInfoList _activeValueInfo) { totalActiveValue = (int)_activeValueInfo.CurValue; gotableRealmPoint = (int)_activeValueInfo.RealmPoint; currentActiveValue = (int)_activeValueInfo.CurValue; currentRewardStageIndex = (int)_activeValueInfo.StageIndex; @@ -659,7 +637,7 @@ if (!reward.got) { var config = DailyLivenessRewardConfig.Get(reward.id); if (totalActiveValue >= config.Liveness) if (currentActiveValue >= config.Liveness) { anyAwardable = true; break; System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs
File was deleted System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs.meta
File was deleted System/DailyQuest/DailyQuestWin.cs
@@ -15,8 +15,6 @@ public class DailyQuestWin : Window { [SerializeField] CyclicScroll m_QuestScroll; [SerializeField] Button m_Calendar; [SerializeField] FunctionButtonGroup m_FunctionGroup; [SerializeField] FunctionButton m_EveryDaily; [SerializeField] FunctionButton m_TimeLimit; @@ -24,14 +22,18 @@ [SerializeField] Button m_Left; [SerializeField] Button m_Right; [SerializeField] ButtonEx m_CloseButton; [SerializeField] GameObject m_ResourcesBackObj; [SerializeField] RectTransform m_DailyQuestContainer; [SerializeField] CyclicScroll m_QuestScroll; [SerializeField] Button m_Calendar; [SerializeField] DailyQuestHangTimeBehaviour m_HangTimeBehaviour; [SerializeField] DailyQuestRealmPracticeBehaviour m_RealmPracticeBehaviour; [SerializeField] DailyQuestActiveSlider m_DailyQuestActiveSlider; [SerializeField] RectTransform m_ResourcesBackContainer; DailyQuestModel model { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } } DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } } public int guidingDailyQuestId = 0; @@ -66,7 +68,6 @@ guidingDailyQuestId = 0; model.currentDailyQuest = 0; m_HangTimeBehaviour.Dispose(); m_RealmPracticeBehaviour.Dispose(); m_QuestScroll.Dispose(); } @@ -116,6 +117,8 @@ private void ShowEveryDayQuests() { var dailyQuests = model.GetDailyQuests(DailyQuestModel.DailyQuestCategory.EveryDay); m_DailyQuestContainer.gameObject.SetActive(true); m_ResourcesBackContainer.gameObject.SetActive(false); ShowQuestGroups(dailyQuests); functionOrder = m_EveryDaily.order; } @@ -123,18 +126,16 @@ private void ShowTimeLimit() { var dailyQuests = model.GetDailyQuests(DailyQuestModel.DailyQuestCategory.TimeLimit); m_DailyQuestContainer.gameObject.SetActive(true); m_ResourcesBackContainer.gameObject.SetActive(false); ShowQuestGroups(dailyQuests); functionOrder = m_TimeLimit.order; } private void ShowResourcesBack() { m_ResourcesBackObj.SetActive(true); m_HangTimeBehaviour.Dispose(); m_HangTimeBehaviour.gameObject.SetActive(false); m_QuestScroll.gameObject.SetActive(false); m_RealmPracticeBehaviour.Dispose(); m_RealmPracticeBehaviour.gameObject.SetActive(false); m_DailyQuestContainer.gameObject.SetActive(false); m_ResourcesBackContainer.gameObject.SetActive(true); functionOrder = m_ResourcesBack.order; } @@ -151,13 +152,8 @@ private void ShowQuestGroups(List<int> _quests) { m_ResourcesBackObj.SetActive(false); m_QuestScroll.gameObject.SetActive(true); m_HangTimeBehaviour.gameObject.SetActive(true); m_HangTimeBehaviour.Display(); m_RealmPracticeBehaviour.gameObject.SetActive(true); m_RealmPracticeBehaviour.Display(); m_DailyQuestActiveSlider.UpdateActiveValue( model.currentActiveValue, model.dailyQuestTotalActiveValue); var groupDatas = new List<DailyQuestGroup.GroupData>(); var max = _quests.Count; for (int i = 0; i < max; i++, i++) @@ -194,7 +190,7 @@ GotoNormalDungeon(_id); break; case DailyQuestType.IceCrystal: WindowCenter.Instance.Open<IceCrystalVeinWin>(); WindowCenter.Instance.Open<IceCrystalVeinWin>(); break; case DailyQuestType.GuardSky: var _fairyModel = ModelCenter.Instance.GetModel<FairyModel>(); @@ -269,7 +265,7 @@ case DailyQuestType.RuneTowerSweep: RuneTowerWin.guideSweep = true; WindowCenter.Instance.Close<DailyQuestWin>(); WindowCenter.Instance.Open<TowerWin>(false,0); WindowCenter.Instance.Open<TowerWin>(false, 0); break; case DailyQuestType.BossHome: WindowCenter.Instance.Close<DailyQuestWin>(); System/ItemTip/TipLegendPropertyWidget.cs
@@ -21,16 +21,14 @@ for (int i = 0; i < count; i++) { var property = data.properties[i]; var config = PlayerPropertyConfig.Get(property.x); var value = PlayerPropertyConfig.GetValueDescription(property.x, property.y); var quality = LegendPropertyConfig.Get(property.x).quality; if (data.isPreview) { lines.Add(UIHelper.AppendColor(quality, string.Format("【推荐】{0}+{1}", config.Name, value))); lines.Add(UIHelper.AppendColor(quality, string.Format("【推荐】{0}", PlayerPropertyConfig.GetFullDescription( property.x,property.y)))); } else { lines.Add(UIHelper.AppendColor(quality, string.Format("{0}+{1}", config.Name, value))); lines.Add(UIHelper.AppendColor(quality, PlayerPropertyConfig.GetFullDescription(property.x, property.y))); } }
@@ -32,7 +32,10 @@ var percent = PlayerDatas.Instance.extersion.MaxHP <= 0 ? 1 : PlayerDatas.Instance.baseData.HP / (float)PlayerDatas.Instance.extersion.MaxHP; if (percent <= GeneralDefine.lowHpRemind * 0.01f) { WindowCenter.Instance.Open<NearDeathWin>(true); if (!WindowCenter.Instance.IsOpen("NearDeathWin")) { WindowCenter.Instance.Open<NearDeathWin>(true); } } break; }
