备份

Assets/Plugins/ShareSDK/iOS/iOSImpl.cs

@@ -6,203 +6,203 @@ 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);
+#if UNITY_IPHONE
+	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");
-		//}
-		
-		
-	//}
-	#endif
+		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/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/Script/Manage/ManaIAP.cs

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