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

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/Android/builds.zip.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9cb5c3e4dd0dd574ba655453ad15edfa
-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/Advertisements/Editor/Resources/Android.meta → Assets/Extension.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 34f35527a1d66ca48a1c8a28dec93f5b
+guid: b948198483a8b93419206e81215060f3
 folderAsset: yes
-timeCreated: 1494301205
+timeCreated: 1496150477
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/Plugins/Android/ShareSDK/AndroidManifest.xml

@@ -17,8 +17,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
     
     <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
+        android:minSdkVersion="8"/>
 
     <application>
         <activity

Assets/Plugins/ShareSDK/ShareSDK.cs

@@ -90,7 +90,7 @@ namespace cn.sharesdk.unity3d
 #if UNITY_ANDROID
 			shareSDKUtils = new AndroidImpl(gameObject);
 #elif UNITY_IPHONE
-			shareSDKUtils = new iOSImpl(gameObject);
+			//shareSDKUtils = new iOSImpl(gameObject);
 #endif
             shareSDKUtils.InitSDK(MobAppKey);
             shareSDKUtils.SetPlatformConfig(platformConfigs);

Assets/Plugins/ShareSDK/iOS/iOSImpl.cs

@@ -7,202 +7,202 @@ using System.Runtime.InteropServices;
 namespace cn.sharesdk.unity3d
 {
 	#if UNITY_IPHONE
-	public class iOSImpl : ShareSDKImpl
-	{
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKRegisterAppAndSetPltformsConfig (string appKey, string configInfo);
+	//public class iOSImpl : ShareSDKImpl
+	//{
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKRegisterAppAndSetPltformsConfig (string appKey, string configInfo);
 		
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKAuthorize (int reqID, int platType, string observer);
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKAuthorize (int reqID, int platType, string observer);
 		
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKCancelAuthorize (int platType);
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKCancelAuthorize (int platType);
 		
-		[DllImport("__Internal")]
-		private static extern bool __iosShareSDKHasAuthorized (int platType);
+		//[DllImport("__Internal")]
+		//private static extern bool __iosShareSDKHasAuthorized (int platType);
 		
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKGetUserInfo (int reqID, int platType, string observer);
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKGetUserInfo (int reqID, int platType, string observer);
 		
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKShare (int reqID, int platType, string content, string observer);
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKShare (int reqID, int platType, string content, string observer);
 		
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKOneKeyShare (int reqID, string platTypes, string content, string observer);
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKOneKeyShare (int reqID, string platTypes, string content, string observer);
 		
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKShowShareMenu (int reqID, string platTypes, string content, int x, int y, string observer);
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKShowShareMenu (int reqID, string platTypes, string content, int x, int y, string observer);
 		
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKShowShareView (int reqID, int platType, string content, string observer);
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKShowShareView (int reqID, int platType, string content, string observer);
 		
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKGetFriendsList (int reqID, int platType,int count, int page, string observer);
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKGetFriendsList (int reqID, int platType,int count, int page, string observer);
 		
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKFollowFriend (int reqID, int platform,string account, string observer);
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKFollowFriend (int reqID, int platform,string account, string observer);
 		
-		[DllImport("__Internal")]
-		private static extern string __iosShareSDKGetCredential (int platType);
+		//[DllImport("__Internal")]
+		//private static extern string __iosShareSDKGetCredential (int platType);
 		
-		[DllImport("__Internal")]
-		private static extern bool __iosShareSDKIsClientInstalled (int platType);
+		//[DllImport("__Internal")]
+		//private static extern bool __iosShareSDKIsClientInstalled (int platType);
 
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKShareWithContentName (int reqID, int platform, string contentName, string customFields, string observer);
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKShareWithContentName (int reqID, int platform, string contentName, string customFields, string observer);
 
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKShowShareMenuWithContentName (int reqID, string contentName, string customFields, string platTypes, int x, int y, string observer);
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKShowShareMenuWithContentName (int reqID, string contentName, string customFields, string platTypes, int x, int y, string observer);
 
-		[DllImport("__Internal")]
-		private static extern void __iosShareSDKShowShareViewWithContentName (int reqID, int platform, string contentName, string customFields, string observer);
+		//[DllImport("__Internal")]
+		//private static extern void __iosShareSDKShowShareViewWithContentName (int reqID, int platform, string contentName, string customFields, string observer);
 
-		private string _callbackObjectName = "Main Camera";
-		private string _appKey;
-		public iOSImpl (GameObject go) 
-		{
-			Debug.Log("iOSUtils  ===>>>  iOSUtils" );
-			try{
-				_callbackObjectName = go.name;
-			} catch(Exception e) {
-				Console.WriteLine("{0} Exception caught.", e);
-			}
-		}
+		//private string _callbackObjectName = "Main Camera";
+		//private string _appKey;
+		//public iOSImpl (GameObject go) 
+		//{
+		//	Debug.Log("iOSUtils  ===>>>  iOSUtils" );
+		//	try{
+		//		_callbackObjectName = go.name;
+		//	} catch(Exception e) {
+		//		Console.WriteLine("{0} Exception caught.", e);
+		//	}
+		//}
 			
-		public override void InitSDK (String appKey) 
-		{
-			_appKey = appKey;
-		}
+		//public override void InitSDK (String appKey) 
+		//{
+		//	_appKey = appKey;
+		//}
 
-		public override void SetPlatformConfig (Hashtable configs) 
-		{
-			String json = ShareMiniJSON.jsonEncode(configs);
-			__iosShareSDKRegisterAppAndSetPltformsConfig (_appKey, json);
-		}
-		
-		public override void Authorize(int reqID, PlatformType platform) 
-		{
-			__iosShareSDKAuthorize (reqID, (int)platform, _callbackObjectName);
-		}
-		
-		public override void CancelAuthorize (PlatformType platform) 
-		{
-			__iosShareSDKCancelAuthorize ((int)platform);
-		}
-		
-		public override bool IsAuthorized (PlatformType platform) 
-		{
+		//public override void SetPlatformConfig (Hashtable configs) 
+		//{
+		//	String json = ShareMiniJSON.jsonEncode(configs);
+		//	__iosShareSDKRegisterAppAndSetPltformsConfig (_appKey, json);
+		//}
+		
+		//public override void Authorize(int reqID, PlatformType platform) 
+		//{
+		//	__iosShareSDKAuthorize (reqID, (int)platform, _callbackObjectName);
+		//}
+		
+		//public override void CancelAuthorize (PlatformType platform) 
+		//{
+		//	__iosShareSDKCancelAuthorize ((int)platform);
+		//}
+		
+		//public override bool IsAuthorized (PlatformType platform) 
+		//{
 			
-			return __iosShareSDKHasAuthorized ((int)platform);
-		}
+		//	return __iosShareSDKHasAuthorized ((int)platform);
+		//}
 		
-		public override bool IsClientValid (PlatformType platform)
-		{
-			return __iosShareSDKIsClientInstalled ((int)platform);
-		}
+		//public override bool IsClientValid (PlatformType platform)
+		//{
+		//	return __iosShareSDKIsClientInstalled ((int)platform);
+		//}
 		
-		public override void GetUserInfo (int reqID, PlatformType platform) 
-		{
-			__iosShareSDKGetUserInfo (reqID, (int)platform, _callbackObjectName);
-		}
+		//public override void GetUserInfo (int reqID, PlatformType platform) 
+		//{
+		//	__iosShareSDKGetUserInfo (reqID, (int)platform, _callbackObjectName);
+		//}
 		
-		public override void ShareContent (int reqID, PlatformType platform, ShareContent content) 
-		{
+		//public override void ShareContent (int reqID, PlatformType platform, ShareContent content) 
+		//{
 			
-			__iosShareSDKShare (reqID, (int)platform, content.GetShareParamsStr(), _callbackObjectName);
-		}
-		
-		public override void ShareContent (int reqID, PlatformType[] platforms, ShareContent content) 
-		{
-			string platTypesStr = null;
-			if (platforms != null)
-			{
-				List<int> platTypesArr = new List<int>();
-				foreach (PlatformType type in platforms)
-				{
-					platTypesArr.Add((int)type);
-				}
-				platTypesStr = ShareMiniJSON.jsonEncode(platTypesArr.ToArray());
-			}
-			__iosShareSDKOneKeyShare (reqID, platTypesStr, content.GetShareParamsStr(), _callbackObjectName);
-		}
-		
-		public override void ShowPlatformList (int reqID, PlatformType[] platforms, ShareContent content, int x, int y) 
-		{
-			string platTypesStr = null;
-			if (platforms != null)
-			{
-				List<int> platTypesArr = new List<int>();
-				foreach (PlatformType type in platforms)
-				{
-					platTypesArr.Add((int)type);
-				}
-				platTypesStr = ShareMiniJSON.jsonEncode(platTypesArr.ToArray());
-			}
+		//	__iosShareSDKShare (reqID, (int)platform, content.GetShareParamsStr(), _callbackObjectName);
+		//}
+		
+		//public override void ShareContent (int reqID, PlatformType[] platforms, ShareContent content) 
+		//{
+		//	string platTypesStr = null;
+		//	if (platforms != null)
+		//	{
+		//		List<int> platTypesArr = new List<int>();
+		//		foreach (PlatformType type in platforms)
+		//		{
+		//			platTypesArr.Add((int)type);
+		//		}
+		//		platTypesStr = ShareMiniJSON.jsonEncode(platTypesArr.ToArray());
+		//	}
+		//	__iosShareSDKOneKeyShare (reqID, platTypesStr, content.GetShareParamsStr(), _callbackObjectName);
+		//}
+		
+		//public override void ShowPlatformList (int reqID, PlatformType[] platforms, ShareContent content, int x, int y) 
+		//{
+		//	string platTypesStr = null;
+		//	if (platforms != null)
+		//	{
+		//		List<int> platTypesArr = new List<int>();
+		//		foreach (PlatformType type in platforms)
+		//		{
+		//			platTypesArr.Add((int)type);
+		//		}
+		//		platTypesStr = ShareMiniJSON.jsonEncode(platTypesArr.ToArray());
+		//	}
 			
-			__iosShareSDKShowShareMenu (reqID, platTypesStr, content.GetShareParamsStr(), x, y, _callbackObjectName);
-		}
+		//	__iosShareSDKShowShareMenu (reqID, platTypesStr, content.GetShareParamsStr(), x, y, _callbackObjectName);
+		//}
 		
-		public override void ShowShareContentEditor (int reqID, PlatformType platform, ShareContent content) 
-		{
-			__iosShareSDKShowShareView (reqID, (int)platform, content.GetShareParamsStr(), _callbackObjectName);
+		//public override void ShowShareContentEditor (int reqID, PlatformType platform, ShareContent content) 
+		//{
+		//	__iosShareSDKShowShareView (reqID, (int)platform, content.GetShareParamsStr(), _callbackObjectName);
 			
-		}
+		//}
 
-		public override void ShareWithContentName (int reqId, PlatformType platform, string contentName, Hashtable customFields)
-		{
-			String customFieldsStr = ShareMiniJSON.jsonEncode(customFields);
-			__iosShareSDKShareWithContentName (reqId, (int)platform, contentName, customFieldsStr,  _callbackObjectName);
-		}
+		//public override void ShareWithContentName (int reqId, PlatformType platform, string contentName, Hashtable customFields)
+		//{
+		//	String customFieldsStr = ShareMiniJSON.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 platTypesStr = null;
-			if (platforms != null)
-			{
-				List<int> platTypesArr = new List<int>();
-				foreach (PlatformType type in platforms)
-				{
-					platTypesArr.Add((int)type);
-				}
-				platTypesStr = ShareMiniJSON.jsonEncode(platTypesArr.ToArray());
-			}
-		
-			__iosShareSDKShowShareMenuWithContentName (reqId, contentName, customFieldsStr, platTypesStr, x, y, _callbackObjectName);
-		}
+		//public override void ShowPlatformListWithContentName (int reqId, string contentName, Hashtable customFields, PlatformType[] platforms, int x, int y)
+		//{
+		//	String customFieldsStr = ShareMiniJSON.jsonEncode(customFields);
+		//	string platTypesStr = null;
+		//	if (platforms != null)
+		//	{
+		//		List<int> platTypesArr = new List<int>();
+		//		foreach (PlatformType type in platforms)
+		//		{
+		//			platTypesArr.Add((int)type);
+		//		}
+		//		platTypesStr = ShareMiniJSON.jsonEncode(platTypesArr.ToArray());
+		//	}
+		
+		//	__iosShareSDKShowShareMenuWithContentName (reqId, contentName, customFieldsStr, platTypesStr, x, y, _callbackObjectName);
+		//}
 
-		public override void ShowShareContentEditorWithContentName (int reqId, PlatformType platform, string contentName, Hashtable customFields)
-		{
-			String customFieldsStr = ShareMiniJSON.jsonEncode(customFields);
-			__iosShareSDKShowShareViewWithContentName (reqId, (int)platform, contentName, customFieldsStr, _callbackObjectName);
-		}
+		//public override void ShowShareContentEditorWithContentName (int reqId, PlatformType platform, string contentName, Hashtable customFields)
+		//{
+		//	String customFieldsStr = ShareMiniJSON.jsonEncode(customFields);
+		//	__iosShareSDKShowShareViewWithContentName (reqId, (int)platform, contentName, customFieldsStr, _callbackObjectName);
+		//}
 
-		public override void GetFriendList (int reqID, PlatformType platform, int count, int page) 
-		{
-			__iosShareSDKGetFriendsList (reqID, (int)platform, count, page, _callbackObjectName);
-		}
-		
-		public override void AddFriend (int reqID, PlatformType platform, String account)
-		{
-			__iosShareSDKFollowFriend (reqID, (int)platform, account, _callbackObjectName);
-		}
-		
-		public override Hashtable GetAuthInfo (PlatformType platform) 
-		{
-			//need modify,
-			string credStr = __iosShareSDKGetCredential((int)platform);
-			Hashtable authInfo = (Hashtable)ShareMiniJSON.jsonDecode (credStr);
-			return authInfo;
-		}
-		
-		public override void DisableSSO (Boolean open)
-		{
-			// no this interface on iOS
-			Console.WriteLine ("#waring : no this interface on iOS");
-		}
-		
-		
-	}
+		//public override void GetFriendList (int reqID, PlatformType platform, int count, int page) 
+		//{
+		//	__iosShareSDKGetFriendsList (reqID, (int)platform, count, page, _callbackObjectName);
+		//}
+		
+		//public override void AddFriend (int reqID, PlatformType platform, String account)
+		//{
+		//	__iosShareSDKFollowFriend (reqID, (int)platform, account, _callbackObjectName);
+		//}
+		
+		//public override Hashtable GetAuthInfo (PlatformType platform) 
+		//{
+		//	//need modify,
+		//	string credStr = __iosShareSDKGetCredential((int)platform);
+		//	Hashtable authInfo = (Hashtable)ShareMiniJSON.jsonDecode (credStr);
+		//	return authInfo;
+		//}
+		
+		//public override void DisableSSO (Boolean open)
+		//{
+		//	// no this interface on iOS
+		//	Console.WriteLine ("#waring : no this interface on iOS");
+		//}
+		
+		
+	//}
 	#endif
 }

Assets/Resource/XML/PlayerConfig.xml

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

Assets/Script/Extension/ExtensionImage.cs

@@ -1,22 +0,0 @@
-using UnityEngine;
-using UnityEngine.UI;
-
-using System.Collections;
-
-public static class ExtensionImage
-{
-    public static void Resize(this Image image, float ratioX, float ratioY)
-    {
-        Vector2 newSize = image.sprite.rect.size;
-
-        newSize.x *= ratioX;
-        newSize.y *= ratioY;
-
-        image.rectTransform.sizeDelta = newSize;
-    }
-
-    public static void Resize(this Image image, Vector2 newSize)
-    {
-        image.rectTransform.sizeDelta = newSize;
-    }
-}

Assets/Script/Extension/ExtensionResize.cs

@@ -0,0 +1,143 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+using System.Collections;
+
+public static class ExtensionResize
+{
+    public static void Resize(this Image image, bool ratio, float x = -999999999, float y = -999999999)
+    {
+        Vector2 newSize;
+
+        SizeMap(ratio, image.sprite.rect.size, ref x, ref y);
+
+        if (ratio)
+        {
+            newSize = image.sprite.rect.size;
+
+            newSize.x *= x;
+            newSize.y *= y;
+        }
+        else
+        {
+            newSize = new Vector2(x, y);
+        }
+
+        image.rectTransform.sizeDelta = newSize;
+    }
+
+    public static void Resize(this Image image, bool ratio, Vector2 size)
+    {
+        Vector2 newSize;
+
+        if (ratio)
+        {
+            newSize = image.sprite.rect.size;
+
+            newSize.x *= size.x;
+            newSize.y *= size.y;
+        }
+        else
+        {
+            newSize = size;
+        }
+
+        image.rectTransform.sizeDelta = newSize;
+    }
+
+
+    public static void Resize(this RectTransform rectTransform, bool ratio, float x = -999999999, float y = -999999999)
+    {
+        Vector2 newSize;
+
+        SizeMap(ratio, rectTransform.rect.size, ref x, ref y);
+
+        if (ratio)
+        {
+            newSize = rectTransform.rect.size;
+
+            newSize.x *= x;
+            newSize.y *= y;
+        }
+        else
+        {
+            newSize = new Vector2(x, y);
+        }
+
+        rectTransform.sizeDelta = newSize;
+    }
+
+    public static void Resize(this RectTransform rectTransform, bool ratio, Vector2 size)
+    {
+        Vector2 newSize;
+
+        if (ratio)
+        {
+            newSize = rectTransform.rect.size;
+
+            newSize.x *= size.x;
+            newSize.y *= size.y;
+        }
+        else
+        {
+            newSize = size;
+        }
+
+        rectTransform.sizeDelta = newSize;
+    }
+
+
+    public static void Resize(this Text text, bool preferredWidth, bool preferredHeight)
+    {
+        Vector2 newSize = new Vector2();
+
+        if (preferredWidth)
+        {
+            newSize.x = text.preferredWidth;
+        }
+        else
+        {
+            newSize.x = -999999999;
+        }
+
+        if (preferredHeight)
+        {
+            newSize.x = text.preferredHeight;
+        }
+        else
+        {
+            newSize.y = -999999999;
+        }
+
+        text.rectTransform.Resize(false, newSize.x, newSize.y);
+    }
+
+
+    private static void SizeMap(bool ratio, Vector2 size, ref float x, ref float y)
+    {
+        if (ratio)
+        {
+            if (x.Equal(-999999999))
+            {
+                x = 1;
+            }
+
+            if (y.Equal(-999999999))
+            {
+                y = 1;
+            }
+        }
+        else
+        {
+            if (x.Equal(-999999999))
+            {
+                x = size.x;
+            }
+
+            if (y.Equal(-999999999))
+            {
+                y = size.y;
+            }
+        }
+    }
+}

Assets/Script/Extension/ExtensionImage.cs.meta → Assets/Script/Extension/ExtensionResize.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 27f5fab8a07e03d43b8e88ed5087c9f4
-timeCreated: 1496149993
+guid: 4a0b30308b458c34795380f6be7f720a
+timeCreated: 1497429014
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

Assets/Script/Manage/ManaCenter.cs

@@ -3,13 +3,13 @@
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Events;
+using UnityEngine.Analytics;
 using UnityEngine.EventSystems;
 
 using System;
 using System.Xml;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEngine.Analytics;
 
 public class ManaCenter : Regist 
 {
@@ -148,13 +148,11 @@ public class ManaCenter : Regist
                 }
             }
 
-            //if (Level_ == 200)
+            //if (Level_ >= 18)
             //{
             //    if (ManaTutorial.TutorialB_)
             //    {
             //        ManaTutorial.TutorialB = true;
-
-            //        ManaTutorial.PrepareStepB1();
             //    }
             //}
         }

Assets/Script/Manage/ManaGarden.cs

@@ -377,7 +377,7 @@ public class ManaGarden : Regist
 
         image.sprite = flowerInfo.Icon;
 
-        image.Resize(0.65f, 0.65f);
+        image.Resize(true, 0.65f, 0.65f);
     }
 
 

Assets/Script/Manage/ManaIAP.cs

@@ -78,7 +78,7 @@ public class ManaIAP : MonoBehaviour, IStoreListener
 
     public static void InitializeShare()
     {
-        if (Application.isMobilePlatform || Application.platform == RuntimePlatform.IPhonePlayer)
+        if (Application.isMobilePlatform)
         {
             ShareSdk = Instance.gameObject.AddComponent<ShareSDK>();
 

Assets/Script/Manage/ManaMiniGame.cs

@@ -17,6 +17,15 @@ public class Award
     public static int BonusCoin;
     public static int BonusDiamond;
     public static string Info;
+    
+    public int Rate; 
+    public int Coin;
+    public int Score; 
+    public int Diamond; 
+    public bool FlowerFlag;
+    public bool DiamondFlag;
+
+    #region 配置
 
     public static int FlowerID;
     public static bool FlowerLock;
@@ -33,35 +42,35 @@ public class Award
 
     #endregion
 
+    #endregion
+
     public void GetAward(int score)
     {
         #region 获得奖励
 
         #region Rate
 
-        int rate;
+        Score = (int)Mathf.Clamp(score, 1, Mathf.Infinity);
 
-        score = (int)Mathf.Clamp(score, 1, Mathf.Infinity);
-
-        if (score < Standard[1])
+        if (Score < Standard[1])
         {
-            rate = 0;
+            Rate = 0;
         }
-        else if (score < Standard[2])
+        else if (Score < Standard[2])
         {
-            rate = 1;
+            Rate = 1;
         }
         else
         {
-            rate = 2;
+            Rate = 2;
         }
 
         #endregion
 
         #region Reset
 
-        bool flowerFlag = false;
-        bool diamondFlag = false;
+        FlowerFlag = false;
+        DiamondFlag = false;
 
         #endregion
 
@@ -70,46 +79,63 @@ public class Award
 
         #region Coin
 
-        int coin = (int)Auxiliary.FmlParse(CoinFml, "s", score.ToString(), "l", Mathf.Clamp(ManaCenter.Level, 1, 9999).ToString());
-        coin = (int)(coin * (1 + ManaCenter.SkillPlus) + BonusCoin);
-        coin = (int) Mathf.Clamp(coin, 1, Mathf.Infinity);
+        Coin = (int)Auxiliary.FmlParse(CoinFml, "s", Score.ToString(), "l", Mathf.Clamp(ManaCenter.Level, 1, 9999).ToString());
+        Coin = (int)(Coin * (1 + ManaCenter.SkillPlus) + BonusCoin);
+        Coin = (int) Mathf.Clamp(Coin, 1, Mathf.Infinity);
+
+        ManaReso.Get<Text>("Da_CoinLab").text = Coin.ToString();
+        ManaReso.Get<Text>("Da_CoinLab").Resize(true, false);
+        ManaReso.Get<ContentSizeFitter>("Da_CoinGroup").enabled = true;
 
-        ManaCenter.Coin += coin;
+        ManaReso.SetActive("Da_CoinLab", true);
 
-        sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(金币)>", coin);
+        ManaCenter.Coin += Coin;
+
+        sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(金币)>", Coin);
 
         #endregion
 
         #region Diamond
 
-        int diamond = 0;
         float diamondRate = (float)Auxiliary.FmlParse(DiamondFml, "l", Mathf.Clamp(ManaCenter.Level, 1, 1000).ToString());
-
+        
         if (Random.Range(0, 1f) <= diamondRate)
         {
-            diamondFlag = true;
+            DiamondFlag = true;
+
+            Diamond = (int)(Mathf.Lerp(DiamondMin, DiamondMax, Random.Range(0, 1f)) + BonusDiamond);
+
+            ManaReso.Get<Text>("Da_DiamondLab").text = Diamond.ToString();
+            ManaReso.Get<Text>("Da_DiamondLab").Resize(true, false);
+            ManaReso.Get<ContentSizeFitter>("Da_DiamondGroup").enabled = true;
 
-            diamond = (int)(Mathf.Lerp(DiamondMin, DiamondMax, Random.Range(0, 1f)) + BonusDiamond);
+            ManaReso.SetActive("Da_DiamondLab", true);
 
-            ManaCenter.Diamond += diamond;
+            ManaCenter.Diamond += Diamond;
 
             ManaReso.SetActive("Da_Diamond", true);
 
-            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(钻石)>", diamond);
+            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(钻石)>", Diamond);
         }
         else
         {
             if (BonusDiamond > 0)
             {
-                diamondFlag = true;
+                DiamondFlag = true;
 
-                diamond = BonusDiamond;
+                Diamond = BonusDiamond;
 
-                ManaCenter.Diamond += diamond;
+                ManaReso.Get<Text>("Da_DiamondLab").text = Diamond.ToString();
+                ManaReso.Get<Text>("Da_DiamondLab").Resize(true, false);
+                ManaReso.Get<ContentSizeFitter>("Da_DiamondGroup").enabled = true;
+
+                ManaReso.SetActive("Da_DiamondLab", true);
+
+                ManaCenter.Diamond += Diamond;
 
                 ManaReso.SetActive("Da_Diamond", true);
 
-                sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(钻石)>", diamond);
+                sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(钻石)>", Diamond);
             }
         }
 
@@ -119,14 +145,14 @@ public class Award
 
         if (ManaTutorial.TutorialA)
         {
-            flowerFlag = true;
+            FlowerFlag = true;
 
             FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[1];
 
             ManaReso.SetActive("Da_FlowerIcon", true);
 
             ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
-            ManaReso.Get<Image>("Da_FlowerIcon").Resize(0.2f, 0.2f);
+            ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.2f, 0.2f);
 
             ManaReso.SetText("Da_FlowerLab", flowerInfo.Name);
 
@@ -136,9 +162,9 @@ public class Award
         {       
             if (!FlowerLock)
             {
-                flowerFlag = true;
+                FlowerFlag = true;
 
-                if (Random.Range(0, 1f) <= Odds[rate])
+                if (Random.Range(0, 1f) <= Odds[Rate])
                 {
                     FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[FlowerID];
 
@@ -148,7 +174,7 @@ public class Award
                     ManaReso.SetActive("Da_Flower", true);
 
                     ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
-                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(0.2f, 0.2f);
+                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.2f, 0.2f);
 
                     ManaReso.SetText("Da_FlowerLab", flowerInfo.Name);
 
@@ -172,6 +198,26 @@ public class Award
 
         #endregion
 
+        ManaReso.SetActive("Da_Info", true);
+
+        Auxiliary.Instance.DelayCall
+            (
+                () =>
+                {
+                    ManaReso.Get<Text>("Da_CoinLab").SetLayoutDirty();
+                    ManaReso.Get<Text>("Da_DiamondLab").SetLayoutDirty();
+
+                    ManaReso.Get<ContentSizeFitter>("Da_CoinGroup").enabled = false;
+                    ManaReso.Get<ContentSizeFitter>("Da_DiamondGroup").enabled = false;
+
+                    InitializeAnim();
+                },
+                2
+            );
+    }
+
+    public void InitializeAnim()
+    {
         #region 构造动画
 
         #region Reset
@@ -193,16 +239,16 @@ public class Award
         ManaReso.SetActive("Da_DiamondLab", false);
 
         ManaReso.SetActive("Da_VGroup", true);
-        ManaReso.SetActive("Da_HGroup", false);
+        ManaReso.SetActive("Da_HGroup1", false);
         ManaReso.SetActive("Da_FlowerGroup", false);
         ManaReso.SetActive("Da_DiamondGroup", false);
 
-        if (flowerFlag)
+        if (FlowerFlag)
         {
             ManaReso.SetActive("Da_FlowerGroup", true);
         }
 
-        if (diamondFlag)
+        if (DiamondFlag)
         {
             ManaReso.SetActive("Da_DiamondGroup", true);
         }
@@ -221,15 +267,15 @@ public class Award
         );
 
 
-        float timeCoin = Mathf.Lerp(0, 1.5f, Mathf.Clamp01(coin / 15f));
-        float timeScore = Mathf.Lerp(0, 1.5f, Mathf.Clamp01(score / 50f));
-        float timeDiamond = Mathf.Lerp(0, 1.5f, Mathf.Clamp01(diamond / 15f));
+        float timeCoin = Mathf.Lerp(0, 1.5f, Mathf.Clamp01(Coin / 15f));
+        float timeScore = Mathf.Lerp(0, 1.5f, Mathf.Clamp01(Score / 50f));
+        float timeDiamond = Mathf.Lerp(0, 1.5f, Mathf.Clamp01(Diamond / 15f));
 
         float time = Mathf.Max(timeCoin, timeDiamond);
-        
-        ManaReso.Get("Da_CoinLab").CreateTweenNumber(0, coin, time, false, true, Curve.EaseOutQuad);
-        ManaReso.Get("Da_ScoreLab").CreateTweenNumber(0, score, timeScore, false, true, Curve.EaseOutQuad);
-        ManaReso.Get("Da_DiamondLab").CreateTweenNumber(0, diamond, time, false, true, Curve.EaseOutQuad);
+
+        ManaReso.Get("Da_CoinLab").CreateTweenNumber(0, Coin, time, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("Da_ScoreLab").CreateTweenNumber(0, Score, timeScore, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("Da_DiamondLab").CreateTweenNumber(0, Diamond, time, false, true, Curve.EaseOutQuad);
 
         #endregion
 
@@ -238,7 +284,7 @@ public class Award
 
         TweenRoot tween;
 
-        if (flowerFlag)
+        if (FlowerFlag)
         {
             tween = ManaReso.Get("Da_CoinLab").GetTweenNumber();
 
@@ -256,7 +302,7 @@ public class Award
 
         #region 按钮
 
-        if (flowerFlag)
+        if (FlowerFlag)
         {
             tween = ManaReso.Get("Da_FlowerGroup").GetTweenScale();
 
@@ -310,15 +356,15 @@ public class Award
 
         #region 得分
 
-        if (rate == 0)
+        if (Rate == 0)
         {
             tween = ManaReso.Get("Da_Star1").GetTweenScale();
         }
-        else if (rate == 1)
+        else if (Rate == 1)
         {
             tween = ManaReso.Get("Da_Star2").GetTweenScale();
         }
-        else if (rate == 2)
+        else if (Rate == 2)
         {
             tween = ManaReso.Get("Da_Star3").GetTweenScale();
         }
@@ -367,17 +413,17 @@ public class Award
             {
                 ManaReso.Get("Da_Star1").TweenReForScale();
 
-                ManaReso.SetActive("Da_HGroup", true);
+                ManaReso.SetActive("Da_HGroup1", true);
             }
         );
 
 
-        if (rate == 0)
+        if (Rate == 0)
         {
             ManaReso.SetActive("Da_Star2", false);
             ManaReso.SetActive("Da_Star3", false);
         }
-        else if (rate == 1)
+        else if (Rate == 1)
         {
             ManaReso.SetActive("Da_Star2", true);
             ManaReso.SetActive("Da_Star3", false);
@@ -394,7 +440,7 @@ public class Award
                 }
             );
         }
-        else if (rate == 2)
+        else if (Rate == 2)
         {
             ManaReso.SetActive("Da_Star2", true);
             ManaReso.SetActive("Da_Star3", true);
@@ -437,7 +483,7 @@ public class Award
             {
                 ManaReso.Get("Da_CoinGroup").TweenReForScale();
 
-                if (diamondFlag)
+                if (DiamondFlag)
                 {
                     ManaReso.Get("Da_DiamondGroup").TweenReForScale();
                 }
@@ -455,7 +501,7 @@ public class Award
             }
         );
 
-        if (diamondFlag)
+        if (DiamondFlag)
         {
             tween = ManaReso.Get("Da_DiamondGroup").GetTweenScale();
 
@@ -836,30 +882,6 @@ public class ManaMiniGame : Regist
     }
 
 
-    public static void Fade()
-    {
-        for (int i = 0; i < IndexList.Count; i++)
-        {
-            Flower flower = FlowerDic[IndexList[i]];
-            
-            if (FadeList.UniqueAdd(flower))
-            {
-                IdleList.Remove(flower);
-
-                flower.PlayParticle();
-
-                flower.FlowerIcon.TweenForSr();
-
-                if (FadeList.Count == 6)
-                {
-                    RoundBegin();
-                }
-                
-                break;
-            }
-        }
-    }
-
     public static void Operate(int index)
     {
         if (Panalty || !FadeList.Valid())
@@ -874,11 +896,22 @@ public class ManaMiniGame : Regist
 
         if (index == IndexList[0])
         {
+            int uiIndex = IndexMap(IndexList[0]);
+
+            ManaReso.Get<Image>("D_FlowerBtn" + uiIndex).material = Shortcut.GrayMat;
+
+            ManaReso.Get<Button>("D_FlowerBtn" + uiIndex).interactable = false;
+
+            ManaReso.Get<Image>("D_FlowerIcon" + uiIndex).material = Shortcut.GrayMat;
+
+            ManaReso.SetActive("D_FlowerTick" + uiIndex, true);
+
             IndexList.RemoveAt(0);
 
+
             Flower flower = FlowerDic[index];
 
-            ManaReso.GetHudText("+45", Color.white, 90, flower.ChildDic["ScorePosTra"], ManaReso.Get("D_MiniGame"), true);
+            ManaReso.GetHudText("+45", Color.white, 90, flower.ChildDic["ScorePosTra"], ManaReso.Get("D_HudParent"), true);
 
             Score += 45;
 
@@ -941,6 +974,37 @@ public class ManaMiniGame : Regist
         }
     }
 
+    public static void ResetOprerate()
+    {
+        ManaReso.Get<Image>("D_FlowerBtn1").material = null;
+        ManaReso.Get<Image>("D_FlowerBtn2").material = null;
+        ManaReso.Get<Image>("D_FlowerBtn3").material = null;
+        ManaReso.Get<Image>("D_FlowerBtn4").material = null;
+        ManaReso.Get<Image>("D_FlowerBtn5").material = null;
+        ManaReso.Get<Image>("D_FlowerBtn6").material = null;
+
+        ManaReso.Get<Button>("D_FlowerBtn1").interactable = true;
+        ManaReso.Get<Button>("D_FlowerBtn2").interactable = true;
+        ManaReso.Get<Button>("D_FlowerBtn3").interactable = true;
+        ManaReso.Get<Button>("D_FlowerBtn4").interactable = true;
+        ManaReso.Get<Button>("D_FlowerBtn5").interactable = true;
+        ManaReso.Get<Button>("D_FlowerBtn6").interactable = true;
+
+        ManaReso.Get<Image>("D_FlowerIcon1").material = null;
+        ManaReso.Get<Image>("D_FlowerIcon2").material = null;
+        ManaReso.Get<Image>("D_FlowerIcon3").material = null;
+        ManaReso.Get<Image>("D_FlowerIcon4").material = null;
+        ManaReso.Get<Image>("D_FlowerIcon5").material = null;
+        ManaReso.Get<Image>("D_FlowerIcon6").material = null;
+
+        ManaReso.SetActive("D_FlowerTick1", false);
+        ManaReso.SetActive("D_FlowerTick2", false);
+        ManaReso.SetActive("D_FlowerTick3", false);
+        ManaReso.SetActive("D_FlowerTick4", false);
+        ManaReso.SetActive("D_FlowerTick5", false);
+        ManaReso.SetActive("D_FlowerTick6", false);
+    }
+
     public static void CreateOperate()
     {
         ManaAudio.PlayClip(Clip.BubbleClip);
@@ -982,34 +1046,28 @@ public class ManaMiniGame : Regist
         }
     }
 
-    public static void InitializeAward()
-    {
-        float flowerRate = (float)Auxiliary.FmlParse(Award.FlowerFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
 
-        if (Random.Range(0, 1f) <= flowerRate)
+    public static void Fade()
+    {
+        for (int i = 0; i < IndexList.Count; i++)
         {
-            if (ManaGarden.MyFlower < ManaGarden.TotalFlower)
+            Flower flower = FlowerDic[IndexList[i]];
+
+            if (FadeList.UniqueAdd(flower))
             {
-                foreach (var kv in ManaGarden.FlowerInfoDic)
-                {
-                    if (kv.Value.Unlock == false)
-                    {
-                        Award.FlowerID = kv.Value.ID_;
+                IdleList.Remove(flower);
 
-                        Award.FlowerLock = false;
+                flower.PlayParticle();
 
-                        break;
-                    }
+                flower.FlowerIcon.TweenForSr();
+
+                if (FadeList.Count == 6)
+                {
+                    RoundBegin();
                 }
+
+                break;
             }
-            else
-            {
-                Award.FlowerLock = true;
-            }
-        }
-        else
-        {
-            Award.FlowerLock = true;
         }
     }
 
@@ -1024,13 +1082,20 @@ public class ManaMiniGame : Regist
         GameA = true;
         //if (ManaCenter.Level >= 18)
         //{
-        //    if (Random.Range(0f, 1f) <= 0.5f)
+        //    if (ManaTutorial.TutorialB)
         //    {
         //        GameB = true;
         //    }
         //    else
         //    {
-        //        GameA = true;
+        //        if (Random.Range(0f, 1f) <= 0.5f)
+        //        {
+        //            GameB = true;
+        //        }
+        //        else
+        //        {
+        //            GameA = true;
+        //        }
         //    }
         //}
         //else
@@ -1039,6 +1104,37 @@ public class ManaMiniGame : Regist
         //}
     }
 
+    public static void InitializeAward()
+    {
+        float flowerRate = (float)Auxiliary.FmlParse(Award.FlowerFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
+
+        if (Random.Range(0, 1f) <= flowerRate)
+        {
+            if (ManaGarden.MyFlower < ManaGarden.TotalFlower)
+            {
+                foreach (var kv in ManaGarden.FlowerInfoDic)
+                {
+                    if (kv.Value.Unlock == false)
+                    {
+                        Award.FlowerID = kv.Value.ID_;
+
+                        Award.FlowerLock = false;
+
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                Award.FlowerLock = true;
+            }
+        }
+        else
+        {
+            Award.FlowerLock = true;
+        }
+    }
+
 
     public static void GameEnd()
     {
@@ -1115,6 +1211,11 @@ public class ManaMiniGame : Regist
             }
         }
 
+        if (ManaTutorial.TutorialB)
+        {
+            InitializeMode();
+        }
+
         if (GameA)
         {
             GameEnterA();
@@ -1212,6 +1313,10 @@ public class ManaMiniGame : Regist
         PrepareLab.SetParent(ManaReso.Get("D_PrepareLayout2"));
 
 
+        ResetOprerate();
+
+        ManaReso.Get("D_Mask").TweenBacGra();
+
         ManaReso.SetActive("D_FlowerBtn1", false);
         ManaReso.SetActive("D_FlowerBtn2", false);
         ManaReso.SetActive("D_FlowerBtn3", false);
@@ -1283,8 +1388,6 @@ public class ManaMiniGame : Regist
         {
             IdleList[i].FlowerIcon.CreateTweenSr(1, 0, 0.25f, true, false, Curve.EaseOutQuad, false, true);
         }
-
-        ManaReso.Get("D_Mask").TweenBacGra();
     }
 
     public static void GameBegin()
@@ -1359,12 +1462,12 @@ public class ManaMiniGame : Regist
             ManaReso.SetActive("D_FlowerBtn5", true);
             ManaReso.SetActive("D_FlowerBtn6", true);
 
-            ManaReso.SetSprite("D_FlowerIcon1", FlowerDic[1].FlowerInfo.Icon).Resize(1f, 1f);
-            ManaReso.SetSprite("D_FlowerIcon2", FlowerDic[2].FlowerInfo.Icon).Resize(1f, 1f);
-            ManaReso.SetSprite("D_FlowerIcon3", FlowerDic[4].FlowerInfo.Icon).Resize(1f, 1f);
-            ManaReso.SetSprite("D_FlowerIcon4", FlowerDic[5].FlowerInfo.Icon).Resize(1f, 1f);
-            ManaReso.SetSprite("D_FlowerIcon5", FlowerDic[7].FlowerInfo.Icon).Resize(1f, 1f);
-            ManaReso.SetSprite("D_FlowerIcon6", FlowerDic[8].FlowerInfo.Icon).Resize(1f, 1f);
+            ManaReso.SetSprite("D_FlowerIcon1", FlowerDic[1].FlowerInfo.Icon).Resize(true, 1f, 1f);
+            ManaReso.SetSprite("D_FlowerIcon2", FlowerDic[2].FlowerInfo.Icon).Resize(true, 1f, 1f);
+            ManaReso.SetSprite("D_FlowerIcon3", FlowerDic[4].FlowerInfo.Icon).Resize(true, 1f, 1f);
+            ManaReso.SetSprite("D_FlowerIcon4", FlowerDic[5].FlowerInfo.Icon).Resize(true, 1f, 1f);
+            ManaReso.SetSprite("D_FlowerIcon5", FlowerDic[7].FlowerInfo.Icon).Resize(true, 1f, 1f);
+            ManaReso.SetSprite("D_FlowerIcon6", FlowerDic[8].FlowerInfo.Icon).Resize(true, 1f, 1f);
         }
 
         PrepareLab.StreamForScale();
@@ -1401,11 +1504,51 @@ public class ManaMiniGame : Regist
 
             i--;
         }
+
+        ResetOprerate();
     }
 
     public static void RoundBegin()
     {
         ManaReso.Get("D_Mask").TweenBacGra();
+
+        if (ManaTutorial.TutorialB)
+        {
+            ManaTutorial.EnterB1();
+        }
+    }
+
+
+    public static int IndexMap(int slotIndex)
+    {
+        if (slotIndex == 1)
+        {
+            return 1;
+        }
+        else if (slotIndex == 2)
+        {
+            return 2;
+        }
+        else if (slotIndex == 4)
+        {
+            return 3;
+        }
+        else if (slotIndex == 5)
+        {
+            return 4;
+        }
+        else if (slotIndex == 7)
+        {
+            return 5;
+        }
+        else if (slotIndex == 8)
+        {
+            return 6;
+        }
+        else
+        {
+            throw new Exception();
+        }
     }
 
 

Assets/Script/Manage/ManaSign.cs

@@ -124,7 +124,7 @@ public class Sign
 
                     ManaReso.SetSprite("Bb_IconA0", flowerInfo.Icon);
 
-                    ManaReso.Get<Image>("Bb_IconA0").Resize(0.65f, 0.65f);
+                    ManaReso.Get<Image>("Bb_IconA0").Resize(true, 0.65f, 0.65f);
 
                     flowerInfo.Unlock = true;
 
@@ -170,7 +170,7 @@ public class Sign
                 if (flowerInfo.Unlock == false)
                 {
                     Icon.sprite = flowerInfo.Icon;
-                    Icon.Resize(0.2f, 0.2f);
+                    Icon.Resize(true, 0.2f, 0.2f);
 
                     return;
                 }
@@ -180,14 +180,14 @@ public class Sign
         if (Diamond > 0)
         {
             Icon.sprite = ManaReso.LoadSprite("钻石", Folder.UI);
-            Icon.Resize(OriginSize);
+            Icon.Resize(false, OriginSize);
 
             Lab1.text = Diamond.ToString();
         }
         else if (Coin > 0)
         {
             Icon.sprite = ManaReso.LoadSprite("金币", Folder.UI);
-            Icon.Resize(OriginSize);
+            Icon.Resize(false, OriginSize);
 
             Lab1.text = Coin.ToString();
         }

Assets/Script/Manage/ManaTutorial.cs

@@ -699,7 +699,27 @@ public class ManaTutorial : Regist
 
     public static void EndB1()
     {
-        Tutorial.HightDisable();
+        Tutorial.HightDisable(0, false);
+    }
+
+    public static void EndB2()
+    {
+        Tutorial.HightDisable(0, false);
+    }
+
+    public static void EndB3()
+    {
+        Tutorial.HightDisable(0, false);
+    }
+
+    public static void EndB4()
+    {
+        Tutorial.HightDisable(0, false);
+    }
+
+    public static void EndB5()
+    {
+        Tutorial.HightDisable(0, false);
     }
 
     public static void EndB()
@@ -708,219 +728,124 @@ public class ManaTutorial : Regist
 
         TutorialB = false;
 
-        PayExemptAmt = 0;
-        ConnectExemptAmt = 0;
+        ManaMiniGame.Pause = false;
     }
 
 
     public static void EnterB1()
     {
-        TutorialB = false;
         TutorialB_ = false;
 
         ManaReso.Get("N_Mask").TweenForGra();
 
-        ManaReso.Get("Fe_Info").TweenBacCG();
-
         ManaReso.SetActive("N_Tutorial", true);
 
 
-        Ability skill = (Ability) ManaCenter.SkillDic["Ability2"];
+        ManaMiniGame.Pause = true;
 
-        if (skill.ItemStatus == SkillStatus.Upgrade)
-        {
-            EnterB3();
-        }
-        else
-        {
-            MoveRoot move = ManaReso.Get<ScrollRect>("Fa_Scrr").Locate(skill.SkillItem, 1, Curve.EaseOutQuad, LocatePos.Middle);
+        int index = ManaMiniGame.IndexMap(ManaMiniGame.IndexList[0]);
 
-            move.AddEventOnetime
+        Tutorial.HightScreen(ManaReso.Get("D_FlowerArrow" + index), ManaReso.Get("D_FlowerBtn" + index));
+
+        ManaReso.AddButtonEventOnetime
             (
-                EventType.ForwardFinish,
+                "D_FlowerBtn" + index,
                 () =>
                 {
-                    Tutorial.HightScreen(skill.SkillItem.FindChild("Arrow0"), skill.SkillItem.FindChild("Arrow1"), skill.SkillItem.FindChild("Btn"));
+                    EndB1();
+                    EnterB2();
                 }
             );
+    }
+
+    public static void EnterB2()
+    {
+        int index = ManaMiniGame.IndexMap(ManaMiniGame.IndexList[0]);
 
+        Tutorial.HightScreen(ManaReso.Get("D_FlowerArrow" + index), ManaReso.Get("D_FlowerBtn" + index));
 
-            skill.ItemBtn.AddButtonEventOnetime
+        ManaReso.AddButtonEventOnetime
             (
+                "D_FlowerBtn" + index,
                 () =>
                 {
-                    Tutorial.HightDisable(0, true);
+                    EndB2();
+                    EnterB3();
                 }
             );
+    }
 
+    public static void EnterB3()
+    {
+        int index = ManaMiniGame.IndexMap(ManaMiniGame.IndexList[0]);
 
-            TweenRoot tween = ManaReso.Get("Fe_Info").GetTweenCG();
+        Tutorial.HightScreen(ManaReso.Get("D_FlowerArrow" + index), ManaReso.Get("D_FlowerBtn" + index));
 
-            tween.AddEventOnetime
+        ManaReso.AddButtonEventOnetime
             (
-                EventType.ForwardFinish,
+                "D_FlowerBtn" + index,
                 () =>
                 {
-                    Tutorial.HightScreen(ManaReso.Get("Fe_Arrow0"), ManaReso.Get("Fe_Arrow1"), ManaReso.Get("Fe_Btn"));
-
-                    ManaReso.AddButtonEventOnetime
-                    (
-                        "Fe_Btn",
-                        () =>
-                        {
-                            EndB1();
-
-                            move = ManaReso.Get("MainCamera").CreateZoom2D();
-
-                            move.AddEventOnetime
-                            (
-                                EventType.ForwardFinish,
-                                () =>
-                                {
-                                    EnterB2();
-                                }
-                            );
-                        }
-                    );
+                    EndB3();
+                    EnterB4();
                 }
             );
-        }
     }
 
-    public static void EnterB2()
+    public static void EnterB4()
     {
-        ManaReso.Get("N_Mask").TweenForGra();
+        int index = ManaMiniGame.IndexMap(ManaMiniGame.IndexList[0]);
 
-        TweenRoot tween = ManaReso.Get("F_Manage0").TweenForVec();
+        Tutorial.HightScreen(ManaReso.Get("D_FlowerArrow" + index), ManaReso.Get("D_FlowerBtn" + index));
 
-        tween.AddEventOnetime
-        (
-            EventType.ForwardFinish,
-            () =>
-            {
-                Auxiliary.Instance.DelayCall
-                (
-                    () =>
-                    {
-                        ManaReso.Get<Button>("F_Elf").onClick.Invoke();
-                    },
-                    0.25f
-                );
-
-                Auxiliary.Instance.DelayCall
-                (
-                    () =>
-                    {
-                        Transform item = ManaCenter.SkillDic["Ability5"].SkillItem;
-
-                        Tutorial.HightScreen(item.FindChild("Arrow0"), item.FindChild("Arrow1"), item.FindChild("Btn"));
-                    },
-                    0.5f
-                );
-            }
-        );
-
-
-        Ability skill = (Ability) ManaCenter.SkillDic["Ability5"];
-
-        skill.ItemBtn.AddButtonEventOnetime
-        (
-            () =>
-            {
-                Tutorial.HightDisable(0, false);
-            }
-        );
-
-
-        tween = ManaReso.Get("Fe_Info").GetTweenCG();
-
-        tween.AddEventOnetime
-        (
-            EventType.ForwardFinish,
-            () =>
-            {
-                Tutorial.HightScreen(ManaReso.Get("Fe_Arrow0"), ManaReso.Get("Fe_Arrow1"), ManaReso.Get("Fe_Btn"));
-
-                ManaReso.AddButtonEventOnetime
-                (
-                    "Fe_Btn",
-                    () =>
-                    {
-                        EndB();
-                    }
-                );
-            }
-        );
+        ManaReso.AddButtonEventOnetime
+            (
+                "D_FlowerBtn" + index,
+                () =>
+                {
+                    EndB4();
+                    EnterB5();
+                }
+            );
     }
 
-    public static void EnterB3()
+    public static void EnterB5()
     {
-        TweenRoot tween = ManaReso.Get("Fe_Info").TweenBacCG();
-
-        tween.AddEventOnetime
-        (
-            EventType.BackwardFinish,
-            () =>
-            {
-                Auxiliary.Instance.DelayCall
-                (
-                    () =>
-                    {
-                        ManaReso.Get<Button>("F_Elf").onClick.Invoke();
-                    },
-                    0.25f
-                );
-
-                Auxiliary.Instance.DelayCall
-                (
-                    () =>
-                    {
-                        Transform item = ManaCenter.SkillDic["Ability5"].SkillItem;
-
-                        Tutorial.HightScreen(item.FindChild("Arrow0"), item.FindChild("Arrow1"), item.FindChild("Btn"));
-                    },
-                    0.5f
-                );
-            }
-        );
-
+        int index = ManaMiniGame.IndexMap(ManaMiniGame.IndexList[0]);
 
-        Ability skill = (Ability)ManaCenter.SkillDic["Ability5"];
-
-        skill.ItemBtn.AddButtonEventOnetime
-        (
-            () =>
-            {
-                Tutorial.HightDisable(0, false);
-            }
-        );
+        Tutorial.HightScreen(ManaReso.Get("D_FlowerArrow" + index), ManaReso.Get("D_FlowerBtn" + index));
 
+        ManaReso.AddButtonEventOnetime
+            (
+                "D_FlowerBtn" + index,
+                () =>
+                {
+                    EndB5();
+                    EnterB6();
+                }
+            );
+    }
 
-        tween = ManaReso.Get("Fe_Info").GetTweenCG();
+    public static void EnterB6()
+    {
+        int index = ManaMiniGame.IndexMap(ManaMiniGame.IndexList[0]);
 
-        tween.AddEventOnetime
-        (
-            EventType.ForwardFinish,
-            () =>
-            {
-                Tutorial.HightScreen(ManaReso.Get("Fe_Arrow0"), ManaReso.Get("Fe_Arrow1"), ManaReso.Get("Fe_Btn"));
+        Tutorial.HightScreen(ManaReso.Get("D_FlowerArrow" + index), ManaReso.Get("D_FlowerBtn" + index));
 
-                ManaReso.AddButtonEventOnetime
-                (
-                    "Fe_Btn",
-                    () =>
-                    {
-                        EndB();
-                    }
-                );
-            }
-        );
+        ManaReso.AddButtonEventOnetime
+            (
+                "D_FlowerBtn" + index,
+                () =>
+                {
+                    EndB();
+                }
+            );
     }
 }
 
 #region DebugList
 
-//教程有A、C两部分
+//教程有A,B,C三部分
 
 //教程结束后各部分能否正常运行
 //教程的存档

Assets/Script/Manage/ManaUI.cs

@@ -436,12 +436,17 @@ public class ManaUI : Regist
                 ManaReso.SetActive("Da_CoinLab", true);
                 ManaReso.SetActive("Da_DiamondLab", true);
 
-                ManaReso.SetActive("Da_HGroup", false);
+                ManaReso.SetActive("Da_HGroup1", false);
                 ManaReso.SetActive("Da_ScoreTit", false);
                 ManaReso.SetActive("Da_GetAward", false);
                 ManaReso.SetActive("Da_FlowerGroup", false);
                 ManaReso.SetActive("Da_DiamondGroup", true);
 
+                ManaReso.Get<Text>("Da_CoinLab").Resize(true, false);
+                ManaReso.Get<Text>("Da_DiamondLab").Resize(true, false);
+
+                ManaReso.Get<ContentSizeFitter>("Da_CoinGroup").enabled = true;
+                ManaReso.Get<ContentSizeFitter>("Da_DiamondGroup").enabled = true;
 
                 if (!Award.FlowerLock)
                 {
@@ -452,7 +457,7 @@ public class ManaUI : Regist
                     ManaReso.SetActive("Da_Flower", true);
 
                     ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
-                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(0.2f, 0.2f);
+                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.2f, 0.2f);
 
                     ManaReso.SetText("Da_FlowerLab", Language.GetStr("FlowerName", "Flower" + flowerInfo.ID_));
 
@@ -1482,11 +1487,16 @@ public class ManaUI : Regist
             }
         );
 
+        if (!Application.isMobilePlatform)
+        {
+            ManaReso.Get<Button>("L_ShareBtn").interactable = false;
+        }
+
         #endregion
-        
-        #region L_AudioBtn
 
-        ManaReso.SetButtonEvent
+            #region L_AudioBtn
+
+            ManaReso.SetButtonEvent
         (
             "L_AudioBtn",
             () =>

Assets/Script/Object/Drop.cs

@@ -61,13 +61,16 @@ public class Drop : Regist,IPointerClickHandler
 
     public void FixedUpdate()
     {
-        Timer += Time.fixedDeltaTime;
-
-        if (Timer > 5)
+        if (!ManaMiniGame.Pause)
         {
-            Retrieve();
+            Timer += Time.fixedDeltaTime;
+
+            if (Timer > 5)
+            {
+                Retrieve();
 
-            ManaMiniGame.DropList.Remove(this);
+                ManaMiniGame.DropList.Remove(this);
+            }
         }
 
         if (MoveLock)

Assets/Script/Object/DropDiamond.cs

@@ -14,6 +14,6 @@ public class DropDiamond : Drop
 
         Award.BonusDiamond += diamond;
 
-        ManaReso.GetHudText("<(钻石)>+" + diamond, Color.white, 90, transform, ManaReso.Get("D_MiniGame"), true);
+        ManaReso.GetHudText("<(钻石)>+" + diamond, Color.white, 90, transform, ManaReso.Get("D_HudParent"), true);
     }
 }

Assets/Script/Object/DropGold.cs

@@ -20,6 +20,6 @@ public class DropGold : Drop
 
         Award.BonusCoin += coin;
 
-        ManaReso.GetHudText("<(金币)>+" + coin, Color.white, 90, transform, ManaReso.Get("D_MiniGame"), true);
+        ManaReso.GetHudText("<(金币)>+" + coin, Color.white, 90, transform, ManaReso.Get("D_HudParent"), true);
     }
 }

Assets/Script/Object/Flower.cs

@@ -134,7 +134,7 @@ public class FlowerInfo
 
         Image.sprite = Icon;
 
-        Image.Resize(0.2f, 0.2f);
+        Image.Resize(true, 0.2f, 0.2f);
 
         Button.onClick.AddListener
         (
@@ -442,7 +442,7 @@ public class Flower : Regist, IPointerClickHandler
         }
         else
         {
-            ManaReso.GetHudText("+15", Color.white, 90, ChildDic["ScorePosTra"], ManaReso.Get("D_MiniGame"), true);
+            ManaReso.GetHudText("+15", Color.white, 90, ChildDic["ScorePosTra"], ManaReso.Get("D_HudParent"), true);
 
             ManaMiniGame.Score += 15;
 

Assets/Script/Object/Skill/Ability.cs

@@ -159,6 +159,7 @@ public class Ability : SkillRoot
         if (Level > 0)
         {
             AnnulA();
+            AnnulB();
         }
     }
 
@@ -505,7 +506,7 @@ public class Ability : SkillRoot
 
                 if (ID == "Ability1")
                 {
-                    ManaCenter.Level ++;
+                    ManaCenter.Level++;
                 }
             }
         );
@@ -535,6 +536,14 @@ public class Ability : SkillRoot
     }
 
 
+    public virtual void AnnulB()
+    {
+        for (int i = 0; i < Auxiliary.IntParse(UnlockPos, 0); i++)
+        {
+            ManaGarden.LockSlot();
+        }
+    }
+
     public override void AnnulA()
     {
         ManaCenter.Person -= NewPerson;
@@ -543,11 +552,6 @@ public class Ability : SkillRoot
         ManaCenter.SkillPlus -= NewPlus;
         ManaCenter.SkillPersonBuff -= NewPersonBuff;
 
-        for (int i = 0; i < Auxiliary.IntParse(UnlockPos, 0); i++)
-        {
-            ManaGarden.LockSlot();
-        }
-
         if (Math.Abs(NewSkillCD) > 0.0005f)
         {
             for (int i = 0; i < ManaCenter.SkillList.Count; i++)

Assets/Script/Tool/Auxiliary.cs

@@ -124,17 +124,17 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            
+            //ManaCenter.MiniTimer = 0;
         }
 
         if (Input.GetKeyDown(KeyCode.X))
         {
-            
+            //ManaMiniGame.GameTimer = 45;
         }
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-            
+            //ManaMiniGame.Score = 2000;
         }
 
         if (Input.GetKeyDown(KeyCode.V))

Assets/Script/Tool/DashGame/Logo.cs

@@ -1,4 +1,4 @@
- using UnityEngine;
+using UnityEngine;
 using UnityEngine.SceneManagement;
 
 using System;

Assets/Script/Tool/UI/HudText.cs

@@ -57,11 +57,6 @@ public class HudText : Regist
             }
 
             transform.position += new Vector3(0, Speed * Time.fixedDeltaTime, 0);
-
-            if (Text.color.a <= 0.05f)
-            {
-                ManaReso.Save(gameObject);
-            }
         }
     }
 
@@ -77,6 +72,17 @@ public class HudText : Regist
         StayTimer = stay;
 
 
-        Text.CreateTweenCG(1, 0, time, false, false, Curve.EaseOutQuad);
+        TweenCG tween = Text.CreateTweenCG(1, 0, time, true, true, Curve.EaseOutQuad);
+
+        tween.CanvasGroup.alpha = 1;
+
+        tween.AddEventOnetime
+        (
+            EventType.ForwardFinish,
+            () =>
+            {
+                ManaReso.Save(gameObject);
+            }
+        );
     }
 }

ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 5.5.2f1
+m_EditorVersion: 5.5.0f3

ToList.txt

@@ -1,3 +1,12 @@
-小游戏2教程
+//还原PlayerConfig
+
+关闭调试界面
+
+//关闭调试按键
+
+//注意存档覆盖情况
+
+
+装个WPS
 
 监督补上循环特效