diff --git a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab index a41f362090..2a1a74a114 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab @@ -1027,7 +1027,7 @@ RectTransform: 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: -121.5, y: -55.099945} + m_AnchoredPosition: {x: -123, y: -55.099945} m_SizeDelta: {x: 274.27, y: 51.700012} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7719948459821737218 @@ -1065,7 +1065,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 4 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Login/ServerListSelectPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/ServerListSelectPanel.prefab index 15b96f9339..a79f9b06ed 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/ServerListSelectPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/ServerListSelectPanel.prefab @@ -552,7 +552,7 @@ RectTransform: 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: 34.5, y: 0.6} + m_AnchoredPosition: {x: -38.64995, y: 0.6} m_SizeDelta: {x: 195.7, y: 49.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7443940717002067312 @@ -590,7 +590,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 44 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1031,7 +1031,7 @@ RectTransform: 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: 38.149975, y: 0.6} + m_AnchoredPosition: {x: -35, y: 0.6} m_SizeDelta: {x: 195.7, y: 49.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5865507525732205369 @@ -1069,7 +1069,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 44 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -2582,7 +2582,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5920877375940425070 RectTransform: m_ObjectHideFlags: 0 @@ -2753,7 +2753,7 @@ RectTransform: 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: 38.150005, y: 0.6} + m_AnchoredPosition: {x: -34.999943, y: 0.6} m_SizeDelta: {x: 195.7, y: 49.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5527442532519764282 @@ -2791,7 +2791,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 44 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -2996,7 +2996,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8894568249531473385 RectTransform: m_ObjectHideFlags: 0 @@ -3421,7 +3421,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7050190722572663993 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index d5a587d657..8e578686aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -232,7 +232,10 @@ function this:OnOpen(_fightData, _fightType, _endFunc) BattleView:SetNameStr(nil) this.DefResult:SetActive(false) this.AtkResult:SetActive(false) - + local lvOpenTimeScaleConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",PRIVILEGE_TYPE.DoubleTimesFight,"UnlockType",1) + if lvOpenTimeScaleConFig and PlayerManager.level == lvOpenTimeScaleConFig.Condition[1][1] and BattleManager.GetTimeScale() == BATTLE_TIME_SCALE_ONE then + BattleManager.SetTimeScale(BATTLE_TIME_SCALE_TWO) + end -- 开始战斗 BattleView:StartBattle() diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 7d7a28d6c9..6e9700fd2e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -110,8 +110,8 @@ function this:BindEvent() LoginManager.SocketPort = list.port LoginManager.ServerId = list.server_id LoginManager.state = list.state - local severArea = tonumber(string.sub(list.server_id, 0, -5)) - this.serverMes.text = PlayerManager.serverInfo.name .. "\t" .. severArea .. "" .. Language[11138] + --local severArea = tonumber(string.sub(list.server_id, 0, -5)) + this.serverMes.text = PlayerManager.serverInfo.name-- .. "\t" .. severArea .. "" .. Language[11138] end }) end) @@ -390,8 +390,8 @@ function this.SetServerList(data) LoginManager.ServerId = this.serverList[lastIndex].server_id LoginManager.state = this.serverList[lastIndex].state - local severArea = tonumber(string.sub(this.serverList[lastIndex].server_id, 0, -5)) - this.serverMes.text = PlayerManager.serverInfo.name .. "\t" .. severArea .. "" .. Language[11138] + --local severArea = tonumber(string.sub(this.serverList[lastIndex].server_id, 0, -5)) + this.serverMes.text = PlayerManager.serverInfo.name-- .. "\t" .. severArea .. "" .. Language[11138] RequestPanel.Hide() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index d23caeba8f..4338db1af1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -135,7 +135,7 @@ function this.PlayerInfoRequest(func) vip_level = msg.player.vipLevel, -- test_date = math.floor(msg.player.serverTime) .. "#3", -- 日期 }) - TapDBManager.SetUser(PlayerManager.uid) + TapDBManager.SetUser(AppConst.OpenId) TapDBManager.SetLevel(PlayerManager.level) TapDBManager.SetServer(LoginManager.ServerId) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua index ef7b30d955..e51d05c383 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua @@ -241,23 +241,25 @@ function PrivilegeManager.GetPrivilegeOpenTip(privilegeType) end --当存在多解锁类型时 - if #privilegeList>1 then - local infoList={} + -- if #privilegeList>1 then + -- local infoList={} --解锁2倍速的处理 - for i,v in ipairs(privilegeList) do - if (v.UnlockType==2 or v.UnlockType==3) and privilegeType==PRIVILEGE_TYPE.DoubleTimesFight then - for _, con in ipairs(v.Condition) do - if con[2] > 0 then - table.insert(infoList, con[1]) - end - end - end - end + -- for i,v in ipairs(privilegeList) do + -- if (v.UnlockType==1) and privilegeType==PRIVILEGE_TYPE.DoubleTimesFight then + -- for _, con in ipairs(v.Condition) do + -- if con[2] > 0 then + -- table.insert(infoList, con[1]) + -- end + -- end + -- end + -- end if privilegeType==PRIVILEGE_TYPE.DoubleTimesFight then - local fightConfig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, infoList[1]) - return string.format(Language[11402],GetLanguageStrById(fightConfig.Name),infoList[2]) + local lvOpenTimeScaleConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",PRIVILEGE_TYPE.DoubleTimesFight,"UnlockType",1) + -- local fightConfig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, infoList[1]) + -- return string.format(Language[11402],GetLanguageStrById(fightConfig.Name),infoList[2]) + return string.format("玩家等级达到 %s 级解锁",lvOpenTimeScaleConFig.Condition[1][1]) end - end + -- end local privilegeData = privilegeList[1] -- 没有条件直接返回0