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

dev_chengFeng
ZhangBiao 2022-01-12 15:38:45 +08:00
commit a74799caea
3 changed files with 60 additions and 11 deletions

View File

@ -6586,9 +6586,9 @@ RectTransform:
m_Father: {fileID: 5306787189736440502}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 58, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 58, y: -71.175}
m_SizeDelta: {x: 0, y: 101}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6149476631504047147
@ -9638,6 +9638,8 @@ GameObject:
m_Component:
- component: {fileID: 8121286746226876291}
- component: {fileID: 8124780028357906616}
- component: {fileID: 5488706725289087337}
- component: {fileID: 1417515970342626066}
m_Layer: 5
m_Name: skill
m_TagString: Untagged
@ -9696,6 +9698,44 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!223 &5488706725289087337
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8335544241066286179}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 1
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &1417515970342626066
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8335544241066286179}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!1 &8335999088447926411
GameObject:
m_ObjectHideFlags: 0

View File

@ -199,15 +199,20 @@ function this:Refresh(_data,_item)
if #formation.teamHeroInfos < 1 then
else
if FormationManager.GetFormationPower(_data.formationId) > this.mapData.force then
--打开时间弹窗
if GuideManager.IsFunctionGuideExist() then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.SelectExploreTime,this.mapData,_data)
else
MsgPanel.ShowTwo("所选队伍战力小于推荐战力,是否仍要进行探索?", function()end, function()
--打开时间弹窗
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.SelectExploreTime,this.mapData,_data)
end, "取消", "确定", "提示",false,"")
end
else
if FormationManager.GetFormationPower(_data.formationId) > this.mapData.force then
--打开时间弹窗
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.SelectExploreTime,this.mapData,_data)
else
MsgPanel.ShowTwo("所选队伍战力小于推荐战力,是否仍要进行探索?", function()end, function()
--打开时间弹窗
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.SelectExploreTime,this.mapData,_data)
end, "取消", "确定", "提示",false,"")
end
end
end
end)
end

View File

@ -67,6 +67,7 @@ function RoleInfoLayout:InitComponent()
this.posInfo = Util.GetGameObject(this.posBtn,"PosInfo"):GetComponent("Text")
this.proTip = Util.GetGameObject(self.gameObject,"content/pro/tishi")
this.skillGrid=Util.GetGameObject(self.gameObject,"content/skill")
this.skillGridCanvas = this.skillGrid:GetComponent("Canvas")
this.selsectSkillImage=Util.GetGameObject(this.skillGrid,"selsectSkillImage")
this.skillList = {}
for i = 1,6 do
@ -189,6 +190,7 @@ function this.SkillInfoPopupClose(panelType, p)
if panelType == UIName.SkillInfoPopup and this.skillPanel == p then --监听到SkillInfoPopup关闭把层级设回去
this.selsectSkillImage:SetActive(false)
this.skillPanel = nil
this.skillGridCanvas.sortingOrder = this.sortingOrder + 1
end
end
@ -370,6 +372,7 @@ end
--单个技能显示
function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills)
this.skillGridCanvas.sortingOrder = this.sortingOrder + 1
this.skillData = this.GetSkillsData()
for i = 1,math.max(#this.skillList,#this.skillData) do
this.skillList[i].icon.gameObject:GetComponent("Button").onClick:RemoveAllListeners()
@ -415,6 +418,7 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills
local awakenSkillList = this.GetAwakenSkill()
this.skillPanel = UIManager.OpenPanel(UIName.SkillInfoPopup,this.skillData[i],1,10,maxLv,i,nil,GodSoulManager.GetGodSoulLv(curHeroData.dynamicId),awakenSkillList[i-2])
end
this.skillGridCanvas.sortingOrder = this.skillPanel.sortingOrder + 1
end)
end
end