Commit ccf9bae8 authored by gaorui's avatar gaorui
Browse files

Merge branch 'feat-unity2' into 'develop'

Feat unity2

See merge request unity-cross/UnityDemo!9
parents 921bc0b3 6a3a7f31
...@@ -158,7 +158,7 @@ RectTransform: ...@@ -158,7 +158,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1000, y: -450} m_AnchoredPosition: {x: -1000, y: -300}
m_SizeDelta: {x: 260, y: 120} m_SizeDelta: {x: 260, y: 120}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &40919616 --- !u!114 &40919616
...@@ -205,7 +205,7 @@ MonoBehaviour: ...@@ -205,7 +205,7 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnPayWithSpecificGoodsBtnClicked m_MethodName: OnPayWithSpecificGoodsBtnClicked
m_Mode: 3 m_Mode: 3
...@@ -255,140 +255,6 @@ CanvasRenderer: ...@@ -255,140 +255,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 40919614} m_GameObject: {fileID: 40919614}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &65284393
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 65284394}
- component: {fileID: 65284396}
- component: {fileID: 65284395}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &65284394
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 65284393}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1114040581}
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 &65284395
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 65284393}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: ProductInfos
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 30
m_fontSizeBase: 30
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &65284396
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 65284393}
m_CullTransparentMesh: 1
--- !u!1 &85050635 --- !u!1 &85050635
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -606,7 +472,7 @@ MonoBehaviour: ...@@ -606,7 +472,7 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnCDKBtnClicked m_MethodName: OnCDKBtnClicked
m_Mode: 1 m_Mode: 1
...@@ -739,8 +605,8 @@ MonoBehaviour: ...@@ -739,8 +605,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnPayBtnClicked m_MethodName: OnPayBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -916,8 +782,8 @@ MonoBehaviour: ...@@ -916,8 +782,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnEnterServerBtnClicked m_MethodName: OnEnterServerBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -1219,8 +1085,8 @@ MonoBehaviour: ...@@ -1219,8 +1085,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnLogoutBtnClicked m_MethodName: OnLogoutBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -1305,7 +1171,6 @@ RectTransform: ...@@ -1305,7 +1171,6 @@ RectTransform:
- {fileID: 259715464} - {fileID: 259715464}
- {fileID: 165585584} - {fileID: 165585584}
- {fileID: 1577749884} - {fileID: 1577749884}
- {fileID: 1114040581}
- {fileID: 40919615} - {fileID: 40919615}
- {fileID: 1370639142} - {fileID: 1370639142}
- {fileID: 1889515970} - {fileID: 1889515970}
...@@ -1963,6 +1828,7 @@ GameObject: ...@@ -1963,6 +1828,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1076467005} - component: {fileID: 1076467005}
- component: {fileID: 1076467004} - component: {fileID: 1076467004}
- component: {fileID: 1076467006}
m_Layer: 0 m_Layer: 0
m_Name: GameSdkManager m_Name: GameSdkManager
m_TagString: Untagged m_TagString: Untagged
...@@ -1997,139 +1863,18 @@ Transform: ...@@ -1997,139 +1863,18 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1114040580 --- !u!114 &1076467006
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1114040581}
- component: {fileID: 1114040584}
- component: {fileID: 1114040583}
- component: {fileID: 1114040582}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1114040581
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1114040580}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 65284394}
m_Father: {fileID: 642178995}
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: -1000, y: -300}
m_SizeDelta: {x: 260, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1114040582
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1114040580} m_GameObject: {fileID: 1076467003}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1114040583}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1076467004}
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnPayWithFirstGoodsBtnClicked
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1114040583
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1114040580}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: 789ca815eac2f468b94840a621f0b2e3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1114040584
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1114040580}
m_CullTransparentMesh: 1
--- !u!1 &1183967693 --- !u!1 &1183967693
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2541,7 +2286,7 @@ MonoBehaviour: ...@@ -2541,7 +2286,7 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnExitBtnClicked m_MethodName: OnExitBtnClicked
m_Mode: 1 m_Mode: 1
...@@ -2801,8 +2546,8 @@ MonoBehaviour: ...@@ -2801,8 +2546,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnShareBtnClicked m_MethodName: OnShareBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -3222,8 +2967,8 @@ MonoBehaviour: ...@@ -3222,8 +2967,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnGetProductInfoBtnClicked m_MethodName: OnGetProductInfoBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -4017,8 +3762,8 @@ MonoBehaviour: ...@@ -4017,8 +3762,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnOpenAccountBtnClicked m_MethodName: OnOpenAccountBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -4150,8 +3895,8 @@ MonoBehaviour: ...@@ -4150,8 +3895,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnOpenServiceBtnClicked m_MethodName: OnOpenServiceBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -4283,8 +4028,8 @@ MonoBehaviour: ...@@ -4283,8 +4028,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnLoginBtnClicked m_MethodName: OnLoginBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
......
...@@ -15,20 +15,20 @@ public class GameManager : MonoBehaviour ...@@ -15,20 +15,20 @@ public class GameManager : MonoBehaviour
public void OnLoginBtnClicked() public void OnLoginBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked login"); NativeLogger.I("Game_Unity_Log", "clicked login");
//SdkPluginManager.CallSdkLogin(); //SdkPluginManager.CallSdkLogin();
HoolaiSdkManager.Login(); HoolaiSdkManager.Login();
} }
public void OnLogoutBtnClicked() public void OnLogoutBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked logout"); NativeLogger.I("Game_Unity_Log", "clicked logout");
HoolaiSdkManager.Logout(); HoolaiSdkManager.Logout();
} }
public void OnEnterServerBtnClicked() public void OnEnterServerBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked EnterServer"); NativeLogger.I("Game_Unity_Log", "clicked EnterServer");
PlayerInfo playerInfo = new PlayerInfo(); PlayerInfo playerInfo = new PlayerInfo();
playerInfo.RoleId = "1234567"; playerInfo.RoleId = "1234567";
playerInfo.RoleName = "大鹏一日同风起"; playerInfo.RoleName = "大鹏一日同风起";
...@@ -53,15 +53,19 @@ public class GameManager : MonoBehaviour ...@@ -53,15 +53,19 @@ public class GameManager : MonoBehaviour
HoolaiSdkManager.SendEvent(EventType.EnterServer, playerInfo); HoolaiSdkManager.SendEvent(EventType.EnterServer, playerInfo);
NativeLogger.I("Game_Unity_Log", "clicked EnterServer");
HoolaiSdkManager.SendEvent(EventType.CreateRole, playerInfo); HoolaiSdkManager.SendEvent(EventType.CreateRole, playerInfo);
NativeLogger.I("Game_Unity_Log", "clicked CreateRole");
HoolaiSdkManager.SendEvent(EventType.LevelUp, playerInfo); HoolaiSdkManager.SendEvent(EventType.LevelUp, playerInfo);
NativeLogger.I("Game_Unity_Log", "clicked LevelUp");
HoolaiSdkManager.SendEvent(EventType.CustomerAction, playerInfo); HoolaiSdkManager.SendEvent(EventType.CustomerAction, playerInfo);
NativeLogger.I("Game_Unity_Log", "clicked CustomerAction");
} }
public void OnPayBtnClicked() public void OnPayBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked Pay"); NativeLogger.I("Game_Unity_Log", "clicked Pay");
// 1. 创建并填充对象 // 1. 创建并填充对象
PayParams payParams = new PayParams PayParams payParams = new PayParams
...@@ -77,58 +81,22 @@ public class GameManager : MonoBehaviour ...@@ -77,58 +81,22 @@ public class GameManager : MonoBehaviour
payParams.AddOptionalParameter("test", "daily_bonus"); payParams.AddOptionalParameter("test", "daily_bonus");
payParams.AddOptionalParameter("player_id", "p-98765"); payParams.AddOptionalParameter("player_id", "p-98765");
NativeLogger.I("fastsdk_btn_unity", $"clicked Exit jsonString: {payParams}"); NativeLogger.I("Game_Unity_Log", $"clicked Exit jsonString: {payParams}");
HoolaiSdkManager.StartPay(payParams); HoolaiSdkManager.StartPay(payParams);
} }
public void OnExitBtnClicked() public void OnExitBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked Exit"); NativeLogger.I("Game_Unity_Log", "clicked Exit");
HoolaiSdkManager.ExitGame(); HoolaiSdkManager.ExitGame();
} }
public void OnGetProductInfoBtnClicked() public void OnGetProductInfoBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked QueryGoodsInfo"); NativeLogger.I("Game_Unity_Log", "clicked QueryGoodsInfo");
HoolaiSdkManager.QueryGoodsInfo(); HoolaiSdkManager.QueryGoodsInfo();
} }
// 新增方法:使用商品列表中的第一条数据进行支付
public void OnPayWithFirstGoodsBtnClicked()
{
NativeLogger.I("fastsdk_btn_unity", "clicked Pay With First Goods");
List<GoodsInfo> goodsList = HoolaiListener.Instance.GetCachedGoodsList();
if (goodsList == null || goodsList.Count == 0)
{
NativeLogger.I("fastsdk_btn_unity", "No goods list available. Please query goods info first.");
return;
}
// 使用第一条商品数据进行支付
GoodsInfo firstGoods = GetGoodsInfoByIndex(goodsList, 0);
if (firstGoods != null)
{
// 将GoodsInfo转换为PayParams
PayParams payParams = ConvertGoodsInfoToPayParams(firstGoods, 1);
if (payParams != null)
{
NativeLogger.I("fastsdk_btn_unity", $"Paying with goods: {firstGoods.itemName}");
HoolaiSdkManager.StartPay(payParams);
}
else
{
NativeLogger.I("fastsdk_btn_unity", "Failed to convert goods info to pay params");
}
}
else
{
NativeLogger.I("fastsdk_btn_unity", "No goods available at index 0");
}
}
// 添加方法用于根据索引获取单个商品信息 // 添加方法用于根据索引获取单个商品信息
public static GoodsInfo GetGoodsInfoByIndex(List<GoodsInfo> goodsList, int index) public static GoodsInfo GetGoodsInfoByIndex(List<GoodsInfo> goodsList, int index)
...@@ -146,14 +114,14 @@ public class GameManager : MonoBehaviour ...@@ -146,14 +114,14 @@ public class GameManager : MonoBehaviour
// 新增方法:使用指定索引的商品数据进行支付 // 新增方法:使用指定索引的商品数据进行支付
public void OnPayWithSpecificGoodsBtnClicked(int goodsIndex) public void OnPayWithSpecificGoodsBtnClicked(int goodsIndex)
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked Pay With Random Goods"); NativeLogger.I("Game_Unity_Log", "clicked Pay With Random Goods");
// 获取缓存的商品列表 // 获取缓存的商品列表
List<GoodsInfo> goodsList = HoolaiListener.Instance.GetCachedGoodsList(); List<GoodsInfo> goodsList = HoolaiListener.Instance.GetCachedGoodsList();
if (goodsList == null || goodsList.Count == 0) if (goodsList == null || goodsList.Count == 0)
{ {
NativeLogger.I("fastsdk_btn_unity", "No goods list available. Please query goods info first."); NativeLogger.I("Game_Unity_Log", "No goods list available. Please query goods info first.");
return; return;
} }
...@@ -168,17 +136,17 @@ public class GameManager : MonoBehaviour ...@@ -168,17 +136,17 @@ public class GameManager : MonoBehaviour
if (payParams != null) if (payParams != null)
{ {
NativeLogger.I("fastsdk_btn_unity", $"Paying with random goods: {randomGoods.itemName} at index {randomIndex}"); NativeLogger.I("Game_Unity_Log", $"Paying with random goods: {randomGoods.itemName} at index {randomIndex}");
HoolaiSdkManager.StartPay(payParams); HoolaiSdkManager.StartPay(payParams);
} }
else else
{ {
NativeLogger.I("fastsdk_btn_unity", "Failed to convert goods info to pay params"); NativeLogger.I("Game_Unity_Log", "Failed to convert goods info to pay params");
} }
} }
else else
{ {
NativeLogger.I("fastsdk_btn_unity", "No goods available at random index"); NativeLogger.I("Game_Unity_Log", "No goods available at random index");
} }
} }
...@@ -206,26 +174,26 @@ public class GameManager : MonoBehaviour ...@@ -206,26 +174,26 @@ public class GameManager : MonoBehaviour
public void OnCDKBtnClicked() public void OnCDKBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked CDKey"); NativeLogger.I("Game_Unity_Log", "clicked CDKey");
HoolaiSdkManager.AccessParticipate(AccessActivityType.CD_KEY, "123456789"); HoolaiSdkManager.AccessParticipate(AccessActivityType.CD_KEY, "123456789");
} }
public void OnShareBtnClicked() public void OnShareBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked shareData"); NativeLogger.I("Game_Unity_Log", "clicked shareData");
HoolaiSdkManager.ShareData(1, 1, "test"); HoolaiSdkManager.ShareData(1, 1, "test");
} }
public void OnOpenServiceBtnClicked() public void OnOpenServiceBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked openService"); NativeLogger.I("Game_Unity_Log", "clicked openService");
HoolaiSdkManager.OpenService(); HoolaiSdkManager.OpenService();
} }
public void OnOpenAccountBtnClicked() public void OnOpenAccountBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked openAccount"); NativeLogger.I("Game_Unity_Log", "clicked openAccount");
HoolaiSdkManager.OpenAccountCenter(); HoolaiSdkManager.OpenAccountCenter();
} }
} }
fileFormatVersion: 2
guid: 789ca815eac2f468b94840a621f0b2e3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
...@@ -29,45 +29,45 @@ public class HoolaiListener : IPlatformCallbackListener ...@@ -29,45 +29,45 @@ public class HoolaiListener : IPlatformCallbackListener
public void OnInitSuccess(InitResult result) public void OnInitSuccess(InitResult result)
{ {
NativeLogger.I("fastsdk_unity_result", $"OnInitSuccess GameId:{result.gameId} channel:{result.channel} channelId:{result.channelId}"); NativeLogger.I("Game_Unity_Callback", $"OnInitSuccess GameId:{result.gameId} channel:{result.channel} channelId:{result.channelId}");
} }
public void OnInitFailed(string reason) public void OnInitFailed(string reason)
{ {
NativeLogger.I("fastsdk_unity_result", $"OnInitFailed reason:{reason}"); NativeLogger.I("Game_Unity_Callback", $"OnInitFailed reason:{reason}");
} }
public void OnLoginFailed(string reason) public void OnLoginFailed(string reason)
{ {
NativeLogger.I("fastsdk_unity_result", $"OnLoginFailed reason:{reason}"); NativeLogger.I("Game_Unity_Callback", $"OnLoginFailed reason:{reason}");
} }
public void OnLoginSuccess(LoginResult result) public void OnLoginSuccess(LoginResult result)
{ {
NativeLogger.I("fastsdk_unity_result", $"OnLoginSuccess uid:{result.uid} channel:{result.channel} channelId:{result.accessToken}"); NativeLogger.I("Game_Unity_Callback", $"OnLoginSuccess uid:{result.uid} channel:{result.channel} channelId:{result.accessToken}");
} }
public void OnRefreshUser(LoginResult result) public void OnRefreshUser(LoginResult result)
{ {
NativeLogger.I("fastsdk_unity_result", $"OnRefreshUser uid:{result.uid} channel:{result.channel} channelId:{result.accessToken}"); NativeLogger.I("Game_Unity_Callback", $"OnRefreshUser uid:{result.uid} channel:{result.channel} channelId:{result.accessToken}");
} }
public void OnLogout(string message) public void OnLogout(string message)
{ {
NativeLogger.I("fastsdk_unity_result", $"OnLogout reason:{message}"); NativeLogger.I("Game_Unity_Callback", $"OnLogout reason:{message}");
} }
public void OnPayFailed(string reason) public void OnPayFailed(string reason)
{ {
NativeLogger.I("fastsdk_unity_result", $"OnPayFailed reason:{reason}"); NativeLogger.I("Game_Unity_Callback", $"OnPayFailed reason:{reason}");
} }
public void OnPayGoodsList(List<GoodsInfo> goodsList) public void OnPayGoodsList(List<GoodsInfo> goodsList)
{ {
_cachedGoodsList = goodsList; _cachedGoodsList = goodsList;
OnGoodsListUpdated?.Invoke(goodsList); OnGoodsListUpdated?.Invoke(goodsList);
NativeLogger.I("fastsdk_unity_result", $"OnPayGoodsList count:{goodsList?.Count ?? 0}"); NativeLogger.I("Game_Unity_Callback", $"OnPayGoodsList count:{goodsList?.Count ?? 0}");
} }
// 获取缓存的商品列表 // 获取缓存的商品列表
...@@ -78,26 +78,26 @@ public class HoolaiListener : IPlatformCallbackListener ...@@ -78,26 +78,26 @@ public class HoolaiListener : IPlatformCallbackListener
public void OnPaySuccess(string message) public void OnPaySuccess(string message)
{ {
NativeLogger.I("fastsdk_unity_result", $"OnPaySuccess message:{message}"); NativeLogger.I("Game_Unity_Callback", $"OnPaySuccess message:{message}");
} }
public void OnShareFailed(string reason) public void OnShareFailed(string reason)
{ {
NativeLogger.I("fastsdk_unity_result", $"OnShareFailed reason:{reason}"); NativeLogger.I("Game_Unity_Callback", $"OnShareFailed reason:{reason}");
} }
public void OnShareSuccess(string reason) public void OnShareSuccess(string reason)
{ {
NativeLogger.I("fastsdk_unity_result", $"OnShareSuccess reason:{reason}"); NativeLogger.I("Game_Unity_Callback", $"OnShareSuccess reason:{reason}");
} }
public void OnUpdate(string data) public void OnUpdate(string data)
{ {
NativeLogger.I("fastsdk_unity_result", $"OnUpdate data:{data}"); NativeLogger.I("Game_Unity_Callback", $"OnUpdate data:{data}");
} }
public void OnCustomExit() public void OnCustomExit()
{ {
NativeLogger.I("fastsdk_unity_result", $"OnCustomExit"); NativeLogger.I("Game_Unity_Callback", $"OnCustomExit");
} }
} }
fileFormatVersion: 2
guid: aad0e2f8fdce143148772b19097f0279
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
...@@ -78,5 +78,4 @@ public class IosSdkInterface ...@@ -78,5 +78,4 @@ public class IosSdkInterface
_OpenService(); _OpenService();
} }
} }
#endif
#endif // UNITY_IOS && !UNITY_EDITOR \ No newline at end of file
\ No newline at end of file
fileFormatVersion: 2
guid: 0de7ca3e29910431bac56565a6da5f42
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
...@@ -46,7 +46,7 @@ public class PlatformCallback : MonoBehaviour ...@@ -46,7 +46,7 @@ public class PlatformCallback : MonoBehaviour
// 单例模式实现 // 单例模式实现
if (Instance != null && Instance != this) if (Instance != null && Instance != this)
{ {
NativeLogger.I("fastsdk_unity_result", "[ ] Destroying duplicate instance"); NativeLogger.I("PlatformCallback", "[PlatformCallback] Destroying duplicate instance");
Destroy(gameObject); Destroy(gameObject);
return; return;
} }
...@@ -59,7 +59,7 @@ public class PlatformCallback : MonoBehaviour ...@@ -59,7 +59,7 @@ public class PlatformCallback : MonoBehaviour
// 确保游戏对象名称与 Android 调用匹配 // 确保游戏对象名称与 Android 调用匹配
gameObject.name = "PlatformCallback"; gameObject.name = "PlatformCallback";
NativeLogger.I("fastsdk_unity_result", "[PlatformCallback] Initialized with GameObject name: " + gameObject.name); NativeLogger.I("PlatformCallback", "[PlatformCallback] Initialized with GameObject name: " + gameObject.name);
} }
public static void SetListener(IPlatformCallbackListener listener) public static void SetListener(IPlatformCallbackListener listener)
...@@ -69,7 +69,7 @@ public class PlatformCallback : MonoBehaviour ...@@ -69,7 +69,7 @@ public class PlatformCallback : MonoBehaviour
public void onInitSuccess(string jsonStr) public void onInitSuccess(string jsonStr)
{ {
NativeLogger.I("fastsdk_unity_result", "[AndroidBrigsCall] onInitSuccess called with result: " + jsonStr); NativeLogger.I("PlatformCallback", "[PlatformCallback] onInitSuccess called with result: " + jsonStr);
InitResult result = JsonConvert.DeserializeObject<InitResult>(jsonStr); InitResult result = JsonConvert.DeserializeObject<InitResult>(jsonStr);
if (result != null) if (result != null)
{ {
...@@ -79,34 +79,34 @@ public class PlatformCallback : MonoBehaviour ...@@ -79,34 +79,34 @@ public class PlatformCallback : MonoBehaviour
public void onInitFailed(string reason) public void onInitFailed(string reason)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onInitFailed called with reason: " + reason); NativeLogger.I("PlatformCallback", "[PlatformCallback] onInitFailed called with reason: " + reason);
_listener.OnInitFailed(reason); _listener?.OnInitFailed(reason);
} }
//自定义退出界面 //自定义退出界面
public void onCustomExit() public void onCustomExit()
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onCustomExit called"); NativeLogger.I("PlatformCallback", "[PlatformCallback] onCustomExit called");
_listener?.OnCustomExit(); _listener?.OnCustomExit();
} }
//预留 //预留
public void onUpdate(string data) public void onUpdate(string data)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onUpdate called with data: " + data); NativeLogger.I("PlatformCallback", "[PlatformCallback] onUpdate called with data: " + data);
_listener?.OnUpdate(data); _listener?.OnUpdate(data);
} }
//登录成功 //登录成功
public void onLoginSuccess(string jsonStr) public void onLoginSuccess(string jsonStr)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onLoginSuccess called with result: " + jsonStr); NativeLogger.I("PlatformCallback", "[PlatformCallback] onLoginSuccess called with result: " + jsonStr);
//判断 null 或空字符串判断空白字符串(包括空格、制表符等) //判断 null 或空字符串判断空白字符串(包括空格、制表符等)
if (string.IsNullOrEmpty(jsonStr) || string.IsNullOrWhiteSpace(jsonStr)) if (string.IsNullOrEmpty(jsonStr) || string.IsNullOrWhiteSpace(jsonStr))
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] Android returned empty or invalid string"); NativeLogger.I("PlatformCallback", "[Unity] Android returned empty or invalid string");
return; return;
} }
LoginResult loginResult = JsonConvert.DeserializeObject<LoginResult>(jsonStr); LoginResult loginResult = JsonConvert.DeserializeObject<LoginResult>(jsonStr);
...@@ -120,12 +120,12 @@ public class PlatformCallback : MonoBehaviour ...@@ -120,12 +120,12 @@ public class PlatformCallback : MonoBehaviour
public void onRefreshUser(string jsonStr) public void onRefreshUser(string jsonStr)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onRefreshUser called with result: " + jsonStr); NativeLogger.I("PlatformCallback", "[PlatformCallback] onRefreshUser called with result: " + jsonStr);
//判断 null 或空字符串判断空白字符串(包括空格、制表符等) //判断 null 或空字符串判断空白字符串(包括空格、制表符等)
if (string.IsNullOrEmpty(jsonStr) || string.IsNullOrWhiteSpace(jsonStr)) if (string.IsNullOrEmpty(jsonStr) || string.IsNullOrWhiteSpace(jsonStr))
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] Android returned empty or invalid string"); NativeLogger.I("PlatformCallback", "[PlatformCallback] Android returned empty or invalid string");
return; return;
} }
LoginResult loginResult = JsonConvert.DeserializeObject<LoginResult>(jsonStr); LoginResult loginResult = JsonConvert.DeserializeObject<LoginResult>(jsonStr);
...@@ -138,42 +138,35 @@ public class PlatformCallback : MonoBehaviour ...@@ -138,42 +138,35 @@ public class PlatformCallback : MonoBehaviour
public void onLoginFailed(string reason) public void onLoginFailed(string reason)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onLoginFailed called with reason: " + reason); NativeLogger.I("PlatformCallback", "[PlatformCallback] onLoginFailed called with reason: " + reason);
_listener?.OnLoginFailed(reason); _listener?.OnLoginFailed(reason);
} }
public void onLogout(string message) public void onLogout(string message)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onLogout called with message: " + message); NativeLogger.I("PlatformCallback", "[PlatformCallback] onLogout called with message: " + message);
_listener?.OnLogout(message); _listener?.OnLogout(message);
} }
public void onPayGoodsList(string jsonStr) public void onPayGoodsList(string jsonStr)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onPayGoodsList called with message: " + jsonStr); NativeLogger.I("PlatformCallback", "[PlatformCallback] onPayGoodsList called with message: " + jsonStr);
List<GoodsInfo> goodsLists = JsonConvert.DeserializeObject<List<GoodsInfo>>(jsonStr); List<GoodsInfo> goodsLists = JsonConvert.DeserializeObject<List<GoodsInfo>>(jsonStr);
NativeLogger.I("fastsdk_unity_result", "[Unity] onPayGoodsList deserialized, count: " + (goodsLists?.Count ?? 0) + ", listener is null: " + (_listener == null)); if (goodsLists != null && goodsLists.Count != 0)
if (_listener == null)
{ {
_listener?.OnPayGoodsList(goodsLists);
NativeLogger.I("fastsdk_unity_result", "[Unity] onPayGoodsList called_listener is null");
} }
_listener?.OnPayGoodsList(goodsLists);
//if (goodsLists != null && goodsLists.Count!=0)
//{
// _listener?.OnPayGoodsList(goodsLists);
//}
} }
public void onPaySuccess(string jsonStr) public void onPaySuccess(string jsonStr)
{ {
NativeLogger.I("fastsdk_unity_result", $"[Unity] onPaySuccess called {jsonStr}"); NativeLogger.I("PlatformCallback", $"[PlatformCallback] onPaySuccess called {jsonStr}");
_listener?.OnPaySuccess(jsonStr); _listener?.OnPaySuccess(jsonStr);
} }
public void onPayFailed(string reason) public void onPayFailed(string reason)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onPayFailed called with reason: " + reason); NativeLogger.I("PlatformCallback", "[PlatformCallback] onPayFailed called with reason: " + reason);
_listener?.OnPayFailed(reason); _listener?.OnPayFailed(reason);
} }
...@@ -181,13 +174,13 @@ public class PlatformCallback : MonoBehaviour ...@@ -181,13 +174,13 @@ public class PlatformCallback : MonoBehaviour
//分享,无特殊处理可不实现 //分享,无特殊处理可不实现
public void onShareSuccess(string jsonStr) public void onShareSuccess(string jsonStr)
{ {
NativeLogger.I("fastsdk_unity_result", $"[Unity] onShareSuccess called {jsonStr}"); NativeLogger.I("PlatformCallback", $"[PlatformCallback] onShareSuccess called {jsonStr}");
_listener?.OnShareSuccess(jsonStr); _listener?.OnShareSuccess(jsonStr);
} }
public void onShareFailed(string jsonStr) public void onShareFailed(string jsonStr)
{ {
NativeLogger.I("fastsdk_unity_result", $"[Unity] onShareFailed called {jsonStr}"); NativeLogger.I("PlatformCallback", $"[PlatformCallback] onShareFailed called {jsonStr}");
_listener?.OnShareFailed(jsonStr); _listener?.OnShareFailed(jsonStr);
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.visualstudio": "2.0.22",
"com.unity.ide.vscode": "1.2.5", "com.unity.ide.vscode": "1.2.5",
"com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.purchasing": "4.11.0", "com.unity.purchasing": "4.12.2",
"com.unity.test-framework": "1.1.33", "com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.7", "com.unity.textmeshpro": "3.0.7",
"com.unity.timeline": "1.7.7", "com.unity.timeline": "1.7.7",
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.purchasing": { "com.unity.purchasing": {
"version": "4.11.0", "version": "4.12.2",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
"com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.androidjni": "1.0.0", "com.unity.modules.androidjni": "1.0.0",
"com.unity.services.core": "1.8.2" "com.unity.services.core": "1.12.5"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
......
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