修改队伍和技能选择界面和编辑队伍界面交互
parent
b2d2b5d433
commit
0ca3da1211
BIN
ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium SDF.asset (Stored with Git LFS)
BIN
ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium SDF.asset (Stored with Git LFS)
Binary file not shown.
|
|
@ -1036,7 +1036,7 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 525093607647340305}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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_ConstrainProportionsScale: 0
|
||||
|
|
@ -1044,11 +1044,11 @@ RectTransform:
|
|||
- {fileID: 4925066079604168135}
|
||||
- {fileID: 1393434217014763445}
|
||||
- {fileID: 1617981097321178885}
|
||||
m_Father: {fileID: 8265578889168304662}
|
||||
m_Father: {fileID: 3030902348937426993}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -76, y: 268}
|
||||
m_AnchoredPosition: {x: -76, y: 387}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!114 &622739012078242495
|
||||
|
|
@ -1058,7 +1058,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 525093607647340305}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||
m_Name:
|
||||
|
|
@ -2174,7 +2174,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 6433538856359175292}
|
||||
- {fileID: 8481837445671463567}
|
||||
m_Father: {fileID: 8265578889168304662}
|
||||
m_Father: {fileID: 3030902348937426993}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
|
|
@ -5062,6 +5062,81 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3541272045685736516}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &3570577257146667025
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 271306237144625838}
|
||||
- component: {fileID: 785860544724629781}
|
||||
- component: {fileID: 7992833390525214703}
|
||||
m_Layer: 5
|
||||
m_Name: Image_Document
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &271306237144625838
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3570577257146667025}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 5}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8265578889168304662}
|
||||
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: -20, y: -45.5}
|
||||
m_SizeDelta: {x: 926, y: 87}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &785860544724629781
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3570577257146667025}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &7992833390525214703
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3570577257146667025}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 6bd662d537d841d4d83b505b2247cf23, 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
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &3843875787799828468
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6783,9 +6858,9 @@ RectTransform:
|
|||
- {fileID: 7520291438806635680}
|
||||
m_Father: {fileID: 800736367165859627}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -539}
|
||||
m_SizeDelta: {x: 259, y: 198}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7273653090028444549
|
||||
|
|
@ -8530,6 +8605,43 @@ MonoBehaviour:
|
|||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &5503028681953623890
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3030902348937426993}
|
||||
m_Layer: 5
|
||||
m_Name: SkillAndFight
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3030902348937426993
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5503028681953623890}
|
||||
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_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 800736367165859627}
|
||||
- {fileID: 6101814368957474041}
|
||||
m_Father: {fileID: 8265578889168304662}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -119}
|
||||
m_SizeDelta: {x: 500, y: 843}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!1 &5521876985779769230
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10210,9 +10322,9 @@ RectTransform:
|
|||
- {fileID: 7754949463816639215}
|
||||
m_Father: {fileID: 800736367165859627}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -319}
|
||||
m_SizeDelta: {x: 259, y: 198}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6506554248882068681
|
||||
|
|
@ -10297,6 +10409,81 @@ MonoBehaviour:
|
|||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &6516820793189869937
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6154711494115995051}
|
||||
- component: {fileID: 8415778910676768797}
|
||||
- component: {fileID: 361647642103058659}
|
||||
m_Layer: 5
|
||||
m_Name: Image_TeamLogo
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6154711494115995051
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6516820793189869937}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 5}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8265578889168304662}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -341.5, y: 118}
|
||||
m_SizeDelta: {x: 633, y: 754}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8415778910676768797
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6516820793189869937}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &361647642103058659
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6516820793189869937}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: dc5bd1eb1ed364a47a130885adcf9f65, 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
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &6549669411803868762
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10822,7 +11009,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\u5F00\u59CB\u626B\u8361"
|
||||
m_text: "\u5F00\u59CB\u6218\u6597"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2}
|
||||
m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063,
|
||||
|
|
@ -10904,7 +11091,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 4545b363802045e3a540e37e426a5df3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
text_key: BeforeFight_StartSaoDang
|
||||
text_key: BeforeFight_BeginFight
|
||||
--- !u!1 &6694030906937433217
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -11582,11 +11769,12 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 271306237144625838}
|
||||
- {fileID: 6154711494115995051}
|
||||
- {fileID: 2391208239552127913}
|
||||
- {fileID: 8004473523530242597}
|
||||
- {fileID: 7839286669531294652}
|
||||
- {fileID: 800736367165859627}
|
||||
- {fileID: 6101814368957474041}
|
||||
- {fileID: 3030902348937426993}
|
||||
- {fileID: 3997610456769359836}
|
||||
m_Father: {fileID: 5792466229674412060}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -13355,9 +13543,9 @@ RectTransform:
|
|||
- {fileID: 5043304230697146416}
|
||||
m_Father: {fileID: 800736367165859627}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -99}
|
||||
m_SizeDelta: {x: 259, y: 198}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8929907797846545424
|
||||
|
|
@ -13592,7 +13780,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3997610456769359836
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -391,7 +391,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &9031947895835492004
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1260,7 +1260,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1270388547756309081
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1818,7 +1818,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4684367457773861543}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
|
|
@ -2815,7 +2815,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6171338732091461706}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
|
|
@ -3990,7 +3990,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3680431867439339296
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -135,6 +135,7 @@
|
|||
HideAllUIExcept,
|
||||
ShowAllUIHiden,
|
||||
ClearUIStack,
|
||||
UI_TeamInfoOpenOrClose,
|
||||
|
||||
//Data
|
||||
AllConfigLoad,
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ public partial class UIManager
|
|||
_WindowMeta(UINameConst.UISkill_LevelUp, UIWindowLayer.Normal);
|
||||
_WindowMeta(UINameConst.UIRedPointTest, UIWindowLayer.Normal);
|
||||
_WindowMeta(UINameConst.UITeamChoose, UIWindowLayer.Normal, UIOpenType.FullScreen);
|
||||
_WindowMeta(UINameConst.UITeamInfo, UIWindowLayer.Normal, UIOpenType.FullScreen);
|
||||
_WindowMeta(UINameConst.UITeamInfo, UIWindowLayer.Normal, UIOpenType.Pop);
|
||||
_WindowMeta(UINameConst.UI_RaffleTotalResult,UIWindowLayer.Normal);
|
||||
_WindowMeta(UINameConst.UI_Raffle, UIWindowLayer.Normal);
|
||||
_WindowMeta(UINameConst.UI_RaffleOneResult, UIWindowLayer.Normal);
|
||||
|
|
|
|||
|
|
@ -77,6 +77,10 @@ public class UI_TeamAndSkillSelectController : UIWindow
|
|||
/// </summary>
|
||||
private readonly Action<TeamItem> selectTeamAction;
|
||||
/// <summary>
|
||||
/// 队伍编辑回调
|
||||
/// </summary>
|
||||
private readonly Action teamEditAction;
|
||||
/// <summary>
|
||||
/// 队伍索引
|
||||
/// </summary>
|
||||
private readonly int teamIndex;
|
||||
|
|
@ -98,10 +102,11 @@ public class UI_TeamAndSkillSelectController : UIWindow
|
|||
}
|
||||
}
|
||||
|
||||
public TeamItem(GameObject root, int index, Action<TeamItem> selectTeam) : base(root)
|
||||
public TeamItem(GameObject root, int index, Action<TeamItem> selectTeam, Action teamEdit) : base(root)
|
||||
{
|
||||
teamIndex = index;
|
||||
selectTeamAction = selectTeam;
|
||||
teamEditAction = teamEdit;
|
||||
|
||||
goTeam = FindObj("ImageTeamName");
|
||||
textTeamNum = GetComponent<TMP_Text>("TextTeamNum");
|
||||
|
|
@ -143,12 +148,9 @@ public class UI_TeamAndSkillSelectController : UIWindow
|
|||
/// <summary>
|
||||
/// 队伍编辑
|
||||
/// </summary>
|
||||
private async void OnEdit()
|
||||
private void OnEdit()
|
||||
{
|
||||
//TeamEditManager.Instance.RefreshTeams();
|
||||
//await TeamEditManager.Instance.PreLoadAssets();
|
||||
//await UIManager.Instance.OpenWindow(UINameConst.UITeamChoose, TeamEditManager.Instance.GetSelectTeam().TeamIndex);
|
||||
await UIManager.Instance.OpenWindow(UINameConst.UITeamInfo, TeamEditManager.Instance.GetSelectTeam());
|
||||
teamEditAction?.Invoke();
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
|
@ -644,6 +646,10 @@ public class UI_TeamAndSkillSelectController : UIWindow
|
|||
/// 队伍根节点
|
||||
/// </summary>
|
||||
private RectTransform rtsTeamRoot;
|
||||
/// <summary>
|
||||
/// 技能和战斗按钮根节点
|
||||
/// </summary>
|
||||
private RectTransform rtsSkillAndFightRoot;
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -667,14 +673,23 @@ public class UI_TeamAndSkillSelectController : UIWindow
|
|||
/// </summary>
|
||||
private int curLevelId;
|
||||
|
||||
/// <summary>
|
||||
/// 是否被覆盖
|
||||
/// </summary>
|
||||
public bool IsCover
|
||||
{
|
||||
set
|
||||
{
|
||||
if (value)
|
||||
rtsTeamRoot.DOPivotX(0f, 0.3f);
|
||||
{
|
||||
rtsTeamRoot.DOPivotX(1f, 0.3f);
|
||||
rtsSkillAndFightRoot.DOPivotX(0f, 0.3f);
|
||||
}
|
||||
else
|
||||
rtsTeamRoot.DOPivotX(1f, 0.3f);
|
||||
{
|
||||
rtsTeamRoot.DOPivotX(0f, 0.3f);
|
||||
rtsSkillAndFightRoot.DOPivotX(1f, 0.3f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -686,16 +701,17 @@ public class UI_TeamAndSkillSelectController : UIWindow
|
|||
TeamAndSkillSelectBinder.GetComponents(this);
|
||||
|
||||
rtsTeamRoot = FindObj("ImageBG/Teams").GetComponent<RectTransform>();
|
||||
rtsSkillAndFightRoot = FindObj("ImageBG/SkillAndFight").GetComponent<RectTransform>();
|
||||
|
||||
selectSkillPanel = new SelectSkillPanel(FindObj("ImageBG/SelectSkillPanel"), OnChangeSkill);
|
||||
|
||||
Transform tsTeamRoot = FindObj("ImageBG/Teams").transform;
|
||||
for (int i = 0; i < tsTeamRoot.childCount; ++i)
|
||||
{
|
||||
listTeam.Add(new TeamItem(tsTeamRoot.GetChild(i).gameObject, i, OnSelectTeam));
|
||||
listTeam.Add(new TeamItem(tsTeamRoot.GetChild(i).gameObject, i, OnSelectTeam, OnTeamEdit));
|
||||
}
|
||||
|
||||
Transform tsSkillRoot = FindObj("ImageBG/CommandSkills").transform;
|
||||
Transform tsSkillRoot = FindObj("ImageBG/SkillAndFight/CommandSkills").transform;
|
||||
for (int i = 0; i < tsSkillRoot.childCount; ++i)
|
||||
{
|
||||
listSkill.Add(new UseSkillItem(tsSkillRoot.GetChild(i).gameObject, i, OnOpenSkillSelect));
|
||||
|
|
@ -725,22 +741,15 @@ public class UI_TeamAndSkillSelectController : UIWindow
|
|||
OnSelectTeam(listTeam[TeamEditManager.Instance.SelectTeamIdx]); // 初始选中
|
||||
|
||||
EventManager.Instance.Register(EventManager.EventName.TeamUpdate, RefreshAllUI);
|
||||
EventManager.Instance.Register<bool>(EventManager.EventName.UI_TeamInfoOpenOrClose, OnIsCover);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 重新加载窗口时调用
|
||||
/// </summary>
|
||||
/// <param name="data"></param>
|
||||
protected override void OnReloadWindow(object data = null)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 关闭窗口时调用
|
||||
/// </summary>
|
||||
protected override void OnHideWindow()
|
||||
{
|
||||
EventManager.Instance.Unregister<bool>(EventManager.EventName.UI_TeamInfoOpenOrClose, OnIsCover);
|
||||
EventManager.Instance.Unregister(EventManager.EventName.TeamUpdate, RefreshAllUI);
|
||||
}
|
||||
|
||||
|
|
@ -762,6 +771,14 @@ public class UI_TeamAndSkillSelectController : UIWindow
|
|||
CloseWindow();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 队伍信息界面回调
|
||||
/// </summary>
|
||||
private void OnIsCover(bool isOpen)
|
||||
{
|
||||
IsCover = isOpen;
|
||||
}
|
||||
|
||||
#region 刷新方法
|
||||
/// <summary>
|
||||
/// 刷新队伍使用的技能
|
||||
|
|
@ -880,5 +897,15 @@ public class UI_TeamAndSkillSelectController : UIWindow
|
|||
team.ChangeSkill(index, (uint)selectSkillId);
|
||||
TeamEditManager.Instance.SaveTeam(team);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 队伍编辑
|
||||
/// </summary>
|
||||
private async void OnTeamEdit()
|
||||
{
|
||||
await UI_TeamInfoController.Open(TeamEditManager.Instance.GetSelectTeam());
|
||||
|
||||
IsCover = true;
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
|
@ -11,12 +11,21 @@ using Utils.Bounds.Data;
|
|||
using Button = UnityEngine.UI.Button;
|
||||
using Image = UnityEngine.UI.Image;
|
||||
using Utils;
|
||||
using Cysharp.Threading.Tasks;
|
||||
|
||||
public class UI_TeamInfoController : UIWindow
|
||||
{
|
||||
//UI GameObj
|
||||
///Auto Gen Start///
|
||||
public Image Image_BG;
|
||||
/// <summary>
|
||||
/// 打开打开队伍信息界面
|
||||
/// </summary>
|
||||
public static async UniTask<UIWindow> Open(Team team)
|
||||
{
|
||||
return await UIManager.Instance.OpenWindow(UINameConst.UITeamInfo, team);
|
||||
}
|
||||
|
||||
//UI GameObj
|
||||
///Auto Gen Start///
|
||||
public Image Image_BG;
|
||||
public Image Image_Document;
|
||||
public Image Image_Blow_Shadow;
|
||||
public Image Image_TeamLogo;
|
||||
|
|
@ -106,16 +115,18 @@ public class UI_TeamInfoController : UIWindow
|
|||
protected override void OnShowWindow(object data = null)
|
||||
{
|
||||
if (data == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
_team = (Team)data;
|
||||
_team = TeamEditManager.Instance.GetSelectTeam();
|
||||
else
|
||||
_team = (Team)data;
|
||||
|
||||
RefreshRawImage();
|
||||
InputField_Name.text = _team.Name;
|
||||
_curName = InputField_Name.text;
|
||||
|
||||
SetScrollViewFunc();
|
||||
Refresh();
|
||||
|
||||
EventManager.Instance.Send(EventManager.EventName.UI_TeamInfoOpenOrClose, true);
|
||||
}
|
||||
|
||||
//invoke when reload window
|
||||
|
|
@ -135,8 +146,8 @@ public class UI_TeamInfoController : UIWindow
|
|||
//invoke when close window
|
||||
protected override void OnHideWindow()
|
||||
{
|
||||
|
||||
}
|
||||
EventManager.Instance.Send(EventManager.EventName.UI_TeamInfoOpenOrClose, false);
|
||||
}
|
||||
|
||||
public override void OnRelease()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ public class TeamAndSkillSelectBinder
|
|||
{
|
||||
window.Button_Back = window.GetComponent<Button>("ImageBG/UI_Topbtn/Button_Back");
|
||||
window.Button_Home = window.GetComponent<Button>("ImageBG/UI_Topbtn/Button_Home");
|
||||
window.Button_Start = window.GetComponent<Button>("ImageBG/Button_Start");
|
||||
window.Button_Start = window.GetComponent<Button>("ImageBG/SkillAndFight/Button_Start");
|
||||
window.RawImage_Scene = window.GetComponent<RawImage>("ImageBG/RawImage_Scene");
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue