From 61fc680b4a48dc52b69cfee0b4bfe044cb4a4e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com>
Date: Sat, 21 Jun 2025 21:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=A4=E4=B8=AA=E5=B0=8F?=
 =?UTF-8?q?=E6=95=B0=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NewGroup/MngView/GroupMngPartnerStatViewAlone.lua     | 2 +-
 wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml  | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua
index eb498a3d..463d8bc8 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua
@@ -414,7 +414,7 @@ function M:OnRenderRecordItemNew(obj, mainRecord, root_id)
     local tex_total_score         = obj:GetChild("tex_total_score")
     local ctr_show_total          = obj:GetController("show_total")
     if mainRecord.hpall then
-        tex_total_score.text = mainRecord.hpall.hp
+        tex_total_score.text = d2ad(mainRecord.hpall.hp)
         ctr_show_total.selectedIndex = 1
     else
         ctr_show_total.selectedIndex = 0
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
index 498fe082..6d17edf6 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="3"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="jushu" pages="0,,1," selected="0"/>
@@ -27,7 +27,7 @@
     <component id="n147_nu0l" name="player_info2" src="f55qw7" fileName="component/Main/component/PlayerHead_2.xml" xy="11,71">
       <relation target="" sidePair="left-left,leftext-left"/>
     </component>
-    <component id="n7" name="player_info1" src="f55qw4" fileName="component/Main/component/PlayerHead_1.xml" xy="20,524" size="189,67">
+    <component id="n7" name="player_info1" src="f55qw4" fileName="component/Main/component/PlayerHead_1.xml" xy="8,570" size="189,67">
       <gearXY controller="state" pages="0,1,2,3" values="20,524|22,548|8,570|8,570"/>
       <relation target="" sidePair="left-left,leftext-left"/>
     </component>
@@ -68,7 +68,7 @@
       <relation target="" sidePair="left-left"/>
     </component>
     <component id="n24" name="right_panel" src="f55qvt" fileName="component/Main/component/Folder/RightPanel.xml" xy="0,-11" size="920,82" group="n150_8th3">
-      <gearDisplay controller="state" pages="0,1,2,3"/>
+      <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="left-left"/>
     </component>
     <component id="n31_h1uu" name="roominfo_panel" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="856,-25" size="461,97" group="n150_8th3" touchable="false"/>
@@ -135,11 +135,9 @@
   </displayList>
   <transition name="outcard1">
     <item time="0" type="XY" target="n153_8th3" tween="true" startValue="625.3,86.3" endValue="239,261" duration="12"/>
-    <item time="12" type="XY" target="n153_8th3" value="239,261"/>
   </transition>
   <transition name="outcard2">
     <item time="0" type="XY" target="n153_8th3" tween="true" startValue="625.3,86.3" endValue="1047,293" duration="12"/>
-    <item time="12" type="XY" target="n153_8th3" value="1047,293"/>
   </transition>
   <transition name="t3">
     <item time="0" type="Visible" target="n174_fgao" value="true"/>