Temp 5.16

Assets/Advertisements/Editor/Resources/Android.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 34f35527a1d66ca48a1c8a28dec93f5b
+folderAsset: yes
+timeCreated: 1494301205
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Alipay-Core-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 172e7fed09ae64690b77b8dbf95a2ea8
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Core-2.8.2.jar.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: 5b0dffa8026f74d1fbe6943379db205e
-timeCreated: 1492482999
-licenseType: Free
+timeCreated: 1494839363
+licenseType: Pro
 DefaultImporter:
   userData: 
   assetBundleName: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Dingding-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 169000a72216e4b748189a2c604e26f6
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Douban-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4c02089e903dc41e3afbf3eb570e00c3
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Dropbox-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 51818f2cbf5aa4353b22e8a883bb2bcb
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Email-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f933c88f54ae644e4a4353e56c958c30
-timeCreated: 1492483000
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Evernote-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7350aa8d1dfff42e4be5f8d4454768d1
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-FacebookMessenger-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 28242358537f245da8ffc9365e292a40
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Flickr-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2346fa8eb22f242719aa34c0fcb94fb9
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Foursquare-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 65440c95e10e34df8a82f47246a74379
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Instagram-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 646ed0dacc69547428b4b0f654d54c10
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Instapaper-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 28f01fff886854f6eb230d449d79282a
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-KaiXin-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4df6d3f7be6034ed0b6b4bc54c2605cd
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Kakao-Core-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 15c3a4462341b4541a5d62b591ecebca
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-KakaoStory-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1e3bdec84050c4050a4cff2ff652fba7
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-KakaoTalk-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b04b36dbc11b248529a5798bdf3b4b31
-timeCreated: 1492483000
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Line-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4245c4a93cea94bc280deefe97ad584f
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Linkedin-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 10b3bdb528ff64d2b86f62429daab5e0
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Meipai-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1d27c537e8796489e8a2faecdee15ac3
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Mingdao-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ec1605302acce4ebaa039da8881b85d9
-timeCreated: 1492483000
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Pinterest-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c735e44de726541668ec7d9b52ae0b51
-timeCreated: 1492483000
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Pocket-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 86062e8f6b24a464494d2f59448869a6
-timeCreated: 1492483000
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Renren-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1f3db423bfe10415090d8c39623143cc
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-ShortMessage-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bdd9718d5ad004dcbabc82a98e61e22d
-timeCreated: 1492483000
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-TencentWeibo-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 41159fc7f813243bab5873efd04fe072
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Tumblr-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6d36e092541094e20bb597ba3fdba6be
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Twitter-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 077a4fd45736c48aa8da92e8bd8ee66d
-timeCreated: 1492482998
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-VKontakte-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7f8a5b7e5f7f746768a97218aae9d0dd
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Wechat-Favorite-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 85090c82bf53043efb8958ad3db9b575
-timeCreated: 1492483000
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-WhatsApp-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 80bc242778b954e3792b44df6dae5155
-timeCreated: 1492483000
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Yixin-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4df4862103aa6486eab2d6b68b28c6d5
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Yixin-Core-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 37fae3ea378bd446f8ecd8d06711b7d6
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Yixin-Moments-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5cbbb39adb8c54cd2a857c59fc3aa67e
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-YouDao-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4388067c355fc4183bc167d8a4d0f973
-timeCreated: 1492482999
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Youtube-2.8.2.jar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a78170f0b66744080884f49ead69634a
-timeCreated: 1492483000
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/ShareSDK/ShareSDK.cs

@@ -11,12 +11,25 @@ namespace cn.sharesdk.unity3d
 	/// <summary>
 	/// ShareSDK.
 	/// </summary>
-	public class ShareSDK : MonoBehaviour 
+	public class ShareSDK : MonoBehaviour
 	{
         public static string MobAppKey = "1b17e87d222c1";
 
-        public static string QQAppKey = "1106162458";
-        public static string QQAppSecrete = "gPNqWfh67WQeM0wr";
+        public static string QQAppKey = "100371282";
+        public static string QQAppSecrete = "aed9b0303e3ed1e27bae87c33761161d";
+
+        public static string WeChatAppKey = "wx4868b35061f87885";
+        public static string WeChatSecrete = "64020361b8ec4c99936c0e3999a9f249";
+
+        public static string SinaAppKey = "568898243";
+        public static string SinaAppSecrete = "38a4f8204cc784f81f9f0daaf31e02e3";
+
+	    public static string GoogleClientID = "682795613743-cfo3a8r4va0ujja7qofr54hobt2kv3cq.apps.googleusercontent.com";
+	    public static string GoogleAppKey = "232554794995.apps.googleusercontent.com";
+        public static string GoogleAppSecrete = "PEdFgtrMw97aCvf0joQj7EMk";
+
+        public static string FacebookAppKey = "107704292745179";
+        public static string FacebookAppSecrete = "38053202e1a5fe26c80c753071f0b573";
 
         private int reqID;
 		public DevInfoSet devInfo;
@@ -28,12 +41,12 @@ namespace cn.sharesdk.unity3d
 		public EventHandler getFriendsHandler;
 		public EventHandler followFriendHandler;
 
-		void Awake()
+	    void Awake()
 		{				
 			
 		}
 
-	    public void Initialize()
+        public void Initialize()
 	    {
             devInfo = new DevInfoSet();
 

Assets/Plugins/ShareSDK/ShareSDKDevInfo.cs

@@ -5,16 +5,15 @@ using System;
 namespace cn.sharesdk.unity3d 
 {
 	public class DevInfoSet
-
 	{
-		//public Facebook facebook;
-        //public GooglePlus googlePlus;
-		//public SinaWeiboDevInfo sinaweibo;
+		public Facebook facebook = new Facebook();
+        public GooglePlus googlePlus = new GooglePlus();
+		public SinaWeiboDevInfo sinaweibo = new SinaWeiboDevInfo();
 
         public QQ qq = new QQ();
-        //public QZone qzone;
-        //public WeChat wechat;
-        //public WeChatMoments wechatMoments;
+        public QZone qzone = new QZone();
+        public WeChat wechat = new WeChat();
+        public WeChatMoments wechatMoments = new WeChatMoments();
 
         //public TencentWeiboDevInfo tencentweibo;
         //public Twitter twitter;
@@ -69,27 +68,25 @@ namespace cn.sharesdk.unity3d
 		public bool Enable = true;
 	}
 
-	[Serializable]
 	public class SinaWeiboDevInfo : DevInfo 
 	{
 		#if UNITY_ANDROID
 		public const int type = (int) PlatformType.SinaWeibo;
 		public string SortId = "4";
-		public string AppKey = "568898243";
-		public string AppSecret = "38a4f8204cc784f81f9f0daaf31e02e3";
+		public string AppKey = ShareSDK.SinaAppKey;
+		public string AppSecret = ShareSDK.SinaAppSecrete;
 		public string RedirectUrl = "http://www.sharesdk.cn";
 		public bool ShareByAppClient = false;
-		#elif UNITY_IPHONE
+#elif UNITY_IPHONE
 		public const int type = (int) PlatformType.SinaWeibo;
-		public string app_key = "568898243";
-		public string app_secret = "38a4f8204cc784f81f9f0daaf31e02e3";
+		public string app_key = ShareSDK.SinaAppKey;
+		public string app_secret = ShareSDK.SinaAppSecrete;
 		public string redirect_uri = "http://www.sharesdk.cn";
 		public string auth_type = "both";	//can pass "both","sso",or "web"  
-		#endif
-	}
+#endif
+    }
 
-	[Serializable]
-	public class TencentWeiboDevInfo : DevInfo 
+    public class TencentWeiboDevInfo : DevInfo 
 	{
 		#if UNITY_ANDROID
 		public const int type = (int) PlatformType.TencentWeibo;
@@ -121,59 +118,55 @@ namespace cn.sharesdk.unity3d
 #endif
     }
 
-    [Serializable]
 	public class QZone : DevInfo 
 	{
 		#if UNITY_ANDROID
 		public string SortId = "1";
 		public const int type = (int) PlatformType.QZone;
-		public string AppId = "100371282";
-		public string AppKey = "ae36f4ee3946e1cbb98d6965b0b2ff5c";
+		public string AppId = ShareSDK.QQAppKey;
+		public string AppKey = ShareSDK.QQAppSecrete;
 		public bool ShareByAppClient = true;
-		#elif UNITY_IPHONE
+#elif UNITY_IPHONE
 		public const int type = (int) PlatformType.QZone;
-		public string app_id = "100371282";
-		public string app_key = "aed9b0303e3ed1e27bae87c33761161d";
+		public string app_id = ShareSDK.QQAppKey;
+		public string app_key = ShareSDK.QQAppSecrete;
 		public string auth_type = "both";  //can pass "both","sso",or "web" 
-		#endif
-	}
-	
+#endif
+    }
 
-	
-	[Serializable]
-	public class WeChat : DevInfo 
+
+
+    public class WeChat : DevInfo 
 	{	
 		#if UNITY_ANDROID
 		public string SortId = "5";
 		public const int type = (int) PlatformType.WeChat;
-		public string AppId = "wx4868b35061f87885";
-		public string AppSecret = "64020361b8ec4c99936c0e3999a9f249";
+		public string AppId = ShareSDK.WeChatAppKey;
+		public string AppSecret = ShareSDK.WeChatSecrete;
 		public bool BypassApproval = true;
-		#elif UNITY_IPHONE
+#elif UNITY_IPHONE
 		public const int type = (int) PlatformType.WeChat;
-		public string app_id = "wx4868b35061f87885";
-		public string app_secret = "64020361b8ec4c99936c0e3999a9f249";
-		#endif
-	}
+		public string app_id = ShareSDK.WeChatAppKey;
+		public string app_secret = ShareSDK.WeChatSecrete;
+#endif
+    }
 
-	[Serializable]
-	public class WeChatMoments : DevInfo 
+    public class WeChatMoments : DevInfo 
 	{
 		#if UNITY_ANDROID
 		public string SortId = "6";
 		public const int type = (int) PlatformType.WeChatMoments;
-		public string AppId = "wx4868b35061f87885";
-		public string AppSecret = "64020361b8ec4c99936c0e3999a9f249";
+		public string AppId = ShareSDK.WeChatAppKey;
+		public string AppSecret = ShareSDK.WeChatSecrete;
 		public bool BypassApproval = false;
-		#elif UNITY_IPHONE
+#elif UNITY_IPHONE
 		public const int type = (int) PlatformType.WeChatMoments;
-		public string app_id = "wx4868b35061f87885";
-		public string app_secret = "64020361b8ec4c99936c0e3999a9f249";
-		#endif
-	}
+		public string app_id = ShareSDK.WeChatAppKey;
+		public string app_secret = ShareSDK.WeChatSecrete;
+#endif
+    }
 
-	[Serializable]
-	public class WeChatFavorites : DevInfo 
+    public class WeChatFavorites : DevInfo 
 	{
 		#if UNITY_ANDROID
 		public string SortId = "7";
@@ -187,26 +180,24 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Facebook : DevInfo 
 	{
 		#if UNITY_ANDROID
 		public string SortId = "8";
 		public const int type = (int) PlatformType.Facebook;
-		public string ConsumerKey = "107704292745179";
-		public string ConsumerSecret = "38053202e1a5fe26c80c753071f0b573";
+		public string ConsumerKey = ShareSDK.FacebookAppKey;
+		public string ConsumerSecret = ShareSDK.FacebookAppSecrete;
 		public string RedirectUrl = "http://mob.com/";
-		#elif UNITY_IPHONE
+#elif UNITY_IPHONE
 		public const int type = (int) PlatformType.Facebook;
-		public string api_key = "107704292745179";
-		public string app_secret = "38053202e1a5fe26c80c753071f0b573";
+		public string api_key = ShareSDK.FacebookAppKey;
+		public string app_secret = ShareSDK.FacebookAppSecrete;
 		public string auth_type = "both";  //can pass "both","sso",or "web" 
 		public string display_name = "ShareSDK";//如果需要使用客户端分享，必填且需与FB 后台配置一样
-		#endif
-	}
+#endif
+    }
 
-	[Serializable]
-	public class Twitter : DevInfo 
+    public class Twitter : DevInfo 
 	{
 		#if UNITY_ANDROID
 		public string SortId = "9";
@@ -222,7 +213,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Renren : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -240,7 +230,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class KaiXin : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -257,7 +246,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Email : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -268,7 +256,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class ShortMessage : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -279,7 +266,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Douban : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -296,7 +282,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class YouDao : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -330,7 +315,6 @@ namespace cn.sharesdk.unity3d
 	//在以下的配置里，安卓请选择Evernote配置。
 	//iOS则需要区分，国内版为Evernote，国际版EvernoteInternational。
 
-	[Serializable]
 	public class Evernote : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -348,7 +332,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class EvernoteInternational : DevInfo
 	{
 		#if UNITY_ANDROID
@@ -362,7 +345,6 @@ namespace cn.sharesdk.unity3d
 	}
 
 
-	[Serializable]
 	public class LinkedIn : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -380,26 +362,24 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class GooglePlus : DevInfo 
 	{
 		#if UNITY_ANDROID
 		public string SortId = "19";
 		public const int type = (int) PlatformType.GooglePlus;
-		public string ClientID = "682795613743-cfo3a8r4va0ujja7qofr54hobt2kv3cq.apps.googleusercontent.com";
+	    public string ClientID = ShareSDK.GoogleAppKey;
 		public string RedirectUrl = "http://localhost";
 		public bool	ShareByAppClient = false;
-		#elif UNITY_IPHONE
+#elif UNITY_IPHONE
 		public const int type = (int) PlatformType.GooglePlus;
-		public string client_id = "232554794995.apps.googleusercontent.com";
-		public string client_secret = "PEdFgtrMw97aCvf0joQj7EMk";
+		public string client_id = ShareSDK.GoogleAppKey;
+		public string client_secret = ShareSDK.GoogleAppSecrete;
 		public string redirect_uri = "http://localhost";
 		public string auth_type = "both";  //can pass "both","sso",or "web" 
-		#endif
-	}
+#endif
+    }
 
-	[Serializable]
-	public class FourSquare : DevInfo 
+    public class FourSquare : DevInfo 
 	{
 		#if UNITY_ANDROID
 		public string SortId = "20";
@@ -412,7 +392,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Pinterest : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -425,7 +404,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Flickr : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -441,7 +419,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Tumblr : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -458,7 +435,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Dropbox : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -474,7 +450,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 	
-	[Serializable]
 	public class VKontakte : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -489,7 +464,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Instagram : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -514,7 +488,6 @@ namespace cn.sharesdk.unity3d
 	//审核的应用也可以执行分享，但是仅限于分享文字或图片，不能分享其他类型，
 	//默认值为false。
 
-	[Serializable]
 	public class Yixin : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -531,7 +504,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class YixinMoments : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -548,7 +520,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Mingdao : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -565,7 +536,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Line : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -576,7 +546,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class KakaoTalk : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -591,7 +560,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 	
-	[Serializable]
 	public class KakaoStory : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -606,7 +574,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 	
-	[Serializable]
 	public class WhatsApp : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -617,7 +584,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 	
-	[Serializable]
 	public class Bluetooth : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -628,7 +594,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Pocket : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -643,7 +608,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Instapaper : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -658,7 +622,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class FacebookMessenger : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -672,7 +635,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Copy : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -682,7 +644,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class YixinSeries : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -698,7 +659,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class YixinFavorites : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -714,7 +674,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 		
-	[Serializable]
 	public class Alipay : DevInfo
 	{
 		#if UNITY_ANDROID
@@ -727,7 +686,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class AlipayMoments : DevInfo
 	{
 		#if UNITY_ANDROID
@@ -740,7 +698,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Dingding : DevInfo
 	{
 		#if UNITY_ANDROID
@@ -752,7 +709,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class WechatSeries : DevInfo 
 	{	
 		#if UNITY_ANDROID
@@ -765,7 +721,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class QQSeries : DevInfo 
 	{	
 		#if UNITY_ANDROID
@@ -779,7 +734,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class KakaoSeries : DevInfo 
 	{
 		#if UNITY_ANDROID
@@ -794,7 +748,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class Youtube : DevInfo
 	{
 		#if UNITY_ANDROID
@@ -811,7 +764,6 @@ namespace cn.sharesdk.unity3d
 		#endif
 	}
 
-	[Serializable]
 	public class MeiPai : DevInfo
 	{
 		#if UNITY_ANDROID

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Alipay-Moments-2.8.2.jar.meta → Assets/Plugins/UnityPurchasing/iOS.meta

@@ -1,7 +1,6 @@
 fileFormatVersion: 2
-guid: 46b028ece09c447cca38f66ea12d58ca
-timeCreated: 1492482999
-licenseType: Free
+guid: b722e2504dd3140409a9beb9c8d1b6b6
+folderAsset: yes
 DefaultImporter:
   userData: 
   assetBundleName: 

Assets/Resource/Mobile/ICON2.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b813046556cad144a8d802561e852941
-timeCreated: 1494289111
+timeCreated: 1494848738
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -19,7 +19,7 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
-  isReadable: 0
+  isReadable: 1
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -58,11 +58,43 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: 2
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: 13
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: 13
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/回家.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: c1bd930204518d34490b0a65ce52cfe2
+timeCreated: 1494898712
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/访问好友.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 82e315b06b317424fa171ba1079b64d3
+timeCreated: 1494898712
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/XML/Config/visit_config.xml

@@ -0,0 +1,17 @@
+<data>
+  <item id="1" addtion_fml="c*1" coin_lmt="" time_lmt="43200" />
+  <comment>
+    <id>
+id
+</id>
+    <addtion_fml>
+加成公式
+</addtion_fml>
+    <coin_lmt>
+金币上限
+</coin_lmt>
+    <time_lmt>
+时间上限
+</time_lmt>
+  </comment>
+</data>

Assets/Resource/XML/Config/visit_config.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 55c5db2c9a211884895cd4df0dc4dc96
+timeCreated: 1494920394
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: config
+  assetBundleVariant: 

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="149" />
+  <Version value="150" />
 
   <ID value="Default" />
   <TutorialA value="1" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -195,6 +195,10 @@
     <QuitGame desc=""><![CDATA[退出游戏?]]></QuitGame>
     <NoValidSlot desc=""><![CDATA[已经没有空地了]]></NoValidSlot>
     <Unlock desc=""><![CDATA[未解锁]]></Unlock>
+    <ShareTit desc=""><![CDATA[分享标题]]></ShareTit>
+    <ShareContent desc=""><![CDATA[分享内容]]></ShareContent>
+    <ShareSuccess desc=""><![CDATA[分享成功]]></ShareSuccess>
+    <ShareFail desc=""><![CDATA[分享失败]]></ShareFail>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[美丽花园-1]]></Achieve1>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -195,6 +195,10 @@
     <QuitGame desc=""><![CDATA[退出遊戲?]]></QuitGame>
     <NoValidSlot desc=""><![CDATA[已經沒有空地了]]></NoValidSlot>
     <Unlock desc=""><![CDATA[未解鎖]]></Unlock>
+    <ShareTit desc=""><![CDATA[]]></ShareTit>
+    <ShareContent desc=""><![CDATA[]]></ShareContent>
+    <ShareSuccess desc=""><![CDATA[分享成功]]></ShareSuccess>
+    <ShareFail desc=""><![CDATA[分享失敗]]></ShareFail>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[美麗花園-1]]></Achieve1>

Assets/Resource/XML/lan/English.xml

@@ -195,6 +195,10 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <QuitGame desc=""><![CDATA[Are you sure to quit?]]></QuitGame>
     <NoValidSlot desc=""><![CDATA[There is no valid slot]]></NoValidSlot>
     <Unlock desc=""><![CDATA[Unlock]]></Unlock>
+    <ShareTit desc=""><![CDATA[]]></ShareTit>
+    <ShareContent desc=""><![CDATA[]]></ShareContent>
+    <ShareSuccess desc=""><![CDATA[Share success]]></ShareSuccess>
+    <ShareFail desc=""><![CDATA[Share fail]]></ShareFail>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[Lovely Garden 1]]></Achieve1>

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Alipay-2.8.2.jar.meta → Assets/Resource/Xlsx/visit_config.xlsx.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 3ae6ace7ae7ea429aa7c9e47548a6186
-timeCreated: 1492482999
-licenseType: Free
+guid: 548bf52bcf452804d9d7d87634850e9a
+timeCreated: 1494920386
+licenseType: Pro
 DefaultImporter:
   userData: 
   assetBundleName: 

Assets/Script/Manage/ManaData.cs

@@ -204,7 +204,16 @@ public class ManaData : Regist
         {
             SkillPerson_ = value;
 
-            ManaReso.SetText("F_PersonLab", Mathf.FloorToInt(Person_ + SkillPerson_).ToString());
+            if (SkillPerson_.Equal(0))
+            {
+                ManaReso.Get<Outline>("F_PersonLab").enabled = false;
+            }
+            else
+            {
+                ManaReso.Get("F_PersonLab").TweenReForOutline();
+            }
+
+            ManaReso.SetText("F_PersonLab", Mathf.FloorToInt(60*(Person_ + SkillPerson_)).ToString());
         }
     }
     public static float CoinPerson
@@ -224,6 +233,15 @@ public class ManaData : Regist
         {
             SkillCoinPerson_ = value;
 
+            if (SkillCoinPerson_.Equal(0))
+            {
+                ManaReso.Get<Outline>("F_CoinPersonLab").enabled = false;
+            }
+            else
+            {
+                ManaReso.Get("F_CoinPersonLab").TweenReForOutline();
+            }
+
             ManaReso.SetText("F_CoinPersonLab", Mathf.FloorToInt(CoinPerson_ + SkillCoinPerson_).ToString());
         }
     }
@@ -267,6 +285,7 @@ public class ManaData : Regist
     public static bool Reset;
     public static bool MiniValid;
     public static bool FirstFrame = true;
+    public static bool OfflineValid;
     public static bool TabBtnValid;
     public static bool ReactiveRequest;
     public static bool InitiateComplete;
@@ -508,7 +527,7 @@ public class ManaData : Regist
         RegistSkill();
         RegistIncome();
 
-        if (ManaServer.Connect)
+        if (OfflineValid)
         {
             if (!ManaTutorial.TutorialA && !ManaTutorial.TutorialB)
             {
@@ -626,22 +645,32 @@ public class ManaData : Regist
 
     public static void RegistSkill()
     {
-        QuitTime = DateTime.Parse(Data.GetPlayerString("QuitTime"));
+        OfflineValid = false;
 
-        Elapse = (float)ManaServer.Time.Subtract(QuitTime).TotalSeconds;
-        
-        if (Elapse > MaxTime)
+        if (ManaServer.Connect && Data.GetPlayerBool("QuitFlag"))
         {
-            Elapse = (long)MaxTime;
-        }
+            QuitTime = DateTime.Parse(Data.GetPlayerString("QuitTime"));
 
-        if (!Data.GetPlayerBool("QuitFlag"))
-        {
-            Elapse = 0;
-        }
+            Elapse = (float)ManaServer.Time.Subtract(QuitTime).TotalSeconds;
+
+            ManaDebug.Log(string.Format("真实离线时间<color=red>{0}</color>", Elapse));
+
+            if (Elapse <= 120)
+            {
+                Elapse = 0;
+            }
+            else
+            {
+                OfflineValid = true;
+            }
 
-        ManaDebug.Log(string.Format("离线时间<color=red>{0}</color>", Elapse));
+            if (Elapse > MaxTime)
+            {
+                Elapse = (long)MaxTime;
+            }
+        }
 
+        ManaDebug.Log(string.Format("计算离线时间<color=red>{0}</color>", Elapse));
 
         FFUseList = new List<List<Skill>>();
         FFCoolList = new List<Skill>();
@@ -871,7 +900,10 @@ public class ManaData : Regist
             }
         }
 
-        if (ManaServer.Connect && Data.GetPlayerBool("QuitFlag"))
+        RegistSkill();
+        RegistIncome();
+
+        if (OfflineValid)
         {
             if (!ManaTutorial.TutorialA)
             {
@@ -879,9 +911,21 @@ public class ManaData : Regist
                 ManaReso.Get("Ba_Notice").TweenConForCG();
             }
         }
+        else
+        {
+            if (!ManaTutorial.TutorialA)
+            {
+                int daySpan = ManaServer.Time.Day - ManaSign.SignTime.Day;
+                int yearSpan = ManaServer.Time.Year - ManaSign.SignTime.Year;
+                int monthSpan = ManaServer.Time.Month - ManaSign.SignTime.Month;
 
-        RegistSkill();
-        RegistIncome();
+                if (daySpan >= 1 || yearSpan >= 1 || monthSpan >= 1)
+                {
+                    ManaReso.Get("B_SignIn").TweenConForCG();
+                    ManaReso.Get("Bb_SignIn").TweenConForCG();
+                }
+            }
+        }
 
         InitiateComplete = true;
 
@@ -986,6 +1030,8 @@ public class ManaData : Regist
                     return;
                 }
 
+                ManaVisit.DataRecover();
+
                 if (ReactiveRequest)
                 {
                     return;

Assets/Script/Manage/ManaGarden.cs

@@ -87,8 +87,12 @@ public class ManaGarden : Regist
     private static int TotalFlowerSpec_;
     private static int TotalFlowerRegu_;
 
+    public static int Page
+    {
+        get { return PageList.Count; }
+    }
+
     public static int SlotAmt;
-    public static int PageAmt;
     public static int TotalFlower;
     public static bool AwardValid = true;
     public static float ElfTimer;
@@ -187,7 +191,6 @@ public class ManaGarden : Regist
         }
 
         SlotAmt = 0;
-        PageAmt = 0;
         MyFlowerSpec = 0;
         MyFlowerRegu = 0;
 
@@ -200,8 +203,6 @@ public class ManaGarden : Regist
         CreatePage();
         CreatePage();
 
-        Garden.TotPage = 1;
-
         Instance.RegistValueA();
     }
 
@@ -212,8 +213,6 @@ public class ManaGarden : Regist
         CreatePage();
         CreatePage();
 
-        Garden.TotPage=1;
-
         #region 生成FlowerItem
 
         List<XmlAttributeCollection> attributeList = Data.GetFlowerConfig();
@@ -298,7 +297,7 @@ public class ManaGarden : Regist
     {
         Transform tra = ManaReso.Get("Page", Folder.Scene, false, ManaReso.Get("GardenPage"), false, ObjType.Page);
 
-        float offset = PageAmt*19.2f;
+        float offset = Page*19.2f;
 
         tra.SetLX(offset);
 
@@ -308,7 +307,7 @@ public class ManaGarden : Regist
         pos.x = -offset;
 
         Garden.PagePos.Add(pos);
-        
+
 
         for (int i = 0; i < 9; i++)
         {
@@ -321,9 +320,6 @@ public class ManaGarden : Regist
 
 
         PageList.Add(tra);
-
-        PageAmt++;
-        Garden.TotPage++;
     }
 
     public static void ShowFlowerCard(FlowerInfo flowerInfo)

Assets/Script/Manage/ManaPlayer.cs

@@ -31,18 +31,11 @@ public class ManaPlayer : Regist
     {
         ManaReso.TraDic.Remove("Player");
 
-        Transform tra = Player.transform;
-
         ManaReso.Save(Player);
 
         Instance.GetPlayer();
 
         ManaReso.Get<HudTarget>("C_MiniGame").PosTra = Player.ChildDic["EnterGameTra"];
-
-        if (ManaReso.Contains(tra))
-        {
-            Destroy(tra.gameObject);
-        }
     }
 
 
@@ -99,10 +92,18 @@ public class ManaPlayer : Regist
     }
 
 
-    public void GetPlayer()
+    public void GetPlayer(string type = null)
     {
         string player = Data.GetPlayerString("Player");
 
+        if (type == null)
+        {
+            player = Data.GetPlayerString("Player");
+        }
+        else
+        {
+            player = type;
+        }
 
         Transform tra = ManaReso.Get("Player", Folder.Scene, false, transform, ManaReso.Get("PlayerPosTra").position, player.ToEnum<ObjType>());
 

Assets/Script/Manage/ManaReso.cs

@@ -364,6 +364,11 @@ public class ManaReso : Regist
         
         if (ObjDic.TryGetValue(goName, out obj))
         {
+            if (objType != ObjType.Null)
+            {
+                ObjectPool.UniqueAdd(objType, new List<Transform>());
+            }
+
             return (T) obj;
         }
         else
@@ -1030,4 +1035,66 @@ public class ManaReso : Regist
             }
         }
     }
+
+
+    public void Read()
+    {
+        StartCoroutine(IRead1());
+        StartCoroutine(IRead2());
+        StartCoroutine(IRead3());
+    }
+
+    public static IEnumerator IRead1()
+    {
+        WWW www = new WWW(Application.streamingAssetsPath + "/Icon/ShareIcon.png");
+
+        yield return www;
+
+        if (string.IsNullOrEmpty(www.error))
+        {
+            Get<RawImage>("RawImage").texture = www.texture;
+
+            ManaDebug.Log("1 good");
+        }
+        else
+        {
+            ManaDebug.Log("1 fail");
+        }
+    }
+
+    public static IEnumerator IRead2()
+    {
+        WWW www = new WWW("file://" + Application.streamingAssetsPath + "/Icon/ShareIcon.png");
+
+        yield return www;
+
+        if (string.IsNullOrEmpty(www.error))
+        {
+            Get<RawImage>("RawImage").texture = www.texture;
+
+            ManaDebug.Log("2 good");
+        }
+        else
+        {
+            ManaDebug.Log("2 fail");
+        }
+    }
+
+    public static IEnumerator IRead3()
+    {
+        WWW www = new WWW("file:///" + Application.streamingAssetsPath + "/Icon/ShareIcon.png");
+
+        yield return www;
+
+        if (string.IsNullOrEmpty(www.error))
+        {
+            Get<RawImage>("RawImage").texture = www.texture;
+
+            ManaDebug.Log("3 good");
+        }
+        else
+        {
+            ManaDebug.Log("3 fail");
+        }
+    }
 }

Assets/Script/Manage/ManaUI.cs

@@ -113,9 +113,10 @@ public class ManaUI : Regist
                 ManaAudio.PlayClip(Clip.CurrentClip);
 
                 int daySpan = ManaServer.Time.Day - ManaSign.SignTime.Day;
+                int yearSpan = ManaServer.Time.Year - ManaSign.SignTime.Year;
                 int monthSpan = ManaServer.Time.Month - ManaSign.SignTime.Month;
 
-                if (daySpan >= 1 || monthSpan >= 1)
+                if (daySpan >= 1 || yearSpan >= 1 || monthSpan >= 1)
                 {
                     ManaReso.Get("Ba_Notice").TweenBacCG();
                     ManaReso.Get("Bb_SignIn").TweenConForCG();
@@ -219,18 +220,18 @@ public class ManaUI : Regist
 
         #region C_Achieve
 
-        tween = ManaAnim.CreateTweenOutline(ManaReso.Get("C_Achieve"), 0, 201/255f, true, true, Curve.EaseOutQuad);
+        tween = ManaAnim.CreateTweenOutline(ManaReso.Get("C_Achieve"), 0, 201/255f, 1f, true, true, Curve.EaseOutQuad);
 
-        var tween3 = tween;
+        var tween7 = tween;
         tween.OnForwardFinish += () =>
         {
-            tween3.StartBackward();
+            tween7.StartBackward();
         };
 
-        var tween4 = tween;
+        var tween8 = tween;
         tween.OnBackwardFinish += () =>
         {
-            tween4.StartForward();
+            tween8.StartForward();
         };
 
         ManaReso.AddButtonEvent
@@ -261,7 +262,7 @@ public class ManaUI : Regist
 
         #region C_MiniGame
 
-        tween = ManaReso.Get("C_MiniGame").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("C_MiniGame").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
         ManaReso.AddButtonEvent
         (
@@ -287,6 +288,70 @@ public class ManaUI : Regist
 
         #endregion
 
+
+        #region C_Visit
+
+        ManaReso.AddButtonEvent
+        (
+            "C_Visit",
+            () =>
+            {
+                ManaVisit.TweenFinish = false;
+
+                ManaVisit.GetArchive();
+
+                ManaAudio.PlayClip(Clip.BubbleClip);
+
+                ManaReso.SetActive("C_Return", false);
+
+
+                tween = ManaReso.Get("I_BlackMask").GetTweenCG();
+
+                tween.Duration = 0.5f;
+                tween.StartBackward();
+
+                tween.AddEventOnetime
+                (
+                    EventType.BackwardFinish,
+                    () =>
+                    {
+                        ManaVisit.TweenFinish = true;
+
+                        ManaVisit.Enter();
+                    }
+                );
+            }
+        );
+
+        #endregion
+
+        #region C_Return
+
+        ManaReso.AddButtonEvent
+        (
+            "C_Return",
+            () =>
+            {
+                tween = ManaReso.Get("I_BlackMask").GetTweenCG();
+
+                tween.Duration = 0.5f;
+                tween.StartBackward();
+
+                tween.AddEventOnetime
+                (
+                    EventType.BackwardFinish,
+                    () =>
+                    {
+                        ManaVisit.Exit();
+                    }
+                );
+
+                ManaAudio.PlayClip(Clip.BubbleClip);
+            }
+        );
+
+        #endregion
+
         #endregion
 
         #region D
@@ -996,6 +1061,24 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region F_PersonLab
+
+        tween = ManaAnim.CreateTweenOutline(ManaReso.Get("F_PersonLab"), 0, 201 / 255f, 1f, true, true, Curve.EaseOutQuad);
+
+        var tween5 = tween;
+        tween.OnForwardFinish += () =>
+        {
+            tween5.StartBackward();
+        };
+
+        var tween6 = tween;
+        tween.OnBackwardFinish += () =>
+        {
+            tween6.StartForward();
+        };
+
+        #endregion
+
         #region F_CoinPersonBtn
 
         ManaReso.AddButtonEvent
@@ -1010,6 +1093,24 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region F_CoinPersonLab
+
+        tween = ManaAnim.CreateTweenOutline(ManaReso.Get("F_CoinPersonLab"), 0, 201 / 255f, 1f, true, true, Curve.EaseOutQuad);
+
+        var tween3 = tween;
+        tween.OnForwardFinish += () =>
+        {
+            tween3.StartBackward();
+        };
+
+        var tween4 = tween;
+        tween.OnBackwardFinish += () =>
+        {
+            tween4.StartForward();
+        };
+
+        #endregion
+
 
         #region Fe_Info
 

Assets/Script/Manage/ManaVisit.cs

@@ -0,0 +1,443 @@
+using UnityEngine;
+
+using System.Xml;
+using System.Collections;
+using System.Collections.Generic;
+using LitJson;
+
+public class ManaVisit  
+{
+    #region 变量
+
+    #region 配置
+
+    public static int LevelMin;
+    public static int LevelMax;
+    public static float CreatePosi;
+
+    #endregion
+
+    public static bool Visit;
+    public static bool LoadFinish;
+    public static bool TweenFinish;
+    public static string XmlStr;
+
+    public static int Slot;
+    public static int Level;
+    public static int PageAmt;
+    public static string Player;
+    public static XmlNode Node;
+    public static XmlDocument Document;
+
+    public static bool Bird;
+    public static bool Tree;
+    public static bool Rainbow;
+    public static List<Slot> VisitPlantList;
+    public static List<Slot> OriginPlantList;
+    public static List<ObjType> OriginElfList;
+
+    #endregion
+
+    public void Regist()
+    {
+        CreatePosi = 0.75f;
+    }
+
+
+    public static void Exit()
+    {
+        ManaReso.Get("I_BlackMask").TweenForCG();
+
+        ManaReso.SetActive("C_Return", false);
+
+        #region Garden
+
+        ManaGarden.RetriveFlowerAll();
+
+        for (int i = 0; i < ManaGarden.PageList.Count; i++)
+        {
+            ManaReso.Save(ManaGarden.PageList[i]);
+        }
+
+        Garden.CurPage = 0;
+        ManaGarden.SlotList = new List<Slot>();
+        ManaGarden.PageList = new List<Transform>();
+
+
+        for (int i = 0; i < ManaGarden.SlotAmt / 7 + 2; i++)
+        {
+            ManaGarden.CreatePage();
+        }
+
+        for (int i = 0; i < ManaGarden.SlotList.Count; i++)
+        {
+            if (i < ManaGarden.SlotAmt)
+            {
+                ManaGarden.SlotList[i].Valid = true;
+            }
+            else
+            {
+                ManaGarden.SlotList[i].Valid = false;
+            }
+        }
+
+
+        List<KV<int, int>> plantList = Data.GetPlantList();
+
+        for (int i = 0; i < plantList.Count; i++)
+        {
+            ManaGarden.PlantFlower(plantList[i].Key, plantList[i].Value);
+        }
+
+        #endregion
+
+        #region Bird Tree Rainbow
+
+        if (Bird)
+        {
+            ManaReso.Get("Bird0").GetTweenSr().InDestination = true;
+        }
+        else
+        {
+            ManaReso.Get("Bird0").GetTweenSr().InOrigin = true;
+        }
+
+        if (Tree)
+        {
+            ManaReso.Get("Tree1").GetTweenSr().InDestination = true;
+            ManaReso.Get("Tree2").GetTweenSr().InDestination = true;
+        }
+        else
+        {
+            ManaReso.Get("Tree1").GetTweenSr().InOrigin = true;
+            ManaReso.Get("Tree2").GetTweenSr().InOrigin = true;
+        }
+
+        if (Rainbow)
+        {
+            ManaReso.Get("Rainbow").GetTweenSr().InDestination = true;
+        }
+        else
+        {
+            ManaReso.Get("Rainbow").GetTweenSr().InOrigin = true;
+        }
+
+        #endregion
+
+        #region Player
+
+        ManaReso.Save(ManaPlayer.Player);
+
+        ManaReso.TraDic.Remove("Player");
+
+        ManaPlayer.Instance.GetPlayer();
+
+        Garden.PlayerPos = new List<Vector3>();
+
+        Garden.Player = ManaReso.Get("Player");
+        Garden.PlayerPos.Add(ManaPlayer.Player.ChildDic["Pos1"].position);
+        Garden.PlayerPos.Add(ManaPlayer.Player.ChildDic["Pos2"].position);
+
+        #endregion
+
+        ManaGarden.ElfList = new List<ObjType>(OriginElfList);
+
+        Visit = false;
+    }
+
+    public static void Enter()
+    {
+        if (!LoadFinish || !TweenFinish)
+        {
+            return;
+        }
+
+        ManaReso.Get("I_BlackMask").TweenForCG();
+
+        ManaReso.SetActive("C_Return", true);
+
+        Document = new XmlDocument();
+        Document.LoadXml(XmlStr);
+
+        Node = Document.SelectSingleNode("PlayerConfig");
+
+        Slot = int.Parse(Node.SelectSingleNode("Slot").Attributes[0].Value);
+        Level = int.Parse(Node.SelectSingleNode("Level").Attributes[0].Value);
+        Player = Node.SelectSingleNode("Player").Attributes[0].Value;
+
+        #region Bird Tree Rainbow
+
+        if (!Visit)
+        {
+            if (ManaReso.Get("Bird").gameObject.activeSelf)
+            {
+                Bird = true;
+            }
+
+            if (ManaReso.Get("Tree1").gameObject.activeSelf)
+            {
+                Tree = true;
+            }
+
+            if (ManaReso.Get("Rainbow").gameObject.activeSelf)
+            {
+                Rainbow = true;
+            }
+        }
+
+        ManaReso.SetActive("Bird0", false);
+        ManaReso.SetActive("Tree1", false);
+        ManaReso.SetActive("Tree2", false);
+        ManaReso.SetActive("Rainbow", false);
+
+        #endregion
+
+        #region Ability
+
+        if (!Visit)
+        {
+            Data.SavePlantList();
+
+            OriginElfList = new List<ObjType>(ManaGarden.ElfList);
+        }
+
+        ManaGarden.ElfList = new List<ObjType>();
+
+        List<XmlAttributeCollection> attributeList = Data.GetSkillList(Node);
+
+        for (int i = 0; i < attributeList.Count; i++)
+        {
+            if (!attributeList[i][0].Value.Contains("Ability"))
+            {
+                continue;
+            }
+
+            if (int.Parse(attributeList[i][3].Value) == 0)
+            {
+                continue;
+            }
+
+            if (attributeList[i][0].Value == "Ability2")
+            {
+                ManaReso.Get("Rainbow").GetTweenSr().InDestination = true;
+            }
+            else if (attributeList[i][0].Value == "Ability3")
+            {
+                ManaReso.Get("Tree1").GetTweenSr().InDestination = true;
+                ManaReso.Get("Tree2").GetTweenSr().InDestination = true;
+            }
+            else if (attributeList[i][0].Value == "Ability4")
+            {
+                ManaReso.Get("Bird0").GetTweenSr().InDestination = true;
+            }
+            else if (attributeList[i][0].Value == "Ability5")
+            {
+                ManaGarden.ElfList.Add(ObjType.BeeYellow);
+            }
+            else if (attributeList[i][0].Value == "Ability6")
+            {
+                Slot++;
+
+                ManaGarden.ElfList.Add(ObjType.BeePurple);
+            }
+            else if (attributeList[i][0].Value == "Ability7")
+            {
+                Slot++;
+
+                ManaGarden.ElfList.Add(ObjType.BeeBlue);
+            }
+            else if (attributeList[i][0].Value == "Ability8")
+            {
+                Slot++;
+
+                ManaGarden.ElfList.Add(ObjType.BeeRed);
+            }
+            else if (attributeList[i][0].Value == "Ability9")
+            {
+                Slot++;
+
+                ManaGarden.ElfList.Add(ObjType.BeeWhite);
+            }
+            else if (attributeList[i][0].Value == "Ability10")
+            {
+                Slot++;
+
+                ManaGarden.ElfList.Add(ObjType.ButterflyYellow);
+            }
+            else if (attributeList[i][0].Value == "Ability11")
+            {
+                Slot++;
+
+                ManaGarden.ElfList.Add(ObjType.ButterflyPurple);
+            }
+            else if (attributeList[i][0].Value == "Ability12")
+            {
+                Slot++;
+
+                ManaGarden.ElfList.Add(ObjType.ButterflyBlue);
+            }
+            else if (attributeList[i][0].Value == "Ability13")
+            {
+                Slot++;
+
+                ManaGarden.ElfList.Add(ObjType.ButterflyRed);
+            }
+            else if (attributeList[i][0].Value == "Ability14")
+            {
+                Slot++;
+
+                ManaGarden.ElfList.Add(ObjType.ButterflyWhite);
+            }
+        }
+        
+        #endregion
+
+        #region Garden
+
+        OriginPlantList = new List<Slot>(ManaGarden.PlantList);
+
+        ManaGarden.RetriveFlowerAll();
+
+        for (int i = 0; i < ManaGarden.PageList.Count; i++)
+        {
+            ManaReso.Save(ManaGarden.PageList[i]);
+        }
+
+        Garden.CurPage = 0;
+        ManaGarden.SlotList = new List<Slot>();
+        ManaGarden.PageList = new List<Transform>();
+
+
+        for (int i = 0; i < Slot/7 + 2; i++)
+        {
+            ManaGarden.CreatePage();
+        }
+        
+        for (int i = 0; i < ManaGarden.SlotList.Count; i++)
+        {
+            if (i < Slot)
+            {
+                ManaGarden.SlotList[i].Valid = true;
+            }
+            else
+            {
+                ManaGarden.SlotList[i].Valid = false;
+            }
+        }
+
+        List<KV<int, int>> plantList = Data.GetPlantList(Node);
+        
+        for (int i = 0; i < plantList.Count; i++)
+        {
+            ManaGarden.PlantFlower(plantList[i].Key, plantList[i].Value);
+        }
+
+        #endregion
+
+        #region Player
+
+        ManaReso.Save(ManaPlayer.Player);
+
+        ManaReso.TraDic.Remove("Player");
+
+        ManaPlayer.Instance.GetPlayer(Player);
+
+        Garden.PlayerPos = new List<Vector3>();
+
+        Garden.Player = ManaReso.Get("Player");
+        Garden.PlayerPos.Add(ManaPlayer.Player.ChildDic["Pos1"].position);
+        Garden.PlayerPos.Add(ManaPlayer.Player.ChildDic["Pos2"].position);
+
+        #endregion
+
+        Visit = true;
+    }
+
+
+    public static void DataReverse()
+    {
+        if (Visit)
+        {
+            VisitPlantList = new List<Slot>(ManaGarden.PlantList);
+
+            ManaGarden.PlantList = OriginPlantList;
+        }
+    }
+
+    public static void DataRecover()
+    {
+        if (Visit)
+        {
+            ManaGarden.PlantList = VisitPlantList;
+        }
+    }
+
+
+    public static void GetArchive()
+    {
+        ManaServer.Load
+        (
+            "hsoiv1",
+            (jsonData) =>
+            {
+                LoadFinish = true;
+                
+                XmlStr = jsonData["l"].ToString();
+                
+                Enter();
+            }
+        );
+
+        //if (Random.Range(0f, 1f) <= CreatePosi)
+        //{
+        //    XmlDocument document = new XmlDocument();
+
+        //    document.LoadXml(Data.PlayerDoc.OuterXml);
+
+
+        //    document.SelectSingleNode("Level").Value = ((int) Mathf.Lerp(LevelMin, LevelMax, Random.Range(0f, 1f))).ToString();
+
+        //    #region 生成技能数据
+
+        //    List<int> intList = new List<int>() {19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
+
+        //    int tempInt = (int)Mathf.Lerp(6, 12, Random.Range(0f, 1f));
+
+        //    XmlNodeList nodeList = document.SelectNodes("Skill");
+
+        //    for (int i = 0; i < tempInt; i++)
+        //    {
+        //        nodeList[intList.Random(true)].Attributes[3].Value = "1";
+        //    }
+
+        //    for (int i = 0; i < intList.Count; i++)
+        //    {
+        //        nodeList[intList.Random(true)].Attributes[3].Value = "0";
+        //    }
+
+        //    #endregion
+
+
+        //    LoadFinish = true;
+
+        //    XmlStr = document.OuterXml;
+
+        //    Enter();
+        //}
+        //else
+        //{
+        //    ManaServer.Load
+        //    (
+        //        "hsoiv1",
+        //        (jsonData) =>
+        //        {
+        //            LoadFinish = true;
+
+        //            XmlStr = jsonData.ToJson();
+
+        //            Enter();
+        //        }
+        //    );
+        //}
+    }
+}

Assets/Script/Manage/ManaVisit.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: a73cf585e07140947ba2daa72eed5532
+timeCreated: 1494899694
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: