| Core/GameEngine/Model/Config/WeekPartyPointConfig.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/GameEngine/Model/Config/WeekPartyPointConfig.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/GameEngine/Model/ConfigManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServiceAchievementModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServiceAchievementWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServiceItem.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Model/Config/WeekPartyPointConfig.cs
New file @@ -0,0 +1,47 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Friday, January 11, 2019 //-------------------------------------------------------- using UnityEngine; using System; namespace TableConfig { public partial class WeekPartyPointConfig : ConfigBase { public int Id { get ; private set ; } public string ImageType1 { get ; private set; } public string ImageType2 { get ; private set; } public string name { get ; private set; } public override string getKey() { return Id.ToString(); } public override void Parse() { try { Id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; ImageType1 = rawContents[1].Trim(); ImageType2 = rawContents[2].Trim(); name = rawContents[3].Trim(); } catch (Exception ex) { DebugEx.Log(ex); } } } } Core/GameEngine/Model/Config/WeekPartyPointConfig.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: d6d1596f2167efa4c9db2e7971f6fb3a timeCreated: 1547186735 licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Core/GameEngine/Model/ConfigManager.cs
@@ -223,7 +223,7 @@ AddAsyncTask<WeekPartyConfig>(); AddAsyncTask<FashionDressCabinetConfig>(); AddAsyncTask<FashionDressConfig>(); AddAsyncTask<WeekPartyPointConfig>(); while (!AllCompleted()) { var completedCount = 0; System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -420,7 +420,7 @@ { TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes; } if (TaypeNumber > 0) if (TaypeNumber > 0 && rewardNum< number) { return RedPointState.Simple; } System/OpenServerActivity/OpenServiceAchievementWin.cs
@@ -89,6 +89,9 @@ ButtonEx Btn = cell.GetComponent<ButtonEx>(); GameObject SelectedObj = cell.transform.Find("Image_XZ").gameObject;//选中 GameObject SelectedObj1 = cell.transform.Find("Image_XZ1").gameObject;//选中 ImageEx SelectedImageEx = SelectedObj.GetComponent<ImageEx>(); GameObject Unselected = cell.transform.Find("Image_WXZ").gameObject;//未选中 ImageEx UnselectedIm = Unselected.GetComponent<ImageEx>(); GameObject Lock = cell.transform.Find("Lock").gameObject;//锁 @@ -105,6 +108,7 @@ } if (Index <= model.DayNow) { SelectedImageEx.gray = false; Unselected.SetActive(true); UnselectedIm.gray = false; SelectedObj.SetActive(false); @@ -128,17 +132,29 @@ if (Index == model.SelectedNow) { if (Index > model.DayNow) { SelectedImageEx.gray = true; IsNotGary.SetActive(false); Gary.SetActive(true); Lock.SetActive(true); } else { SelectedImageEx.gray = false; IsNotGary.SetActive(true); Gary.SetActive(false); Lock.SetActive(false); } SelectedObj.SetActive(true); SelectedObj1.SetActive(true); Unselected.SetActive(false); Lock.SetActive(false); IsNotGary.SetActive(true); Gary.SetActive(false); IsNotGary_text.text = (Index + 1).ToString(); } Btn.SetListener(() => { if (Index != model.SelectedNow && Index<= model.DayNow) if (Index != model.SelectedNow) { model.SelectedNow = Index;//选中天 SetTextIntegral(); @@ -338,14 +354,14 @@ { m_One.SetActive(false); m_Two.SetActive(true); m_OpenServiceItemA1.SetReward(model.SelectedNow, ItemDayList[0],0); m_OpenServiceItemB1.SetReward(model.SelectedNow, ItemDayList[1],1); m_OpenServiceItemA1.SetReward(model.SelectedNow, ItemDayList[0],0,2); m_OpenServiceItemB1.SetReward(model.SelectedNow, ItemDayList[1],1,2); } else { m_One.SetActive(true); m_Two.SetActive(false); m_OpenServiceItemA.SetReward(model.SelectedNow, ItemDayList[0], 0); m_OpenServiceItemA.SetReward(model.SelectedNow, ItemDayList[0], 0,2); } } } System/OpenServerActivity/OpenServiceItem.cs
@@ -22,9 +22,22 @@ [SerializeField] GameObject m_IsReachImage; [SerializeField] GameObject m_IsDrawImage; OpenServiceAchievementModel model { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } } public void SetReward(int day, WeekPartyItemClass item, int index) public void SetReward(int day, WeekPartyItemClass item, int index,int Type) { var weekPartPointConfig = Config.Instance.Get<WeekPartyPointConfig>(item.ItemID); if (weekPartPointConfig != null) { m_Text_A.text = weekPartPointConfig.name; if (Type == 1) { m_ImageShow.SetSprite(weekPartPointConfig.ImageType1); } else { m_ImageShow.SetSprite(weekPartPointConfig.ImageType2); } m_ImageShow.SetNativeSize(); } int Point = model.GetPoint(day); m_TextPoint.text = Language.Get("OSA_3", item.NeedPoint); bool IsBool = model.IsDayReward(model.SelectedNow, index);