From eb50d0d7affcf6d1cddb08b92eb85e63dc0cf41f Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 11 一月 2019 14:26:29 +0800
Subject: [PATCH] 5767 【前端】【1.5】新增8-14天活动功能（制作成7日运营活动的模板）
---
Core/GameEngine/Model/ConfigManager.cs | 2
System/OpenServerActivity/OpenServiceAchievementWin.cs | 30 +++++++++++---
Core/GameEngine/Model/Config/WeekPartyPointConfig.cs.meta | 12 ++++++
System/OpenServerActivity/OpenServiceAchievementModel.cs | 2
System/OpenServerActivity/OpenServiceItem.cs | 17 +++++++-
Core/GameEngine/Model/Config/WeekPartyPointConfig.cs | 47 +++++++++++++++++++++++
6 files changed, 99 insertions(+), 11 deletions(-)
diff --git a/Core/GameEngine/Model/Config/WeekPartyPointConfig.cs b/Core/GameEngine/Model/Config/WeekPartyPointConfig.cs
new file mode 100644
index 0000000..a149176
--- /dev/null
+++ b/Core/GameEngine/Model/Config/WeekPartyPointConfig.cs
@@ -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);
+ }
+ }
+
+ }
+
+}
+
+
+
+
diff --git a/Core/GameEngine/Model/Config/WeekPartyPointConfig.cs.meta b/Core/GameEngine/Model/Config/WeekPartyPointConfig.cs.meta
new file mode 100644
index 0000000..9b0fcb7
--- /dev/null
+++ b/Core/GameEngine/Model/Config/WeekPartyPointConfig.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: d6d1596f2167efa4c9db2e7971f6fb3a
+timeCreated: 1547186735
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index fe40e35..c964b41 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -223,7 +223,7 @@
AddAsyncTask<WeekPartyConfig>();
AddAsyncTask<FashionDressCabinetConfig>();
AddAsyncTask<FashionDressConfig>();
-
+ AddAsyncTask<WeekPartyPointConfig>();
while (!AllCompleted())
{
var completedCount = 0;
diff --git a/System/OpenServerActivity/OpenServiceAchievementModel.cs b/System/OpenServerActivity/OpenServiceAchievementModel.cs
index cf0b85e..aca098a 100644
--- a/System/OpenServerActivity/OpenServiceAchievementModel.cs
+++ b/System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -420,7 +420,7 @@
{
TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes;
}
- if (TaypeNumber > 0)
+ if (TaypeNumber > 0 && rewardNum< number)
{
return RedPointState.Simple;
}
diff --git a/System/OpenServerActivity/OpenServiceAchievementWin.cs b/System/OpenServerActivity/OpenServiceAchievementWin.cs
index 39ba087..6e1792c 100644
--- a/System/OpenServerActivity/OpenServiceAchievementWin.cs
+++ b/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);
}
}
}
diff --git a/System/OpenServerActivity/OpenServiceItem.cs b/System/OpenServerActivity/OpenServiceItem.cs
index 86ae58d..f412501 100644
--- a/System/OpenServerActivity/OpenServiceItem.cs
+++ b/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);
--
Gitblit v1.8.0