diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
index 0b092683..74723722 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
@@ -57,7 +57,7 @@ function M:InitView(url)
hx = 15
end
- ZPMainView.InitView(self, 'ui://Main_RunBeard/Main_' .. _room.room_config.people_num, false, false, 1.2, hx)
+ ZPMainView.InitView(self, 'ui://Main_RunBeard/Main_' .. _room.room_config.people_num, false, false, 2, hx)
self:PlayerChangeLineState()
SettingView.onEXMainCallback = handler(self, self.UpdateCardDisplay)
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua
index 7c0bdea3..df8663a6 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua
@@ -520,6 +520,10 @@ function M:UpdateOutLine()
self._data_outLinePos = 90 - (116 * 3)
elseif self:getCardSize() == 0.8 then
self._data_outLinePos = 100 - (93 * 3)
+ elseif self:getCardSize() == 1.5 then
+ self._data_outLinePos = 90 - (143 * 3)
+ elseif self:getCardSize() == 2 then
+ self._data_outLinePos = 110 - (155 * 3)
end
self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height
end
@@ -796,6 +800,10 @@ function M:GetHandCardPos(cards_view, cards)
y = 90 - (110 * cards_view.index_Y)
elseif self:getCardSize() == 0.8 then
y = 100 - (85 * cards_view.index_Y)
+ elseif self:getCardSize() == 1.5 then
+ y = 90 - (137 * cards_view.index_Y)
+ elseif self:getCardSize() == 2 then
+ y = 90 - (182 * cards_view.index_Y)
end
return Vector2.New(x, y)
end
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 b2e6ff50..8c2ef4d7 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
@@ -31,7 +31,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
index 7256b950..afaba41b 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
@@ -8,17 +8,17 @@
-
+
-
+
-
+
@@ -49,13 +49,13 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
index cdaca08d..1815cf03 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
@@ -1,11 +1,11 @@
-
-
+
+
-
-
+
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/new_ui/refresh_img.png b/wb_new_ui/assets/Main_RunBeard/component/Main/component/new_ui/refresh_img.png
deleted file mode 100644
index a6006b46..00000000
Binary files a/wb_new_ui/assets/Main_RunBeard/component/Main/component/new_ui/refresh_img.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png
index d5ee23ba..edcbab74 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png
index 4b8029ef..40020808 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png
index a23ebc32..a90b51ac 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes
index 226abc23..cf5a2aa6 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes differ