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

Assets/Lua/Core/LuaMain.lua

@@ -82,6 +82,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

Assets/Lua/Managers/LuaActorAttributeMgr.lua

@@ -179,7 +179,7 @@ function LuaActorAttributeMgr:OnCheckActorCb(NeedGetActor)
     for i=1,#NeedGetActor do
         local IsHero = NeedGetActor[i].IsHero
         local Id = NeedGetActor[i].Id
-        table.insert( Senddata.actor_list,{is_hero_pet = IsHero,actor_id = tonumber(Id),attr_list = {}})
+        table.insert( Senddata.actor_list,{is_hero_pet = IsHero,actor_id = tostring(Id),attr_list = {}})
     end
     --LogError("Send...OnCheckActorCb.."..Inspect(Senddata))
     ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_ACTOR_ATTR_GET_REQ, Senddata)

Assets/Lua/Managers/LuaBattleMgr.lua

@@ -1059,7 +1059,7 @@ function LuaBattleMgr:OnBattleWin(killboss, killBossTime, mapId, levelId, isPlay
         self.bKillBoss = false
         if not isPlayRecord then   --  and self.difficulty == 0
             if self.curMapId == mapId and self.curLevelId == levelId  then
-                self:SendBossRewardReq(killBossTime,tonumber(recordTimeStamp))
+                self:SendBossRewardReq(killBossTime,tostring(recordTimeStamp))
             else
                 LogError('[wboy] curMapId : ' .. tostring(self.curMapId) .. ' curMapId : ' .. tostring(self.curLevelId) .. ' mapId : ' .. tostring(mapId) .. ' levelId : ' .. tostring(levelId))
             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) 
+    {
+ 
+    }];
 }
 
 }

UserSettings/Layouts/default-2021.dwlt

@@ -41,9 +41,9 @@ MonoBehaviour:
     x: 588
     y: 57
     width: 1304
-    height: 905
+    height: 903
   m_ShowMode: 4
-  m_Title: Console
+  m_Title: Inspector
   m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -67,8 +67,8 @@ MonoBehaviour:
     y: 0
     width: 546
     height: 963
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 200, y: 221}
+  m_MaxSize: {x: 4000, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -97,7 +97,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 84
+  controlID: 87
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -119,7 +119,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1304
-    height: 905
+    height: 903
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -164,7 +164,7 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 885
+    y: 883
     width: 1304
     height: 20
   m_MinSize: {x: 0, y: 0}
@@ -189,11 +189,11 @@ MonoBehaviour:
     x: 0
     y: 30
     width: 1304
-    height: 855
+    height: 853
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 112
+  controlID: 35
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -214,11 +214,11 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 926
-    height: 855
+    height: 853
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 113
+  controlID: 16
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -239,11 +239,11 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 926
-    height: 460
+    height: 541
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 114
+  controlID: 17
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -261,10 +261,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 288
-    height: 460
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 464
+    height: 541
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -285,12 +285,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 288
+    x: 464
     y: 0
-    width: 638
-    height: 460
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+    width: 462
+    height: 541
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -313,11 +313,11 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 460
+    y: 541
     width: 926
-    height: 395
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
+    height: 312
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 16}
@@ -342,9 +342,9 @@ MonoBehaviour:
     x: 926
     y: 0
     width: 378
-    height: 855
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+    height: 853
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 21}
@@ -466,9 +466,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 588
-    y: 547
+    y: 628
     width: 925
-    height: 374
+    height: 291
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -485,23 +485,23 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Content/Prefabs/Effects/Hero/Master/HuoQiuShu_Skill11
+    - Assets/Content/Raw_Art/UI/UILanuch
     m_Globs: []
     m_OriginalText: 
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Content/Prefabs/Effects/Hero/Master/HuoQiuShu_Skill11
+  - Assets/Content/Raw_Art/UI/UILanuch
   m_LastFoldersGridSize: 16
   m_LastProjectPath: E:\Project\Unity\bt_client_2022_S
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 607}
-    m_SelectedIDs: 425f0000
-    m_LastClickedID: 24386
-    m_ExpandedIDs: 00000000b65e0000b85e0000ba5e0000bc5e0000be5e0000c05e0000c25e0000c45e00000c5f0000445f0000465f0000485f000000ca9a3b
+    scrollPos: {x: 0, y: 1041}
+    m_SelectedIDs: 5ab30000
+    m_LastClickedID: 45914
+    m_ExpandedIDs: 0000000006b3000008b300000ab300000cb300000eb3000010b3000012b3000014b3000016b3000018b300001ab300002cb300005cb3000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -529,7 +529,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000b65e0000b85e0000ba5e0000bc5e0000be5e0000c05e0000c25e0000c45e0000
+    m_ExpandedIDs: 0000000006b3000008b300000ab300000cb300000eb3000010b3000012b3000014b3000016b3000018b300001ab30000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -557,7 +557,7 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 0
-    m_ExpandedInstanceIDs: c62300002cdf01008cb00c0000cf0c0076280d007e660c0098660c0060940c0008a10c00e6950c008ec90c00c2f8010000000000084604006c410400a2010500
+    m_ExpandedInstanceIDs: c62300002cdf01008cb00c0000cf0c0076280d007e660c0098660c0060940c0008a10c00e6950c008ec90c00c2f8010000000000084604006c410400a2010500b6610000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -608,8 +608,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 588
     y: 87
-    width: 287
-    height: 439
+    width: 463
+    height: 520
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -620,7 +620,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: e4faffff
+      m_ExpandedIDs: eecfffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -665,10 +665,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 876
+    x: 1052
     y: 87
-    width: 636
-    height: 439
+    width: 460
+    height: 520
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -865,7 +865,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 25}
+      snapOffset: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Particles
@@ -932,14 +932,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 0
+  m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -53.92711, y: 2.9127536, z: -56.499435}
+    m_Target: {x: 1.519492, y: -0.98756385, z: 1.2862674}
     speed: 2
-    m_Value: {x: -53.92711, y: 2.9127536, z: -56.499435}
+    m_Value: {x: 1.519492, y: -0.98756385, z: 1.2862674}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -968,17 +968,17 @@ MonoBehaviour:
       m_Size: {x: 1, y: 1}
     yGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -986,17 +986,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.0012546577, y: 0.9908172, z: -0.1348914, w: 0.009215888}
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: 0.0012546573, y: 0.99081683, z: -0.13489136, w: 0.009215884}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 1.232658
+    m_Target: 2.8659794
     speed: 2
-    m_Value: 1.232658
+    m_Value: 2.8659794
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -1107,9 +1107,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 588
-    y: 547
+    y: 628
     width: 925
-    height: 374
+    height: 291
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -1139,7 +1139,7 @@ MonoBehaviour:
     x: 1514
     y: 87
     width: 377
-    height: 834
+    height: 832
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default