From 688662836a3d3da97e381f3daa2c8edaffe734bc Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 23 Jul 2020 21:18:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArenaTopMatch/ArenaTopMatchPanel.prefab | 130 +++++++++--------- .../ArenaTopMatch/ArenaTopMatchManager.lua | 19 +-- .../ArenaTopMatch/View/ATM_CommonInfo.lua | 5 + .../ArenaTopMatch/View/ATM_GuessView.lua | 2 +- 4 files changed, 72 insertions(+), 84 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab index de10fdffdd..73b2c4f26a 100644 --- a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab @@ -82636,7 +82636,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: 238.36, y: -14.5} + m_AnchoredPosition: {x: 238.36002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8086162646993805284 @@ -83494,7 +83494,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: 186.7, y: -14.5} + m_AnchoredPosition: {x: 186.70001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540045983877 @@ -83864,7 +83864,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: 255.58, y: -14.5} + m_AnchoredPosition: {x: 255.58002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540110399824 @@ -84091,7 +84091,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: 203.92, y: -14.5} + m_AnchoredPosition: {x: 203.92001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540133933357 @@ -84313,7 +84313,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: 186.7, y: -14.5} + m_AnchoredPosition: {x: 186.70001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540141309790 @@ -84612,7 +84612,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: 186.7, y: -14.5} + m_AnchoredPosition: {x: 186.70001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540180028201 @@ -84877,7 +84877,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: 255.58, y: -14.5} + m_AnchoredPosition: {x: 255.58002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540191575559 @@ -84951,7 +84951,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: 238.36, y: -14.5} + m_AnchoredPosition: {x: 238.36002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540192971188 @@ -85025,7 +85025,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: 203.92, y: -14.5} + m_AnchoredPosition: {x: 203.92001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540219038039 @@ -85322,7 +85322,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: 203.92, y: -14.5} + m_AnchoredPosition: {x: 203.92001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540253162765 @@ -85396,7 +85396,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: 203.92, y: -14.5} + m_AnchoredPosition: {x: 203.92001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540261498486 @@ -85544,7 +85544,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: 221.14, y: -14.5} + m_AnchoredPosition: {x: 221.14001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540289170234 @@ -85618,7 +85618,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: 186.7, y: -14.5} + m_AnchoredPosition: {x: 186.70001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540308776401 @@ -85840,7 +85840,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: 221.14, y: -14.5} + m_AnchoredPosition: {x: 221.14001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540338171984 @@ -86359,7 +86359,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: 186.7, y: -14.5} + m_AnchoredPosition: {x: 186.70001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540385827542 @@ -87212,7 +87212,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: 221.14, y: -14.5} + m_AnchoredPosition: {x: 221.14001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540453299864 @@ -87360,7 +87360,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: 186.7, y: -14.5} + m_AnchoredPosition: {x: 186.70001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540473660724 @@ -87813,7 +87813,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: 186.7, y: -14.5} + m_AnchoredPosition: {x: 186.70001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540512854026 @@ -88221,7 +88221,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: 203.92, y: -14.5} + m_AnchoredPosition: {x: 203.92001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540558976241 @@ -88705,7 +88705,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: 255.58, y: -14.5} + m_AnchoredPosition: {x: 255.58002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540594051518 @@ -88853,7 +88853,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: 255.58, y: -14.5} + m_AnchoredPosition: {x: 255.58002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540611813102 @@ -89001,7 +89001,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: 255.58, y: -14.5} + m_AnchoredPosition: {x: 255.58002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540626062941 @@ -89150,7 +89150,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: 186.7, y: -14.5} + m_AnchoredPosition: {x: 186.70001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540638867336 @@ -89224,7 +89224,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: 238.36, y: -14.5} + m_AnchoredPosition: {x: 238.36002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540661418432 @@ -90126,7 +90126,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: 203.92, y: -14.5} + m_AnchoredPosition: {x: 203.92001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540771019575 @@ -90460,7 +90460,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: 255.58, y: -14.5} + m_AnchoredPosition: {x: 255.58002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540785296744 @@ -90534,7 +90534,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: 203.92, y: -14.5} + m_AnchoredPosition: {x: 203.92001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540785317137 @@ -90756,7 +90756,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: 203.92, y: -14.5} + m_AnchoredPosition: {x: 203.92001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540823014289 @@ -91470,7 +91470,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: 238.36, y: -14.5} + m_AnchoredPosition: {x: 238.36002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540870125171 @@ -91618,7 +91618,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: 255.58, y: -14.5} + m_AnchoredPosition: {x: 255.58002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540873100134 @@ -91766,7 +91766,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: 203.92, y: -14.5} + m_AnchoredPosition: {x: 203.92001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540877946789 @@ -91979,7 +91979,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: 238.36, y: -14.5} + m_AnchoredPosition: {x: 238.36002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161540906671494 @@ -92958,7 +92958,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: 221.14, y: -14.5} + m_AnchoredPosition: {x: 221.14001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541017313241 @@ -93442,7 +93442,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: 238.36, y: -14.5} + m_AnchoredPosition: {x: 238.36002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541069529370 @@ -93664,7 +93664,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: 221.14, y: -14.5} + m_AnchoredPosition: {x: 221.14001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541082853143 @@ -93738,7 +93738,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: 221.14, y: -14.5} + m_AnchoredPosition: {x: 221.14001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541097694222 @@ -93812,7 +93812,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: 221.14, y: -14.5} + m_AnchoredPosition: {x: 221.14001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541124738793 @@ -94374,7 +94374,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: 238.36, y: -14.5} + m_AnchoredPosition: {x: 238.36002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541193617649 @@ -95273,7 +95273,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: 238.36, y: -14.5} + m_AnchoredPosition: {x: 238.36002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541312001869 @@ -95607,7 +95607,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: 238.36, y: -14.5} + m_AnchoredPosition: {x: 238.36002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541353929678 @@ -96937,7 +96937,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: 186.7, y: -14.5} + m_AnchoredPosition: {x: 186.70001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541536778318 @@ -97159,7 +97159,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: 221.14, y: -14.5} + m_AnchoredPosition: {x: 221.14001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541566342643 @@ -97351,7 +97351,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: 255.58, y: -14.5} + m_AnchoredPosition: {x: 255.58002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541589189721 @@ -97499,7 +97499,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: 221.14, y: -14.5} + m_AnchoredPosition: {x: 221.14001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541596271436 @@ -98065,7 +98065,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: 255.58, y: -14.5} + m_AnchoredPosition: {x: 255.58002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541640597889 @@ -98548,7 +98548,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: 186.7, y: -14.5} + m_AnchoredPosition: {x: 186.70001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541676668109 @@ -99815,7 +99815,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: 203.92, y: -14.5} + m_AnchoredPosition: {x: 203.92001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541750134811 @@ -99889,7 +99889,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: 221.14, y: -14.5} + m_AnchoredPosition: {x: 221.14001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541757876061 @@ -99963,7 +99963,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: 186.7, y: -14.5} + m_AnchoredPosition: {x: 186.70001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541765586967 @@ -100154,7 +100154,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: 255.58, y: -14.5} + m_AnchoredPosition: {x: 255.58002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541803235999 @@ -100636,7 +100636,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: 238.36, y: -14.5} + m_AnchoredPosition: {x: 238.36002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541880974003 @@ -101011,7 +101011,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: 221.14, y: -14.5} + m_AnchoredPosition: {x: 221.14001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541916189075 @@ -101085,7 +101085,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: 255.58, y: -14.5} + m_AnchoredPosition: {x: 255.58002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541929570805 @@ -101307,7 +101307,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: 238.36, y: -14.5} + m_AnchoredPosition: {x: 238.36002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541944235952 @@ -101381,7 +101381,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: 238.36, y: -14.5} + m_AnchoredPosition: {x: 238.36002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161541946902312 @@ -102735,7 +102735,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: 203.92, y: -14.5} + m_AnchoredPosition: {x: 203.92001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3359161542112394850 @@ -108903,7 +108903,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: 221.14, y: -14.5} + m_AnchoredPosition: {x: 221.14001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2471589278177577023 @@ -110960,7 +110960,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: 203.92, y: -14.5} + m_AnchoredPosition: {x: 203.92001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4021584058718398440 @@ -124728,7 +124728,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: 31, y: -31} + m_AnchoredPosition: {x: 88.36, y: -31} m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1754906815985402965 @@ -129647,7 +129647,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: 97.52, y: -31} + m_AnchoredPosition: {x: 154.88, y: -31} m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4089440107815377248 @@ -148482,7 +148482,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: 255.58, y: -14.5} + m_AnchoredPosition: {x: 255.58002, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5887398676514620691 @@ -151170,7 +151170,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: 458.3, y: -178} + m_AnchoredPosition: {x: 396, y: -178} m_SizeDelta: {x: 252.4, y: 74.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6274738899986610223 @@ -151190,7 +151190,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 2 m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 62, y: 62} @@ -152498,7 +152498,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: 164.04, y: -31} + m_AnchoredPosition: {x: 221.4, y: -31} m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &54516247072135542 @@ -154323,7 +154323,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: 186.7, y: -14.5} + m_AnchoredPosition: {x: 186.70001, y: -14.5} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6265379949867384594 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index f15115cc73..ccccf354c9 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -238,22 +238,6 @@ function this.RequestBetBaseInfo(func,isPlayBattle) if func then func() end return end - --第一个准备阶段无竞猜信息 - if this.baseInfo.battleStage == TOP_MATCH_STAGE.CHOOSE - and this.baseInfo.battleTurn == 1 - and this.baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_READY then - -- this.isCanBet = false - if func then func() end - return - end - -- 积分赛不设置竞猜环节 32强才显示 - --if this.baseInfo.battleStage~=TOP_MATCH_STAGE.ELIMINATION then - -- this.isCanBet = false - -- if func then func() end - -- return - --end - - LogGreen("this.isCanBet = true ") -- 获取巅峰战信息 NetManager.GetBetMatchInfo(0, function(msg) this.betBattleInfo = msg.championBattleInfo @@ -268,8 +252,7 @@ function this.RequestBetBaseInfo(func,isPlayBattle) Log(string.format(Language[10114], msg.winUid, msg.championBetInfo.id, msg.championBetInfo.redCoins, msg.championBetInfo.blueCoins)) -- 可以竞猜了 this.isCanBet = true - - -- + LogGreen("this.isCanBet = true ") Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnGuessDataUpdate) Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnGuessRateUpdate) LogGreen("this.baseInfo.battleState "..this.baseInfo.battleState) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua index 0e338f83d4..f9d3292bf6 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua @@ -128,6 +128,11 @@ function this.SetInfoData(panelType, blueData, redData, textType, showScore,batt this.RefreshTwoOutOfThreeData() this.awaitText:SetActive(ArenaTopMatchManager.GetIsBattleEndState(this.panelType)) + if this.panelType == 1 then + this.awaitText.transform.localPosition = Vector3.New(0,785,0) + elseif this.panelType == 2 then + this.awaitText.transform.localPosition = Vector3.New(0,515,0) + end end -- 设置显隐 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua index ab986b0ce1..7c0abe77b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua @@ -237,7 +237,7 @@ function this.RefreshBaseShow() this.blueGuess:SetActive(false) end else - LogGreen("sssssssssssss "..tostring(true)) + LogGreen("sssssssssssss "..tostring(IsCanBet)) this.emptyPanel:SetActive(true) this.guessPanel:SetActive(false) commonInfo.SetActive(false)