diff --git a/lua_probject/base_project/Game/View/ResultView.lua b/lua_probject/base_project/Game/View/ResultView.lua
index e385ef84..00f6c9bf 100644
--- a/lua_probject/base_project/Game/View/ResultView.lua
+++ b/lua_probject/base_project/Game/View/ResultView.lua
@@ -387,6 +387,10 @@ function M:InitBigResult(room, fontsize)
else
item:GetController('self').selectedIndex = 0
end
+
+ if item:GetChild('head') and item:GetChild('head')._iconObject then
+ ImageLoad.Load(player_info.head_url,item:GetChild('head')._iconObject)
+ end
end
local btn_continue_game = big_result:GetChild('btn_continue_game')
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
index 00cea9b2..1d18bd25 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
@@ -778,7 +778,7 @@ function M:__FangziTip(tip, _uid, fptype)
else
self._view:AddChild(_chipeng_tip)
_chipeng_tip:Center()
- _chipeng_tip.x = _chipeng_tip.x + 450
+ _chipeng_tip.x = _chipeng_tip.x + 750
_chipeng_tip.y = _chipeng_tip.y - 100
end
end
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua
index dc18bff3..d5081e3b 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua
@@ -288,7 +288,7 @@ function M:UpdateOutCardList(outcard, isShow, isMopai, seat)
end
else
show_di_bg.visible = false
- outcards:GetTransition("cpai" .. seat):Play()
+ outcards:GetTransition("mopai" .. seat):Play()
end
else
--show_di_bg.visible = true
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 525b8d58..21630bf2 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua
@@ -530,8 +530,9 @@ function M:UpdateOutLine()
elseif self:getCardSize() == 1.8 then
self._data_outLinePos = 90 - (170 * 3)
elseif self:getCardSize() == 2 then
- self._data_outLinePos = 110 - (155 * 3)
+ self._data_outLinePos = 110 - (195 * 3)
end
+ print("输出高度位置===="..self._data_outLinePos.."="..self._area_handcard_list.height)
self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height - 60
end
diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info
index 5ccc1ea8..aa6fba8d 100644
--- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info
+++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info
@@ -9,8 +9,8 @@
"n64_pwj4": {
"collapsed": true
},
- "n51_fmkv": {
- "collapsed": true
+ "n33_n1ry": {
+ "locked": true
},
"n84_rbpg": {
"hidden": true
@@ -18,13 +18,10 @@
"n43_n1ry": {
"hidden": true
},
- "n33_n1ry": {
- "locked": true
- },
"n45_n1ry": {
"collapsed": true
},
- "n70_dunj": {
+ "n51_fmkv": {
"collapsed": true
},
"n55_rx2e": {
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index cc2050bf..d7dfdb5e 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -4,6 +4,8 @@
"doc.openedDocs": [
"ui://lkq9ne9speuq8b",
"ui://lkq9ne9speuq5a",
+ "ui://lkq9ne9speuq9g",
+ "ui://lkq9ne9speuqcv",
"ui://lkq9ne9speuqc6",
"ui://lkq9ne9speuqao",
"ui://lkq9ne9speuq5b",
@@ -14,7 +16,7 @@
"test.device": "Huawei Mate20",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://lkq9ne9speuq5a",
+ "doc.activeDoc": "ui://lkq9ne9speuq8b",
"libview.twoColumn": false,
"libview.expandedNodes": [
"27vd145b",
@@ -26,6 +28,10 @@
"lkq9ne9s",
"/component/",
"lkq9ne9s",
+ "/component/Main/",
+ "lkq9ne9s",
+ "/component/Main/component/",
+ "lkq9ne9s",
"/component/option/",
"lkq9ne9s",
"/component/option/component/",
diff --git a/wb_new_ui/assets/Common/images/Frame 1179.png b/wb_new_ui/assets/Common/images/Frame 1179.png
deleted file mode 100644
index 7e0aad16..00000000
Binary files a/wb_new_ui/assets/Common/images/Frame 1179.png and /dev/null differ
diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml
index 16f38e69..7c40a4e4 100644
--- a/wb_new_ui/assets/Common/package.xml
+++ b/wb_new_ui/assets/Common/package.xml
@@ -1560,7 +1560,6 @@
-
diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
index 7834141e..8b56923b 100644
--- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
+++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
@@ -1,14 +1,14 @@
-
+
-
-
+
+
@@ -136,12 +136,12 @@
-
+
-
+
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 b8f99398..7fe2b91a 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
@@ -20,7 +20,7 @@
-
+
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 f953f0ec..85edbb82 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
@@ -4,7 +4,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/chi/component/choose/Comp_choose.xml b/wb_new_ui/assets/Main_RunBeard/component/chi/component/choose/Comp_choose.xml
index bdee6b8f..0587922e 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/chi/component/choose/Comp_choose.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/chi/component/choose/Comp_choose.xml
@@ -2,10 +2,10 @@
-
+
-
-
+
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/option/component/choose/Comp_choose.xml b/wb_new_ui/assets/Main_RunBeard/component/option/component/choose/Comp_choose.xml
index e5c6ef8c..a6cd8769 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/option/component/choose/Comp_choose.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/option/component/choose/Comp_choose.xml
@@ -2,11 +2,11 @@
-
+
-
-
-
+
+
+
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 26274d9e..301486c1 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
diff --git a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_fui.bytes b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_fui.bytes
index ae816790..c2c03489 100644
Binary files a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_fui.bytes and b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_fui.bytes differ
diff --git a/wb_unity_pro/Assets/StreamingAssets/Pack.byte b/wb_unity_pro/Assets/StreamingAssets/Pack.byte
index cea09b45..dd6c0f27 100644
Binary files a/wb_unity_pro/Assets/StreamingAssets/Pack.byte and b/wb_unity_pro/Assets/StreamingAssets/Pack.byte differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes
index 1b6343e6..6a0e6e6d 100644
Binary files a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.32.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.32.bytes
index 4427407a..b879a63b 100644
Binary files a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.32.bytes and b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.32.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/extend/zipai/fanpaofa/asset_pack1.0.49.bytes b/wb_unity_pro/Pack/Android32/extend/zipai/fanpaofa/asset_pack1.0.49.bytes
index 785627a2..0ce34a62 100644
Binary files a/wb_unity_pro/Pack/Android32/extend/zipai/fanpaofa/asset_pack1.0.49.bytes and b/wb_unity_pro/Pack/Android32/extend/zipai/fanpaofa/asset_pack1.0.49.bytes differ