From 7686cc4b9eb68b19211bb8bc6c3a444770cb8621 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 13 二月 2019 18:27:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into ConfigLoad
---
System/OpenServerActivity/EntryInformationCell.cs | 53 ++++++++++++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/System/OpenServerActivity/EntryInformationCell.cs b/System/OpenServerActivity/EntryInformationCell.cs
index 747baa8..bcac606 100644
--- a/System/OpenServerActivity/EntryInformationCell.cs
+++ b/System/OpenServerActivity/EntryInformationCell.cs
@@ -1,30 +1,29 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Monday, December 10, 2018
-//--------------------------------------------------------
-using UnityEngine;
-using System.Collections;
-using UnityEngine.UI;
-using TableConfig;
-
-namespace Snxxz.UI {
- [XLua.Hotfix]
- public class EntryInformationCell:MonoBehaviour {
- [SerializeField] ItemCell m_ItemCell;
- [SerializeField] Text m_Text1;
- [SerializeField] Text m_Text2;
- [SerializeField] Button m_Btn;
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Monday, December 10, 2018
+//--------------------------------------------------------
+using UnityEngine;
+using System.Collections;
+using UnityEngine.UI;
+
+namespace Snxxz.UI {
+ [XLua.Hotfix]
+ public class EntryInformationCell:MonoBehaviour {
+ [SerializeField] ItemCell m_ItemCell;
+ [SerializeField] Text m_Text1;
+ [SerializeField] Text m_Text2;
+ [SerializeField] Button m_Btn;
[SerializeField] Text m_BtnText;
[SerializeField] GameObject m_Miss;//閿欒繃
[SerializeField] GameObject m_Reach;//鏈揪鎴�
[SerializeField] GameObject m_Draw;//宸查鍙�
- LoginRewardModel m_LoginRewardModel;
+ LoginRewardModel m_LoginRewardModel;
LoginRewardModel loginRewardModel { get { return m_LoginRewardModel ?? (m_LoginRewardModel = ModelCenter.Instance.GetModel<LoginRewardModel>()); } }
ItemTipsModel m_itemTipsModel;
- ItemTipsModel itemTipsModel { get { return m_itemTipsModel ?? (m_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }
+ ItemTipsModel itemTipsModel { get { return m_itemTipsModel ?? (m_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }
public void GetDisplayInformation(int id)
{
- var config = Config.Instance.Get<LoginRewardConfig>(id);
+ var config = LoginRewardConfig.Get(id);
if (config == null)
{
DebugEx.LogError("鐧诲綍濂栧姳琛ㄦ病鏈夋ID"+id);
@@ -183,7 +182,7 @@
var loginAward = loginRewardModel.LoginAwardDic[ID];
int rewardNum = loginRewardModel.GetRewardNumber(loginRewardModel.SelectedNow, ID);//宸查濂栨鏁�
int carryOutNum = loginRewardModel.GetCarryOutNum(loginRewardModel.SelectedNow, ID);//宸插畬鎴愭鏁�
- var config = Config.Instance.Get<HolidayHomingConfig>(ID);
+ var config = HolidayHomingConfig.Get(ID);
if (config != null && config.SpecialDisplayType == 1)
{
@@ -213,10 +212,10 @@
str = type + "/" + loginAward.SingleTimes;
}
return str;
- }
- }
-
-}
-
-
-
+ }
+ }
+
+}
+
+
+
--
Gitblit v1.8.0