diff --git a/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXGameInfo.lua b/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXGameInfo.lua
index 7b0623c7..37b73a45 100644
--- a/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXGameInfo.lua
+++ b/fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXGameInfo.lua
@@ -255,7 +255,12 @@ function M:LoadConfigData(data)
end
_config:GetController("jiangma").selectedIndex = data.jiangma
- _config:GetChild("btn_dianpaohu").selected = data.dianpaohu
+
+
+ if _config:GetController("btn_dianpaohu") then
+ _config:GetChild("btn_dianpaohu").selected = data.dianpaohu
+ end
+
if _config:GetController("piao") then
_config:GetController("piao").selectedIndex = data.piao_niao
@@ -263,13 +268,11 @@ function M:LoadConfigData(data)
_config:GetChild('pf2').selected = data.piao2
_config:GetChild('pf3').selected = data.piao3
end
-
if _config:GetChild("btn_sihongzhong") then
_config:GetChild("btn_sihongzhong").selected = data.laizi4_hu
_config:GetChild("btn_wuhongzhong").selected = data.hz_hu
_config:GetChild("btn_wuhongzhongzimo").selected = data.wuguijiabei
end
-
if _config:GetController("difen") then
_config:GetController("difen").selectedIndex = data.di_fen
end
diff --git a/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerSelfCardInfoView.lua b/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerSelfCardInfoView.lua
index 78bc8899..044a708b 100644
--- a/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerSelfCardInfoView.lua
+++ b/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerSelfCardInfoView.lua
@@ -57,8 +57,8 @@ function M:init()
self._isDrg = false
self.card_list = {} -- 牌的btn code type pos 等等
self.cards_count = 0 -- 牌的总列数
- self.card_width = 99
- self.card_hight = 121
+ self.card_width = 172
+ self.card_hight = 223
self.outcard_button = nil
self._room = DataManager.CurrenRoom
self._area_handcard_list = view:GetChild('area_handcard_list')
@@ -267,8 +267,8 @@ function M:InitHandCard(isPlayAni)
btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_code)
btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
- self.card_width = 95 * self:getCardSize()
- self.card_hight = 121 * self:getCardSize()
+ self.card_width = 172 * self:getCardSize()
+ self.card_hight = 223 * self:getCardSize()
local x, y = 500, (j * 75) + 500
btn_card:SetXY(x, y)
@@ -337,8 +337,8 @@ function M:InitHandCard(isPlayAni)
btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_code)
btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
- self.card_width = 95 * self:getCardSize()
- self.card_hight = 121 * self:getCardSize()
+ self.card_width = 172 * self:getCardSize()
+ self.card_hight = 223 * self:getCardSize()
btn_card:GetController('cardnum').selectedIndex=currentCardNum-1
local cardNums=currentCardNum-1
if cardNums>0 then
@@ -469,8 +469,8 @@ function M:UpdateHandCards(list)
btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_code)
btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
- self.card_width = 87 * self:getCardSize()
- self.card_hight = 110 * self:getCardSize()
+ self.card_width = 172 * self:getCardSize()
+ self.card_hight = 223 * self:getCardSize()
local card_view = NewCardView(btn_card, card_code, list[i].index_X, list[i].index_Y)
--存牌堆
self.card_list[#self.card_list + 1] = card_view
@@ -631,8 +631,8 @@ function M:UpdateCardSize()
card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_view.card_item)
card_view.btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
card_view.btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
- self.card_width = 99 * self:getCardSize()
- self.card_hight = 121 * self:getCardSize()
+ self.card_width = 172 * self:getCardSize()
+ self.card_hight = 223 * self:getCardSize()
self._area_handcard_list:AddChild(card_view.btn_card)
card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3)
end
diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json
index c0414b75..b0a6eb7f 100644
--- a/fk101/wb_new_ui/.objs/workspace.json
+++ b/fk101/wb_new_ui/.objs/workspace.json
@@ -49,9 +49,72 @@
"ui://4skil1l6ms5spy",
"ui://4skil1l6r6qo1kc",
"ui://5cdldr01qaqf9c",
+ "ui://5cdldr01qaqf61",
+ "ui://5cdldr01qaqfb",
+ "ui://5cdldr01qaqf62",
+ "ui://5cdldr01qaqf7o",
+ "ui://5cdldr01qaqfo",
+ "ui://yzaioi79lvh412c",
+ "ui://yzaioi79cyprwq",
+ "ui://5cdldr01qaqfbb",
+ "ui://5cdldr01qaqfc",
+ "ui://4skil1l6bw4gev",
+ "ui://3z9lj55vjokmis",
+ "ui://3z9lj55vjokmce",
+ "ui://3z9lj55vjokm7g",
+ "ui://3z9lj55vjokm3",
+ "ui://3op8sm5eu86s2",
+ "ui://fnuxqeflnrnoa",
+ "ui://kplym8mus9wx2",
+ "ui://425x67nrs9wx2",
+ "ui://s63l0suw6cpqm",
+ "ui://visk5g30gq7m9",
+ "ui://visk5g30gq7m1v",
+ "ui://xul2z8cts9wx2",
+ "ui://b50sd5s6s9wx2",
+ "ui://y8prev1ms9wx2",
+ "ui://c7j2rnvqtpf08b",
+ "ui://c7j2rnvqtpf066",
+ "ui://c7j2rnvqtpf0o",
+ "ui://c7j2rnvqtpf0k",
+ "ui://c7j2rnvqtpf00",
+ "ui://bx1t0boos9wx2",
+ "ui://4skil1l6piv91oc",
+ "ui://4skil1l6by4o1i4",
+ "ui://5cdldr01qaqf60",
+ "ui://5cdldr01qaqf7s",
+ "ui://5cdldr01qaqf34",
"ui://5cdldr01qaqfa4",
"ui://5cdldr01qaqfaw",
"ui://yzaioi79f55qwa",
+ "ui://yzaioi79oynr1ag",
+ "ui://yzaioi79f55qw5",
+ "ui://yzaioi79f55qvw",
+ "ui://yzaioi79lr5d31",
+ "ui://27vd145bycze3n",
+ "ui://1hl55dqmc4r115",
+ "ui://d1qrzqprc4r116",
+ "ui://m7iejg46kwi0hkb",
+ "ui://egnzysm7ffp38j",
+ "ui://s63l0suw6cpqy",
+ "ui://27vd145bh1uu3i",
+ "ui://qubt49z8c4r116",
+ "ui://5cdldr01qaqf3f",
+ "ui://yzaioi79f55qvx",
+ "ui://yzaioi79f55qvy",
+ "ui://27vd145bko559b",
+ "ui://c7j2rnvqtpf059",
+ "ui://c7j2rnvqtpf07n",
+ "ui://c7j2rnvqtpf05a",
+ "ui://3z9lj55vjokmj5",
+ "ui://3z9lj55vjokmj1",
+ "ui://4skil1l6bw4ghh",
+ "ui://5cdldr01qaqfbk",
+ "ui://5cdldr01qaqfbi",
+ "ui://yzaioi79wyal87",
+ "ui://yzaioi79wyal85",
+ "ui://yzaioi79f55qw7",
+ "ui://3n2top74kpmgp5",
"ui://yzaioi79f55qva",
"ui://yzaioi79f55qvp",
"ui://yzaioi79f55qvt",
@@ -76,15 +139,35 @@
"test.device": "Xiaomi 9",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://yzaioi79f55qwa",
+ "doc.activeDoc": "ui://egnzysm7ffp38j",
"libview.twoColumn": false,
"libview.expandedNodes": [
+ "27vd145b",
+ "/",
+ "27vd145b",
+ "/buttons/",
+ "27vd145b",
+ "/conMui/",
+ "3n2top74",
+ "/",
+ "5cdldr01",
+ "/",
+ "5cdldr01",
+ "/component/",
+ "5cdldr01",
+ "/component/Main/",
+ "5cdldr01",
+ "/component/Main/images/",
+ "5cdldr01",
+ "/component/game/",
"yzaioi79",
"/",
"yzaioi79",
"/component/",
"yzaioi79",
- "/component/Main/"
+ "/component/Main/",
+ "yzaioi79",
+ "/component/Main/component/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml b/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml
index 4f9c2d35..75d28103 100644
--- a/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml
+++ b/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml
@@ -4,12 +4,12 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml
index 012d34d9..f210fb7f 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Common/component/game/btn_ready.xml b/fk101/wb_new_ui/assets/Common/component/game/btn_ready.xml
index 11228b2c..582394a1 100644
--- a/fk101/wb_new_ui/assets/Common/component/game/btn_ready.xml
+++ b/fk101/wb_new_ui/assets/Common/component/game/btn_ready.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Common/conMui/Group 523.png b/fk101/wb_new_ui/assets/Common/conMui/Group 523.png
new file mode 100644
index 00000000..ef0118a7
Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/Group 523.png differ
diff --git a/fk101/wb_new_ui/assets/Common/conMui/Group 524.png b/fk101/wb_new_ui/assets/Common/conMui/Group 524.png
new file mode 100644
index 00000000..c2a59920
Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/Group 524.png differ
diff --git a/fk101/wb_new_ui/assets/Common/conMui/platform_btn_ready_1.png b/fk101/wb_new_ui/assets/Common/conMui/platform_btn_ready_1.png
new file mode 100644
index 00000000..39979e03
Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/platform_btn_ready_1.png differ
diff --git a/fk101/wb_new_ui/assets/Common/conMui/xipai.png b/fk101/wb_new_ui/assets/Common/conMui/xipai.png
new file mode 100644
index 00000000..d4c04fb3
Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/xipai.png differ
diff --git a/fk101/wb_new_ui/assets/Common/package.xml b/fk101/wb_new_ui/assets/Common/package.xml
index ce438b8a..1bb34c7c 100644
--- a/fk101/wb_new_ui/assets/Common/package.xml
+++ b/fk101/wb_new_ui/assets/Common/package.xml
@@ -1157,6 +1157,10 @@
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml b/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
index 0c63255b..24191fa1 100644
--- a/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
+++ b/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
@@ -2,7 +2,7 @@
-
+
@@ -36,15 +36,15 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
index 18859218..3b593883 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
@@ -1,9 +1,9 @@
-
+
-
-
+
+
@@ -36,7 +36,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
index 344deced..79f3abcf 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
index 259f5d11..a9d1021c 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/option/Btn_fztip.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/option/Btn_fztip.xml
index 8f84929a..e81a3092 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeard/component/option/Btn_fztip.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/option/Btn_fztip.xml
@@ -4,9 +4,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/Main_2.xml b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/Main_2.xml
index 50e2dd3e..c7535568 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/Main_2.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/Main_2.xml
@@ -1,6 +1,6 @@
-
+
@@ -26,14 +26,14 @@
-
+
-
+
@@ -41,27 +41,27 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -82,10 +82,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Folder/component/phone_info/Btn_jiesan_lobby.xml b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Folder/component/phone_info/Btn_jiesan_lobby.xml
index 3c23b1ce..b201eadf 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Folder/component/phone_info/Btn_jiesan_lobby.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Folder/component/phone_info/Btn_jiesan_lobby.xml
@@ -1,11 +1,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_1.xml b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_1.xml
index 69c99cba..8c9afd3d 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_1.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_1.xml
@@ -4,17 +4,17 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PromptOutCard.xml b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PromptOutCard.xml
index b8200233..2ed36e8d 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PromptOutCard.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PromptOutCard.xml
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/cards/Btn_Card.xml b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/cards/Btn_Card.xml
index 1fe1ed3b..06e68a14 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/cards/Btn_Card.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/cards/Btn_Card.xml
@@ -1,25 +1,25 @@
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/cards/Qipai.xml b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/cards/Qipai.xml
index b8f4c05d..193cc715 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/cards/Qipai.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/cards/Qipai.xml
@@ -1,7 +1,7 @@
-
+
-
+