From c758a9f3e5ec4fbe36da5ac5e61afd477f303e40 Mon Sep 17 00:00:00 2001 From: LuanShi Date: Tue, 18 Feb 2025 20:01:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=99=BB=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Plugins/SDK/CommSDK.cs | 7 +- Assets/Plugins/SDK/NativeBridgeUtil.cs | 6 + Assets/Scenes/Init.unity | 227 ++++++++++++++++++++++++- 3 files changed, 229 insertions(+), 11 deletions(-) diff --git a/Assets/Plugins/SDK/CommSDK.cs b/Assets/Plugins/SDK/CommSDK.cs index f9bca73..d68b547 100644 --- a/Assets/Plugins/SDK/CommSDK.cs +++ b/Assets/Plugins/SDK/CommSDK.cs @@ -23,11 +23,8 @@ namespace ETHotfix public EventWechatHandler responseHandler; public void Init() { - if (Application.platform == RuntimePlatform.Android) - { - Debug.Log("GameObject.name = " + gameObject.name); - commSdkUtils = new AndroidImpl(gameObject.name, "_Callback"); - } + Debug.Log("GameObject.name = " + gameObject.name); + commSdkUtils = new AndroidImpl(gameObject.name, "_Callback"); } /// diff --git a/Assets/Plugins/SDK/NativeBridgeUtil.cs b/Assets/Plugins/SDK/NativeBridgeUtil.cs index b798c1d..53e7989 100644 --- a/Assets/Plugins/SDK/NativeBridgeUtil.cs +++ b/Assets/Plugins/SDK/NativeBridgeUtil.cs @@ -46,6 +46,8 @@ public class NativeBridgeUtil : MonoBehaviour #endif } + public Action loginCallback; + #region 通用SDK //0 1 微信 2 闲聊 3多聊 public void WeChatLogin(int type) @@ -81,6 +83,10 @@ public class NativeBridgeUtil : MonoBehaviour Debug.Log("OnAuthorizedHandler->Success:result=" + result); string unionid = result["unionid"].ToString(); Debug.Log("OnAuthorizedHandler->Success:unionid=" + unionid); + if (loginCallback!= null) + { + loginCallback(unionid); + } } else if (state == RespState.Fail) { diff --git a/Assets/Scenes/Init.unity b/Assets/Scenes/Init.unity index 78d05b9..69b5601 100644 --- a/Assets/Scenes/Init.unity +++ b/Assets/Scenes/Init.unity @@ -1375,6 +1375,124 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 983980998} m_CullTransparentMesh: 0 +--- !u!1 &1145709077 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1145709078} + - component: {fileID: 1145709081} + - component: {fileID: 1145709080} + - component: {fileID: 1145709079} + m_Layer: 5 + m_Name: wxbindButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1145709078 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1145709077} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2042624494} + m_Father: {fileID: 1392791841} + m_RootOrder: 2 + 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: 0, y: -170.51} + m_SizeDelta: {x: 240, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1145709079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1145709077} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1145709080} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1145709080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1145709077} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 9bb6ff4d55cdca2439f2935d834c6d71, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1145709081 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1145709077} + m_CullTransparentMesh: 0 --- !u!1 &1165168744 GameObject: m_ObjectHideFlags: 0 @@ -1487,7 +1605,7 @@ RectTransform: - {fileID: 1957083328} - {fileID: 867391743} m_Father: {fileID: 1392791841} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1665,9 +1783,10 @@ RectTransform: m_Children: - {fileID: 73} - {fileID: 1796563212} + - {fileID: 1145709078} - {fileID: 1302099225} - - {fileID: 1768218918} - {fileID: 705294046} + - {fileID: 1768218918} m_Father: {fileID: 75} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1698,6 +1817,7 @@ MonoBehaviour: loginBthTrans: {fileID: 705294045} PhoneLoginButton: {fileID: 1445372299} WxLoginButton: {fileID: 1719537387} + WxBindButton: {fileID: 1145709079} --- !u!1 &1445372295 GameObject: m_ObjectHideFlags: 0 @@ -1756,7 +1876,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b712e65990021194795e721125b0ad46, type: 3} + m_Sprite: {fileID: 21300000, guid: 27f253e451b91484b9dddd97028c0699, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2014,7 +2134,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 27f253e451b91484b9dddd97028c0699, type: 3} + m_Sprite: {fileID: 21300000, guid: b712e65990021194795e721125b0ad46, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2198,11 +2318,11 @@ RectTransform: m_Children: - {fileID: 1722103141} m_Father: {fileID: 1392791841} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 9.172485} + m_AnchoredPosition: {x: 0, y: 9.172363} m_SizeDelta: {x: 99.475586, y: 40} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1768218919 @@ -2435,6 +2555,101 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1957083327} m_CullTransparentMesh: 0 +--- !u!1 &2042624493 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2042624494} + - component: {fileID: 2042624497} + - component: {fileID: 2042624496} + - component: {fileID: 2042624495} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2042624494 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042624493} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1145709078} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2042624495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042624493} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.79607844, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &2042624496 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042624493} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 84948b65e63891a4c97d401108de144b, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5FAE\u4FE1\u7ED1\u5B9A" +--- !u!222 &2042624497 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042624493} + m_CullTransparentMesh: 0 --- !u!1 &2072301149 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3375001057570166699, guid: 9b0f4d97ae0b01149a8ba8adb6bd35e2,