Commit d56c702d authored by gaorui's avatar gaorui
Browse files

feat(app): 更新分享接口

parent 002db533
No preview for this file type
......@@ -691,7 +691,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.00099182, y: 112.5}
m_SizeDelta: {x: 640, y: 255}
m_SizeDelta: {x: 800, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &154432638
MonoBehaviour:
......@@ -1348,8 +1348,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -200, y: -150}
m_SizeDelta: {x: 200, y: 50}
m_AnchoredPosition: {x: -200, y: -200}
m_SizeDelta: {x: 250, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &412879170
MonoBehaviour:
......@@ -1481,8 +1481,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -200, y: -70}
m_SizeDelta: {x: 200, y: 50}
m_AnchoredPosition: {x: -200, y: -100}
m_SizeDelta: {x: 250, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &460951944
MonoBehaviour:
......@@ -3169,6 +3169,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
exitDialog: {fileID: 951489758}
localResourceImage: {fileID: 0}
--- !u!1 &1135382759
GameObject:
m_ObjectHideFlags: 0
......@@ -3666,8 +3667,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -200, y: 70}
m_SizeDelta: {x: 200, y: 50}
m_AnchoredPosition: {x: -200, y: 85}
m_SizeDelta: {x: 250, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1252018359
MonoBehaviour:
......@@ -3715,7 +3716,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnWXShareText
m_MethodName: OnWXShareImage
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
......@@ -3800,7 +3801,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -200, y: 0}
m_SizeDelta: {x: 200, y: 50}
m_SizeDelta: {x: 250, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1259612083
MonoBehaviour:
......@@ -3848,7 +3849,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnWXShareImage
m_MethodName: OnWXShareText
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
......@@ -5498,7 +5499,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 640, y: 480}
m_SizeDelta: {x: 800, y: 560}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1668801350
MonoBehaviour:
......@@ -5842,8 +5843,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -200, y: 150}
m_SizeDelta: {x: 200, y: 50}
m_AnchoredPosition: {x: -200, y: 170}
m_SizeDelta: {x: 250, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1780901905
MonoBehaviour:
......
......@@ -314,10 +314,7 @@ public class GameManager : MonoBehaviour
};
string jsonStr = JsonConvert.SerializeObject(shareParams);
HoolaiSdkManager.ShareData(ShareType.WECHAT_TIMELINE, jsonStr);
HoolaiSdkManager.ShareData(ShareType.WECHAT_TIMELINE, shareParams);
}
public void OnWXShareImage()
......@@ -346,10 +343,7 @@ public class GameManager : MonoBehaviour
};
string jsonStr = JsonConvert.SerializeObject(shareParams);
HoolaiSdkManager.ShareData(ShareType.WECHAT_SESSION, jsonStr);
HoolaiSdkManager.ShareData(ShareType.WECHAT_SESSION, shareParams);
}
else
{
......@@ -371,10 +365,7 @@ public class GameManager : MonoBehaviour
};
string jsonStr = JsonConvert.SerializeObject(shareParams);
HoolaiSdkManager.ShareData(ShareType.WECHAT_FAVORITE, jsonStr);
HoolaiSdkManager.ShareData(ShareType.WECHAT_FAVORITE, shareParams);
}
......@@ -393,10 +384,7 @@ public class GameManager : MonoBehaviour
};
string jsonStr = JsonConvert.SerializeObject(shareParams);
HoolaiSdkManager.ShareData(ShareType.QQ_TEXT, jsonStr);
HoolaiSdkManager.ShareData(ShareType.QQ_TEXT, shareParams);
}
......@@ -426,10 +414,7 @@ public class GameManager : MonoBehaviour
};
string jsonStr = JsonConvert.SerializeObject(shareParams);
HoolaiSdkManager.ShareData(ShareType.QQ_IMG, jsonStr);
HoolaiSdkManager.ShareData(ShareType.QQ_IMG, shareParams);
}
else
{
......
......@@ -103,9 +103,10 @@ public static class HoolaiSdkManager
}
// ==================== 分享 ====================
public static void ShareData(ShareType shareType, string jsonStr)
public static void ShareData(ShareType shareType, ShareParams shareParams)
{
int type = (int)shareType;
string jsonStr = JsonConvert.SerializeObject(shareParams);
#if UNITY_ANDROID && !UNITY_EDITOR
AndroidSdkInterface.CallSdkShareData(type, jsonStr);
#elif UNITY_IOS && !UNITY_EDITOR
......
......@@ -3,21 +3,19 @@
public enum ShareType
{
// 微信平台
WECHAT_SESSION = 11, // 微信对话
WECHAT_TIMELINE = 12, // 朋友圈
WECHAT_FAVORITE = 13, // 收藏
WECHAT_SESSION = 0, // 微信对话
WECHAT_TIMELINE = 1, // 朋友圈
WECHAT_FAVORITE = 10, //iOS 无此选项,待定接入
// QQ平台
QQ_TEXT = 21,//分享文字
QQ_IMG = 22,//分享图片
QQ_TEXT = 2,//分享文字
QQ_IMG = 3,//分享图片
//DQD(31, "懂球帝"),
FACEBOOK_LINK = 41,//facebook链接
FACEBOOK_IMG = 42,//facebook图片
FACEBOOK_VIDEO = 43,//facebook图片
FACEBOOK_LINK = 5,//facebook链接
FACEBOOK_IMG = 6,//facebook图片
FACEBOOK_VIDEO = 7,//facebook图片
SYSTEM_TEXT = 51,//系统分享文字链接
SYSTEM_IMG = 52,//系统分享图片
SYSTEM_FILE = 53//系统分享文件
SYSTEM_SHARE = 8,//系统分享
}
\ No newline at end of file
......@@ -14,12 +14,12 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 1
x: 0
y: 53
width: 1920
height: 975
m_ShowMode: 4
m_Title: Project
m_Title: Hierarchy
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
......@@ -119,7 +119,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 49
controlID: 16
draggingID: 0
--- !u!114 &6
MonoBehaviour:
......@@ -145,7 +145,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 50
controlID: 17
draggingID: 0
--- !u!114 &7
MonoBehaviour:
......@@ -167,11 +167,11 @@ MonoBehaviour:
x: 0
y: 0
width: 1347.5
height: 617.5
height: 619.5
m_MinSize: {x: 200, y: 50}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 39
controlID: 18
draggingID: 0
--- !u!114 &8
MonoBehaviour:
......@@ -191,9 +191,9 @@ MonoBehaviour:
x: 0
y: 0
width: 332
height: 617.5
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
height: 619.5
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
......@@ -217,9 +217,9 @@ MonoBehaviour:
x: 332
y: 0
width: 1015.5
height: 617.5
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
height: 619.5
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
......@@ -242,9 +242,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 617.5
y: 619.5
width: 1347.5
height: 307.5
height: 305.5
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 15}
......@@ -366,10 +366,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1
x: 0
y: 83
width: 331
height: 596.5
height: 598.5
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
......@@ -383,9 +383,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 68a0ffffc6b0ffff12b1ffff08b3ffff12b6ffffdccfffff28d0ffff2ed2ffff64d6ffff50e5ffff9ce5ffffa2e7ffff22fbffff
m_SelectedIDs: 0aefffff
m_LastClickedID: -4342
m_ExpandedIDs: 0aefffff24fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -401,7 +401,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 0}
m_ClientGUIView: {fileID: 8}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
......@@ -429,10 +429,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 333
x: 332
y: 83
width: 1013.5
height: 596.5
height: 598.5
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
......@@ -960,9 +960,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 166.60838, y: 290.00543, z: -15.928277}
m_Target: {x: 393.59805, y: 134.30421, z: -14.739415}
speed: 2
m_Value: {x: 166.60838, y: 290.00543, z: -15.928277}
m_Value: {x: 393.59805, y: 134.30421, z: -14.739415}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
......@@ -1012,9 +1012,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 545.3695
m_Target: 426.48193
speed: 2
m_Value: 545.3695
m_Value: 426.48193
m_Ortho:
m_Target: 1
speed: 2
......@@ -1059,10 +1059,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1
y: 700.5
x: 0
y: 702.5
width: 1346.5
height: 286.5
height: 284.5
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
......@@ -1099,9 +1099,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 7e670000
m_LastClickedID: 26494
m_ExpandedIDs: 000000007e6700008267000084670000866700008e670000
m_SelectedIDs: 80670000
m_LastClickedID: 26496
m_ExpandedIDs: 00000000806700008267000084670000866700008867000090670000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -1129,7 +1129,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000007e67000080670000826700008467000086670000
m_ExpandedIDs: 000000008067000082670000846700008667000088670000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -1156,7 +1156,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000b25c0000245a000000000000
m_RenameOverlay:
m_UserAcceptedRename: 0
......@@ -1205,10 +1205,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1
y: 700.5
x: 0
y: 386.5
width: 1346.5
height: 286.5
height: 600.5
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
......@@ -1239,10 +1239,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1
y: 620
width: 1347.5
height: 367
x: 0
y: 700.5
width: 1346.5
height: 286.5
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
......@@ -1274,7 +1274,7 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1348.5
x: 1347.5
y: 83
width: 571.5
height: 904
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment