From d4e78afcab20530eefb9bc20531f2bef2fd9465e Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 27 Jul 2021 10:04:22 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E3=80=90packID=E3=80=91=E6=95=B0=E6=95=B0?= =?UTF-8?q?=E6=89=93=E7=82=B9=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Framework/Manager/PackageManager.lua | 5 +++++ Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua | 6 ++++-- Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua index 6b7d832287..73e53dcb7d 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua @@ -32,6 +32,11 @@ end -- 获取包名 function PackageManager.GetPackageID() + -- 优先使用sdk自带的 + if LoginManager.SdkSubChannel then + return LoginManager.SdkSubChannel + end + -- 否则使用配置的 if this.StreamConfig then return this.StreamConfig.PackID end diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua index d5e60749fb..b552979825 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua @@ -1,4 +1,4 @@ -LoginManager = {}; +LoginManager = {}; local this = LoginManager this.sign = "d13b3e8ef74bf72d8aafce3a1c8672a0" this.openId = nil @@ -44,6 +44,7 @@ function this.Initialize() AppConst.SdkChannel = result[5] or "" this.extData = result[6] or "" this.p_appId = result[7] or "" + this.SdkSubChannel = result[8] AppConst.SdkPackageName = AndroidDeviceInfo.Instance:GetPackageName() end -- 判断是否是注册并登录 @@ -102,7 +103,8 @@ function this.TrackCreateAccount() account = AppConst.isSDK and tostring(AppConst.OpenId) or "", Bundle_id = AppConst.isSDK and AppConst.SdkPackageName or "", xx_id = AppConst.isSDK and AppConst.SdkChannel or "", - device_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDeviceId() or "" + device_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDeviceId() or "", + packId = PackageManager.GetPackageID() or "", }) ThinkingAnalyticsManager.Track("create_account") end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 31b993bf2f..ac9d43d6b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -45,7 +45,8 @@ function this.LoginRequest(openId, func) data.distinct_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDistinctId() or "" data.openId = openId data.cc_id = PackageManager.GetCCCode() - data.channel_s = AppConst.isSDKLogin and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName or "" --pt_pid.."#"..pt_gid + local packId = PackageManager.GetPackageID() or "" + data.channel_s = AppConst.isSDKLogin and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName .."#".. packId or "" --pt_pid.."#"..pt_gid data.platform_s = AppConst.Platform --and "ADR" or "PC" local msg = data:SerializeToString() @@ -72,6 +73,7 @@ function this.LoginRequest(openId, func) account = AppConst.isSDK and tostring(AppConst.OpenId) or "", Bundle_id = AppConst.isSDK and AppConst.SdkPackageName or "", xx_id = AppConst.isSDK and AppConst.SdkChannel or "", + packId = PackageManager.GetPackageID() or "", -- test_list = "1,2,3#2", -- 数组 }) TapDBManager.SetServer(LoginManager.ServerId) From 1006de499cd68efaf41b86e4f43fd9937ca85e0f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 31 Jul 2021 15:59:14 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E3=80=90=E5=B7=85=E5=B3=B0=E8=B5=9B?= =?UTF-8?q?=E3=80=91=E6=B7=BB=E5=8A=A0=E6=9C=AA=E8=A7=A3=E9=94=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Arena/ArenaTypePanel.prefab | 355 +++++++++++++++++- .../~Lua/Message/CommonProto_pb.lua | 13 +- .../~Lua/Message/gtGprotos/GlobalProto_pb.lua | 18 - .../~Lua/Modules/Arena/ArenaTypePanel.lua | 110 ++++-- .../GlobalActTimeCtrl/ActTimeCtrlManager.lua | 35 +- 5 files changed, 448 insertions(+), 83 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab index 0eef7e56b1..32da8dcb8d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab @@ -185,13 +185,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873960035} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 2082006401} - m_Father: {fileID: 2857972376571971649} - m_RootOrder: 3 + m_Father: {fileID: 1436239891183394945} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1416,11 +1416,8 @@ RectTransform: m_Children: - {fileID: 5676066250249380744} - {fileID: 6672747167317814919} - - {fileID: 2737230903987393118} - - {fileID: 873960036} - - {fileID: 4106886662852041418} - - {fileID: 6937309361002804487} - - {fileID: 6746978938403573984} + - {fileID: 1436239891183394945} + - {fileID: 8356349735732826998} m_Father: {fileID: 1295965547740137698} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1533,14 +1530,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 456010732934271532} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 3408779923621903900} - {fileID: 6714232552303648380} - m_Father: {fileID: 2857972376571971649} - m_RootOrder: 2 + m_Father: {fileID: 1436239891183394945} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2076,6 +2073,46 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2527152010726074024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1436239891183394945} + m_Layer: 0 + m_Name: normal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1436239891183394945 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2527152010726074024} + 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: 2737230903987393118} + - {fileID: 873960036} + - {fileID: 4106886662852041418} + - {fileID: 6937309361002804487} + - {fileID: 6746978938403573984} + m_Father: {fileID: 2857972376571971649} + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2695179168051854542 GameObject: m_ObjectHideFlags: 0 @@ -2175,13 +2212,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2711261480814228782} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 7133322365696889359} - m_Father: {fileID: 2857972376571971649} - m_RootOrder: 5 + m_Father: {fileID: 1436239891183394945} + 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} @@ -2231,6 +2268,87 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5386\u53F2\u6700\u9AD8\uFF1A" LanguageIndex: 0 +--- !u!1 &2871227230248073167 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6364408976405844178} + - component: {fileID: 1256412335996617393} + - component: {fileID: 3243561346559563886} + m_Layer: 0 + m_Name: Season + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6364408976405844178 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2871227230248073167} + 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: 5689779010244021189} + m_Father: {fileID: 8356349735732826998} + m_RootOrder: 0 + 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: -196, y: 149.70001} + m_SizeDelta: {x: 343.05, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1256412335996617393 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2871227230248073167} + m_CullTransparentMesh: 0 +--- !u!114 &3243561346559563886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2871227230248073167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7075472, g: 0.64001215, b: 0.56403524, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5F00\u670D\u7B2C3\u5929\u89E3\u9501" + LanguageIndex: 0 --- !u!1 &2979872552327346480 GameObject: m_ObjectHideFlags: 0 @@ -2559,12 +2677,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4096992386751104221} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 2857972376571971649} - m_RootOrder: 6 + m_Father: {fileID: 1436239891183394945} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3243,6 +3361,86 @@ MonoBehaviour: m_EditorClassIdentifier: bgList: - {fileID: 3229093599019750937} +--- !u!1 &5762417203835210408 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 465233556910743428} + - component: {fileID: 1083308268956750754} + - component: {fileID: 2956255318628547991} + m_Layer: 0 + m_Name: Tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &465233556910743428 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5762417203835210408} + 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: 8356349735732826998} + m_RootOrder: 1 + 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: -167, y: -73} + m_SizeDelta: {x: 398.88, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1083308268956750754 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5762417203835210408} + m_CullTransparentMesh: 0 +--- !u!114 &2956255318628547991 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5762417203835210408} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.7607844, b: 0.5019608, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 45 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5F00\u542F\u540E\u5343\u6218\u9010\u80DC\u53F0\u6392\u540D\u524D\n128\u540D\u7684\u73A9\u5BB6\u5C06\u81EA\u52A8\u53C2\u4E0E" + LanguageIndex: 0 --- !u!1 &6184529373675545504 GameObject: m_ObjectHideFlags: 0 @@ -3342,13 +3540,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6348000190297303489} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 2894788629952705247} - m_Father: {fileID: 2857972376571971649} - m_RootOrder: 4 + m_Father: {fileID: 1436239891183394945} + 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} @@ -3398,6 +3596,123 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6211\u7684\u6392\u540D\uFF1A" LanguageIndex: 0 +--- !u!1 &6942200164054550947 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8356349735732826998} + m_Layer: 0 + m_Name: lock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8356349735732826998 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6942200164054550947} + 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: 6364408976405844178} + - {fileID: 465233556910743428} + m_Father: {fileID: 2857972376571971649} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6971458859534464137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5689779010244021189} + - component: {fileID: 2951341077535999481} + - component: {fileID: 5060451528222810491} + m_Layer: 0 + m_Name: Time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5689779010244021189 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6971458859534464137} + 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: 6364408976405844178} + m_RootOrder: 0 + 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: -52.5} + m_SizeDelta: {x: 210.9, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2951341077535999481 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6971458859534464137} + m_CullTransparentMesh: 0 +--- !u!114 &5060451528222810491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6971458859534464137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.5088341, g: 0.7264151, b: 0.48998755, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\uFF08\u5269\u4F59\u65F6\u95F4\uFF1A05:02:53\uFF09" + LanguageIndex: 0 --- !u!1 &7998630011325784670 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index e2942ad66e..c35611f78e 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -247,6 +247,7 @@ FUNCTIONOFTIME_FUNCTIONID_FIELD = protobuf.FieldDescriptor(); FUNCTIONOFTIME_STARTTIME_FIELD = protobuf.FieldDescriptor(); FUNCTIONOFTIME_ENDTIME_FIELD = protobuf.FieldDescriptor(); FUNCTIONOFTIME_INTERVAL_FIELD = protobuf.FieldDescriptor(); +FUNCTIONOFTIME_SWITCH_FIELD = protobuf.FieldDescriptor(); ADVENTURERANKITEMINFO = protobuf.Descriptor(); ADVENTURERANKITEMINFO_LEVEL_FIELD = protobuf.FieldDescriptor(); ADVENTURERANKITEMINFO_NAME_FIELD = protobuf.FieldDescriptor(); @@ -3032,11 +3033,21 @@ FUNCTIONOFTIME_INTERVAL_FIELD.default_value = 0 FUNCTIONOFTIME_INTERVAL_FIELD.type = 5 FUNCTIONOFTIME_INTERVAL_FIELD.cpp_type = 1 +FUNCTIONOFTIME_SWITCH_FIELD.name = "switch" +FUNCTIONOFTIME_SWITCH_FIELD.full_name = ".rpc.protocols.FunctionOfTime.switch" +FUNCTIONOFTIME_SWITCH_FIELD.number = 5 +FUNCTIONOFTIME_SWITCH_FIELD.index = 4 +FUNCTIONOFTIME_SWITCH_FIELD.label = 1 +FUNCTIONOFTIME_SWITCH_FIELD.has_default_value = false +FUNCTIONOFTIME_SWITCH_FIELD.default_value = 0 +FUNCTIONOFTIME_SWITCH_FIELD.type = 5 +FUNCTIONOFTIME_SWITCH_FIELD.cpp_type = 1 + FUNCTIONOFTIME.name = "FunctionOfTime" FUNCTIONOFTIME.full_name = ".rpc.protocols.FunctionOfTime" FUNCTIONOFTIME.nested_types = {} FUNCTIONOFTIME.enum_types = {} -FUNCTIONOFTIME.fields = {FUNCTIONOFTIME_FUNCTIONID_FIELD, FUNCTIONOFTIME_STARTTIME_FIELD, FUNCTIONOFTIME_ENDTIME_FIELD, FUNCTIONOFTIME_INTERVAL_FIELD} +FUNCTIONOFTIME.fields = {FUNCTIONOFTIME_FUNCTIONID_FIELD, FUNCTIONOFTIME_STARTTIME_FIELD, FUNCTIONOFTIME_ENDTIME_FIELD, FUNCTIONOFTIME_INTERVAL_FIELD, FUNCTIONOFTIME_SWITCH_FIELD} FUNCTIONOFTIME.is_extendable = false FUNCTIONOFTIME.extensions = {} ADVENTURERANKITEMINFO_LEVEL_FIELD.name = "level" diff --git a/Assets/ManagedResources/~Lua/Message/gtGprotos/GlobalProto_pb.lua b/Assets/ManagedResources/~Lua/Message/gtGprotos/GlobalProto_pb.lua index 09b0744e03..f46a415e66 100644 --- a/Assets/ManagedResources/~Lua/Message/gtGprotos/GlobalProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/gtGprotos/GlobalProto_pb.lua @@ -9,8 +9,6 @@ GETWORLDSERVERRESPONSE = protobuf.Descriptor(); GETWORLDSERVERRESPONSE_IP_FIELD = protobuf.FieldDescriptor(); GETWORLDSERVERRESPONSE_PORT_FIELD = protobuf.FieldDescriptor(); GETWORLDSERVERRESPONSE_GROUP_FIELD = protobuf.FieldDescriptor(); -GETGLOBALSPLITMAILREQUEST = protobuf.Descriptor(); -GETGLOBALSPLITMAILRESPONSE = protobuf.Descriptor(); GETWORLDSERVERREQUEST_SERVERID_FIELD.name = "serverID" GETWORLDSERVERREQUEST_SERVERID_FIELD.full_name = ".rpc.global.GetWorldServerRequest.serverID" @@ -66,23 +64,7 @@ GETWORLDSERVERRESPONSE.enum_types = {} GETWORLDSERVERRESPONSE.fields = {GETWORLDSERVERRESPONSE_IP_FIELD, GETWORLDSERVERRESPONSE_PORT_FIELD, GETWORLDSERVERRESPONSE_GROUP_FIELD} GETWORLDSERVERRESPONSE.is_extendable = false GETWORLDSERVERRESPONSE.extensions = {} -GETGLOBALSPLITMAILREQUEST.name = "GetGlobalSplitMailRequest" -GETGLOBALSPLITMAILREQUEST.full_name = ".rpc.global.GetGlobalSplitMailRequest" -GETGLOBALSPLITMAILREQUEST.nested_types = {} -GETGLOBALSPLITMAILREQUEST.enum_types = {} -GETGLOBALSPLITMAILREQUEST.fields = {} -GETGLOBALSPLITMAILREQUEST.is_extendable = false -GETGLOBALSPLITMAILREQUEST.extensions = {} -GETGLOBALSPLITMAILRESPONSE.name = "GetGlobalSplitMailResponse" -GETGLOBALSPLITMAILRESPONSE.full_name = ".rpc.global.GetGlobalSplitMailResponse" -GETGLOBALSPLITMAILRESPONSE.nested_types = {} -GETGLOBALSPLITMAILRESPONSE.enum_types = {} -GETGLOBALSPLITMAILRESPONSE.fields = {} -GETGLOBALSPLITMAILRESPONSE.is_extendable = false -GETGLOBALSPLITMAILRESPONSE.extensions = {} -GetGlobalSplitMailRequest = protobuf.Message(GETGLOBALSPLITMAILREQUEST) -GetGlobalSplitMailResponse = protobuf.Message(GETGLOBALSPLITMAILRESPONSE) GetWorldServerRequest = protobuf.Message(GETWORLDSERVERREQUEST) GetWorldServerResponse = protobuf.Message(GETWORLDSERVERRESPONSE) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua index 5b6a3b4686..17330e639c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua @@ -17,12 +17,18 @@ function ArenaTypePanel:InitComponent() this.Arena_Score = Util.GetGameObject(this.btnArena, "Score/Text"):GetComponent("Text") this.Arena_Rank = Util.GetGameObject(this.btnArena, "Rank/Text"):GetComponent("Text") + this.TopMatch_Normal = Util.GetGameObject(this.btnTopMatch, "normal") this.TopMatch_Name = Util.GetGameObject(this.btnTopMatch, "Name"):GetComponent("Text") - this.TopMatch_Season = Util.GetGameObject(this.btnTopMatch, "Season/Text"):GetComponent("Text") - this.TopMatch_SeasonTime = Util.GetGameObject(this.btnTopMatch, "Season/Time"):GetComponent("Text") - this.TopMatch_Stage = Util.GetGameObject(this.btnTopMatch, "Stage/Text"):GetComponent("Text") - this.TopMatch_Rank = Util.GetGameObject(this.btnTopMatch, "MyRank/Text"):GetComponent("Text") - this.TopMatch_BestRank = Util.GetGameObject(this.btnTopMatch, "BestRank/Text"):GetComponent("Text") + this.TopMatch_Season = Util.GetGameObject(this.TopMatch_Normal, "Season/Text"):GetComponent("Text") + this.TopMatch_SeasonTime = Util.GetGameObject(this.TopMatch_Normal, "Season/Time"):GetComponent("Text") + this.TopMatch_Stage = Util.GetGameObject(this.TopMatch_Normal, "Stage/Text"):GetComponent("Text") + this.TopMatch_Rank = Util.GetGameObject(this.TopMatch_Normal, "MyRank/Text"):GetComponent("Text") + this.TopMatch_BestRank = Util.GetGameObject(this.TopMatch_Normal, "BestRank/Text"):GetComponent("Text") + + this.TopMatch_Lock = Util.GetGameObject(this.btnTopMatch, "lock") + this.TopMatch_Lock_Title = Util.GetGameObject(this.TopMatch_Lock, "Season"):GetComponent("Text") + this.TopMatch_Lock_Time = Util.GetGameObject(this.TopMatch_Lock, "Season/Time"):GetComponent("Text") + this.TopMatch_Lock_Tip = Util.GetGameObject(this.TopMatch_Lock, "Tip"):GetComponent("Text") this.btnArenaRedpot = Util.GetGameObject(this.btnArena, "bg/redpot") -- 上部货币显示 @@ -61,22 +67,22 @@ end --添加事件监听(用于子类重写) function ArenaTypePanel:AddListener() Game.GlobalEvent:AddEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.RefreshTopMatchShow) - Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.OnOpen, this) - Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionClose, this.OnOpen, this) + Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.OnShow, this) + Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionClose, this.OnShow, this) end --移除事件监听(用于子类重写) function ArenaTypePanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.RefreshTopMatchShow) - Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.OnOpen, this) - Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionClose, this.OnOpen, this) + Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.OnShow, this) + Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionClose, this.OnShow, this) end --界面打开时调用(用于子类重写) function ArenaTypePanel:OnOpen(...) -- SoundManager.PlayMusic(SoundConfig.BGM_Arena) - local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TOP_MATCH) - if serData then + local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.TOP_MATCH) + if isOpen then FormationManager.GetFormationByID(FormationTypeDef.ARENA_TOM_MATCH) end end @@ -120,21 +126,34 @@ end -- 刷新巅峰战显示 function this.RefreshTopMatchShow() - local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TOP_MATCH) - if serData then - local startDate = os.date("%m.%d", serData.startTime) - local endDate = os.date("%m.%d", serData.endTime) - this.TopMatch_Season.text = string.format("%s-%s", startDate, endDate) + local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.TOP_MATCH) + if isOpen then + this.TopMatch_Normal:SetActive(true) + this.TopMatch_Lock:SetActive(false) + local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TOP_MATCH) + if serData then + local startDate = os.date("%m.%d", serData.startTime) + local endDate = os.date("%m.%d", serData.endTime) + this.TopMatch_Season.text = string.format("%s-%s", startDate, endDate) + else + this.TopMatch_Season.text = "暂未开放" + end + + local tmData = ArenaTopMatchManager.GetBaseData() + local titleName, stageName = ArenaTopMatchManager.GetCurTopMatchName() + this.TopMatch_Name.text = titleName + this.TopMatch_Stage.text = stageName + this.TopMatch_Rank.text = tmData.myrank <= 0 and Language[10036] or ArenaTopMatchManager.GetRankNameByRank(tmData.myrank) + this.TopMatch_BestRank.text = tmData.maxRank <= 0 and Language[10086] or this.GetRankName(tmData.maxRank) else - this.TopMatch_Season.text = "暂未开放" - end + this.TopMatch_Normal:SetActive(false) + this.TopMatch_Lock:SetActive(true) - local tmData = ArenaTopMatchManager.GetBaseData() - local titleName, stageName = ArenaTopMatchManager.GetCurTopMatchName() - this.TopMatch_Name.text = titleName - this.TopMatch_Stage.text = stageName - this.TopMatch_Rank.text = tmData.myrank <= 0 and Language[10036] or ArenaTopMatchManager.GetRankNameByRank(tmData.myrank) - this.TopMatch_BestRank.text = tmData.maxRank <= 0 and Language[10086] or this.GetRankName(tmData.maxRank) + local titleName, stageName = ArenaTopMatchManager.GetCurTopMatchName() + this.TopMatch_Name.text = titleName + + this.TopMatch_Lock_Title.text = string.format("%s解锁", ActTimeCtrlManager.GetSwitchOpenTip(FUNCTION_OPEN_TYPE.TOP_MATCH)) + end end @@ -165,26 +184,37 @@ function this.TimeUpdate() end this.Arena_SeasonTime.text = string.format(Language[10090], TimeToHMS(leftTime)) - local isActive = ArenaTopMatchManager.IsTopMatchActive() - local startTime, endTime = ArenaTopMatchManager.GetTopMatchTime() - if isActive then - local leftTime = endTime - GetTimeStamp() - if leftTime <= 0 then - this.RefreshTopMatchShow() - end - this.TopMatch_SeasonTime.text = string.format(Language[10090], TimeToHMS(leftTime)) - else - if startTime then - local leftTime = startTime - GetTimeStamp() + local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.TOP_MATCH) + if isOpen then + local isActive = ArenaTopMatchManager.IsTopMatchActive() + local startTime, endTime = ArenaTopMatchManager.GetTopMatchTime() + if isActive then + local leftTime = endTime - GetTimeStamp() if leftTime <= 0 then this.RefreshTopMatchShow() - this.TopMatch_SeasonTime.text = "" - else - this.TopMatch_SeasonTime.text = string.format(Language[10091], TimeToHMS(leftTime)) end + this.TopMatch_SeasonTime.text = string.format(Language[10090], TimeToHMS(leftTime)) else - this.RefreshTopMatchShow() - this.TopMatch_SeasonTime.text = "" + if startTime then + local leftTime = startTime - GetTimeStamp() + if leftTime <= 0 then + this.RefreshTopMatchShow() + this.TopMatch_SeasonTime.text = "" + else + this.TopMatch_SeasonTime.text = string.format(Language[10091], TimeToHMS(leftTime)) + end + else + this.RefreshTopMatchShow() + this.TopMatch_SeasonTime.text = "" + end + end + else + local startTime, endTime = ArenaTopMatchManager.GetTopMatchTime() + if startTime then + local leftTime = startTime - GetTimeStamp() + this.TopMatch_Lock_Time.text = string.format("(即将解锁:%s)", TimeToHMS(leftTime)) + else + this.TopMatch_Lock_Time.text = "" end end end diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua index 48dfc4e3ba..cba38f0cb2 100644 --- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua @@ -98,6 +98,7 @@ function this.InitMsg(msg) local startTime = t.startTime local endTime = t.endTime local restTime = t.interval + local switch = t.switch this.serData[id] = {} @@ -105,10 +106,11 @@ function this.InitMsg(msg) this.serData[id].startTime = startTime this.serData[id].endTime = endTime this.serData[id].restTime = restTime + this.serData[id].switch = switch - -- Log( - -- string.format("--- 功能解锁数据 id = %s, startTime = %s, endTime = %s", - -- id, startTime, endTime)) + Log( + string.format("--- 功能解锁数据 id = %s, startTime = %s, endTime = %s, switch = %s", + id, startTime, endTime, switch)) -- 用于标记是否解锁使用 local typeId = AllActSetConfig[id].IsIDdSame @@ -272,8 +274,9 @@ end function this.SingleFuncState(id) local isOpen = false local qualifiled = this.IsQualifiled(id) + local isOpen = this.IsSwitchOpen(id) local isActive = this.FuncTimeJudge(id) - if qualifiled and isActive then + if isOpen and qualifiled and isActive then isOpen = true else isOpen = false @@ -322,6 +325,30 @@ function this.IsQualifiled(id) return qualifiled end +-- 判断功能是否真的开放 +function this.IsSwitchOpen(id) + local serData = this.GetSerDataByTypeId(id) + if serData then + return serData.switch == 0 + end + return false +end +-- +local SwitchOpenStr = { + [1] = "创角第%s天", + [2] = "开服第%s天" +} +function this.GetSwitchOpenTip(id) + local data = this.GetTableDataByTypeId(id)[1] + if data then + if data.IfOpen then + local t = data.IfOpen[1] + return string.format(SwitchOpenStr[t], data.IfOpen[2]) + end + end + return +end + --传入需要锁上的功能, state 为true,需要置灰 function this.SetFuncLockState(obj, id, state,isWorkShop) local isOpen = this.SingleFuncState(id) From 7757dc2f1e7a7ea85068f8cba961cbc53ab92530 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 31 Jul 2021 15:59:48 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E3=80=90=E7=83=AD=E6=9B=B4=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=80=91=E6=B7=BB=E5=8A=A0=E8=B7=A8=E6=9C=8D=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=83=AD=E6=9B=B4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs index d9018abac2..955b3b68c3 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs @@ -380,6 +380,7 @@ namespace GameEditor.FrameTool new string[]{ "灵动-商务", "mht_china/sw", "cdn_mht_sw", "china/mht_sw" }, new string[]{ "先遣-内网", "mht_china/local", "local12_cn_local", "china/local" }, + new string[]{ "先遣-测试跨服", "mht_china/kf", "cdn_xq_kf", "china/local" }, new string[]{ "先遣-测试", "mht_china/xq", "cdn_xq_test", "china/test" }, new string[]{ "先遣-正式", "mht_china/xq", "cdn_xq_release", "china/test" }, From 96adf23ab2a564a10fea7135aaae32f5f0afd5b3 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 31 Jul 2021 16:02:49 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E3=80=90http=E8=AF=B7=E6=B1=82=E3=80=91?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=8A=A5=E9=94=99=E6=97=A5=E5=BF=97=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 4d4438943c..9c036a702c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -356,7 +356,7 @@ function this.RequestServerVersion(func) func() end end, nil, nil, function(errCode, errMsg) - LogError("GetServerVersion Error: "..errCode .. ", "..errMsg) + LogError("GetServerVersion Error: "..tostring(errCode) .. ", "..tostring(errMsg)) if func then func() end From 0cd58e9f6dff5ed88da6e4eab820cbcd3533b6ae Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 31 Jul 2021 16:10:57 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E3=80=90=E5=B7=85=E5=B3=B0=E8=B5=9B?= =?UTF-8?q?=E3=80=91=E6=9C=AA=E5=BC=80=E6=94=BE=E7=8A=B6=E6=80=81=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E8=BF=9B=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua index 17330e639c..151faa0a29 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua @@ -49,8 +49,8 @@ function ArenaTypePanel:BindEvent() --end --JumpManager.GoJump(57001) - local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TOP_MATCH) - if not serData then + local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.TOP_MATCH) + if not isOpen then PopupTipPanel.ShowTip("巅峰赛暂未开放") return end From de1d87971729a8975bc1bd6f130cd57594fbd9ef Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 31 Jul 2021 16:25:43 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E3=80=90=E8=81=8A=E5=A4=A9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E4=BC=9A=E5=92=8C=E8=B7=A8=E6=9C=8D?= =?UTF-8?q?=E9=A2=91=E9=81=93=E7=9A=84=E6=9C=AA=E8=A7=A3=E9=94=81=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index 20a5172741..81bc96c593 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -190,14 +190,14 @@ function this.TabIsLockCheck(index) if channel == CHAT_CHANNEL.FAMILY then local isOpen = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GUILD) if not isOpen then - return true, Language[10369] + return true, ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.GUILD) end if isOpen and PlayerManager.familyId == 0 then return true, Language[10370] end elseif channel == CHAT_CHANNEL.JUMP_SERVER then if PlayerManager.isCross == 0 then - return true, "跨服频道暂未开启" + return true, "未划分跨服分组" end end return false From a96b609a49d781d714d23eb4a41852a7eb796d92 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 31 Jul 2021 16:49:28 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=90=E6=A3=AE=E7=BD=97=E5=B9=BB?= =?UTF-8?q?=E5=A2=83=E3=80=91=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E6=97=B6=E7=BA=A2=E7=82=B9=E6=96=B9=E6=B3=95=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Map/MapTrialManager.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua index 804ba9c4f2..e724f00aba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua @@ -301,8 +301,11 @@ end function this.TrialRedCheck() local text =PlayerManager.uid.."TrialReset" local cTime = GetTimeStamp() - local freshTime = ActTimeCtrlManager.GetSerDataByTypeId(30).endTime - + local sdata = ActTimeCtrlManager.GetSerDataByTypeId(30) + if not sdata then + return false + end + local freshTime = sdata.endTime if not PlayerPrefs.HasKey(text) then PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗每两天五点刷新重置红点 PlayerPrefs.SetInt(text,freshTime) From acf647d9c5357be3a3c877262fb29c89e244245a Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 31 Jul 2021 17:20:07 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E3=80=90=E7=BD=97=E6=B5=AE=E4=BA=89?= =?UTF-8?q?=E9=94=8B=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 3 ++- .../ManagedResources/~Lua/Modules/Ranking/RankingManager.lua | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 357df52c3a..cc46b6f328 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2428,7 +2428,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag [15] = { bgImage = "", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_PROGRESS,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 18}, [16] = { bgImage = "", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 19}, [17] = { bgImage = "", name = "排行榜" ,rankType = RANK_TYPE.TASUILINGXIAO,activiteId = ActivityTypeDef.TaSuiLingXiao,isRankingMainPanelShow = 0,RankingListMainSortId = 20}, - [18] = { bgImage = "", name = "罗浮争锋排行" ,rankType = RANK_TYPE.JUMPSERVER_HIGHTLADDER,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 21}, + [18] = { bgImage = "", name = "罗浮争锋排行" ,rankType = RANK_TYPE.JUMPSERVER_HIGHTLADDER,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 21}, [19] = { bgImage = "r_zjm_paihangbang_banner002_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 5}, [20] = { bgImage = "r_zjm_paihangbang_banner001_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_MONSTER_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 6}, diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 70b80ecad1..d8a19163ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -504,7 +504,7 @@ function this:BindEvent() local types = {} local activiteIds = {} for i = 1, #rankKingList do - if rankKingList[i].isRankingMainPanelShow > 0 then + if rankKingList[i].isRankingMainPanelShow == 1 or rankKingList[i].isRankingMainPanelShow == 2 then table.insert(types,rankKingList[i].rankType) table.insert(activiteIds,rankKingList[i].activiteId) end @@ -1684,6 +1684,7 @@ function this.RefreshBattleUpLvTip() end local roleRefreshNum = 0 function this.OnMainPlayerNPCRefresh() + -- Log("roleRefreshNum asd ") if roleRefreshNum < 20 then roleRefreshNum = roleRefreshNum + 1 -- LogRed("roleRefreshNum "..roleRefreshNum) diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua index 98edcfb24d..3b59ab7da6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua @@ -23,7 +23,7 @@ function this.InitData(rankType,fun,id,rankIndex) local isCross = 0 for i = 1, #rankKingList do if rankType == rankKingList[i].rankType then - if rankKingList[i].isRankingMainPanelShow == 2 then + if rankKingList[i].isRankingMainPanelShow >= 2 then isCross = 1 end end @@ -46,7 +46,7 @@ function this.RequestNextWarPowerPageData(fun) --LogGreen(Language[12215]) return end - Log("cur_rankIndex "..cur_rankIndex) + -- Log("cur_rankIndex "..cur_rankIndex) NetManager.RequestRankInfo(cur_rankType, function (msg)--请求数据 this.ReceiveNextRankingData(msg,fun) end,cur_activiteId,cur_rankIndex)