更新机器人配置

Assets/Resource/Logo.unity

@@ -445,10 +445,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 1
-  CatchException: 0
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  DebugMode: 0
+  CatchException: 1
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -345,7 +345,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1122321127892574
 GameObject:
   m_ObjectHideFlags: 1

Assets/Resource/XML/Config/robot_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" amt_fml="2" digit_chest_rate="0.3" color_chest_rate="0.42" move_frequency="3,6" create_chest_rate="0.2" chest_value="20,40" lifetime="10,30" />
+  <item id="1" amt_fml="2" digit_chest_rate="0.5" color_chest_rate="0.6" move_frequency="3,20" create_chest_rate="0.005" chest_value="20,40" lifetime="30,90" />
   <comment>
     <id>
 id

Assets/Script/SFS/Manager/BaseConnector.cs

@@ -11,7 +11,8 @@ public abstract class BaseConnector
     public static int TcpPort = 9933;
     public static string Host = "121.199.20.79";
     //public static string Host = "127.0.0.1";
-    public static string Zone = "GardenTest";
+    public static string Zone = "Garden";
+    //public static string Zone = "GardenTest";
 
     public Action<BaseEvent> onConnectSucceed;
     public Action<BaseEvent> onConnectFailed;

Assets/Script/Tool/Auxiliary.cs

@@ -135,162 +135,162 @@ public class Auxiliary : Regist
     {
         #region 调试
 
-        if (Input.GetKeyDown(KeyCode.Escape))
-        {
-            SFSManager.GardenSmartFox.SmartFox.Disconnect();
-            RobotManager.DeactivateAllRobots(false);
-        }
+        //if (Input.GetKeyDown(KeyCode.Escape))
+        //{
+        //    SFSManager.GardenSmartFox.SmartFox.Disconnect();
+        //    RobotManager.DeactivateAllRobots(false);
+        //}
 
 
-        if (Input.GetKeyDown(KeyCode.Space))
-        {
-            //ManaCenter.SaveTimer = 0;
-
-            //URLRequestData urlData = new URLRequestData();
-            
-            //urlData.Add("u", "1704189794672324513");
-            //urlData.Add("v", "10");
-
-            //ManaData.SavePlayerConfig();
-
-            //urlData.Add("l", ManaData.PlayerDoc.OuterXml);
-
-            //URLRequest.CreateURLRequest(false, ManaServer.NewBaseURL + "/user/save", urlData, (data => Debug.Log(data.ToJson())), URLRequest.Method.POST);
-            //RobotManager.AddRobot(SFSManager.GardenSmartFox.PlazaRoomManager.CurrentPlazaRoom.Id, 19, position, PlayerDirection.Left);
-            //Resources.UnloadAsset(ManaReso.Get("U_LoadingPanel"));
-            //foreach (var VARIABLE in ChestMge.PlazaRoomChests)
-            //{
-            //    VARIABLE.ShadowSR.material = UnityFactory.Materials[0];
-            //    VARIABLE.ChestSR.material = UnityFactory.Materials[0];
-            //}
-
-            //ManaSocial.CloseCommentPanel();
-            //Debug.LogWarning(ManaServer.SerialNumber);
-            //SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultRoomStatus(1);
-            //ManaReso.Get<VerticalLayoutGroup>("R_Grid").CalculateLayoutInputVertical();
-            //ManaReso.Get<VerticalLayoutGroup>("R_Grid").SetLayoutVertical();
-        }
+        //if (Input.GetKeyDown(KeyCode.Space))
+        //{
+        //    ManaCenter.SaveTimer = 0;
 
-        if (Input.GetKeyDown(KeyCode.A))
-        {
-            URLRequestData urlData = new URLRequestData();
+        //    URLRequestData urlData = new URLRequestData();
 
-            urlData.Add("i", "");
+        //    urlData.Add("u", "1704189794672324513");
+        //    urlData.Add("v", "10");
 
-            URLRequest.CreateURLRequest(false, ManaServer.NewBaseURL + "/user/rand", urlData, data => { Debug.Log(data.ToJson()); }, URLRequest.Method.POST);
+        //    ManaData.SavePlayerConfig();
 
-            //ManaSocial.UpdatePage(true);
-            //PlazaRoomMge.DownloadRoomData(0);
-            //DatabaseManager.GetRoomList(-1);
+        //    urlData.Add("l", ManaData.PlayerDoc.OuterXml);
 
-            //ManaServer.NotificationIndex = ManaData.GetPlayerInt("NotificationIndex") + 1;
-            //ManaCenter.OfflineLock = true;
-            //ManaSign.ShowOfflinePanel();
+        //    URLRequest.CreateURLRequest(false, ManaServer.NewBaseURL + "/user/save", urlData, (data => Debug.Log(data.ToJson())), URLRequest.Method.POST);
+        //    RobotManager.AddRobot(SFSManager.GardenSmartFox.PlazaRoomManager.CurrentPlazaRoom.Id, 19, position, PlayerDirection.Left);
+        //    Resources.UnloadAsset(ManaReso.Get("U_LoadingPanel"));
+        //    foreach (var VARIABLE in ChestMge.PlazaRoomChests)
+        //    {
+        //        VARIABLE.ShadowSR.material = UnityFactory.Materials[0];
+        //        VARIABLE.ChestSR.material = UnityFactory.Materials[0];
+        //    }
 
-            //ManaTutorial.EnterC1();
-        }
+        //    ManaSocial.CloseCommentPanel();
+        //    Debug.LogWarning(ManaServer.SerialNumber);
+        //    SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultRoomStatus(1);
+        //    ManaReso.Get<VerticalLayoutGroup>("R_Grid").CalculateLayoutInputVertical();
+        //    ManaReso.Get<VerticalLayoutGroup>("R_Grid").SetLayoutVertical();
+        //}
 
-        if (Input.GetKeyDown(KeyCode.S))
-        {
-            ManaTutorial.EnterD1();
-        }
+        //if (Input.GetKeyDown(KeyCode.A))
+        //{
+        //    URLRequestData urlData = new URLRequestData();
 
-        if (Input.GetKeyDown(KeyCode.D))
-        {
-            //SFSManager.GardenSmartFox.PlazaRoomManager.BeginEnterPlazaRoom();
-        }
+        //    urlData.Add("i", "");
 
-        if (Input.GetKeyDown(KeyCode.Z))
-        {
-            //byte[] bytes = Encoding.UTF8.GetBytes(ManaData.PlayerDoc.OuterXml);
+        //    URLRequest.CreateURLRequest(false, ManaServer.NewBaseURL + "/user/rand", urlData, data => { Debug.Log(data.ToJson()); }, URLRequest.Method.POST);
 
-            //MD5 md5 = new MD5CryptoServiceProvider();
+        //    ManaSocial.UpdatePage(true);
+        //    PlazaRoomMge.DownloadRoomData(0);
+        //    DatabaseManager.GetRoomList(-1);
 
-            //PlayerPrefs.SetString("config", ToString(md5.ComputeHash(bytes)));
+        //    ManaServer.NotificationIndex = ManaData.GetPlayerInt("NotificationIndex") + 1;
+        //    ManaCenter.OfflineLock = true;
+        //    ManaSign.ShowOfflinePanel();
 
-            ManaCenter.MiniTimer = 0;
+        //    ManaTutorial.EnterC1();
+        //}
 
-            //GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.OnEnterPlazaRoomButton();
-        }
+        //if (Input.GetKeyDown(KeyCode.S))
+        //{
+        //    ManaTutorial.EnterD1();
+        //}
 
-        if (Input.GetKeyDown(KeyCode.X))
-        {
-            //GardenSmartFoxManager.GardenSmartFox.ExtensionManager.PlazaRoomExtension.SendPublicMessage("123");
+        //if (Input.GetKeyDown(KeyCode.D))
+        //{
+        //    SFSManager.GardenSmartFox.PlazaRoomManager.BeginEnterPlazaRoom();
+        //}
 
-            //ManaPlayer.Player.PlayAnim("newAnimation");
+        //if (Input.GetKeyDown(KeyCode.Z))
+        //{
+        //    byte[] bytes = Encoding.UTF8.GetBytes(ManaData.PlayerDoc.OuterXml);
 
-            //StartCoroutine(ManaServer.DownloadAllAsset(new List<string>() { "http://or5zgoeui.bkt.clouddn.com/game_icon.png", "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3853411417,2245648913&fm=26&gp=0.jpg" }, ManaServer.DownloadAllTexture));
+        //    MD5 md5 = new MD5CryptoServiceProvider();
 
-            ManaMiniGame.GameTimer = 45;
+        //    PlayerPrefs.SetString("config", ToString(md5.ComputeHash(bytes)));
 
-            //Lottery.TempTypeList = new List<int>();
-            //Lottery.TempValueList = new List<int>();
-            //Lottery.TempLotteryList = new List<Lottery>();
+        //    ManaCenter.MiniTimer = 0;
 
-            //Lottery.EnterAnimation();
+        //    GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.OnEnterPlazaRoomButton();
+        //}
 
-            //ManaReso.Get("Bc_LotteryItem1").TweenForEuler();
-            //ManaReso.Get("Bc_LotteryItem2").TweenForEuler();
-            //ManaReso.Get("Bc_LotteryItem3").TweenForEuler();
-        }
+        //if (Input.GetKeyDown(KeyCode.X))
+        //{
+        //    GardenSmartFoxManager.GardenSmartFox.ExtensionManager.PlazaRoomExtension.SendPublicMessage("123");
 
-        if (Input.GetKeyDown(KeyCode.C))
-        {
-            //GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.郁闷);
+        //    ManaPlayer.Player.PlayAnim("newAnimation");
 
-            //SFSObject sfsObject = new SFSObject();
-            //sfsObject.PutInt(DataID.SenderID.GetHashString(), 0);
-            //sfsObject.PutText(DataID.Message.GetHashString(), "123");
+        //    StartCoroutine(ManaServer.DownloadAllAsset(new List<string>() { "http://or5zgoeui.bkt.clouddn.com/game_icon.png", "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3853411417,2245648913&fm=26&gp=0.jpg" }, ManaServer.DownloadAllTexture));
 
-            //SFSObject parameter = GardenSmartFox.ConstructCommandParameter(CommandID.ReceivePublicMessage.GetHashCode(), sfsObject, -1);
+        //    ManaMiniGame.GameTimer = 45;
 
-            //GardenSmartFoxManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
+        //    Lottery.TempTypeList = new List<int>();
+        //    Lottery.TempValueList = new List<int>();
+        //    Lottery.TempLotteryList = new List<Lottery>();
 
-            //GardenSmartFoxManager.GardenSmartFox.SmartFox.Send(new ExtensionRequest("0", sfsObject));
+        //    Lottery.EnterAnimation();
 
-            //ManaPlayer.Player.PlayAnim("newAnimation1");
+        //    ManaReso.Get("Bc_LotteryItem1").TweenForEuler();
+        //    ManaReso.Get("Bc_LotteryItem2").TweenForEuler();
+        //    ManaReso.Get("Bc_LotteryItem3").TweenForEuler();
+        //}
 
-            //ManaReso.Get("C_Notify").TweenForCG();
+        //if (Input.GetKeyDown(KeyCode.C))
+        //{
+        //    GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.郁闷);
 
-            ManaMiniGame.Score += 400;
+        //    SFSObject sfsObject = new SFSObject();
+        //    sfsObject.PutInt(DataID.SenderID.GetHashString(), 0);
+        //    sfsObject.PutText(DataID.Message.GetHashString(), "123");
 
-            //ManaSign.SignTime = new DateTime(2007, 1, 1);
-        }
+        //    SFSObject parameter = GardenSmartFox.ConstructCommandParameter(CommandID.ReceivePublicMessage.GetHashCode(), sfsObject, -1);
 
-        if (Input.GetKeyDown(KeyCode.V))
-        {
-            //ManaData.PlayerDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 6.ToString();
-            //ManaData.PlayerNode.RemoveChild(ManaData.PlayerNode.SelectSingleNode("FlowerAmtList"));
+        //    GardenSmartFoxManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
 
-            Debug.Log(ManaData.GetPlayerString("FlowerList"));
-            Debug.Log(ManaData.GetPlayerString("FlowerAmtList"));
+        //    GardenSmartFoxManager.GardenSmartFox.SmartFox.Send(new ExtensionRequest("0", sfsObject));
 
-            //ManaPlayer.Player.PlayAnim("newAnimation2");
+        //    ManaPlayer.Player.PlayAnim("newAnimation1");
 
-            //ManaPlayer.Player.Flip(PlayerDirection.Right);
+        //    ManaReso.Get("C_Notify").TweenForCG();
 
-            //ManaServer.MailReward mailReward = new ManaServer.MailReward("1", "pack", "4");
-            //ManaServer.MailReward mailReward1 = new ManaServer.MailReward("1", "close", "2");
+        //    ManaMiniGame.Score += 400;
 
-            //ManaServer.GetMainReward(mailReward);
-            //ManaServer.GetMainReward(mailReward1);
+        //    ManaSign.SignTime = new DateTime(2007, 1, 1);
+        //}
 
-            //ManaGarden.ElfTimer = 0;
+        //if (Input.GetKeyDown(KeyCode.V))
+        //{
+        //    ManaData.PlayerDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 6.ToString();
+        //    ManaData.PlayerNode.RemoveChild(ManaData.PlayerNode.SelectSingleNode("FlowerAmtList"));
 
-            //ManaServer.Time = new DateTime(2007, 1, 1);
-        }
+        //    Debug.Log(ManaData.GetPlayerString("FlowerList"));
+        //    Debug.Log(ManaData.GetPlayerString("FlowerAmtList"));
 
-        if (Input.GetKeyDown(KeyCode.B))
-        {
-            //ManaPlayer.Player.PlayAnim("newAnimation3");
+        //    ManaPlayer.Player.PlayAnim("newAnimation2");
 
-            //ManaPlayer.Player.Flip(PlayerDirection.Left);
+        //    ManaPlayer.Player.Flip(PlayerDirection.Right);
 
-            //foreach (var VARIABLE in ManaPlayer.CloseUnitDic)
-            //{
-            //    VARIABLE.Value.Unlock();
-            //}
-        }
+        //    ManaServer.MailReward mailReward = new ManaServer.MailReward("1", "pack", "4");
+        //    ManaServer.MailReward mailReward1 = new ManaServer.MailReward("1", "close", "2");
+
+        //    ManaServer.GetMainReward(mailReward);
+        //    ManaServer.GetMainReward(mailReward1);
+
+        //    ManaGarden.ElfTimer = 0;
+
+        //    ManaServer.Time = new DateTime(2007, 1, 1);
+        //}
+
+        //if (Input.GetKeyDown(KeyCode.B))
+        //{
+        //    ManaPlayer.Player.PlayAnim("newAnimation3");
+
+        //    ManaPlayer.Player.Flip(PlayerDirection.Left);
+
+        //    foreach (var VARIABLE in ManaPlayer.CloseUnitDic)
+        //    {
+        //        VARIABLE.Value.Unlock();
+        //    }
+        //}
 
         //if (Input.GetKeyDown(KeyCode.M))
         //{

Assets/Script/Tool/UI/ScrollHelper.cs

@@ -6,35 +6,35 @@ using UnityEngine.UI;
 
 public static class ScrollHelper
 {
-    private static float ScaleFactor;
-    private static ScrollRect ScrollRect;
-    private static LayoutGroup LayoutGroup;
-    private static RectTransform RectTransform;
-
-    public static void Locate(this ScrollRect scrollRect, float verticalPos, float horizontalPos)
-    {
-        Vector2 viewSize = scrollRect.viewport.rect.size;
-        Vector2 contentSize = scrollRect.content.rect.size;
-        if (viewSize.x >= contentSize.x && viewSize.y >= contentSize.y)
-        {
-            return;
-        }
-    }
-
-    private static void Init(ScrollRect scrollRect)
-    {
-        ScaleFactor = scrollRect.GetComponentInChildren<Graphic>().canvas.scaleFactor;
-        LayoutGroup = scrollRect.content.GetComponent<LayoutGroup>();
-        RectTransform = scrollRect.GetComponent<RectTransform>();
-    }
-
-    private static void CalVertical(float normalizedPos)
-    {
-
-    }
-
-    private static void CalHorizontal()
-    {
-
-    }
+    //private static float ScaleFactor;
+    //private static ScrollRect ScrollRect;
+    //private static LayoutGroup LayoutGroup;
+    //private static RectTransform RectTransform;
+
+    //public static void Locate(this ScrollRect scrollRect, float verticalPos, float horizontalPos)
+    //{
+    //    Vector2 viewSize = scrollRect.viewport.rect.size;
+    //    Vector2 contentSize = scrollRect.content.rect.size;
+    //    if (viewSize.x >= contentSize.x && viewSize.y >= contentSize.y)
+    //    {
+    //        return;
+    //    }
+    //}
+
+    //private static void Init(ScrollRect scrollRect)
+    //{
+    //    ScaleFactor = scrollRect.GetComponentInChildren<Graphic>().canvas.scaleFactor;
+    //    LayoutGroup = scrollRect.content.GetComponent<LayoutGroup>();
+    //    RectTransform = scrollRect.GetComponent<RectTransform>();
+    //}
+
+    //private static void CalVertical(float normalizedPos)
+    //{
+
+    //}
+
+    //private static void CalHorizontal()
+    //{
+
+    //}
 }

ProjectSettings/ProjectSettings.asset

@@ -122,13 +122,13 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.2.0
+  bundleVersion: 1.2.1
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   protectGraphicsMemory: 0
-  AndroidBundleVersionCode: 12
+  AndroidBundleVersionCode: 13
   AndroidMinSdkVersion: 16
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -136,7 +136,7 @@ PlayerSettings:
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 6
+  iPhoneBuildNumber: 7
   ForceInternetPermission: 0
   ForceSDCardPermission: 1
   CreateWallpaper: 0

第四期.txt

@@ -1,6 +1,6 @@
 //开启公告
 
-//关闭ManaDebug 开启CatchException
+//关闭DebugMode 开启CatchException
 
 //切换到远程服务器 正常Zone