Merge branch 'main' of ssh://192.168.0.8:29418/xianjing into hy_dny

# Conflicts:
#	Build/BuildDependenceResource/Plugins/iOS/Xuanyou_SDK_IOS/QsdkMgr.mm

Build/BuildDependenceResource/Plugins/iOS/Xuanyou_SDK_IOS/QsdkMgr.mm

@@ -1,9 +1,10 @@
 #import <Foundation/Foundation.h>
 
-#import <SPSDK/SPSDK.h>
+#import <SPHSDK_DZ/SPSDK.h>
 
+static  NSString* UnityListenerGoName;
 
- void SendMsgToUnity(NSString* messageName,messageName* parameters)
+ void SendMsgToUnity(NSString* messageName,NSString* parameters)
     {
 
         if (!UnityListenerGoName) {
@@ -69,7 +70,7 @@ void SDK_Login_Callback(BOOL success, SPUserData *data)
         {
             //[self log:[NSString stringWithFormat:@"登录成功:%@",data.username]];
             int code = 0;
-            SendMsgToUnity(@"onLoginSuccess",[NSString stringWithFormat:@"%d[]%@[]%@[]%@[]%@",code,"success", data.token, data.username, data.timestamp]);
+            SendMsgToUnity(@"onLoginSuccess",[NSString stringWithFormat:@"%d[]%@[]%@[]%@[]%@",code,@"success", data.token, data.username, data.timestamp]);
         }else
         {
             //[self log:[NSString stringWithFormat:@"登录失败❌:%@",data]];
@@ -99,7 +100,7 @@ void SDK_UpdateRoleInfo_Callback(BOOL success, id data)
 
 extern "C" 
 {
-    static  NSString* UnityListenerGoName;
+    
 
 
     void QSDK_SetListener(const char *gameObjectName){
@@ -124,14 +125,24 @@ void QSDK_Init() {
 //        @"tempDomain":@"",///设置此值来切换线上域名
         @"gameId":gameId,///替换为实际游戏id
     };
-    [SPSDK.instance registerGame:game callback:SDK_Init_Callback];
-    SPSDK.instance.observer = SDK_observer_CallBack;
+
+    [SPSDK.instance registerGame:game  callback:^(BOOL success, id data) 
+    {
+        SDK_Init_Callback(success,data);
+    }];
+    SPSDK.instance.observer = ^(SPSDKEvent event, NSDictionary *data) 
+    {
+        SDK_observer_CallBack(event,data);
+    };
 }
 
 void QSDK_login()
 {
     //使用SDK登录界面登录
-    [SPSDK.instance login:SDK_Login_Callback]
+    [SPSDK.instance login:^(BOOL success, SPUserData *data) 
+    {
+        SDK_Login_Callback(success,data);
+    }];
 }
 
 void QSDK_Pay(const char *productId,const char *productName,const char * amount,const char *orderNo,
@@ -140,13 +151,19 @@ void QSDK_Pay(const char *productId,const char *productName,const char * amount,
                 const char* productDesc,
                 const char* serverID,const char* accountID,const char* roleID,const char* roleLv) {
     
+     NSDictionary *ext = @{
+        @"gameextrasParams":QsdkCreateNSString(extrasParams),
+     };
     //支付
     SPProductData *product = [SPProductData new];
     product.productId = QsdkCreateNSString(productId);
     product.productName = QsdkCreateNSString(productName);
     product.amount =QsdkCreateNSString(amount);
-    product.extra = QsdkCreateNSString(extrasParams);
-    [SPSDK.instance pay:product callback:SDK_Pay_Callback];
+    product.extra = ext;
+    [SPSDK.instance pay:product callback:^(BOOL success, id data) 
+    {
+        SDK_Pay_Callback(success,data);
+    }];
     
 }
 
@@ -154,7 +171,10 @@ void QSDK_logout() {
     
     //退出登录
      NSLog(@"U3D call SDK logout");
-    [SPSDK.instance logout:SDK_Logout_Callback];
+    [SPSDK.instance logout:^(BOOL success, id data) 
+    {
+        SDK_Logout_Callback(success,data);
+    }];
 }
 
 void QSDK_UpdateRoleInfo(int type,const char * roleName,const char * roleId,
@@ -178,9 +198,12 @@ void QSDK_UpdateRoleInfo(int type,const char * roleName,const char * roleId,
     roleData.roleName =QsdkCreateNSString(roleName);
     roleData.roleLevel = QsdkCreateNSString(roleLv);
     roleData.roleId = QsdkCreateNSString(roleId);
-    roleData.serverId = QsdkCreateNSString(serverID);
+    roleData.serverId = QsdkCreateNSString(serverId);
     roleData.serverName = QsdkCreateNSString(serverName);
-    [SPSDK.instance reportRole:roleData type:RType callback:SDK_UpdateRoleInfo_Callback];
+    [SPSDK.instance reportRole:roleData type:RType callback:^(BOOL success, id data) 
+    {
+ 
+    }];
 }
 
 }