Merge branch 'master' of http://git.dashgame.com/gsgundam/garden_client into Stage2

# Conflicts:
#	Assets/Resource/Logo.unity
#	Assets/Script/Manage/Initializer.cs
#	ProjectSettings/ProjectSettings.asset

.gitignore

@@ -29,7 +29,6 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
-*.zip
 *.7z
 *.rar
 .DS_Store

Assets/Advertisements/Editor/Resources/Android/builds.meta

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

Assets/Advertisements/Editor/Resources/iOS/builds.meta

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

Assets/Advertisements/Editor/Resources/iOS/builds.zip.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: deca0ba656ca01b40a6bc5a68c0561b1
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/ShareSDK/AndroidManifest.xml

@@ -8,19 +8,20 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
-    <!--<uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
-    <!--<uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>-->
-    <!--<uses-permission android:name="android.permission.GET_ACCOUNTS"/>-->
-    <!-- 蓝牙分享所需的权限 -->
-    <!--<uses-permission android:name="android.permission.BLUETOOTH" />
+    <!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    --><!-- 蓝牙分享所需的权限 --><!--
+    <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
     
     <uses-sdk
         android:minSdkVersion="8"
         android:targetSdkVersion="17" />
 
-    <application>
+    <application
+    	android:name="com.mob.MobApplication">
         <activity
             android:name="com.mob.tools.MobUIShell"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -74,7 +75,9 @@
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true"/>
-				
+
+        <meta-data android:name="Mob-AppKey" android:value="mob_a6b6c6d6"/>
+        <meta-data android:name="Mob-AppSecret" android:value="b89d2427a3bc7ad1aea1e1e8c1d36bf3"/>				
     </application>
 
 </manifest>

Assets/Plugins/Android/ShareSDK/libs/MobCommons-2017.0531.1145.jar.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 3d175b609ca833540a128ba7c3418757
+DefaultImporter:
+  userData: 

Assets/Plugins/Android/ShareSDK/libs/MobTools-2017.0531.1145.jar.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: d6f20f6ecd7f1d64a903cf0d7ea6d5f1
+DefaultImporter:
+  userData: 

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

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 042f59d52839d7744b1ce179fee3e387
+DefaultImporter:
+  userData: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Facebook-3.0.0.jar.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 718a79f11491fd44b98e84c9e212b823
+DefaultImporter:
+  userData: 

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QQ-3.0.0.jar.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: fd260530020799342a0444708849c5b3
+DefaultImporter:
+  userData: 

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

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

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QZone-3.0.0.jar.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 50040c3a1aad4194bae15093f9e36e48
+DefaultImporter:
+  userData: 

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

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

Assets/Plugins/Android/ShareSDK/libs/ShareSDK-SinaWeibo-3.0.0.jar.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 437f8b1c1b85e4048a6edfd1cfc74089
+DefaultImporter:
+  userData: 

Assets/Plugins/Android/ShareSDK/res/values-en/ssdk_strings.xml

@@ -66,6 +66,9 @@
     <string name="ssdk_alipay">Alipay</string>
     <string name="ssdk_alipaymoments">Alipay Moments</string>
     <string name="ssdk_plurk">Plurk</string>
+    <string name="ssdk_dingding">Dingding</string>
+	<string name="ssdk_meipai">Meipai</string>
+	<string name="ssdk_youtube">Youtube</string>
 
 	<string name="ssdk_share_to_qzone">Share To QZone</string>
 	<string name="ssdk_share_to_qq">Share To QQ</string>

Assets/Plugins/Android/ShareSDK/res/values/ssdk_strings.xml

@@ -66,7 +66,9 @@
     <string name="ssdk_alipay">支付宝好友</string>
     <string name="ssdk_alipaymoments">支付宝生活圈</string>
     <string name="ssdk_plurk">Plurk</string>
-
+	<string name="ssdk_youtube">Youtube</string>
+    <string name="ssdk_dingding">钉钉</string>
+	<string name="ssdk_meipai">美拍</string>
 	<string name="ssdk_share_to_qzone">分享到QQ空间</string>
 	<string name="ssdk_share_to_qq">分享到QQ</string>
 	<string name="ssdk_share_to_facebook">分享到Facebook</string>
@@ -75,4 +77,9 @@
 	<string name="ssdk_share_to_googleplus">分享到Google+</string>
 	<string name="ssdk_share_to_qzone_default">来自%s的分享</string>
 	<string name="ssdk_use_login_button">请改用“登录”按钮</string>
+	<string name="ssdk_share_to_youtube">分享到Youtube</string>
+	
+	<string name="ssdk_gender_male">男</string>
+	<string name="ssdk_gender_female">女</string>
+	<string name="ssdk_symbol_ellipsis">...</string>
 </resources>

Assets/Plugins/ShareSDK/Android/AndroidImpl.cs

@@ -11,6 +11,7 @@ namespace cn.sharesdk.unity3d
 
 		public AndroidImpl (GameObject go) 
 		{
+			Debug.Log("AndroidImpl  ===>>>  AndroidImpl" );
 			try{
 				ssdk = new AndroidJavaObject("cn.sharesdk.unity3d.ShareSDKUtils", go.name, "_Callback");
 			} catch(Exception e) {
@@ -20,15 +21,26 @@ namespace cn.sharesdk.unity3d
 
 		public override void InitSDK (String appKey) 
 		{
+			Debug.Log("AndroidImpl  ===>>>  InitSDK === " + appKey);
 			if (ssdk != null) 
 			{			
 				ssdk.Call("initSDK", appKey);
 			}
 		}
 
+		public override void InitSDK (String appKey,String appSecret) 
+		{
+			Debug.Log("AndroidImpl  ===>>>  InitSDK === " + appKey);
+			if (ssdk != null) 
+			{			
+				ssdk.Call("initSDK", appKey,appSecret);
+			}
+		}
+
 		public override void SetPlatformConfig (Hashtable configs) 
 		{
-			String json = ShareMiniJSON.jsonEncode(configs);
+			String json = MiniJSON.jsonEncode(configs);
+			Debug.Log("AndroidImpl  ===>>>  SetPlatformConfig === " + json);
 			if (ssdk != null) 
 			{			
 				ssdk.Call("setPlatformConfig", json);
@@ -104,6 +116,7 @@ namespace cn.sharesdk.unity3d
 
 		public override void ShowShareContentEditor (int reqID, PlatformType platform, ShareContent content) 
 		{
+			Debug.Log("AndroidImpl  ===>>>  OnekeyShare platform ===" + (int)platform );
 			if (ssdk != null) 
 			{
 				ssdk.Call("onekeyShare", reqID, (int)platform, content.GetShareParamsStr());
@@ -134,7 +147,7 @@ namespace cn.sharesdk.unity3d
 			if (ssdk != null) 
 			{
 				String result = ssdk.Call<String>("getAuthInfo", (int)platform);
-				return (Hashtable)ShareMiniJSON.jsonDecode(result);
+				return (Hashtable) MiniJSON.jsonDecode(result);
 			}
 			return new Hashtable ();
 		}

Assets/Plugins/ShareSDK/Editor.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: b07210448e2704bcb871b667d3cd49a6
+folderAsset: yes
+timeCreated: 1495814218
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/ShareSDK/Editor/ShareSDKConfigEditor.cs

@@ -0,0 +1,63 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Runtime.Serialization.Formatters.Binary;
+using UnityEngine;
+using UnityEditor;
+
+
+namespace cn.sharesdk.unity3d
+{
+[CustomEditor(typeof(ShareSDK))]
+[ExecuteInEditMode]
+public class ShareSDKConfigEditor : Editor {
+
+		private ShareSDKConfig config;
+
+		void Awake()
+		{
+			this.config = new ShareSDKConfig ();
+		}
+				
+		public override void OnInspectorGUI()
+		{
+			base.OnInspectorGUI();
+			//var obj = target as ShareSDK;
+			//this.config.appKey = obj.appKey;
+			//this.config.appSecret = obj.appSecret;
+//			this.config.SinaWeibo ["chosen"] = obj.devInfo.sinaweibo.Enable;
+//			this.config.TencentWeibo ["chosen"] = obj.devInfo.tencentweibo.Enable;
+//			this.config.DouBan ["chosen"] = obj.devInfo.douban.Enable;
+//			this.config.QQ["chosen"] = obj.devInfo.qq.Enable;
+//			this.config.WeChat["chosen"] = obj.devInfo.wechat.Enable;
+//			this.config.Renren["chosen"] = obj.devInfo.renren.Enable;
+//			this.config.Kaixin["chosen"] = obj.devInfo.kaiXin.Enable;
+//			this.config.Facebook["chosen"] = obj.devInfo.facebook.Enable;
+//			this.config.Evernote["chosen"] = obj.devInfo.evernote.Enable;
+//			this.config.GooglePlus["chosen"] = obj.devInfo.googlePlus.Enable;
+//			this.config.Instagram["chosen"] = obj.devInfo.instagram.Enable;
+//			this.config.LinkedIn["chosen"] = obj.devInfo.linkedIn.Enable;
+//			this.config.Tumblr["chosen"] = obj.devInfo.tumblr.Enable;
+//			this.config.Mail["chosen"] = obj.devInfo.email.Enable;
+//			this.config.SMS["chosen"] = obj.devInfo.shortMessage.Enable;
+//			this.config.Print["chosen"] = obj.devInfo.shortMessage.Enable;
+			Save ();
+		}
+		private void Save()
+		{
+			try
+			{
+					string filePath = Application.dataPath + "/Plugins/ShareSDK/ShareSDKConfig.bin";
+					BinaryFormatter formatter = new BinaryFormatter();
+					Stream stream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None);
+					formatter.Serialize(stream, this.config);
+					stream.Flush();
+					stream.Close();
+			}
+			catch (Exception e) 
+			{
+					Debug.Log ("save error:" + e);
+			}
+		}
+	}
+}

Assets/Plugins/ShareSDK/Editor/ShareSDKConfigEditor.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 5778eae13659d41e4935afbf227e8e74
+timeCreated: 1495814218
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/ShareSDK/ShareMiniJSON.cs → Assets/Plugins/ShareSDK/MiniJSON.cs

@@ -19,7 +19,7 @@ using System.Collections.Generic;
 /// </summary>
 
 
-public class ShareMiniJSON
+public class MiniJSON
 {
 	private const int TOKEN_NONE = 0;
 	private const int TOKEN_CURLY_OPEN = 1;
@@ -50,19 +50,19 @@ public class ShareMiniJSON
 	public static object jsonDecode( string json )
 	{
 		// save the string for debug information
-		ShareMiniJSON.lastDecode = json;
+		MiniJSON.lastDecode = json;
 
 		if( json != null )
 		{
 			char[] charArray = json.ToCharArray();
 			int index = 0;
 			bool success = true;
-			object value = ShareMiniJSON.parseValue( charArray, ref index, ref success );
+			object value = MiniJSON.parseValue( charArray, ref index, ref success );
 
 			if( success )
-				ShareMiniJSON.lastErrorIndex = -1;
+				MiniJSON.lastErrorIndex = -1;
 			else
-				ShareMiniJSON.lastErrorIndex = index;
+				MiniJSON.lastErrorIndex = index;
 
 			return value;
 		}
@@ -81,7 +81,7 @@ public class ShareMiniJSON
 	public static string jsonEncode( object json )
 	{
 		var builder = new StringBuilder( BUILDER_CAPACITY );
-		var success = ShareMiniJSON.serializeValue( json, builder );
+		var success = MiniJSON.serializeValue( json, builder );
 		
 		return ( success ? builder.ToString() : null );
 	}
@@ -93,7 +93,7 @@ public class ShareMiniJSON
 	/// <returns></returns>
 	public static bool lastDecodeSuccessful()
 	{
-		return ( ShareMiniJSON.lastErrorIndex == -1 );
+		return ( MiniJSON.lastErrorIndex == -1 );
 	}
 
 
@@ -103,7 +103,7 @@ public class ShareMiniJSON
 	/// <returns></returns>
 	public static int getLastErrorIndex()
 	{
-		return ShareMiniJSON.lastErrorIndex;
+		return MiniJSON.lastErrorIndex;
 	}
 
 
@@ -114,21 +114,21 @@ public class ShareMiniJSON
 	/// <returns></returns>
 	public static string getLastErrorSnippet()
 	{
-		if( ShareMiniJSON.lastErrorIndex == -1 )
+		if( MiniJSON.lastErrorIndex == -1 )
 		{
 			return "";
 		}
 		else
 		{
-			int startIndex = ShareMiniJSON.lastErrorIndex - 5;
-			int endIndex = ShareMiniJSON.lastErrorIndex + 15;
+			int startIndex = MiniJSON.lastErrorIndex - 5;
+			int endIndex = MiniJSON.lastErrorIndex + 15;
 			if( startIndex < 0 )
 				startIndex = 0;
 
-			if( endIndex >= ShareMiniJSON.lastDecode.Length )
-				endIndex = ShareMiniJSON.lastDecode.Length - 1;
+			if( endIndex >= MiniJSON.lastDecode.Length )
+				endIndex = MiniJSON.lastDecode.Length - 1;
 
-			return ShareMiniJSON.lastDecode.Substring( startIndex, endIndex - startIndex + 1 );
+			return MiniJSON.lastDecode.Substring( startIndex, endIndex - startIndex + 1 );
 		}
 	}
 
@@ -147,15 +147,15 @@ public class ShareMiniJSON
 		while( !done )
 		{
 			token = lookAhead( json, index );
-			if( token == ShareMiniJSON.TOKEN_NONE )
+			if( token == MiniJSON.TOKEN_NONE )
 			{
 				return null;
 			}
-			else if( token == ShareMiniJSON.TOKEN_COMMA )
+			else if( token == MiniJSON.TOKEN_COMMA )
 			{
 				nextToken( json, ref index );
 			}
-			else if( token == ShareMiniJSON.TOKEN_CURLY_CLOSE )
+			else if( token == MiniJSON.TOKEN_CURLY_CLOSE )
 			{
 				nextToken( json, ref index );
 				return table;
@@ -171,7 +171,7 @@ public class ShareMiniJSON
 
 				// :
 				token = nextToken( json, ref index );
-				if( token != ShareMiniJSON.TOKEN_COLON )
+				if( token != MiniJSON.TOKEN_COLON )
 					return null;
 
 				// value
@@ -199,15 +199,15 @@ public class ShareMiniJSON
 		while( !done )
 		{
 			int token = lookAhead( json, index );
-			if( token == ShareMiniJSON.TOKEN_NONE )
+			if( token == MiniJSON.TOKEN_NONE )
 			{
 				return null;
 			}
-			else if( token == ShareMiniJSON.TOKEN_COMMA )
+			else if( token == MiniJSON.TOKEN_COMMA )
 			{
 				nextToken( json, ref index );
 			}
-			else if( token == ShareMiniJSON.TOKEN_SQUARED_CLOSE )
+			else if( token == MiniJSON.TOKEN_SQUARED_CLOSE )
 			{
 				nextToken( json, ref index );
 				break;
@@ -231,24 +231,24 @@ public class ShareMiniJSON
 	{
 		switch( lookAhead( json, index ) )
 		{
-			case ShareMiniJSON.TOKEN_STRING:
+			case MiniJSON.TOKEN_STRING:
 				return parseString( json, ref index );
-			case ShareMiniJSON.TOKEN_NUMBER:
+			case MiniJSON.TOKEN_NUMBER:
 				return parseNumber( json, ref index );
-			case ShareMiniJSON.TOKEN_CURLY_OPEN:
+			case MiniJSON.TOKEN_CURLY_OPEN:
 				return parseObject( json, ref index );
-			case ShareMiniJSON.TOKEN_SQUARED_OPEN:
+			case MiniJSON.TOKEN_SQUARED_OPEN:
 				return parseArray( json, ref index );
-			case ShareMiniJSON.TOKEN_TRUE:
+			case MiniJSON.TOKEN_TRUE:
 				nextToken( json, ref index );
 				return Boolean.Parse( "TRUE" );
-			case ShareMiniJSON.TOKEN_FALSE:
+			case MiniJSON.TOKEN_FALSE:
 				nextToken( json, ref index );
 				return Boolean.Parse( "FALSE" );
-			case ShareMiniJSON.TOKEN_NULL:
+			case MiniJSON.TOKEN_NULL:
 				nextToken( json, ref index );
 				return null;
-			case ShareMiniJSON.TOKEN_NONE:
+			case MiniJSON.TOKEN_NONE:
 				break;
 		}
 
@@ -402,7 +402,7 @@ public class ShareMiniJSON
 
 		if( index == json.Length )
 		{
-			return ShareMiniJSON.TOKEN_NONE;
+			return MiniJSON.TOKEN_NONE;
 		}
 		
 		char c = json[index];
@@ -410,17 +410,17 @@ public class ShareMiniJSON
 		switch( c )
 		{
 			case '{':
-				return ShareMiniJSON.TOKEN_CURLY_OPEN;
+				return MiniJSON.TOKEN_CURLY_OPEN;
 			case '}':
-				return ShareMiniJSON.TOKEN_CURLY_CLOSE;
+				return MiniJSON.TOKEN_CURLY_CLOSE;
 			case '[':
-				return ShareMiniJSON.TOKEN_SQUARED_OPEN;
+				return MiniJSON.TOKEN_SQUARED_OPEN;
 			case ']':
-				return ShareMiniJSON.TOKEN_SQUARED_CLOSE;
+				return MiniJSON.TOKEN_SQUARED_CLOSE;
 			case ',':
-				return ShareMiniJSON.TOKEN_COMMA;
+				return MiniJSON.TOKEN_COMMA;
 			case '"':
-				return ShareMiniJSON.TOKEN_STRING;
+				return MiniJSON.TOKEN_STRING;
 			case '0':
 			case '1':
 			case '2':
@@ -432,9 +432,9 @@ public class ShareMiniJSON
 			case '8':
 			case '9':
 			case '-': 
-				return ShareMiniJSON.TOKEN_NUMBER;
+				return MiniJSON.TOKEN_NUMBER;
 			case ':':
-				return ShareMiniJSON.TOKEN_COLON;
+				return MiniJSON.TOKEN_COLON;
 		}
 		index--;
 
@@ -450,7 +450,7 @@ public class ShareMiniJSON
 				json[index + 4] == 'e' )
 			{
 				index += 5;
-				return ShareMiniJSON.TOKEN_FALSE;
+				return MiniJSON.TOKEN_FALSE;
 			}
 		}
 
@@ -463,7 +463,7 @@ public class ShareMiniJSON
 				json[index + 3] == 'e' )
 			{
 				index += 4;
-				return ShareMiniJSON.TOKEN_TRUE;
+				return MiniJSON.TOKEN_TRUE;
 			}
 		}
 
@@ -476,11 +476,11 @@ public class ShareMiniJSON
 				json[index + 3] == 'l' )
 			{
 				index += 4;
-				return ShareMiniJSON.TOKEN_NULL;
+				return MiniJSON.TOKEN_NULL;
 			}
 		}
 
-		return ShareMiniJSON.TOKEN_NONE;
+		return MiniJSON.TOKEN_NONE;
 	}
 
 	#endregion
@@ -714,25 +714,25 @@ public static class MiniJsonExtensions
 {
 	public static string toJson( this Hashtable obj )
 	{
-		return ShareMiniJSON.jsonEncode( obj );
+		return MiniJSON.jsonEncode( obj );
 	}
 	
 	
 	public static string toJson( this Dictionary<string,string> obj )
 	{
-		return ShareMiniJSON.jsonEncode( obj );
+		return MiniJSON.jsonEncode( obj );
 	}
 	
 	
 	public static ArrayList arrayListFromJson( this string json )
 	{
-		return ShareMiniJSON.jsonDecode( json ) as ArrayList;
+		return MiniJSON.jsonDecode( json ) as ArrayList;
 	}
 
 
 	public static Hashtable hashtableFromJson( this string json )
 	{
-		return ShareMiniJSON.jsonDecode( json ) as Hashtable;
+		return MiniJSON.jsonDecode( json ) as Hashtable;
 	}
 }
 

Assets/Plugins/ShareSDK/MiniJSON.cs.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 292f3332666627041aeee41ac11e4981
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/ShareSDK/ShareContent.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.18408
@@ -390,7 +390,7 @@ namespace cn.sharesdk.unity3d
 			if (customizeShareParams.Count > 0) {
 				shareParams["customizeShareParams"] = customizeShareParams;
 			}
-			String jsonStr = ShareMiniJSON.jsonEncode (shareParams);
+			String jsonStr = MiniJSON.jsonEncode (shareParams);
 			Debug.Log("ParseShareParams  ===>>> " + jsonStr );
 			return jsonStr;
 		}
@@ -399,7 +399,7 @@ namespace cn.sharesdk.unity3d
 			if (customizeShareParams.Count > 0) {
 				shareParams["customizeShareParams"] = customizeShareParams;
 			}
-			String jsonStr = ShareMiniJSON.jsonEncode (shareParams);
+			String jsonStr = MiniJSON.jsonEncode (shareParams);
 			Debug.Log("ParseShareParams  ===>>> " + jsonStr );
 			return shareParams;
 		}

Assets/Plugins/ShareSDK/ShareSDK.cs

@@ -18,28 +18,15 @@ namespace cn.sharesdk.unity3d
         public static string QQAppKey = "100371282";
         public static string QQAppSecrete = "aed9b0303e3ed1e27bae87c33761161d";
 
-        //public static string WeChatAppKey = "wx4868b35061f87885";
-        //public static string WeChatSecrete = "64020361b8ec4c99936c0e3999a9f249";
-        public static string WeChatAppKey = "wxfefb3bdab3362c21";
-        public static string WeChatSecrete = "96f884bc929f8f39e5ba239738084921";
+        public static string QQZoneAppKey = "100371282";
+        public static string QQZoneAppSecreteForIOS = "aed9b0303e3ed1e27bae87c33761161d";
+        public static string QQZoneAppSecreteForAndroid = "ae36f4ee3946e1cbb98d6965b0b2ff5c";
 
-        //public static string SinaAppKey = "568898243";
-        //public static string SinaAppSecrete = "38a4f8204cc784f81f9f0daaf31e02e3";
-        public static string SinaAppKey = "1089133069";
-        public static string SinaAppSecrete = "f44fdbcf346c507cd989ebdbcb8cd251";
+        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 GoogleAppKey = "";
-        public static string GoogleAppSecrete = "";
-        public static string GoogleClientID = "839373660096-rekqhoistqv24rvb0luobcfmjbo6gonj.apps.googleusercontent.com";
-
-        //public static string FacebookAppKey = "107704292745179";
-        //public static string FacebookAppSecrete = "38053202e1a5fe26c80c753071f0b573";
-        public static string FacebookAppKey = "1996720443893282";
-        public static string FacebookAppSecrete = "45a70c021b5cdde6f1f82891181d0306";
+        public static string FacebookAppKey = "107704292745179";
+        public static string FacebookAppSecrete = "38053202e1a5fe26c80c753071f0b573";
 
         private int reqID;
 		public DevInfoSet devInfo;
@@ -109,7 +96,7 @@ namespace cn.sharesdk.unity3d
 				return;
 			}
 			
-			Hashtable res = (Hashtable) ShareMiniJSON.jsonDecode(data);
+			Hashtable res = (Hashtable) MiniJSON.jsonDecode(data);
 			if (res == null || res.Count <= 0) 
 			{
 				return;

Assets/Plugins/Android/ShareSDK/libs/MobCommons-2017.0322.1909.jar.meta → Assets/Plugins/ShareSDK/ShareSDKConfig.bin.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 726a90485c44d4d69b299d5d86a69c14
-timeCreated: 1492482999
+guid: 3a67ea23574974ca1aacef0c26da5e5e
+timeCreated: 1497531812
 licenseType: Free
 DefaultImporter:
   userData: 

Assets/Plugins/ShareSDK/ShareSDKConfig.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections;
+using UnityEngine;
+
+namespace cn.sharesdk.unity3d
+{
+		[Serializable]
+		public class ShareSDKConfig
+		{
+				public string appKey;
+				public string appSecret;
+
+				public ShareSDKConfig()
+				{
+						this.appKey = "moba6b6c6d6";
+						this.appSecret = "b89d2427a3bc7ad1aea1e1e8c1d36bf3";
+				}
+		}		
+				
+}
+
+

Assets/Plugins/ShareSDK/ShareSDKConfig.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 153c65500f2e44affa69f16c58ad0d27
+timeCreated: 1495809287
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/ShareSDK/ShareSDKDevInfo.cs

@@ -120,16 +120,16 @@ namespace cn.sharesdk.unity3d
 
 	public class QZone : DevInfo 
 	{
-		#if UNITY_ANDROID
+#if UNITY_ANDROID
 		public string SortId = "1";
 		public const int type = (int) PlatformType.QZone;
-		public string AppId = ShareSDK.QQAppKey;
-		public string AppKey = ShareSDK.QQAppSecrete;
+		public string AppId = ShareSDK.QQZoneAppKey;
+		public string AppKey = ShareSDK.QQZoneAppSecreteForAndroid;
 		public bool ShareByAppClient = true;
 #elif UNITY_IPHONE
 		public const int type = (int) PlatformType.QZone;
-		public string app_id = ShareSDK.QQAppKey;
-		public string app_key = ShareSDK.QQAppSecrete;
+		public string app_id = ShareSDK.QQZoneAppKey;
+		public string app_key = ShareSDK.QQZoneAppSecreteForIOS;
 		public string auth_type = "both";  //can pass "both","sso",or "web" 
 #endif
     }
@@ -141,13 +141,13 @@ namespace cn.sharesdk.unity3d
 		#if UNITY_ANDROID
 		public string SortId = "5";
 		public const int type = (int) PlatformType.WeChat;
-		public string AppId = ShareSDK.WeChatAppKey;
-		public string AppSecret = ShareSDK.WeChatSecrete;
+		//public string AppId = ShareSDK.WeChatAppKey;
+		//public string AppSecret = ShareSDK.WeChatSecrete;
 		public bool BypassApproval = true;
 #elif UNITY_IPHONE
 		public const int type = (int) PlatformType.WeChat;
-		public string app_id = ShareSDK.WeChatAppKey;
-		public string app_secret = ShareSDK.WeChatSecrete;
+		//public string app_id = ShareSDK.WeChatAppKey;
+		//public string app_secret = ShareSDK.WeChatSecrete;
 #endif
     }
 
@@ -156,13 +156,13 @@ namespace cn.sharesdk.unity3d
 		#if UNITY_ANDROID
 		public string SortId = "6";
 		public const int type = (int) PlatformType.WeChatMoments;
-		public string AppId = ShareSDK.WeChatAppKey;
-		public string AppSecret = ShareSDK.WeChatSecrete;
+		//public string AppId = ShareSDK.WeChatAppKey;
+		//public string AppSecret = ShareSDK.WeChatSecrete;
 		public bool BypassApproval = false;
 #elif UNITY_IPHONE
 		public const int type = (int) PlatformType.WeChatMoments;
-		public string app_id = ShareSDK.WeChatAppKey;
-		public string app_secret = ShareSDK.WeChatSecrete;
+		//public string app_id = ShareSDK.WeChatAppKey;
+		//public string app_secret = ShareSDK.WeChatSecrete;
 #endif
     }
 
@@ -367,13 +367,13 @@ namespace cn.sharesdk.unity3d
 		#if UNITY_ANDROID
 		public string SortId = "19";
 		public const int type = (int) PlatformType.GooglePlus;
-	    public string ClientID = ShareSDK.GoogleAppKey;
+	    //public string ClientID = ShareSDK.GoogleAppKey;
 		public string RedirectUrl = "http://localhost";
 		public bool	ShareByAppClient = false;
 #elif UNITY_IPHONE
 		public const int type = (int) PlatformType.GooglePlus;
-		public string client_id = ShareSDK.GoogleAppKey;
-		public string client_secret = ShareSDK.GoogleAppSecrete;
+		//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

Assets/Plugins/ShareSDK/ShareSDKImpl.cs

@@ -17,6 +17,8 @@ namespace cn.sharesdk.unity3d{
 		/// </summary>
 		public abstract void InitSDK (String appKey);
 
+		public abstract void InitSDK (String appKey,String screct);
+
 		/// <summary>
 		/// Sets the platform config.
 		/// </summary>

Assets/Plugins/ShareSDK/iOS/iOSImpl.cs

@@ -74,9 +74,14 @@ namespace cn.sharesdk.unity3d
 			_appKey = appKey;
 		}
 
+		public override void InitSDK (String appKey,String appSecret) 
+		{
+			_appKey = appKey;
+		}
+
 		public override void SetPlatformConfig (Hashtable configs) 
 		{
-			String json = ShareMiniJSON.jsonEncode(configs);
+			String json = MiniJSON.jsonEncode(configs);
 			__iosShareSDKRegisterAppAndSetPltformsConfig (_appKey, json);
 		}
 		
@@ -122,7 +127,7 @@ namespace cn.sharesdk.unity3d
 				{
 					platTypesArr.Add((int)type);
 				}
-				platTypesStr = ShareMiniJSON.jsonEncode(platTypesArr.ToArray());
+				platTypesStr = MiniJSON.jsonEncode(platTypesArr.ToArray());
 			}
 			__iosShareSDKOneKeyShare (reqID, platTypesStr, content.GetShareParamsStr(), _callbackObjectName);
 		}
@@ -137,7 +142,7 @@ namespace cn.sharesdk.unity3d
 				{
 					platTypesArr.Add((int)type);
 				}
-				platTypesStr = ShareMiniJSON.jsonEncode(platTypesArr.ToArray());
+				platTypesStr = MiniJSON.jsonEncode(platTypesArr.ToArray());
 			}
 			
 			__iosShareSDKShowShareMenu (reqID, platTypesStr, content.GetShareParamsStr(), x, y, _callbackObjectName);
@@ -151,13 +156,13 @@ namespace cn.sharesdk.unity3d
 
 		public override void ShareWithContentName (int reqId, PlatformType platform, string contentName, Hashtable customFields)
 		{
-			String customFieldsStr = ShareMiniJSON.jsonEncode(customFields);
+			String customFieldsStr = MiniJSON.jsonEncode(customFields);
 			__iosShareSDKShareWithContentName (reqId, (int)platform, contentName, customFieldsStr,  _callbackObjectName);
 		}
 
 		public override void ShowPlatformListWithContentName (int reqId, string contentName, Hashtable customFields, PlatformType[] platforms, int x, int y)
 		{
-			String customFieldsStr = ShareMiniJSON.jsonEncode(customFields);
+			String customFieldsStr = MiniJSON.jsonEncode(customFields);
 			string platTypesStr = null;
 			if (platforms != null)
 			{
@@ -166,7 +171,7 @@ namespace cn.sharesdk.unity3d
 				{
 					platTypesArr.Add((int)type);
 				}
-				platTypesStr = ShareMiniJSON.jsonEncode(platTypesArr.ToArray());
+				platTypesStr = MiniJSON.jsonEncode(platTypesArr.ToArray());
 			}
 		
 			__iosShareSDKShowShareMenuWithContentName (reqId, contentName, customFieldsStr, platTypesStr, x, y, _callbackObjectName);
@@ -174,7 +179,7 @@ namespace cn.sharesdk.unity3d
 
 		public override void ShowShareContentEditorWithContentName (int reqId, PlatformType platform, string contentName, Hashtable customFields)
 		{
-			String customFieldsStr = ShareMiniJSON.jsonEncode(customFields);
+			String customFieldsStr = MiniJSON.jsonEncode(customFields);
 			__iosShareSDKShowShareViewWithContentName (reqId, (int)platform, contentName, customFieldsStr, _callbackObjectName);
 		}
 
@@ -192,7 +197,7 @@ namespace cn.sharesdk.unity3d
 		{
 			//need modify,
 			string credStr = __iosShareSDKGetCredential((int)platform);
-			Hashtable authInfo = (Hashtable)ShareMiniJSON.jsonDecode (credStr);
+			Hashtable authInfo = (Hashtable)MiniJSON.jsonDecode (credStr);
 			return authInfo;
 		}
 		

Assets/Plugins/iOS/ShareSDKUnity3DBridge.m

@@ -2742,7 +2742,7 @@ extern "C" {
     {
         NSMutableArray *activePlatforms = [NSMutableArray array];
         NSMutableDictionary *platformsDict = [NSMutableDictionary dictionary];
-        NSString *appKeyStr = [NSString stringWithCString:appKey encoding:NSUTF8StringEncoding];
+//        NSString *appKeyStr = [NSString stringWithCString:appKey encoding:NSUTF8StringEncoding];
         
         if (configInfo)
         {
@@ -2760,8 +2760,7 @@ extern "C" {
             
             
         }
-        [ShareSDK registerApp:appKeyStr
-              activePlatforms:activePlatforms
+        [ShareSDK registerActivePlatforms:activePlatforms
                      onImport:^(SSDKPlatformType platformType) {
                          switch (platformType)
                          {

Assets/Resource/DragonBones/3rdParty/MiniJSON.cs

@@ -32,7 +32,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
-namespace MiniJSON {
+namespace DragonbonesMiniJSON {
     // Example usage:
     //
     //  using UnityEngine;

Assets/Resource/DragonBones/Unity/src/DragonBones/unity/UnityFactory.cs

@@ -417,7 +417,7 @@ namespace DragonBones
                 }
             }
 
-            return ParseDragonBonesData((Dictionary<string, object>)MiniJSON.Json.Deserialize(dragonBonesJSON.text), name, scale); // Unity default Scale Factor.
+            return ParseDragonBonesData((Dictionary<string, object>)DragonbonesMiniJSON.Json.Deserialize(dragonBonesJSON.text), name, scale); // Unity default Scale Factor.
         }
         /**
          * @language zh_CN
@@ -476,7 +476,7 @@ namespace DragonBones
                 return null;
             }
 
-            var textureAtlasData = ParseTextureAtlasData((Dictionary<string, object>)MiniJSON.Json.Deserialize(textureAtlasJSON.text), null, name, scale) as UnityTextureAtlasData;
+            var textureAtlasData = ParseTextureAtlasData((Dictionary<string, object>)DragonbonesMiniJSON.Json.Deserialize(textureAtlasJSON.text), null, name, scale) as UnityTextureAtlasData;
             var path = _textureAtlasPath;
 
             var index = path.LastIndexOf("Resources");
@@ -511,7 +511,7 @@ namespace DragonBones
 
             BundlePath = bundlePath;
 
-            var textureAtlasData = ParseTextureAtlasData((Dictionary<string, object>)MiniJSON.Json.Deserialize(textureAtlasJSON.text), null, null, 0.0f) as UnityTextureAtlasData;
+            var textureAtlasData = ParseTextureAtlasData((Dictionary<string, object>)DragonbonesMiniJSON.Json.Deserialize(textureAtlasJSON.text), null, null, 0.0f) as UnityTextureAtlasData;
 
             _refreshTextureAtlas(textureAtlasData);
 

Assets/Resource/Shader/Gray.shader

@@ -14,6 +14,7 @@
 		_StencilReadMask("Stencil Read Mask", Float) = 255
 		_StencilWriteMask("Stencil Write Mask", Float) = 255
 
+		_GrayLerp("GrayLerp", range(0,1)) = 1
 		_GrayScaleX("GrayScaleX", range(0,1)) = 0.299
 		_GrayScaleY("GrayScaleY", range(0,1)) = 0.587
 		_GrayScaleZ("GrayScaleZ", range(0,1)) = 0.114
@@ -76,6 +77,7 @@
 				float4 worldPosition : TEXCOORD1;
 			};
 
+			float _GrayLerp;
 			float _GrayScaleX;
 			float _GrayScaleY;
 			float _GrayScaleZ;
@@ -102,7 +104,11 @@
 
 				fixed gray = dot(col.rgb, fixed3(_GrayScaleX, _GrayScaleY, _GrayScaleZ));
 
-				col.rgb = fixed3(gray, gray, gray);
+				fixed newR = lerp(col.r, gray, _GrayLerp);
+				fixed newG = lerp(col.g, gray, _GrayLerp);
+				fixed newB = lerp(col.b, gray, _GrayLerp);
+
+				col.rgb = fixed3(newR, newG, newB);
 
 				col.a *= i.color.a; //CanvasGroup
 

Assets/Resource/Sprite/Garden/Flower1.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower10.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower11.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower12.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower13.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower14.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower15.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower16.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower17.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower18.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower19.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower2.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower20.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower21.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower22.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower23.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower24.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower25.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower26.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower27.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower3.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower4.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower5.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower6.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower7.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower8.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower9.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/FlowerAtlas.png.meta

@@ -0,0 +1,506 @@
+fileFormatVersion: 2
+guid: bd007edf149fd024f99f0c5d743d0d57
+timeCreated: 1498656795
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName:
+    21300000: Flower25
+    21300002: Flower19
+    21300004: Flower21
+    21300006: Flower3
+    21300008: Flower26
+    21300010: Flower5
+    21300012: Flower20
+    21300014: Flower13
+    21300016: Flower22
+    21300018: Flower27
+    21300020: Flower6
+    21300022: Flower17
+    21300024: Flower8
+    21300026: Flower24
+    21300028: FlowerAtlas_14
+    21300030: Flower15
+    21300032: Flower4
+    21300034: Flower10
+    21300036: Flower18
+    21300038: Flower9
+    21300040: Flower12
+    21300042: FlowerAtlas_21
+    21300044: Flower16
+    21300046: Flower14
+    21300048: Flower2
+    21300050: Flower7
+    21300052: Flower23
+    21300054: Flower1
+    21300056: Flower11
+  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: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 200.00002, y: 184.49998}
+  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
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: Flower25
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 2167
+        width: 388
+        height: 391
+      alignment: 9
+      pivot: {x: 0.525974, y: 0.4691517}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower19
+      rect:
+        serializedVersion: 2
+        x: 396
+        y: 2213
+        width: 426
+        height: 345
+      alignment: 9
+      pivot: {x: 0.4716981, y: 0.5349854}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower21
+      rect:
+        serializedVersion: 2
+        x: 827
+        y: 2218
+        width: 426
+        height: 340
+      alignment: 9
+      pivot: {x: 0.4692671, y: 0.5414201}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower3
+      rect:
+        serializedVersion: 2
+        x: 1258
+        y: 2179
+        width: 371
+        height: 380
+      alignment: 9
+      pivot: {x: 0.5, y: 0.4853723}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower26
+      rect:
+        serializedVersion: 2
+        x: 1635
+        y: 2189
+        width: 362
+        height: 369
+      alignment: 9
+      pivot: {x: 0.55, y: 0.5027248}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower5
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 1791
+        width: 365
+        height: 370
+      alignment: 9
+      pivot: {x: 0.5, y: 0.4972752}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower20
+      rect:
+        serializedVersion: 2
+        x: 396
+        y: 1810
+        width: 372
+        height: 364
+      alignment: 9
+      pivot: {x: 0.4405406, y: 0.5609418}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower13
+      rect:
+        serializedVersion: 2
+        x: 828
+        y: 1854
+        width: 378
+        height: 359
+      alignment: 9
+      pivot: {x: 0.4920425, y: 0.5140056}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower22
+      rect:
+        serializedVersion: 2
+        x: 1212
+        y: 1813
+        width: 364
+        height: 361
+      alignment: 9
+      pivot: {x: 0.5027701, y: 0.6197771}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower27
+      rect:
+        serializedVersion: 2
+        x: 1635
+        y: 1814
+        width: 362
+        height: 370
+      alignment: 9
+      pivot: {x: 0.5555556, y: 0.5027248}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower6
+      rect:
+        serializedVersion: 2
+        x: 373
+        y: 1426
+        width: 339
+        height: 379
+      alignment: 9
+      pivot: {x: 0.5, y: 0.4853723}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower17
+      rect:
+        serializedVersion: 2
+        x: 773
+        y: 1452
+        width: 333
+        height: 395
+      alignment: 9
+      pivot: {x: 0.5334346, y: 0.4669211}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower8
+      rect:
+        serializedVersion: 2
+        x: 1213
+        y: 1446
+        width: 363
+        height: 362
+      alignment: 9
+      pivot: {x: 0.5, y: 0.6197772}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower24
+      rect:
+        serializedVersion: 2
+        x: 1582
+        y: 1420
+        width: 310
+        height: 386
+      alignment: 9
+      pivot: {x: 0.4967532, y: 0.4611399}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: FlowerAtlas_14
+      rect:
+        serializedVersion: 2
+        x: 1792
+        y: 1798
+        width: 11
+        height: 11
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower15
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 1445
+        width: 360
+        height: 341
+      alignment: 9
+      pivot: {x: 0.4343576, y: 0.5418879}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower4
+      rect:
+        serializedVersion: 2
+        x: 773
+        y: 1051
+        width: 333
+        height: 395
+      alignment: 9
+      pivot: {x: 0.5, y: 0.4643766}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower10
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 1089
+        width: 350
+        height: 351
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5244253}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower18
+      rect:
+        serializedVersion: 2
+        x: 374
+        y: 1044
+        width: 338
+        height: 377
+      alignment: 9
+      pivot: {x: 0.5178571, y: 0.4866667}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower9
+      rect:
+        serializedVersion: 2
+        x: 1111
+        y: 1104
+        width: 348
+        height: 336
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5464072}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower12
+      rect:
+        serializedVersion: 2
+        x: 1582
+        y: 1026
+        width: 310
+        height: 385
+      alignment: 9
+      pivot: {x: 0.5, y: 0.4727979}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: FlowerAtlas_21
+      rect:
+        serializedVersion: 2
+        x: 1792
+        y: 1404
+        width: 11
+        height: 11
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower16
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 731
+        width: 344
+        height: 353
+      alignment: 9
+      pivot: {x: 0.5292398, y: 0.5171428}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower14
+      rect:
+        serializedVersion: 2
+        x: 374
+        y: 700
+        width: 373
+        height: 338
+      alignment: 9
+      pivot: {x: 0.5216216, y: 0.5446429}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower2
+      rect:
+        serializedVersion: 2
+        x: 760
+        y: 677
+        width: 259
+        height: 368
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower7
+      rect:
+        serializedVersion: 2
+        x: 1111
+        y: 712
+        width: 286
+        height: 385
+      alignment: 9
+      pivot: {x: 0.5, y: 0.45625}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower23
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 371
+        width: 341
+        height: 355
+      alignment: 9
+      pivot: {x: 0.4852941, y: 0.5454546}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower1
+      rect:
+        serializedVersion: 2
+        x: 351
+        y: 340
+        width: 243
+        height: 355
+      alignment: 9
+      pivot: {x: 0.5829875, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower11
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 7
+        width: 196
+        height: 359
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5126405}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Skill/4大技能1.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: ui
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Skill/4大技能2.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: ui
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Skill/4大技能3.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: ui
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Skill/4大技能4.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: ui
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Skill/Skill.png.meta

@@ -0,0 +1,520 @@
+fileFormatVersion: 2
+guid: ff54675045a50274cb3e0094de4954e5
+timeCreated: 1498706521
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName:
+    21300000: "4\u5927\u6280\u80FD4"
+    21300002: "4\u5927\u6280\u80FD3"
+    21300004: "\u7EFF-\u514D\u8D39\u91D1\u5E01"
+    21300006: "\u7EFF-\u91D1\u5E01\u53051"
+    21300008: "\u9EC4-\u9EC4\u8272\u871C\u8702"
+    21300010: "\u9EC4-\u84DD\u8774\u8776"
+    21300012: "\u9EC4-\u767D\u8272\u871C\u8702"
+    21300014: "\u84DD-\u5927\u91CF\u94BB\u77F3"
+    21300016: "\u7EA2-\u516C\u56ED"
+    21300018: "\u9EC4-\u7D2B\u8272\u871C\u8702"
+    21300020: "\u84DD-\u9AD8\u7EA7\u5305"
+    21300022: "\u9EC4-\u9EC4\u8774\u8776"
+    21300024: "4\u5927\u6280\u80FD2"
+    21300026: "\u9EC4-\u767D\u8774\u8776"
+    21300028: "\u84DD-\u4E2D\u91CF\u94BB\u77F3"
+    21300030: "4\u5927\u6280\u80FD1"
+    21300032: "\u84DD-\u521D\u7EA7\u5305"
+    21300034: "\u7EA2-\u5F69\u8679"
+    21300036: "\u84DD-\u4E2D\u7EA7\u5305"
+    21300038: "\u7EFF-\u7E41\u82B1\u4F3C\u9526"
+    21300040: "\u84DD-\u514D\u8D39\u94BB"
+    21300042: "\u84DD-\u5C0F\u91CF\u94BB\u77F3"
+    21300044: "\u7EA2-\u9EC4\u9E42\u9E1F"
+    21300046: "\u7EFF-\u91D1\u5E01\u53052"
+    21300048: "\u7EFF-\u91D1\u5E01\u53053"
+    21300050: "\u9EC4-\u7EA2\u8272\u871C\u8702"
+    21300052: "\u9EC4-\u7EA2\u8774\u8776"
+    21300054: "\u7EA2-\u6A31\u82B1\u6811"
+    21300056: "\u9EC4-\u7D2B\u8774\u8776"
+    21300058: "\u9EC4-\u84DD\u8272\u871C\u8702"
+  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: 2
+  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
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: "4\u5927\u6280\u80FD4"
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 770
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "4\u5927\u6280\u80FD3"
+      rect:
+        serializedVersion: 2
+        x: 234
+        y: 770
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EFF-\u514D\u8D39\u91D1\u5E01"
+      rect:
+        serializedVersion: 2
+        x: 464
+        y: 770
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EFF-\u91D1\u5E01\u53051"
+      rect:
+        serializedVersion: 2
+        x: 694
+        y: 808
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u9EC4\u8272\u871C\u8702"
+      rect:
+        serializedVersion: 2
+        x: 886
+        y: 808
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u84DD\u8774\u8776"
+      rect:
+        serializedVersion: 2
+        x: 1078
+        y: 808
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u767D\u8272\u871C\u8702"
+      rect:
+        serializedVersion: 2
+        x: 1270
+        y: 808
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u5927\u91CF\u94BB\u77F3"
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 540
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EA2-\u516C\u56ED"
+      rect:
+        serializedVersion: 2
+        x: 234
+        y: 540
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u7D2B\u8272\u871C\u8702"
+      rect:
+        serializedVersion: 2
+        x: 464
+        y: 578
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u9AD8\u7EA7\u5305"
+      rect:
+        serializedVersion: 2
+        x: 656
+        y: 578
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u9EC4\u8774\u8776"
+      rect:
+        serializedVersion: 2
+        x: 848
+        y: 616
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "4\u5927\u6280\u80FD2"
+      rect:
+        serializedVersion: 2
+        x: 1040
+        y: 616
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u767D\u8774\u8776"
+      rect:
+        serializedVersion: 2
+        x: 1232
+        y: 616
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u4E2D\u91CF\u94BB\u77F3"
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 310
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "4\u5927\u6280\u80FD1"
+      rect:
+        serializedVersion: 2
+        x: 234
+        y: 310
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u521D\u7EA7\u5305"
+      rect:
+        serializedVersion: 2
+        x: 464
+        y: 386
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EA2-\u5F69\u8679"
+      rect:
+        serializedVersion: 2
+        x: 656
+        y: 386
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u4E2D\u7EA7\u5305"
+      rect:
+        serializedVersion: 2
+        x: 848
+        y: 424
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EFF-\u7E41\u82B1\u4F3C\u9526"
+      rect:
+        serializedVersion: 2
+        x: 1040
+        y: 424
+        width: 187
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u514D\u8D39\u94BB"
+      rect:
+        serializedVersion: 2
+        x: 1231
+        y: 425
+        width: 188
+        height: 187
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u5C0F\u91CF\u94BB\u77F3"
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 80
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EA2-\u9EC4\u9E42\u9E1F"
+      rect:
+        serializedVersion: 2
+        x: 234
+        y: 80
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EFF-\u91D1\u5E01\u53052"
+      rect:
+        serializedVersion: 2
+        x: 464
+        y: 194
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EFF-\u91D1\u5E01\u53053"
+      rect:
+        serializedVersion: 2
+        x: 656
+        y: 194
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u7EA2\u8272\u871C\u8702"
+      rect:
+        serializedVersion: 2
+        x: 848
+        y: 232
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u7EA2\u8774\u8776"
+      rect:
+        serializedVersion: 2
+        x: 1040
+        y: 232
+        width: 187
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EA2-\u6A31\u82B1\u6811"
+      rect:
+        serializedVersion: 2
+        x: 1231
+        y: 233
+        width: 187
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u7D2B\u8774\u8776"
+      rect:
+        serializedVersion: 2
+        x: 848
+        y: 41
+        width: 188
+        height: 187
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u84DD\u8272\u871C\u8702"
+      rect:
+        serializedVersion: 2
+        x: 1231
+        y: 42
+        width: 187
+        height: 187
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Skill/红-公园.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: ui
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Skill/红-彩虹.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: ui
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Skill/红-樱花树.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: ui
+  assetBundleName: 
   assetBundleVariant: