From 64ff9d0995edc36bf176ff26789b0cfb26be19e7 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 14 一月 2019 21:29:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/OpenServerActivity/OpenServiceAchievementModel.cs |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/System/OpenServerActivity/OpenServiceAchievementModel.cs b/System/OpenServerActivity/OpenServiceAchievementModel.cs
index 3b3997e..d28b3b1 100644
--- a/System/OpenServerActivity/OpenServiceAchievementModel.cs
+++ b/System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -109,6 +109,9 @@
 
     public void OnBeforePlayerDataInitialize()
     {
+        WeekPartyDayInfoDic.Clear();
+        WeekPartyDayDic.Clear();
+        WeekPartyActionDic.Clear();
         isOpenNow = false;
         isPreviewTime = false;
     }
@@ -117,6 +120,8 @@
     {
         GlobalTimeEvent.Instance.secondEvent -= secondEvent;
         GlobalTimeEvent.Instance.secondEvent += secondEvent;
+        SetRedPoint();
+
     }
 
     private void secondEvent()
@@ -132,6 +137,7 @@
             }
         }
         GetIsOpen();//鍒ゆ柇鍔熻兘鏄惁寮�鍚�
+        GetDayNow();
 
     }
 
@@ -357,8 +363,16 @@
         {
             Day = 0;
         }
-        DebugEx.LogError("杈撳嚭褰撳墠鐨勫ぉ鏁�" + Day);
-        DayNow = Day;
+       // DebugEx.LogError("杈撳嚭褰撳墠鐨勫ぉ鏁�" + Day);
+        if (DayNow != Day && Day<7)
+        {
+            DayNow = Day;
+            if (WeekPartyDayInfoUpdate != null)
+            {
+                WeekPartyDayInfoUpdate();
+            }
+        }
+        
     }
 
     public void SendGetWeekParty(int day, int temdayplateID)//棰嗗彇鍛ㄧ媯娆㈡椿鍔ㄥ鍔�
@@ -448,7 +462,7 @@
             bool IsBool = IsDayReward(day, type);
             if (point >= item.NeedPoint && !IsBool)
             {
-                return RedPointState.Simple;
+                return RedPointState.GetReward;
             }
         }
         for (int i = 0; i < WeekPartyDay.TemplateList.Length; i++)
@@ -467,7 +481,7 @@
                 }
                 if (TaypeNumber > 0 && rewardNum< number)
                 {
-                    return RedPointState.Simple;
+                    return RedPointState.GetReward;
                 }
             }
         }

--
Gitblit v1.8.0