diff --git a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPPlayerCardInfoView.lua b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPPlayerCardInfoView.lua
index dfab2634..25535256 100644
--- a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPPlayerCardInfoView.lua
+++ b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPPlayerCardInfoView.lua
@@ -229,11 +229,11 @@ end
--牌位置
function M:GetHandCardPos(cards_view,cards)
local x,y = 0,0
- local card_width = 42 -- 牌的宽度
+ local card_width = 80 -- 牌的宽度
local middle_x = self._area_handcard_list.width / 2
local start_x = middle_x - (cards / 2 * (card_width))
x = start_x + (card_width) * (cards_view.index_X - 1)
- y = 0 - (42*cards_view.index_Y)
+ y = 0 - (80*cards_view.index_Y)
return Vector2.New(x,y)
end
diff --git a/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerCardInfoView.lua b/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerCardInfoView.lua
index f260d0ca..fc89ded4 100644
--- a/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerCardInfoView.lua
+++ b/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerCardInfoView.lua
@@ -323,7 +323,7 @@ end
--牌位置
function M:GetHandCardPos(cards_view,cards)
local x,y = 0,0
- local card_width = 90 -- 牌的宽度
+ local card_width = 150 -- 牌的宽度
local middle_x = self._area_handcard_list.width / 2
local start_x = middle_x - (cards / 2 * (card_width))
x = start_x + (card_width) * (cards_view.index_X - 1)
diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPPlayerCardInfoView.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPPlayerCardInfoView.lua
index 3139e761..435a9c95 100644
--- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPPlayerCardInfoView.lua
+++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPPlayerCardInfoView.lua
@@ -229,11 +229,11 @@ end
--牌位置
function M:GetHandCardPos(cards_view,cards)
local x,y = 0,0
- local card_width = 42 -- 牌的宽度
- local middle_x = self._area_handcard_list.width / 2
+ local card_width = 80 -- 牌的宽度
+ local middle_x = self._area_handcard_list.width / 2
local start_x = middle_x - (cards / 2 * (card_width))
x = start_x + (card_width) * (cards_view.index_X - 1)
- y = 0 - (42*cards_view.index_Y)
+ y = 0 - (80*cards_view.index_Y)
return Vector2.New(x,y)
end
diff --git a/fk101/lua_probject/main_project/main/zipai/ZPPlayerCardInfoView.lua b/fk101/lua_probject/main_project/main/zipai/ZPPlayerCardInfoView.lua
index 5be62c48..7729edf7 100644
--- a/fk101/lua_probject/main_project/main/zipai/ZPPlayerCardInfoView.lua
+++ b/fk101/lua_probject/main_project/main/zipai/ZPPlayerCardInfoView.lua
@@ -228,11 +228,11 @@ end
--牌位置
function M:GetHandCardPos(cards_view,cards)
local x,y = 0,0
- local card_width = 42 -- 牌的宽度
+ local card_width = 80 -- 牌的宽度
local middle_x = self._area_handcard_list.width / 2
local start_x = middle_x - (cards / 2 * (card_width))
x = start_x + (card_width) * (cards_view.index_X - 1)
- y = 0 - (42*cards_view.index_Y)
+ y = 0 - (80*cards_view.index_Y)
return Vector2.New(x,y)
end
diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json
index 027d90d6..84f055b6 100644
--- a/fk101/wb_new_ui/.objs/workspace.json
+++ b/fk101/wb_new_ui/.objs/workspace.json
@@ -5,16 +5,49 @@
"ui://m7iejg46jgh8hwv",
"ui://1hl55dqmc4r115",
"ui://yzaioi79f55qwa",
+ "ui://yzaioi79f55qvx",
"ui://m7iejg46l679hws",
"ui://27vd145beeqmch0",
"ui://m7iejg46kwi0hmc",
"ui://yzaioi79f55qw5",
+ "ui://4skil1l6piv91mk",
+ "ui://4skil1l6uwvl1qp",
+ "ui://4skil1l6piv91o7",
+ "ui://4skil1l6piv91o5",
+ "ui://4skil1l6piv91ny",
+ "ui://x3mp2cn6xvhr3r",
+ "ui://niy3ldiwl9mn14",
+ "ui://442j0uepygxga",
+ "ui://3n2top74kpmgkd",
+ "ui://awernf6xbazq7n",
+ "ui://qpsoxvaiprgzee",
+ "ui://b8jloj2qg8ktcmb",
+ "ui://3op8sm5eu86s1f",
+ "ui://y8prev1ms9wx7",
+ "ui://c7j2rnvqtpf02f",
+ "ui://b50sd5s6s9wx7",
+ "ui://xul2z8cts9wx7",
+ "ui://visk5g30gq7m2c",
+ "ui://s63l0suw6cpqv",
+ "ui://425x67nrs9wx7",
+ "ui://kplym8mus9wx7",
+ "ui://fnuxqeflnrnod",
+ "ui://egnzysm7ffp36a",
+ "ui://v2hilfzbgq7mde",
+ "ui://ypulwxjhl9mn14",
+ "ui://k15boclkl9mn14",
+ "ui://oubpz2r2ofil7k",
+ "ui://4skil1l6piv91mg",
"ui://27vd145bdjzo18",
"ui://yzaioi79f55qvw",
"ui://c7j2rnvqtpf08x",
"ui://fnuxqeflkllg1x",
"ui://5cdldr01qaqf9c",
+ "ui://5cdldr01qaqf61",
"ui://5cdldr01qaqf7o",
+ "ui://5cdldr01qaqf60",
+ "ui://5cdldr01qaqfb",
+ "ui://5cdldr01qaqf3f",
"ui://5cdldr01qaqfa2",
"ui://442j0uepdafga8",
"ui://ypulwxjhl9mn37",
@@ -33,6 +66,12 @@
"ui://m7iejg4610snh5j",
"ui://m7iejg46jvvohyf",
"ui://3z9lj55vjokmwr",
+ "ui://3z9lj55vjokmlu",
+ "ui://3z9lj55vjokmlt",
+ "ui://3z9lj55vjokmay",
+ "ui://3z9lj55vjokmb2",
+ "ui://3z9lj55vjokmbc",
+ "ui://3z9lj55vjokm6c",
"ui://3z9lj55vjokm7l",
"ui://4skil1l6ms5spy",
"ui://2d9xdj6znlwcgk",
@@ -60,9 +99,15 @@
"test.device": "Xiaomi 9",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://yzaioi79f55qw5",
+ "doc.activeDoc": "ui://5cdldr01qaqf9c",
"libview.twoColumn": false,
"libview.expandedNodes": [
+ "3z9lj55v",
+ "/",
+ "3z9lj55v",
+ "/component/",
+ "3z9lj55v",
+ "/component/card/",
"yzaioi79",
"/",
"yzaioi79",
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 11a74724..77e0512d 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
@@ -4,8 +4,8 @@
-
-
+
+
diff --git a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_2.xml b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_2.xml
index 48542966..45154e0a 100644
--- a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_2.xml
+++ b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_2.xml
@@ -1,7 +1,7 @@
-
+
@@ -30,7 +30,7 @@
-
+
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes
index b1d57cb6..5e4edc78 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes
index c970d52f..3d8b12a9 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes differ