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

Assets/Lua/Core/LuaMain.lua

@@ -80,6 +80,8 @@ InternalRequire = function(name, endStep)
     return data
 end
 
+IsNewLuadll = false
+
 local LuaMain = class("LuaMain")
 
 -- 这里是异步初始化, 初始化的耗时操作可放这里面

Assets/Lua/Logic/CompetitionData.lua

@@ -323,7 +323,12 @@ function CompetitionData:CanOpenSeasonUI()
     local curServerTime = ManagerContainer.LuaTimerMgr:CurLuaServerTime()
     if endTime > 0 and endTime < curServerTime then
         local delta = (curServerTime - endTime)/1000
-        local minutes = ManagerContainer.LuaTimerMgr:TransSeconds2Minutes(delta)
+        local minutes =  0
+        if IsNewLuadll then
+            minutes = ManagerContainer.LuaTimerMgr:TransSeconds2Minutes(delta)
+        else    
+            minutes = ManagerContainer.LuaTimerMgr:TransSeconds2Minutes(#delta)
+        end
         if minutes < 5 then
             ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("DscSeasonResult8")
             return false

Assets/Lua/Logic/Friend/FriendData.lua

@@ -67,7 +67,12 @@ function FriendData:GetOfflineTimeStr()
     if offlineTime < 3600 then
         return string.formatbykey("FriendsOffline")
     elseif offlineTime < 86400 then
-        local hours = math.floor(offlineTime/3600)  
+        local hours = 0
+        if IsNewLuadll then
+            hours = math.floor(offlineTime/3600)  
+        else    
+            hours = math.floor(#offlineTime/3600)  
+        end
         return string.formatbykey("FriendsOfflineHour",hours)
     elseif  offlineTime < 259200 then
         return string.formatbykey("FriendsOfflineDay",1)

Assets/Lua/Logic/ProtocalDataNormal.lua

@@ -416,7 +416,12 @@ function ProtocalDataNormal.ParseSystemMessageData(message)
     data.nickname = message.nick_name
     data.paramIds = message.param_id
     local time = message.send_time/1000
-    data.sendTime = time
+    if IsNewLuadll then
+        data.sendTime = time
+    else
+        data.sendTime = #time    
+    end
+    
     data.sendTime64 = message.send_time
     return data
 end

Build/BuildDependenceResource/PackConfig.json

@@ -1478,9 +1478,13 @@
             "gameAssetsPath": "Default",
             "specialFuncShield": true,
             "splashScreenRelativeFiles": [],
-            "obscureKey": "",
+            "obscureKey": "c0f0a92eecc1ab6e757ec2b856b05799",
             "obscureOffsetMin": 0,
-            "obscureOffsetValues": [],
+            "obscureOffsetValues": [
+                6,
+                10,
+                8
+            ],
             "sdkVerifyUrl": "http://43.156.13.116:81//",
             "serverListUrl": "http://43.156.13.116:81//serverlist",
             "notifyUrl": "http://43.156.13.116:88/res/NoticeNew/",
@@ -1526,9 +1530,13 @@
             "gameAssetsPath": "Default",
             "specialFuncShield": true,
             "splashScreenRelativeFiles": [],
-            "obscureKey": "",
+            "obscureKey": "fa0574eb0381d1b043c62fbd46f10bcb",
             "obscureOffsetMin": 0,
-            "obscureOffsetValues": [],
+            "obscureOffsetValues": [
+                8,
+                4,
+                10
+            ],
             "sdkVerifyUrl": "http://43.156.13.116:81//",
             "serverListUrl": "http://43.156.13.116:81//serverlist",
             "notifyUrl": "http://43.156.13.116:88/res/NoticeNew/",

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){
@@ -113,19 +114,35 @@ void QSDK_Init() {
     //SendMsgToUnity(@"onInitSuccess",@"Init:Init Success");
     //SendMsgToUnity(@"onInitSuccess",@"Fail");
     //SDK初始化 code: 0:成功, 1:失败
+     NSString *gameId = @"127";
+     NSDictionary<NSString *, id> *infoDictionary = [NSBundle mainBundle].infoDictionary;
+    id value = [infoDictionary objectForKey:@"xuanyou_GameId"];
+    if (value != NULL && [value isKindOfClass:[NSString class]]) {
+        gameId = (NSString *)value;
+    }
     NSDictionary *game = @{
 //        @"timestamp":@"XXXX",///设置此值来切换线上域名
 //        @"tempDomain":@"",///设置此值来切换线上域名
-        @"gameId":@"7",///替换为实际游戏id
+        @"gameId":gameId,///替换为实际游戏id
+    };
+
+    [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);
     };
-    [SPSDK.instance registerGame:game callback:SDK_Init_Callback];
-    SPSDK.instance.observer = SDK_observer_CallBack;
 }
 
 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,
@@ -134,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);
+    }];
     
 }
 
@@ -148,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,
@@ -172,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) 
+    {
+ 
+    }];
 }
 
 }