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

dev_chengFeng
gaoxin 2021-03-19 14:19:13 +08:00
commit 1b3e9460fe
5 changed files with 44 additions and 24 deletions

View File

@ -173,7 +173,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1492499629588067375
RectTransform:
m_ObjectHideFlags: 0
@ -1684,6 +1684,7 @@ GameObject:
m_Component:
- component: {fileID: 7598740983930717330}
- component: {fileID: 4153919401695343612}
- component: {fileID: 2321711066255673890}
m_Layer: 0
m_Name: box
m_TagString: Untagged
@ -1705,10 +1706,10 @@ RectTransform:
m_Father: {fileID: 426311262980600154}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 50}
m_SizeDelta: {x: 119.2, y: 100}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &4153919401695343612
MonoBehaviour:
@ -1723,16 +1724,30 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 150
m_Right: 0
m_Left: 216
m_Right: 80
m_Top: 0
m_Bottom: 80
m_ChildAlignment: 3
m_Spacing: 30
m_Spacing: 185
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 0
--- !u!114 &2321711066255673890
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6024333862272756716}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1 &6097502257844573580
GameObject:
m_ObjectHideFlags: 0

View File

@ -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()

View File

@ -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])
end
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
local privilegeData = privilegeList[1]
-- 没有条件直接返回0