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

dev_chengFeng
ZhangBiao 2021-12-20 15:02:41 +08:00
commit 777b353f4f
3 changed files with 2 additions and 62 deletions

View File

@ -320,7 +320,6 @@ GameObject:
- component: {fileID: 134824311}
- component: {fileID: 134824314}
- component: {fileID: 2767435939076187884}
- component: {fileID: 8562262682098124306}
m_Layer: 5
m_Name: Root
m_TagString: Untagged
@ -388,35 +387,6 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &8562262682098124306
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 134824310}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &147624192
GameObject:
m_ObjectHideFlags: 0
@ -27112,7 +27082,6 @@ GameObject:
- component: {fileID: 4381005762452039409}
- component: {fileID: 8782233851135989828}
- component: {fileID: 1756471361763787702}
- component: {fileID: 5158220398415254417}
m_Layer: 5
m_Name: Root
m_TagString: Untagged
@ -27180,35 +27149,6 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &5158220398415254417
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4798530326272507141}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4821790168365617154
GameObject:
m_ObjectHideFlags: 0

View File

@ -668,7 +668,7 @@ function this.GetCurLevelTips()
for id, config in ConfigPairs(LevelTipsConfig) do
LogError(id)
if config.Type == 1 then
if this.CarbonIdCompare(this.GetCurFightId(), config.Parameter) < 0 then
if this.CarbonIdCompare(this.GetCurFightId(), config.Parameter) <= 0 then
return config.Desc -- string.format("通关%s%s", mainLevelConfig[config.Parameter].Name, config.Desc)
end
elseif config.Type == 2 then

View File

@ -61,7 +61,7 @@ function this.OnLevelChange()
table.insert(_FuncGuideList, 100200)
StoryMapManager.isShowStory = 1
this.CheckFuncGuide()
elseif PlayerManager.level == 22 then
elseif PlayerManager.level == 15 then
StoryMapManager.isShowStory = 3
elseif PlayerManager.level == tonumber(SpecialConfig[89].Value) then
table.insert(_FuncGuideList, 103000)