| Lua/Gen/SnxxzUISignInModelWrap.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/TreasureEffectModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/FairyTreasureCollectPanelPattern4.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/SignInCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/SignInGiftCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/SignInModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/SignInWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Lua/Gen/SnxxzUISignInModelWrap.cs
@@ -21,7 +21,7 @@ { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); System.Type type = typeof(Snxxz.UI.SignInModel); Utils.BeginObjectRegister(type, L, translator, 0, 5, 10, 2); Utils.BeginObjectRegister(type, L, translator, 0, 5, 8, 2); Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnRefreshData", _m_OnRefreshData); Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init); @@ -30,19 +30,17 @@ Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnSignRefresh", _e_OnSignRefresh); Utils.RegisterFunc(L, Utils.GETTER_IDX, "signAwardList", _g_get_signAwardList); Utils.RegisterFunc(L, Utils.GETTER_IDX, "cntSignList", _g_get_cntSignList); Utils.RegisterFunc(L, Utils.GETTER_IDX, "ctnSignJade", _g_get_ctnSignJade); Utils.RegisterFunc(L, Utils.GETTER_IDX, "signNum", _g_get_signNum); Utils.RegisterFunc(L, Utils.GETTER_IDX, "surSignNum", _g_get_surSignNum); Utils.RegisterFunc(L, Utils.GETTER_IDX, "todaySign", _g_get_todaySign); Utils.RegisterFunc(L, Utils.GETTER_IDX, "isFirst", _g_get_isFirst); Utils.RegisterFunc(L, Utils.GETTER_IDX, "SumSignNum", _g_get_SumSignNum); Utils.RegisterFunc(L, Utils.GETTER_IDX, "keepSignInCost", _g_get_keepSignInCost); Utils.RegisterFunc(L, Utils.GETTER_IDX, "alreadySignInCount", _g_get_alreadySignInCount); Utils.RegisterFunc(L, Utils.GETTER_IDX, "keepSignInCount", _g_get_keepSignInCount); Utils.RegisterFunc(L, Utils.GETTER_IDX, "todaySignIn", _g_get_todaySignIn); Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsFirstMonth", _g_get_IsFirstMonth); Utils.RegisterFunc(L, Utils.GETTER_IDX, "totalSignInCount", _g_get_totalSignInCount); Utils.RegisterFunc(L, Utils.GETTER_IDX, "redpoint", _g_get_redpoint); Utils.RegisterFunc(L, Utils.GETTER_IDX, "m_ContinueJobItems", _g_get_m_ContinueJobItems); Utils.RegisterFunc(L, Utils.GETTER_IDX, "m_KeepSignInItemDict", _g_get_m_KeepSignInItemDict); Utils.RegisterFunc(L, Utils.SETTER_IDX, "redpoint", _s_set_redpoint); Utils.RegisterFunc(L, Utils.SETTER_IDX, "m_ContinueJobItems", _s_set_m_ContinueJobItems); Utils.RegisterFunc(L, Utils.SETTER_IDX, "m_KeepSignInItemDict", _s_set_m_KeepSignInItemDict); Utils.EndObjectRegister(type, L, translator, null, null, @@ -201,13 +199,13 @@ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_signAwardList(RealStatePtr L) static int _g_get_keepSignInCost(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.SignInModel gen_to_be_invoked = (Snxxz.UI.SignInModel)translator.FastGetCSObj(L, 1); translator.Push(L, gen_to_be_invoked.signAwardList); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.keepSignInCost); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } @@ -215,13 +213,13 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_cntSignList(RealStatePtr L) static int _g_get_alreadySignInCount(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.SignInModel gen_to_be_invoked = (Snxxz.UI.SignInModel)translator.FastGetCSObj(L, 1); translator.Push(L, gen_to_be_invoked.cntSignList); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.alreadySignInCount); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } @@ -229,13 +227,13 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_ctnSignJade(RealStatePtr L) static int _g_get_keepSignInCount(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.SignInModel gen_to_be_invoked = (Snxxz.UI.SignInModel)translator.FastGetCSObj(L, 1); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.ctnSignJade); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.keepSignInCount); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } @@ -243,13 +241,13 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_signNum(RealStatePtr L) static int _g_get_todaySignIn(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.SignInModel gen_to_be_invoked = (Snxxz.UI.SignInModel)translator.FastGetCSObj(L, 1); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.signNum); LuaAPI.lua_pushboolean(L, gen_to_be_invoked.todaySignIn); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } @@ -257,13 +255,13 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_surSignNum(RealStatePtr L) static int _g_get_IsFirstMonth(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.SignInModel gen_to_be_invoked = (Snxxz.UI.SignInModel)translator.FastGetCSObj(L, 1); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.surSignNum); LuaAPI.lua_pushboolean(L, gen_to_be_invoked.IsFirstMonth); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } @@ -271,41 +269,13 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_todaySign(RealStatePtr L) static int _g_get_totalSignInCount(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.SignInModel gen_to_be_invoked = (Snxxz.UI.SignInModel)translator.FastGetCSObj(L, 1); LuaAPI.lua_pushboolean(L, gen_to_be_invoked.todaySign); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 1; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_isFirst(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.SignInModel gen_to_be_invoked = (Snxxz.UI.SignInModel)translator.FastGetCSObj(L, 1); LuaAPI.lua_pushboolean(L, gen_to_be_invoked.isFirst); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 1; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_SumSignNum(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.SignInModel gen_to_be_invoked = (Snxxz.UI.SignInModel)translator.FastGetCSObj(L, 1); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.SumSignNum); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.totalSignInCount); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } @@ -327,13 +297,13 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_m_ContinueJobItems(RealStatePtr L) static int _g_get_m_KeepSignInItemDict(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.SignInModel gen_to_be_invoked = (Snxxz.UI.SignInModel)translator.FastGetCSObj(L, 1); translator.Push(L, gen_to_be_invoked.m_ContinueJobItems); translator.Push(L, gen_to_be_invoked.m_KeepSignInItemDict); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } @@ -358,13 +328,13 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _s_set_m_ContinueJobItems(RealStatePtr L) static int _s_set_m_KeepSignInItemDict(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.SignInModel gen_to_be_invoked = (Snxxz.UI.SignInModel)translator.FastGetCSObj(L, 1); gen_to_be_invoked.m_ContinueJobItems = (System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>>)translator.GetObject(L, 2, typeof(System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>>)); gen_to_be_invoked.m_KeepSignInItemDict = (System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>>)translator.GetObject(L, 2, typeof(System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>>)); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); System/KnapSack/Logic/TreasureEffectModel.cs
@@ -136,11 +136,11 @@ PlayerPropertyConfig propertyConfig = Config.Instance.Get<PlayerPropertyConfig>(id); string des = string.Format(treasureConfig.Verse[0], GetProValueTypeStr(propertyConfig, attrDict[id]), propertyConfig.Name); effectDesSB.Append(des); if (signInModel.SumSignNum > 0) if (signInModel.totalSignInCount > 0) { des = string.Format(treasureConfig.Verse[1], signInModel.SumSignNum); des = string.Format(treasureConfig.Verse[1], signInModel.totalSignInCount); effectDesSB.Append(StringUtility.Contact("\n", des)); int addAtk = signInModel.SumSignNum * attrDict[id]; int addAtk = signInModel.totalSignInCount * attrDict[id]; if (isHaveTreasure) { des = string.Format(treasureConfig.Verse[2], Language.Get("TreasureEffect105", GetProValueTypeStr(propertyConfig, addAtk))); System/Treasure/FairyTreasureCollectPanelPattern4.cs
@@ -88,17 +88,17 @@ var _propertyCfg = Config.Instance.Get<PlayerPropertyConfig>(_property.Key); m_SignPropertyEffect.text = Language.Get("FairyTreasure_5", _property.Value, _propertyCfg.Name); m_SignInTotalDays.text = Language.Get("FairyTreasure_6", signInModel.SumSignNum); m_SignInTotalDays.text = Language.Get("FairyTreasure_6", signInModel.totalSignInCount); if (treasure.state != TreasureState.Collected) { m_ProerptyValue.text = Language.Get("FairyTreasure_7", _propertyCfg.Name, signInModel.SumSignNum * _property.Value); _propertyCfg.Name, signInModel.totalSignInCount * _property.Value); m_SignInTip.text = Language.Get("SignInTreasureTip1"); } else { m_ProerptyValue.text = Language.Get("FairyTreasure_8", _propertyCfg.Name, signInModel.SumSignNum * _property.Value); _propertyCfg.Name, signInModel.totalSignInCount * _property.Value); m_SignInTip.text = Language.Get("SignInTreasureTip2"); } } System/Welfare/SignInCell.cs
@@ -54,16 +54,17 @@ public override void Refresh(CellView cell) { var _page = cell.index; var configs = Config.Instance.GetAllValues<SignInConfig>(); for (int i = 0; i < 5; i++) { var _index = _page * 5 + i; if (_index >= model.signAwardList.Count) if (_index >= configs.Count) { m_SignIns[i].gameObject.SetActive(false); continue; } var _signInCfg = model.signAwardList[_index]; var _ring = model.isFirst ? 0 : (_signInCfg.ItemID.Length > 1 ? 1 : 0); var _signInCfg = configs[_index]; var _ring = model.IsFirstMonth ? 0 : (_signInCfg.ItemID.Length > 1 ? 1 : 0); var _itemCfg = Config.Instance.Get<ItemConfig>(_signInCfg.ItemID[_ring]); m_ItemIcons[i].SetSprite(_itemCfg.IconKey); m_ItemBgs[i].SetItemBackGround(_itemCfg.ItemColor); @@ -72,12 +73,12 @@ m_ItemCntTxts[i].text = _signInCfg.OrdinaryNum[_ring] <= 1 ? string.Empty : _signInCfg.OrdinaryNum[_ring].ToString(); m_DayTxts[i].text = Language.Get("SignIn_4", _index + 1); m_BindImgs[i].gameObject.SetActive(_signInCfg.IsBind == 1); m_HasSignImgs[i].gameObject.SetActive(_index < model.signNum); m_RetroactiveImgs[i].gameObject.SetActive(_index == model.signNum && model.todaySign && model.surSignNum > 0); m_PresentEffects[i].gameObject.SetActive(_index == model.signNum && !model.todaySign); if (AchievementGoto.achievementType == AchievementGoto.SignInAchievement && _page == model.signNum / 5 && _index == model.signNum && model.surSignNum > 0 && model.todaySign) m_HasSignImgs[i].gameObject.SetActive(_index < model.alreadySignInCount); m_RetroactiveImgs[i].gameObject.SetActive(_index == model.alreadySignInCount && model.todaySignIn && model.keepSignInCount > 0); m_PresentEffects[i].gameObject.SetActive(_index == model.alreadySignInCount && !model.todaySignIn); if (AchievementGoto.achievementType == AchievementGoto.SignInAchievement && _page == model.alreadySignInCount / 5 && _index == model.alreadySignInCount && model.keepSignInCount > 0 && model.todaySignIn) { if (_achieveEffects[i] == null) { @@ -105,23 +106,23 @@ private void OnClickSign(int _day) { if (_day == model.signNum) if (_day == model.alreadySignInCount) { AchievementGoto.achievementType = 0; if (!model.todaySign) if (!model.todaySignIn) { CA509_tagCMDaySign signpack = new CA509_tagCMDaySign(); signpack.Day = 0; GameNetSystem.Instance.SendInfo(signpack); return; } else if (model.surSignNum > 0) else if (model.keepSignInCount > 0) { ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("SinInReplenish", model.ctnSignJade), (bool isOk) => ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("SinInReplenish", model.keepSignInCost), (bool isOk) => { if (isOk) { if (PlayerDatas.Instance.baseData.Gold >= model.ctnSignJade) if (PlayerDatas.Instance.baseData.Gold >= model.keepSignInCost) { CA509_tagCMDaySign signpack = new CA509_tagCMDaySign(); signpack.Day = 1; @@ -141,10 +142,11 @@ return; } } var _signInCfg = model.signAwardList[_day]; var configs = Config.Instance.GetAllValues<SignInConfig>(); var _signInCfg = configs[_day]; int itemId = 0; int itemCount = 0; if (!model.isFirst) if (!model.IsFirstMonth) { itemId = _signInCfg.ItemID.Length > 1 ? _signInCfg.ItemID[1] : _signInCfg.ItemID[0]; itemCount = _signInCfg.OrdinaryNum.Length > 1 ? _signInCfg.OrdinaryNum[1] : _signInCfg.OrdinaryNum[0]; System/Welfare/SignInGiftCell.cs
@@ -38,12 +38,13 @@ public override void Refresh(CellView cell) { var _signCfg = model.cntSignList[cell.index]; var _ring = model.isFirst ? 0 : (_signCfg.ItemID.Length > 1 ? 1 : 0); var configs = Config.Instance.GetAllValues<ContinueSignInConfig>(); var _signCfg = configs[cell.index]; var _ring = model.IsFirstMonth ? 0 : (_signCfg.ItemID.Length > 1 ? 1 : 0); var _itemId = _signCfg.ItemID[_ring]; if (model.m_ContinueJobItems.ContainsKey(_signCfg.ContineDay)) if (model.m_KeepSignInItemDict.ContainsKey(_signCfg.ContineDay)) { var _list = model.m_ContinueJobItems[_signCfg.ContineDay]; var _list = model.m_KeepSignInItemDict[_signCfg.ContineDay]; if (_list.Contains(_itemId)) { try @@ -62,7 +63,7 @@ m_ItemCntTxt.text = _signCfg.ItemNum[_ring] <= 1 ? string.Empty : _signCfg.ItemNum[_ring].ToString(); m_DayTxt.text = Language.Get("SignIn_5", _signCfg.ContineDay); m_ItemNameTxt.text = _itemCfg.ItemName; m_GetItemImg.gameObject.SetActive(_signCfg.ContineDay <= model.signNum); m_GetItemImg.gameObject.SetActive(_signCfg.ContineDay <= model.alreadySignInCount); m_GiftBtn.onClick.RemoveAllListeners(); int _index = cell.index; m_GiftBtn.onClick.AddListener(() => @@ -73,10 +74,11 @@ private void OnClickCtnSign(int _index) { var _signCfg = model.cntSignList[_index]; var configs = Config.Instance.GetAllValues<ContinueSignInConfig>(); var _signCfg = configs[_index]; int itemId = 0; int itemCount = 0; if (!model.isFirst) if (!model.IsFirstMonth) { itemId = _signCfg.ItemID.Length > 1 ? _signCfg.ItemID[1] : _signCfg.ItemID[0]; itemCount = _signCfg.ItemNum.Length > 1 ? _signCfg.ItemNum[1] : _signCfg.ItemNum[0]; @@ -86,9 +88,9 @@ itemId = _signCfg.ItemID[0]; itemCount = _signCfg.ItemNum[0]; } if (model.m_ContinueJobItems.ContainsKey(_signCfg.ContineDay)) if (model.m_KeepSignInItemDict.ContainsKey(_signCfg.ContineDay)) { var _list = model.m_ContinueJobItems[_signCfg.ContineDay]; var _list = model.m_KeepSignInItemDict[_signCfg.ContineDay]; if (_list.Contains(itemId)) { try System/Welfare/SignInModel.cs
@@ -8,84 +8,32 @@ [XLua.LuaCallCSharp] public class SignInModel : Model, IBeforePlayerDataInitialize { private void OnFuncStateChangeEvent(int func) public int keepSignInCost { if (func == (int)FuncOpenEnum.SignIn) { UpdateRedPoint(); } } #region 配置 private List<SignInConfig> m_signAwardList = null; public List<SignInConfig> signAwardList { get { if (m_signAwardList == null) { m_signAwardList = Config.Instance.GetAllValues<SignInConfig>(); } return m_signAwardList; } get; private set; } private List<ContinueSignInConfig> m_ctnSignList = null; public List<ContinueSignInConfig> cntSignList public int alreadySignInCount { get { if (m_ctnSignList == null) { m_ctnSignList = Config.Instance.GetAllValues<ContinueSignInConfig>(); } return m_ctnSignList; } } /// <summary> /// 补签所需仙玉 /// </summary> private int m_ctnSignJade = -1; public int ctnSignJade { get { if (m_ctnSignJade == -1) { FuncConfigConfig cfg = Config.Instance.Get<FuncConfigConfig>("SignConsumption"); if (cfg != null) { m_ctnSignJade = int.Parse(cfg.Numerical1); } } return m_ctnSignJade; } } #endregion private int m_SignNum = 0; public int signNum { get { return m_SignNum; } } private int m_surSignNum = 0; public int surSignNum { get { return m_surSignNum; } } private bool m_todaySign = false; public bool todaySign { get { return m_todaySign; } } private bool m_isFirst = true; public bool isFirst { get { return m_isFirst; } get; private set; } public int SumSignNum { get; private set; } public int keepSignInCount { get; private set; } public bool todaySignIn { get;private set; } public bool IsFirstMonth { get; private set; } public int totalSignInCount { get; private set; } public event Action OnSignRefresh; @@ -93,23 +41,16 @@ public void OnRefreshData(HA30D_tagMCDaySignInfo vNetData) { m_SignNum = vNetData.DaySignCount; m_surSignNum = vNetData.ReplenishSignCount; SumSignNum = vNetData.TotalSignCount; m_todaySign = vNetData.IsSign == 1; m_isFirst = vNetData.IsFrist == 1; if (OnSignRefresh != null) OnSignRefresh(); UpdateRedPoint(); } private void UpdateRedPoint() { if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.SignIn)) alreadySignInCount = vNetData.DaySignCount; keepSignInCount = vNetData.ReplenishSignCount; totalSignInCount = vNetData.TotalSignCount; todaySignIn = vNetData.IsSign == 1; IsFirstMonth = vNetData.IsFrist == 1; if (OnSignRefresh != null) { redpoint.state = RedPointState.None; return; OnSignRefresh(); } redpoint.state = todaySign ? RedPointState.None : RedPointState.GetReward; UpdateRedPoint(); } public override void Init() @@ -120,30 +61,52 @@ public override void UnInit() { FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent; } public Dictionary<int, List<int>> m_KeepSignInItemDict = new Dictionary<int, List<int>>(); void ParseConfig() { var configs = Config.Instance.GetAllValues<ContinueSignInConfig>(); for (int i = 0; i < configs.Count; i++) { var config = configs[i]; if (config.JobItemList.Length != 0) { m_KeepSignInItemDict.Add(config.ContineDay, new List<int>(config.JobItemList)); } } { var config = Config.Instance.Get<FuncConfigConfig>("SignConsumption"); keepSignInCost = int.Parse(config.Numerical1); } } public void OnBeforePlayerDataInitialize() { m_SignNum = 0; m_surSignNum = 0; m_todaySign = false; m_isFirst = true; SumSignNum = 0; alreadySignInCount = 0; keepSignInCount = 0; todaySignIn = false; IsFirstMonth = true; totalSignInCount = 0; } public Dictionary<int, List<int>> m_ContinueJobItems = new Dictionary<int, List<int>>(); void ParseConfig() private void UpdateRedPoint() { var _cfgs = Config.Instance.GetAllValues<ContinueSignInConfig>(); for (int i = 0; i < _cfgs.Count; i++) if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.SignIn)) { var _cfg = _cfgs[i]; if (_cfg.JobItemList.Length != 0) { m_ContinueJobItems.Add(_cfg.ContineDay, new List<int>(_cfg.JobItemList)); } redpoint.state = RedPointState.None; return; } redpoint.state = todaySignIn ? RedPointState.None : RedPointState.GetReward; } private void OnFuncStateChangeEvent(int func) { if (func == (int)FuncOpenEnum.SignIn) { UpdateRedPoint(); } } } System/Welfare/SignInWin.cs
@@ -86,9 +86,9 @@ if (AchievementGoto.achievementType == AchievementGoto.SignInAchievement) { var _cfg = Config.Instance.Get<SuccessConfig>(AchievementGoto.SignInAchievement); if (!model.todaySign || model.surSignNum > 0) if (!model.todaySignIn || model.keepSignInCount > 0) { var _num = Mathf.Max(0, model.signNum); var _num = Mathf.Max(0, model.alreadySignInCount); var _line = _num / 5; signInCtrl.JumpIndex(_line); } @@ -103,10 +103,11 @@ private void InitSignIn() { var configs = Config.Instance.GetAllValues<SignInConfig>(); if (signInCtrl.GetNumberOfCells(signInCtrl.m_Scorller) == 0) { signInCtrl.Refresh(); int page = Mathf.CeilToInt((float)model.signAwardList.Count / 5); int page = Mathf.CeilToInt((float)configs.Count / 5); for (int i = 0; i < page; i++) { signInCtrl.AddCell(ScrollerDataType.Header, i); @@ -118,15 +119,16 @@ signInCtrl.m_Scorller.RefreshActiveCellViews(); } signInfo.text = Language.Get("SignIn_3", model.signNum, model.surSignNum); signInfo.text = Language.Get("SignIn_3", model.alreadySignInCount, model.keepSignInCount); } private void InitCtnSign() { { var configs = Config.Instance.GetAllValues<ContinueSignInConfig>(); if (ctnSignCtrl.GetNumberOfCells(ctnSignCtrl.m_Scorller) == 0) { ctnSignCtrl.Refresh(); for (int i = 0; i < model.cntSignList.Count; i++) for (int i = 0; i < configs.Count; i++) { ctnSignCtrl.AddCell(ScrollerDataType.Header, i); } @@ -140,7 +142,7 @@ private void JumpToTodaySign() { var _num = Mathf.Max(0, model.signNum); var _num = Mathf.Max(0, model.alreadySignInCount); var _line = _num / 5; signInCtrl.JumpIndex(_line); }
