diff --git a/lua_probject/extend_project/extend/zipai/runbeard/EXGameInfo.lua b/lua_probject/extend_project/extend/zipai/runbeard/EXGameInfo.lua
index 9e372a2f..f9d2a468 100644
--- a/lua_probject/extend_project/extend/zipai/runbeard/EXGameInfo.lua
+++ b/lua_probject/extend_project/extend/zipai/runbeard/EXGameInfo.lua
@@ -245,6 +245,8 @@ function M:SelectedConfigData()
local hongheihu = _config:GetController('hongheihu').selectedIndex --红黑胡
local yidianhu = _config:GetController('yidianhu').selectedIndex --一点红
+ local mingtabudiejia = _config:GetController('mingtabudiejia').selectedIndex --名堂不叠加
+
local qupai=0
if renshu==2 then
qupai=_config:GetController('qupai').selectedIndex
@@ -273,7 +275,7 @@ function M:SelectedConfigData()
_data['daxiaozi'] = daxiaozi
_data['hongheihu'] = hongheihu
_data['yidianhu'] = yidianhu
-
+ _data['mingtabudiejia'] = mingtabudiejia
elseif wanfa_C == 1 then
_data['tun'] = tun -- 充囤 0 1 2 3 4 5 分别是 0 1 2 3 4 5
_data['fengding'] = fengding -- 封顶 0 1 2 红黑点分别是 不封顶 单局20封顶 单局 40封顶
@@ -344,7 +346,7 @@ function M:LoadConfigData(data)
_config:GetController('daxiaozi').selectedIndex = data.daxiaozi
_config:GetController('hongheihu').selectedIndex = data.hongheihu
_config:GetController('yidianhu').selectedIndex = data.yidianhu
-
+ _config:GetController('mingtabudiejia').selectedIndex = data.mingtabudiejia
elseif data.mode == 2 then
_config:GetController('tun').selectedIndex = data.tun
_config:GetController('fengding').selectedIndex = data.fengding
diff --git a/lua_probject/extend_project/extend/zipai/runbeard/EXRoomConfig.lua b/lua_probject/extend_project/extend/zipai/runbeard/EXRoomConfig.lua
index 709455e2..425a7268 100644
--- a/lua_probject/extend_project/extend/zipai/runbeard/EXRoomConfig.lua
+++ b/lua_probject/extend_project/extend/zipai/runbeard/EXRoomConfig.lua
@@ -37,6 +37,8 @@ function M.new(config)
self.daxiaozi =config["daxiaozi"]
self.hongheihu =config["hongheihu"]
self.yidianhu =config["yidianhu"]
+ self.mingtabudiejia =config["mingtabudiejia"]
+
return self
end
@@ -131,7 +133,7 @@ function M:GetDes(sp)
str = str .. sp
end
elseif (self.mode == 1 ) then
- str = str .. "跑胡子 十五息起胡 一息一囤 明偎 天地胡 30胡翻倍 大小字 碰碰胡 一点胡 红黑胡"
+ str = str .. "跑胡子 十五息起胡 一息一囤 暗偎 天地胡 30胡翻倍 大小字 碰碰胡 一点胡 红黑胡"
str = str .. sp
-- if self.tianhu == 1 then
-- str = str .. "天胡"
@@ -153,6 +155,11 @@ function M:GetDes(sp)
-- str = str .. "黄番"
-- str = str .. sp
-- end
+
+ if self.mingtabudiejia == 1 then
+ str = str .. "名堂不叠加"
+ str = str .. sp
+ end
-- str = str .. (self.tun).."囤"
str = str .. sp
diff --git a/wb_new_ui/.objs/metas/442j0uep/ygxgd.info b/wb_new_ui/.objs/metas/442j0uep/ygxgd.info
index 5b13b0b9..88059f18 100644
--- a/wb_new_ui/.objs/metas/442j0uep/ygxgd.info
+++ b/wb_new_ui/.objs/metas/442j0uep/ygxgd.info
@@ -3,6 +3,9 @@
"n363_u3z9": {
"hidden": true
},
+ "n365_eo65": {
+ "hidden": true
+ },
"n364_u3z9": {
"hidden": true
},
diff --git a/wb_new_ui/.objs/metas/z3z0ysur/ygxgd.info b/wb_new_ui/.objs/metas/z3z0ysur/ygxgd.info
index 20616fc8..6bcf9720 100644
--- a/wb_new_ui/.objs/metas/z3z0ysur/ygxgd.info
+++ b/wb_new_ui/.objs/metas/z3z0ysur/ygxgd.info
@@ -1,10 +1,10 @@
{
"objectStatus": {
- "n46_g92u": {
- "collapsed": true
- },
"n123_r282": {
"collapsed": true
+ },
+ "n323_efnv": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index 27eb57d6..688a555d 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -1,5 +1,5 @@
{
- "libview.firstColumnWidth": 416,
+ "libview.firstColumnWidth": 283,
"expanded_nodes": [
"27vd145b",
"/",
@@ -14,18 +14,20 @@
"ui://v6yvqp7wakwa1gz",
"ui://m7iejg46l7wn7i80",
"ui://9n9stu2eprgzf0",
+ "ui://z3z0ysurygxgd",
+ "ui://27vd145bh1uu3i",
"ui://442j0uepn1ry4i"
],
"packageGroup.mine": [],
"test.device": "720p Phone",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://9n9stu2eprgzf0",
+ "doc.activeDoc": "ui://z3z0ysurygxgd",
"libview.twoColumn": false,
"libview.expandedNodes": [
- "9n9stu2e",
+ "z3z0ysur",
"/",
- "9n9stu2e",
+ "z3z0ysur",
"/component/"
],
"auxline1": true,
diff --git a/wb_new_ui/assets/Extend_Poker_RunBeard/component/create_room/Cgm_create_room.xml b/wb_new_ui/assets/Extend_Poker_RunBeard/component/create_room/Cgm_create_room.xml
index c6042d33..0f9690ab 100644
--- a/wb_new_ui/assets/Extend_Poker_RunBeard/component/create_room/Cgm_create_room.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunBeard/component/create_room/Cgm_create_room.xml
@@ -31,6 +31,7 @@
+
@@ -145,7 +146,7 @@
-
+
@@ -214,16 +215,19 @@
+
+
+
-
-
+
+
-
+
-
-
+
+
@@ -231,7 +235,7 @@
-
+
@@ -242,7 +246,7 @@
-
+
@@ -250,15 +254,23 @@
-
-
+
+
-
+
-
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunBeard/package.xml b/wb_new_ui/assets/Extend_Poker_RunBeard/package.xml
index f9f6df96..854fdd21 100644
--- a/wb_new_ui/assets/Extend_Poker_RunBeard/package.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunBeard/package.xml
@@ -153,5 +153,5 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_Poker_RunBeard/Cgm_create_room.xml b/wb_new_ui/assets/Info_Poker_RunBeard/Cgm_create_room.xml
index 0e825a95..c47ebfc7 100644
--- a/wb_new_ui/assets/Info_Poker_RunBeard/Cgm_create_room.xml
+++ b/wb_new_ui/assets/Info_Poker_RunBeard/Cgm_create_room.xml
@@ -104,31 +104,34 @@
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
@@ -220,17 +223,17 @@
-
-
-
+
+
+
-
+
-
-
-
+
+
+
diff --git a/wb_unity_pro/Assets/ART/extend/zipai/runbeard/ui/Extend_Poker_RunBeard_fui.bytes b/wb_unity_pro/Assets/ART/extend/zipai/runbeard/ui/Extend_Poker_RunBeard_fui.bytes
index dadf55eb..1bdce063 100644
Binary files a/wb_unity_pro/Assets/ART/extend/zipai/runbeard/ui/Extend_Poker_RunBeard_fui.bytes and b/wb_unity_pro/Assets/ART/extend/zipai/runbeard/ui/Extend_Poker_RunBeard_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/zipai/runbeard/ui/Info_Poker_RunBeard_fui.bytes b/wb_unity_pro/Assets/ART/extend/zipai/runbeard/ui/Info_Poker_RunBeard_fui.bytes
index dec49ad0..4e7170fd 100644
Binary files a/wb_unity_pro/Assets/ART/extend/zipai/runbeard/ui/Info_Poker_RunBeard_fui.bytes and b/wb_unity_pro/Assets/ART/extend/zipai/runbeard/ui/Info_Poker_RunBeard_fui.bytes differ
diff --git a/wb_unity_pro_jx/Assets/ART/extend/zipai/runbeard/bg.meta b/wb_unity_pro_jx/Assets/ART/extend/zipai/runbeard/bg.meta
deleted file mode 100644
index a2c9a56b..00000000
--- a/wb_unity_pro_jx/Assets/ART/extend/zipai/runbeard/bg.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ac100764a9b83e943aff467cd8672713
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_jx/Assets/ART/extend/zipai/runbeard/ui/Extend_Poker_RunBeard_fui.bytes b/wb_unity_pro_jx/Assets/ART/extend/zipai/runbeard/ui/Extend_Poker_RunBeard_fui.bytes
index dadf55eb..e845317f 100644
Binary files a/wb_unity_pro_jx/Assets/ART/extend/zipai/runbeard/ui/Extend_Poker_RunBeard_fui.bytes and b/wb_unity_pro_jx/Assets/ART/extend/zipai/runbeard/ui/Extend_Poker_RunBeard_fui.bytes differ
diff --git a/wb_unity_pro_jx/Assets/StreamingAssets/init1_1.json b/wb_unity_pro_jx/Assets/StreamingAssets/init1_1.json
index 15265d80..dc2dc538 100644
--- a/wb_unity_pro_jx/Assets/StreamingAssets/init1_1.json
+++ b/wb_unity_pro_jx/Assets/StreamingAssets/init1_1.json
@@ -16,10 +16,10 @@
"bundle": "extend/majiang/zhuanzhuan"
},
{
- "ver": "1.0.2",
+ "ver": "1.0.3",
"name": "湘潭跑胡子",
"check": true,
- "version": "1.0.2",
+ "version": "1.0.3",
"game_id": "13",
"bundle": "extend/zipai/runbeard"
},
diff --git a/wb_unity_pro_jx/Pack/Android/extend/zipai/runbeard/asset_pack1.0.3.bytes b/wb_unity_pro_jx/Pack/Android/extend/zipai/runbeard/asset_pack1.0.3.bytes
new file mode 100644
index 00000000..52b716fe
Binary files /dev/null and b/wb_unity_pro_jx/Pack/Android/extend/zipai/runbeard/asset_pack1.0.3.bytes differ
diff --git a/wb_unity_pro_jx/Pack/iOS/extend/zipai/runbeard/asset_pack1.0.3.bytes b/wb_unity_pro_jx/Pack/iOS/extend/zipai/runbeard/asset_pack1.0.3.bytes
new file mode 100644
index 00000000..f35f2c76
Binary files /dev/null and b/wb_unity_pro_jx/Pack/iOS/extend/zipai/runbeard/asset_pack1.0.3.bytes differ
diff --git a/wb_unity_pro_jx/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro_jx/ProjectSettings/GraphicsSettings.asset
index 4da061a7..a7bcfc3d 100644
--- a/wb_unity_pro_jx/ProjectSettings/GraphicsSettings.asset
+++ b/wb_unity_pro_jx/ProjectSettings/GraphicsSettings.asset
@@ -39,7 +39,6 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}