jet пре 8 година
родитељ
комит
40a466cea7

+ 3 - 3
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -4225,7 +4225,7 @@ MonoBehaviour:
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
     m_DisabledTrigger: Disabled
-  m_Interactable: 1
+  m_Interactable: 0
   m_TargetGraphic: {fileID: 114632778979679736}
   m_OnClick:
     m_PersistentCalls:
@@ -9563,7 +9563,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200, y: -96}
+  m_AnchoredPosition: {x: 200, y: -101}
   m_SizeDelta: {x: 400, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224430338104111620
@@ -9763,7 +9763,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -296.778, y: 201.9}
+  m_AnchoredPosition: {x: -291.83, y: 197}
   m_SizeDelta: {x: 206.35, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224482729533700574

+ 2 - 0
Assets/Script/Manage/ManaNotify.cs

@@ -55,6 +55,8 @@ public class ManaNotify
             SwitchLanguage(GetLanguage());
         }
 
+        ManaAudio.PlayClip(Clip.BubbleClip);
+
         ManaReso.Get("R_Notify").TweenForCG();
     }
 

+ 31 - 31
Assets/Script/Manage/ManaServer.cs

@@ -139,11 +139,11 @@ public class ManaServer : Regist
         //URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/user/rand", urlData, Debug.Log, URLRequest.Method.POST);
 
 
-        //URLRequestData urlData = new URLRequestData();
+        URLRequestData urlData = new URLRequestData();
 
-        //urlData.Add("u", "ytcy9g");
+        urlData.Add("u", "ytcy9g");
 
-        //URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/user/load", urlData, Debug.Log, URLRequest.Method.POST);
+        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/user/load", urlData, Debug.Log, URLRequest.Method.POST);
 
 
         //Login((data => print(data.ToJson())));
@@ -473,32 +473,32 @@ public class ManaServer : Regist
 
     public static void MailRequest()
     {
-        MailXml = "<mail>" +
-                  "<OneTimeReward>" +
-                  "<id>4</id>" +
-                  "<start>2017-08-18 12:12:12</start>" +
-                  "<end>2017-09-1 11:30:12</end>" +
-                  "<reward>" +
-                  "<coin>1000</coin>" +
-                  "<diamond>10</diamond>" +
-                  "</reward>" +
-                  "<targets>" +
-                  "<id>90arbl</id>" +
-                  "</targets>" +
-                  "</OneTimeReward>" +
-                  "<OneTimeReward>" +
-                  "<id>3</id>" +
-                  "<start>2017-08-21 12:12:12</start>" +
-                  "<end>2017-09-01 18:12:12</end>" +
-                  "<reward>" +
-                  "<coin>10000</coin>" +
-                  "<diamond>100</diamond>" +
-                  "</reward>" +
-                  "<targets>" +
-                  "<id>90arbl</id>" +
-                  "</targets>" +
-                  "</OneTimeReward>" +
-                  "</mail>";
+        //MailXml = "<mail>" +
+        //          "<OneTimeReward>" +
+        //          "<id>4</id>" +
+        //          "<start>2017-08-18 12:12:12</start>" +
+        //          "<end>2017-09-1 11:30:12</end>" +
+        //          "<reward>" +
+        //          "<coin>1000</coin>" +
+        //          "<diamond>10</diamond>" +
+        //          "</reward>" +
+        //          "<targets>" +
+        //          "<id>90arbl</id>" +
+        //          "</targets>" +
+        //          "</OneTimeReward>" +
+        //          "<OneTimeReward>" +
+        //          "<id>3</id>" +
+        //          "<start>2017-08-21 12:12:12</start>" +
+        //          "<end>2017-09-01 18:12:12</end>" +
+        //          "<reward>" +
+        //          "<coin>10000</coin>" +
+        //          "<diamond>100</diamond>" +
+        //          "</reward>" +
+        //          "<targets>" +
+        //          "<id>90arbl</id>" +
+        //          "</targets>" +
+        //          "</OneTimeReward>" +
+        //          "</mail>";
 
         IndexRequest
             (
@@ -511,7 +511,7 @@ public class ManaServer : Regist
                             urlData,
                             mailXml =>
                             {
-                                //MailXml = mailXml;
+                                MailXml = mailXml;
                             }
                         );
                 }
@@ -740,7 +740,7 @@ public class ManaServer : Regist
 
             if (Time < startTime || Time > endTime)
             {
-                Debug.Log("Skip");
+                //Debug.Log("Skip");
                 continue;
             }
 

+ 7 - 7
Assets/Script/Manage/ManaSign.cs

@@ -699,6 +699,11 @@ public class ManaSign : Regist
 
     public static bool ShowOfflineReward()
     {
+        if (ManaTutorial.TutorialA)
+        {
+            return false;
+        }
+
         if (ShowOfflineIncomReward())
         {
             return true;
@@ -726,15 +731,12 @@ public class ManaSign : Regist
     {
         if (ManaCenter.OfflineLock)
         {
-            if (!ManaTutorial.TutorialA)
-            {
                 ManaReso.Get("C_Group").TweenBacCG();
 
                 ManaReso.Get("B_SignIn").TweenForCG();
                 ManaReso.Get("Ba_Notice").TweenForCG();
 
                 return true;
-            }
         }
 
         return false;
@@ -746,8 +748,6 @@ public class ManaSign : Regist
 
         if (ManaServer.MailRewardList.Count > 0)
         {
-            if (!ManaTutorial.TutorialA)
-            {
                 ManaServer.GetMailReward();
 
                 ManaReso.Get("C_Group").TweenBacCG();
@@ -756,7 +756,6 @@ public class ManaSign : Regist
                 ManaReso.Get("Bd_Mail0").TweenForCG();
 
                 return true;
-            }
         }
 
         return false;
@@ -764,7 +763,7 @@ public class ManaSign : Regist
 
     public static bool ShowSignReward()
     {
-        if (!ManaTutorial.TutorialA && ManaData.GetPlayerBool("QuitFlag") && ManaServer.Connect)
+        if (ManaData.GetPlayerBool("QuitFlag") && ManaServer.Connect)
         {
             int daySpan = ManaServer.Time.Day - ManaSign.SignTime.Day;
             int yearSpan = ManaServer.Time.Year - ManaSign.SignTime.Year;
@@ -784,6 +783,7 @@ public class ManaSign : Regist
 
     public static bool ShowNotification()
     {
+        //Debug.Log(ManaServer.NotificationIndex + " " + ManaData.GetPlayerInt("NotificationIndex"));
         if (ManaServer.NotificationIndex > ManaData.GetPlayerInt("NotificationIndex") && ManaServer.NotificationReady)
         {
             ManaData.SavePlayerInt("NotificationIndex", ManaServer.NotificationIndex);

+ 1 - 1
Assets/Script/Manage/ManaSocial.cs

@@ -117,7 +117,7 @@ public class ManaSocial : Regist
         }
         else
         {
-            DisablePraise();
+            throw new Exception();
         }
     }
 

+ 3 - 0
Assets/Script/Manage/ManaVisit.cs

@@ -635,6 +635,9 @@ public class ManaVisit
     public static void SetPlayerPraise()
     {
         ManaSocial.PraiseText.text = ManaServer.PraiseAmt.ToString();
+
+        ManaSocial.PraiseBtn.interactable = false;
+        ManaSocial.PraiseBtn.image.color = Color.white;
     }
 
     public static void SetVisiteePraise(XmlDocument document)

+ 3 - 14
ToDoList.txt

@@ -1,7 +1,6 @@
-修改了MailXML
-
-修改了公告XML
+ID不区分大小写
 
+服务器端功能尽量不用短码
 
 关闭调试模式
 
@@ -24,23 +23,13 @@ FlowerHouse
 
 图集
 {
-  Scale之后的Pivot Border Alignment alphaIsTransparency textureType SaveAndReimport
-
-  ChangeReferenceToMobilePlatform
-  
-  ChangeReferenceToDesktopPlatform
-
-  ChangeReferenceToCurrentPlatform
+  平台管理(AssetBundleName AssetBundleVariant 图集)
 
   尽量不用SerializeProperty
 
   整理新增加的脚本
 
-  PlatformReferenceTable的增加与删除
-
   Color的默认值全为0
 
-  平台管理(图集 散图 引用Texture的地方也要考虑(.Mat) AssetBundleName AssetBundleVariant)
-
   把网络得到的小图合并为图集(运行效率)
 }