From 4c9f8762ef2f59b628a4d736618724019da54d0a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 09 一月 2019 11:52:29 +0800
Subject: [PATCH] 5767 【前端】【1.5】新增8-14天活动功能(制作成7日运营活动的模板)

---
 System/OpenServerActivity/OpenServiceAchievementCell.cs |   55 ++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/System/OpenServerActivity/OpenServiceAchievementCell.cs b/System/OpenServerActivity/OpenServiceAchievementCell.cs
index 92c5f78..d52b696 100644
--- a/System/OpenServerActivity/OpenServiceAchievementCell.cs
+++ b/System/OpenServerActivity/OpenServiceAchievementCell.cs
@@ -81,12 +81,26 @@
                 }
                 else//宸茶繃鐨勫ぉ鏁�
                 {
-                    if (WeekPartyAction.SingleTimes > carryOutNum)//鏈埌杈�
+
+                    int TaypeNumber = 0;
+                    if (carryOutNum - rewardNum > 0)
                     {
-                        m_Btn.gameObject.SetActive(false);
+                        TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes;
+                    }
+                    if (TaypeNumber > 0)//鍙
+                    {
+                        m_Btn.gameObject.SetActive(true);
+                        UIEffect uieffect = m_Btn.GetComponent<UIEffect>();
+                        uieffect.Play();
+                        m_BtnText.text = Language.Get("RealmPractice109");//棰嗗彇
                         m_Miss.SetActive(false);
-                        m_Reach.SetActive(true);
+                        m_Reach.SetActive(false);
                         m_Draw.SetActive(false);
+                        m_Btn.SetListener(() =>
+                        {
+                            model.SendGetWeekParty(model.SelectedNow, ID);
+                            DebugEx.LogError("-----------------------------");
+                        });
                     }
                     else
                     {
@@ -97,33 +111,38 @@
                             m_Reach.SetActive(false);
                             m_Draw.SetActive(true);
                         }
-                        else//杩樻湭棰嗗彇
+                        else//鏈埌杈�
                         {
-                            m_Btn.gameObject.SetActive(true);
-                            m_BtnText.text = Language.Get("RealmPractice109");//棰嗗彇
+                            m_Btn.gameObject.SetActive(false);
                             m_Miss.SetActive(false);
-                            m_Reach.SetActive(false);
+                            m_Reach.SetActive(true);
                             m_Draw.SetActive(false);
-                            m_Btn.SetListener(()=> 
-                            {
-                                DebugEx.LogError("-----------------------------");
-                            });
+
                         }
+
                     }
                 }
             }
             else//褰撳墠澶�
             {
-                if (WeekPartyAction.SingleTimes > carryOutNum)//鏈埌杈�(鍓嶅線)
+                int TaypeNumber = 0;
+                if (carryOutNum - rewardNum > 0)
+                {
+                    TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes;
+                }
+                if (TaypeNumber > 0)//鍙
                 {
                     m_Btn.gameObject.SetActive(true);
-                    m_BtnText.text = Language.Get("RealmPractice108");//鍓嶅線
+                    UIEffect uieffect = m_Btn.GetComponent<UIEffect>();
+                    uieffect.Play();
+                    m_BtnText.text = Language.Get("RealmPractice109");//棰嗗彇
                     m_Miss.SetActive(false);
                     m_Reach.SetActive(false);
                     m_Draw.SetActive(false);
                     m_Btn.SetListener(() =>
                     {
-                         WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
+                        model.SendGetWeekParty(model.SelectedNow, ID);
+                        DebugEx.LogError("-----------------------------");
                     });
                 }
                 else
@@ -135,16 +154,18 @@
                         m_Reach.SetActive(false);
                         m_Draw.SetActive(true);
                     }
-                    else//杩樻湭棰嗗彇
+                    else//鏈埌杈�(鍓嶅線)
                     {
                         m_Btn.gameObject.SetActive(true);
-                        m_BtnText.text = Language.Get("RealmPractice109");//棰嗗彇
+                        m_BtnText.text = Language.Get("RealmPractice108");//鍓嶅線
+                        UIEffect uieffect = m_Btn.GetComponent<UIEffect>();
+                        uieffect.Stop();
                         m_Miss.SetActive(false);
                         m_Reach.SetActive(false);
                         m_Draw.SetActive(false);
                         m_Btn.SetListener(() =>
                         {
-                            DebugEx.LogError("-----------------------------");
+                            WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
                         });
                     }
                 }

--
Gitblit v1.8.0