Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-03-19 11:46:12 +08:00
commit 7986167a58
6 changed files with 36 additions and 31 deletions

View File

@ -1027,7 +1027,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 274.27, y: 51.700012}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7719948459821737218 --- !u!222 &7719948459821737218
@ -1065,7 +1065,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 4 m_MinSize: 4
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 5 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0

View File

@ -552,7 +552,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 195.7, y: 49.9}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7443940717002067312 --- !u!222 &7443940717002067312
@ -590,7 +590,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 10 m_MinSize: 10
m_MaxSize: 44 m_MaxSize: 44
m_Alignment: 4 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
@ -1031,7 +1031,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 195.7, y: 49.9}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5865507525732205369 --- !u!222 &5865507525732205369
@ -1069,7 +1069,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 10 m_MinSize: 10
m_MaxSize: 44 m_MaxSize: 44
m_Alignment: 4 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
@ -2582,7 +2582,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &5920877375940425070 --- !u!224 &5920877375940425070
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2753,7 +2753,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 195.7, y: 49.9}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5527442532519764282 --- !u!222 &5527442532519764282
@ -2791,7 +2791,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 10 m_MinSize: 10
m_MaxSize: 44 m_MaxSize: 44
m_Alignment: 4 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
@ -2996,7 +2996,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &8894568249531473385 --- !u!224 &8894568249531473385
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3421,7 +3421,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &7050190722572663993 --- !u!224 &7050190722572663993
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -232,7 +232,10 @@ function this:OnOpen(_fightData, _fightType, _endFunc)
BattleView:SetNameStr(nil) BattleView:SetNameStr(nil)
this.DefResult:SetActive(false) this.DefResult:SetActive(false)
this.AtkResult: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() BattleView:StartBattle()

View File

@ -110,8 +110,8 @@ function this:BindEvent()
LoginManager.SocketPort = list.port LoginManager.SocketPort = list.port
LoginManager.ServerId = list.server_id LoginManager.ServerId = list.server_id
LoginManager.state = list.state LoginManager.state = list.state
local severArea = tonumber(string.sub(list.server_id, 0, -5)) --local severArea = tonumber(string.sub(list.server_id, 0, -5))
this.serverMes.text = PlayerManager.serverInfo.name .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. Language[11138] this.serverMes.text = PlayerManager.serverInfo.name-- .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. Language[11138]
end end
}) })
end) end)
@ -390,8 +390,8 @@ function this.SetServerList(data)
LoginManager.ServerId = this.serverList[lastIndex].server_id LoginManager.ServerId = this.serverList[lastIndex].server_id
LoginManager.state = this.serverList[lastIndex].state LoginManager.state = this.serverList[lastIndex].state
local severArea = tonumber(string.sub(this.serverList[lastIndex].server_id, 0, -5)) --local severArea = tonumber(string.sub(this.serverList[lastIndex].server_id, 0, -5))
this.serverMes.text = PlayerManager.serverInfo.name .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. Language[11138] this.serverMes.text = PlayerManager.serverInfo.name-- .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. Language[11138]
RequestPanel.Hide() RequestPanel.Hide()

View File

@ -135,7 +135,7 @@ function this.PlayerInfoRequest(func)
vip_level = msg.player.vipLevel, vip_level = msg.player.vipLevel,
-- test_date = math.floor(msg.player.serverTime) .. "#3", -- 日期 -- test_date = math.floor(msg.player.serverTime) .. "#3", -- 日期
}) })
TapDBManager.SetUser(PlayerManager.uid) TapDBManager.SetUser(AppConst.OpenId)
TapDBManager.SetLevel(PlayerManager.level) TapDBManager.SetLevel(PlayerManager.level)
TapDBManager.SetServer(LoginManager.ServerId) TapDBManager.SetServer(LoginManager.ServerId)

View File

@ -241,23 +241,25 @@ function PrivilegeManager.GetPrivilegeOpenTip(privilegeType)
end end
--当存在多解锁类型时 --当存在多解锁类型时
if #privilegeList>1 then -- if #privilegeList>1 then
local infoList={} -- local infoList={}
--解锁2倍速的处理 --解锁2倍速的处理
for i,v in ipairs(privilegeList) do -- for i,v in ipairs(privilegeList) do
if (v.UnlockType==2 or v.UnlockType==3) and privilegeType==PRIVILEGE_TYPE.DoubleTimesFight then -- if (v.UnlockType==1) and privilegeType==PRIVILEGE_TYPE.DoubleTimesFight then
for _, con in ipairs(v.Condition) do -- for _, con in ipairs(v.Condition) do
if con[2] > 0 then -- if con[2] > 0 then
table.insert(infoList, con[1]) -- table.insert(infoList, con[1])
end -- end
end -- end
end -- end
end -- end
if privilegeType==PRIVILEGE_TYPE.DoubleTimesFight then if privilegeType==PRIVILEGE_TYPE.DoubleTimesFight then
local fightConfig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, infoList[1]) local lvOpenTimeScaleConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",PRIVILEGE_TYPE.DoubleTimesFight,"UnlockType",1)
return string.format(Language[11402],GetLanguageStrById(fightConfig.Name),infoList[2]) -- 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 -- end
local privilegeData = privilegeList[1] local privilegeData = privilegeList[1]
-- 没有条件直接返回0 -- 没有条件直接返回0