From 759de1e7ecc29f2ce0e09e0a3711551cf31c4719 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 13 Dec 2021 17:19:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E4=B8=BB=E8=A7=92=E6=8A=80=E8=83=BD=E9=87=8A=E6=94=BE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Battle/Logic/Monster/MonsterSkill/MTrigger.lua | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua index 604f285101..f37437e13e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua @@ -240,7 +240,11 @@ function this.InitListener() table.sort(firstList, function(a, b) -- 同阵营按位置排序 if a.owner.camp == b.owner.camp then - return a.owner.position < b.owner.position + if a.owner.position == b.owner.position then + return a.id < b.id + else + return a.owner.position < b.owner.position + end else -- 不同阵营的根据先手阵营排序 return a.owner.camp == BattleLogic.FirstCamp @@ -250,7 +254,11 @@ function this.InitListener() table.sort(sortList, function(a, b) -- 同阵营按位置排序 if a.owner.camp == b.owner.camp then - return a.owner.position < b.owner.position + if a.owner.position == b.owner.position then + return a.id < b.id + else + return a.owner.position < b.owner.position + end else -- 不同阵营的根据先手阵营排序 return a.owner.camp == BattleLogic.FirstCamp From bfd0cd7184301555463dc801e24d6941efbd7ca0 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 13 Dec 2021 17:27:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecruitTreasurePanel.prefab | 223 ++++++------------ 1 file changed, 67 insertions(+), 156 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/RecruitTreasurePanel.prefab b/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/RecruitTreasurePanel.prefab index 21aab04c24..2286764fd9 100644 --- a/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/RecruitTreasurePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/RecruitTreasurePanel.prefab @@ -165,7 +165,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 392200360282455416} - {fileID: 417611533} m_Father: {fileID: 0} m_RootOrder: 0 @@ -296,8 +295,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -2.199997, y: -194.27002} - m_SizeDelta: {x: -209, y: -1012.6} + m_AnchoredPosition: {x: 0, y: -194.27} + m_SizeDelta: {x: -115, y: -1012.56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &263232123 CanvasRenderer: @@ -341,7 +340,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 182.7, y: -57} + m_AnchoredPosition: {x: 152, y: -53} m_SizeDelta: {x: 8, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &273463933 @@ -414,10 +413,10 @@ RectTransform: m_Father: {fileID: 700413942} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 64.03, y: -113} - m_SizeDelta: {x: 324, y: 264.40002} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -415, y: -617.5} + m_SizeDelta: {x: 324, y: 1273.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &381764992 CanvasRenderer: @@ -490,12 +489,12 @@ RectTransform: - {fileID: 794766830} - {fileID: 662672666} m_Father: {fileID: 242517190} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &417611535 CanvasRenderer: @@ -618,7 +617,6 @@ GameObject: m_Component: - component: {fileID: 612307184} - component: {fileID: 612307187} - - component: {fileID: 612307185} - component: {fileID: 1195522480809803017} m_Layer: 5 m_Name: tips @@ -643,8 +641,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -261.25, y: -181.39998} - m_SizeDelta: {x: 459.72998, y: 82.67999} + m_AnchoredPosition: {x: -269.9, y: -179.3} + m_SizeDelta: {x: 477.1, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &612307187 CanvasRenderer: @@ -654,19 +652,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 612307183} m_CullTransparentMesh: 0 ---- !u!114 &612307185 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 612307183} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} - m_Name: - m_EditorClassIdentifier: - _textSpacing: -0.7 --- !u!114 &1195522480809803017 MonoBehaviour: m_ObjectHideFlags: 0 @@ -694,11 +679,11 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6FC0\u6D3B\u79D8\u5B9D\u540E\u5728\u730E\u5996\u4E4B\u8DEF\u4E2D\u83B7\u5F97\u653B\u51FB\u529B15%\u7684\u52A0\u6210\uFF0C\u5E76\u53EF\u9886\u53D6\u989D\u5916\u5956\u52B1" LanguageIndex: 0 @@ -895,7 +880,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 189, y: -28.5} + m_AnchoredPosition: {x: 142.1, y: -28.5} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &718967643 @@ -957,7 +942,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &769230676 RectTransform: m_ObjectHideFlags: 0 @@ -979,10 +964,10 @@ RectTransform: m_Father: {fileID: 662672666} 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: -2.2, y: 209.43} - m_SizeDelta: {x: 871, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -1919, y: 272.5} + m_SizeDelta: {x: 950, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &769230677 CanvasRenderer: @@ -1027,10 +1012,10 @@ RectTransform: m_Father: {fileID: 417611533} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -416} - m_SizeDelta: {x: -224, y: 378} + m_SizeDelta: {x: 856, y: 378} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &794766832 CanvasRenderer: @@ -1103,8 +1088,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 104.600006, y: -52} - m_SizeDelta: {x: 148.2, y: 100} + m_AnchoredPosition: {x: 88.25, y: -52} + m_SizeDelta: {x: 119.5, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1222381459 CanvasRenderer: @@ -1144,8 +1129,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 --- !u!1 &1548439227 @@ -1259,10 +1244,10 @@ RectTransform: m_Father: {fileID: 769230676} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -145.8, y: -50} - m_SizeDelta: {x: 152.5, y: 70} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 807, y: -50} + m_SizeDelta: {x: 190, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1679051616 CanvasRenderer: @@ -1365,9 +1350,9 @@ RectTransform: m_Father: {fileID: 700413942} m_RootOrder: 1 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: -177, y: -28.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 335, y: -28.5} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1714223451 @@ -1583,10 +1568,10 @@ RectTransform: m_Father: {fileID: 769230676} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -8, y: 10} - m_SizeDelta: {x: -77, y: 9} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -8, y: 60} + m_SizeDelta: {x: 873, y: 9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2093586629 CanvasRenderer: @@ -1642,7 +1627,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8522078921106535360 RectTransform: m_ObjectHideFlags: 0 @@ -1658,10 +1643,10 @@ RectTransform: m_Father: {fileID: 1679051612} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -76.25, y: -35} - m_SizeDelta: {x: 152.5, y: 70} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 190, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &392290363513713079 CanvasRenderer: @@ -2120,10 +2105,10 @@ RectTransform: m_Father: {fileID: 1679051612} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -76.25, y: -35} - m_SizeDelta: {x: 152.5, y: 70} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 190, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9080305000098355600 CanvasRenderer: @@ -2274,9 +2259,9 @@ RectTransform: m_Father: {fileID: 1679051612} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -21, y: -17.1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 74, y: 17.9} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &335254081599527853 @@ -2349,7 +2334,7 @@ RectTransform: 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: 64, y: -10} + m_AnchoredPosition: {x: 99, y: -10} m_SizeDelta: {x: 262.8, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3333102989217380818 @@ -2502,8 +2487,8 @@ RectTransform: 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: -161.74, y: -18} - m_SizeDelta: {x: 162.9, y: 100} + m_AnchoredPosition: {x: -183.1, y: -18} + m_SizeDelta: {x: 235.7, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3901255681791354113 MonoBehaviour: @@ -2619,80 +2604,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &5189724795882588538 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 392200360282455416} - - component: {fileID: 4022435860038932995} - - component: {fileID: 6275749967492990847} - m_Layer: 5 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &392200360282455416 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5189724795882588538} - 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: 242517190} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4022435860038932995 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5189724795882588538} - m_CullTransparentMesh: 0 ---- !u!114 &6275749967492990847 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5189724795882588538} - 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: 0, g: 0, b: 0, 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 &6215952172496680248 GameObject: m_ObjectHideFlags: 0 @@ -2725,9 +2636,9 @@ RectTransform: m_Father: {fileID: 769230676} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -142, y: -60} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 333, y: -10} m_SizeDelta: {x: 128, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1401826056226417853 @@ -2800,10 +2711,10 @@ RectTransform: m_Father: {fileID: 1679051612} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -76.24998, y: -35} - m_SizeDelta: {x: 152.5, y: 70} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 190, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5029010809554487346 CanvasRenderer: @@ -3022,10 +2933,10 @@ RectTransform: m_Father: {fileID: 718967641} 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: 179.59, y: -25.33} - m_SizeDelta: {x: 115.64, y: 41.300003} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 95.1, y: -0.33} + m_SizeDelta: {x: 83, y: 41.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &455196130103154195 CanvasRenderer: @@ -3062,7 +2973,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -3106,7 +3017,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 9.1501, y: 214.5} + m_AnchoredPosition: {x: 9.150085, y: 214.5} m_SizeDelta: {x: -96.7, y: 75.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5457082822150884615