From de6ac55599e30cbd4f3017fc77e54f16e2d2f851 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 22 Apr 2021 17:22:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B8=8F=E7=A2=8E=E5=87=8C=E9=9C=84?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaSuiLingXiao/TaSuiLingXiaoPanel.prefab | 297 +++++++++++++++++- .../TaSuiLingXiao/TaSuiLingXiaoPanel.lua | 17 +- 2 files changed, 298 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TaSuiLingXiao/TaSuiLingXiaoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TaSuiLingXiao/TaSuiLingXiaoPanel.prefab index d4d6f78e07..d7b90e9d0d 100644 --- a/Assets/ManagedResources/Prefabs/UI/TaSuiLingXiao/TaSuiLingXiaoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TaSuiLingXiao/TaSuiLingXiaoPanel.prefab @@ -105,7 +105,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6874039101556936243} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -179,7 +179,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6874039101556936243} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -223,6 +223,140 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2273202859923281215 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6454967612031309572} + - component: {fileID: 2105698133038890572} + m_Layer: 0 + m_Name: SkillList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6454967612031309572 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2273202859923281215} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -3.12055} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1605479106849131559} + m_Father: {fileID: 6874039101556936243} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100, y: -232} + m_SizeDelta: {x: 200, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2105698133038890572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2273202859923281215} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 20 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!1 &4345718779189720393 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2814452437388739077} + - component: {fileID: 4828954397227201508} + - component: {fileID: 3142227523850164692} + m_Layer: 5 + m_Name: btnBack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2814452437388739077 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4345718779189720393} + 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: 6874039101556936243} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 70, y: 90} + m_SizeDelta: {x: 140, y: 121} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4828954397227201508 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4345718779189720393} + m_CullTransparentMesh: 0 +--- !u!114 &3142227523850164692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4345718779189720393} + 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: 2887ec8dbdcb57242a540f77f7cb5a72, 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 &4565377216131505798 GameObject: m_ObjectHideFlags: 0 @@ -303,6 +437,143 @@ MonoBehaviour: m_LineSpacing: 0.7 m_Text: "\u6311\u6218" LanguageIndex: 0 +--- !u!1 &4820508137090964698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1605479106849131559} + - component: {fileID: 4580484045467219932} + - component: {fileID: 2733952063219199623} + - component: {fileID: 1999086434555349925} + - component: {fileID: 5926855060110953184} + m_Layer: 0 + m_Name: skillPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1605479106849131559 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4820508137090964698} + 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: 6454967612031309572} + m_RootOrder: 0 + 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_SizeDelta: {x: 120, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4580484045467219932 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4820508137090964698} + m_CullTransparentMesh: 0 +--- !u!114 &2733952063219199623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4820508137090964698} + 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: 41d0b06e8baf97b429743cbc84e53714, 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!114 &1999086434555349925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4820508137090964698} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2733952063219199623} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &5926855060110953184 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4820508137090964698} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &4995289701837259760 GameObject: m_ObjectHideFlags: 0 @@ -333,7 +604,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6874039101556936243} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -397,7 +668,7 @@ GameObject: - component: {fileID: 1379305977417811396} - component: {fileID: 3659885109963813517} m_Layer: 5 - m_Name: helpBtn + m_Name: btnHelp m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -415,11 +686,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6874039101556936243} - m_RootOrder: 1 + m_RootOrder: 2 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: 452.7, y: 856.7} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -153, y: -153} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.49999955, y: 0.5} --- !u!222 &8943628898880466096 @@ -584,11 +855,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 127670207085333400} + - {fileID: 6454967612031309572} - {fileID: 5219427271101005652} - - {fileID: 4414666417705597670} - - {fileID: 8271667800507655558} - {fileID: 5273057559836183242} - {fileID: 8728565709264507226} + - {fileID: 4414666417705597670} + - {fileID: 8271667800507655558} + - {fileID: 2814452437388739077} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -619,7 +892,7 @@ GameObject: - component: {fileID: 1514093676277642383} - component: {fileID: 7151412212616056521} m_Layer: 5 - m_Name: fightBtn + m_Name: btnFight m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -638,7 +911,7 @@ RectTransform: m_Children: - {fileID: 7077883291355746240} m_Father: {fileID: 6874039101556936243} - m_RootOrder: 2 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua index 5ed69b6f4f..325e02eea2 100644 --- a/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua @@ -3,9 +3,12 @@ local TaSuiLingXiao = Inherit(BasePanel) function TaSuiLingXiao:InitComponent() self.time = Util.GetGameObject(self.gameObject, "time"):GetComponent("Text") - self.fightBtn = Util.GetGameObject(self.gameObject, "layout/fightBtn") - self.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn") - self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition + self.btnFight = Util.GetGameObject(self.gameObject, "btnFight") + self.btnTeam = Util.GetGameObject(self.gameObject, "btnTeam") + self.btnReward = Util.GetGameObject(self.gameObject, "btnReward") + self.btnBack = Util.GetGameObject(self.gameObject, "btnBack") + self.btnHelp = Util.GetGameObject(self.gameObject, "btnHelp") + self.helpPosition=self.btnHelp:GetComponent("RectTransform").localPosition self.liveRoot = Util.GetGameObject(self.gameObject, "bg/liveRoot") self.sortingOrder = 0 end @@ -16,7 +19,7 @@ function TaSuiLingXiao:BindEvent() UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.TaSuiLingXiao,self.helpPosition.x,self.helpPosition.y) end) - Util.AddClick(self.fightBtn,function() + Util.AddClick(self.btnFight,function() --开始战斗 NetManager.NewGeneralAttackRequest(self.actData.activityId,function(msg) local fightData = BattleManager.GetBattleServerData(msg,0) @@ -27,6 +30,12 @@ function TaSuiLingXiao:BindEvent() end) end) end) + Util.AddClick(self.btnTeam, function() + UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION) + end) + Util.AddClick(self.btnReward, function() + UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION) + end) end --添加事件监听(用于子类重写) function TaSuiLingXiao:AddListener()