diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/CardCheck.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/CardCheck.lua
index 2757ceba..1d7dd255 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/CardCheck.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/CardCheck.lua
@@ -583,7 +583,7 @@ function M.tingPai(player, room)
num1 = num1 + self.stackHuxi[k]
--printlog(self.stackHuxi[k])
end
- --printlog("胡息数量===>>>",player.hu_xi,num1,kan_huxi)
+ printlog("胡息数量===>>>",player.hu_xi,num1,kan_huxi)
if (player.hu_xi + num1 + kan_huxi) >= (self:getHuxi(room)-1) then
tingList[#tingList + 1] = tem
end
@@ -600,6 +600,11 @@ function M:getHuxi(room)
if room.game_id == 301 then
return 8
end
+
+ if room.room_config.config.hunum==0 then
+ return 15
+ end
+
if room.game_id == 13 or room.game_id == 14 or room.game_id == 23 then
return 15
elseif room.game_id == 26 then
diff --git a/lua_probject/main_project/main/zipai/CardCheck.lua b/lua_probject/main_project/main/zipai/CardCheck.lua
index 38850d29..26013c42 100644
--- a/lua_probject/main_project/main/zipai/CardCheck.lua
+++ b/lua_probject/main_project/main/zipai/CardCheck.lua
@@ -419,6 +419,9 @@ function M:getHuxi(room)
if room.game_id == 15 then
return 15
end
+ if room.game_id == 17 then
+ return 15
+ end
if room.game_id == 13 or room.game_id == 14 or room.game_id == 23 then
return 15
elseif room.game_id == 26 then
diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qw7.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qw7.info
index 99572a82..95fc59c3 100644
--- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qw7.info
+++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qw7.info
@@ -1,7 +1,16 @@
{
"objectStatus": {
+ "n74_o49p": {
+ "collapsed": true
+ },
"n39_e7qn": {
"collapsed": true
+ },
+ "n49_lr5d": {
+ "collapsed": true
+ },
+ "n38_e7qn": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info
index c0ce1590..8c42c4b9 100644
--- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info
+++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info
@@ -6,16 +6,13 @@
"n34_k3io": {
"hidden": true
},
+ "n46_u4l2": {
+ "hidden": true
+ },
"n163_o49p": {
"hidden": true,
"collapsed": true
},
- "n154_r1mo": {
- "collapsed": true
- },
- "n150_8th3": {
- "collapsed": true
- },
"n170_o49p": {
"hidden": true
},
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 190eb2c0..63d06b04 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
@@ -3,10 +3,10 @@
-
+
-
+
@@ -20,22 +20,22 @@
-
+
-
+
-
+
-
+
@@ -73,25 +73,25 @@
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
@@ -112,10 +112,10 @@
-
+
-
+
@@ -128,7 +128,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml
index bac776fd..5433dcce 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml
@@ -1,23 +1,23 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
+
@@ -45,7 +45,7 @@
-
+
@@ -54,11 +54,11 @@
-
-
+
+
-
+
@@ -75,11 +75,11 @@
-
+
-
-
+
+
@@ -87,10 +87,10 @@
-
+
-
+
@@ -99,8 +99,8 @@
-
-
+
+