增加 图鉴、神将归元、恭送神将界面“全部”按钮
2han9B1a0
parent
96d5d080d5
commit
8eaa1f6e8c
|
|
@ -18494,80 +18494,6 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3443803148591329534
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6630796034109084814}
|
||||
- component: {fileID: 8525994404564589321}
|
||||
- component: {fileID: 8608456163204832065}
|
||||
m_Layer: 5
|
||||
m_Name: selectBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6630796034109084814
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3443803148591329534}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6818199247398006187}
|
||||
m_RootOrder: 1
|
||||
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: -361.4, y: 263}
|
||||
m_SizeDelta: {x: 158, y: 158}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8525994404564589321
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3443803148591329534}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8608456163204832065
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3443803148591329534}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
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: 21300000, guid: 8f20c7f83b837d64aa1eb6fd54fce9f1, type: 3}
|
||||
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 &3451517361027498487
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -21452,7 +21378,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.00024390519}
|
||||
m_AnchoredPosition: {x: 0, y: 0.0002444663}
|
||||
m_SizeDelta: {x: 1011, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &3479522007591241276
|
||||
|
|
@ -25636,14 +25562,14 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 937462778811890991}
|
||||
- {fileID: 455258775517793228}
|
||||
- {fileID: 6630796034109084814}
|
||||
m_Father: {fileID: 7435143058469024522}
|
||||
m_RootOrder: 11
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 34.95, y: 51}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 34.95, y: -867}
|
||||
m_SizeDelta: {x: 880, y: 104}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1935076869411467390
|
||||
|
|
@ -31239,8 +31165,8 @@ MonoBehaviour:
|
|||
m_TargetGraphic: {fileID: 1755185850362724256}
|
||||
m_HandleRect: {fileID: 129146334546192825}
|
||||
m_Direction: 2
|
||||
m_Value: 0.9999999
|
||||
m_Size: 0.42627624
|
||||
m_Value: 0.99999994
|
||||
m_Size: 0
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -35816,6 +35742,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &7703425439495884181
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 937462778811890991}
|
||||
- component: {fileID: 2016838023123515696}
|
||||
- component: {fileID: 619116992639114599}
|
||||
m_Layer: 5
|
||||
m_Name: selectBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &937462778811890991
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7703425439495884181}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6818199247398006187}
|
||||
m_RootOrder: 0
|
||||
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: -336, y: 0}
|
||||
m_SizeDelta: {x: 158, y: 158}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2016838023123515696
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7703425439495884181}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &619116992639114599
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7703425439495884181}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
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: 21300000, guid: 8f20c7f83b837d64aa1eb6fd54fce9f1, type: 3}
|
||||
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 &7728922301027725535
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -36324,11 +36324,11 @@ RectTransform:
|
|||
- {fileID: 7578276957751805400}
|
||||
- {fileID: 9109786025061138459}
|
||||
m_Father: {fileID: 6818199247398006187}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
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: -0.00000095367, y: 5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 880, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &8154632061112756327
|
||||
|
|
@ -36352,7 +36352,7 @@ MonoBehaviour:
|
|||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 88, y: 88}
|
||||
m_Spacing: {x: 100, y: 0}
|
||||
m_Spacing: {x: 80, y: 0}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
--- !u!1 &7971390525586732992
|
||||
|
|
@ -39045,7 +39045,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9199890422166788147
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -39061,10 +39061,10 @@ RectTransform:
|
|||
m_Father: {fileID: 455258775517793228}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 44.20999, y: -50}
|
||||
m_SizeDelta: {x: 88, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1806077302080232653
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
|
|
@ -4386,7 +4386,7 @@ MonoBehaviour:
|
|||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 88, y: 88}
|
||||
m_Spacing: {x: 43.93, y: 0}
|
||||
m_Spacing: {x: 80, y: 0}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
--- !u!1 &3986309077087717417
|
||||
|
|
@ -8829,7 +8829,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7583128553461871495
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -8845,10 +8845,10 @@ RectTransform:
|
|||
m_Father: {fileID: 3986309076981122991}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 44.20999, y: -50}
|
||||
m_SizeDelta: {x: 88, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7583128553461871492
|
||||
CanvasRenderer:
|
||||
|
|
@ -9519,7 +9519,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -34.6, y: -1.2700553}
|
||||
m_SizeDelta: {x: 569.5, y: 104}
|
||||
m_SizeDelta: {x: 880, y: 104}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7583128554718342603
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ end
|
|||
--界面打开时调用（用于子类重写）
|
||||
function HandBookHeroAndEquipListPanel:OnOpen(_type)
|
||||
|
||||
proId=ProIdConst.All
|
||||
-- proId=ProIdConst.All
|
||||
OpenType = _type
|
||||
--self.BtView:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView.RolePanel })
|
||||
--self.BtView2:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView2.HandBookPanel })
|
||||
|
|
@ -154,6 +154,7 @@ end
|
|||
--界面打开或者重新打开后，界面刷新时调用（用于子类重写）
|
||||
function HandBookHeroAndEquipListPanel:OnShow()
|
||||
|
||||
proId = 0
|
||||
if OpenType == 1 then
|
||||
self.heroScroll:SetActive(true)
|
||||
self.heroScrollbar:SetActive(true)
|
||||
|
|
@ -162,7 +163,7 @@ function HandBookHeroAndEquipListPanel:OnShow()
|
|||
self.talismanScroll:SetActive(false)
|
||||
self.talismanScrollbar:SetActive(false)
|
||||
self.Tabs:SetActive(true)
|
||||
--proId=ProIdConst.All
|
||||
-- proId=ProIdConst.All
|
||||
self:OnShowHeroFun()
|
||||
elseif OpenType == 2 then
|
||||
self.heroScroll:SetActive(false)
|
||||
|
|
@ -724,9 +725,11 @@ end
|
|||
|
||||
--设置选中按钮
|
||||
function HandBookHeroAndEquipListPanel:SetSelectBtn()
|
||||
self.selectBtn:SetActive(proId ~= ProIdConst.All)
|
||||
-- self.selectBtn:SetActive(proId ~= ProIdConst.All)
|
||||
if proId ~= ProIdConst.All then
|
||||
self.selectBtn.transform.localPosition = tabs[proId].transform.localPosition
|
||||
else
|
||||
self.selectBtn.transform.localPosition = Vector3.New(-336, 0, 0)
|
||||
end
|
||||
end
|
||||
function HandBookHeroAndEquipListPanel:SortHeroNatural(heroList)
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ function ResolvePanel:InitComponent()
|
|||
|
||||
this.selectHeroBtn = Util.GetGameObject(this.panel, "endTabs/selectBtn")
|
||||
for i = 1, 6 do
|
||||
heroEndBtns[i]=Util.GetGameObject(this.panel, "endTabs/btnHeroGrid/btnHeroGrid/Btn"..i)
|
||||
heroEndBtns[i]=Util.GetGameObject(this.panel, "endTabs/btnHeroGrid/btnHeroGrid/Btn"..i-1)
|
||||
end
|
||||
for i = 1, #this.contents do
|
||||
this.contents[i].view:InitComponent(this.panel)
|
||||
|
|
@ -78,11 +78,13 @@ function ResolvePanel:BindEvent()
|
|||
if tabSortType == i then
|
||||
tabSortType = 0
|
||||
this.contents[curIndex].view.SortTypeClick(0)--全部
|
||||
this.EndTabBtnSelect()
|
||||
else
|
||||
tabSortType = i
|
||||
this.contents[curIndex].view.SortTypeClick(i)
|
||||
this.EndTabBtnSelect(heroEndBtns[i])
|
||||
end
|
||||
this.EndTabBtnSelect(heroEndBtns[i])
|
||||
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
|
@ -164,6 +166,9 @@ function this.SwitchView(index)
|
|||
|
||||
--执行子模块初始化
|
||||
this.contents[index].view:OnShow(this.sortingOrder,this.itemListRoot)
|
||||
--刷新选择按钮
|
||||
tabSortType = 0
|
||||
this.EndTabBtnSelect()
|
||||
end
|
||||
|
||||
-- tab节点显示自定义
|
||||
|
|
@ -199,11 +204,15 @@ end
|
|||
|
||||
--下部页签排序
|
||||
function this.EndTabBtnSelect(_btn)
|
||||
this.selectHeroBtn:SetActive(tabSortType > 0)
|
||||
-- this.selectHeroBtn:SetActive(tabSortType > 0)
|
||||
if _btn then
|
||||
this.selectHeroBtn.transform:SetParent(_btn.transform)
|
||||
this.selectHeroBtn.transform.localScale = Vector3.one
|
||||
this.selectHeroBtn.transform.localPosition=Vector3.zero
|
||||
else
|
||||
this.selectHeroBtn.transform:SetParent(heroEndBtns[1].transform)
|
||||
this.selectHeroBtn.transform.localScale = Vector3.one
|
||||
this.selectHeroBtn.transform.localPosition=Vector3.zero
|
||||
end
|
||||
end
|
||||
return ResolvePanel
|
||||
Loading…
Reference in New Issue