From 658cb1d5af0fb885df1404a716a79d6d52903cbb Mon Sep 17 00:00:00 2001
From: FPGA <fpgajie@163.com>
Date: Sat, 14 Jun 2025 20:10:46 +0800
Subject: [PATCH] 20

---
 .../base_project/Game/Controller/NewGroupController.lua      | 1 +
 lua_probject/base_project/Game/Data/GroupData.lua            | 1 +
 .../Game/View/NewGroup/MngView/GroupShowMemberInfoView.lua   | 5 +++++
 .../extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua | 2 --
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua
index 022d4610..b4e31de1 100644
--- a/lua_probject/base_project/Game/Controller/NewGroupController.lua
+++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua
@@ -31,6 +31,7 @@ function M:FG_GroupList(callback)
 				group.id = tem.id
 				group.name = tem.name
 				group.owner = tem.owner
+				group.parentId = tem.parentId
 				group.top_time = tem.top_time
 				group.o_nick = tem.o_nick
 				group.o_portrait = tem.o_portrait
diff --git a/lua_probject/base_project/Game/Data/GroupData.lua b/lua_probject/base_project/Game/Data/GroupData.lua
index 362e68a0..d0209339 100644
--- a/lua_probject/base_project/Game/Data/GroupData.lua
+++ b/lua_probject/base_project/Game/Data/GroupData.lua
@@ -5,6 +5,7 @@ function M:ctor()
 	self.name = ""
 	-- 盟主ID
 	self.owner = 0
+	self.parentId = 0
 	--盟主昵称
 	self.o_nick = ""
 	--盟主头像
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupShowMemberInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupShowMemberInfoView.lua
index 5f21a54e..3270efd3 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupShowMemberInfoView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupShowMemberInfoView.lua
@@ -17,9 +17,13 @@ function M:init(url)
 	self.Tx = self._view:GetChild("btn_head")
 	self.Name = self._view:GetChild("tex_name")
 	self.Id = self._view:GetChild("tex_id")
+	self.ParentId = self._view:GetChild("tex_parentid")
 	ImageLoad.Load(data.head_url, self.Tx._iconObject)
 	self.Name.text = data.nick_name
 	self.Id.text = data.account_id
+	local groupdata = DataManager.groups:get(self.group_id)
+	self.ParentId.text = groupdata.parentId
+	
 	self._view:GetChild("btn_close").onClick:Set(
 		function()
 			self:Destroy()
@@ -41,6 +45,7 @@ function M:SetAddMember(data)
 	ImageLoad.Load(data.portrait, self.Tx._iconObject)
 	self.Name.text = data.nick
 	self.Id.text = data.uid
+	self.ParentId.text = data.parentId
 	self:Show()
 end
 
diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua
index 1a7acf23..72b60b28 100644
--- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua
+++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua
@@ -848,8 +848,6 @@ end
 
 function M:GetHandCardPos(index, card_count)
     local x, y = 0, -18
-
-    printlog("DataManager.CurrenRoom.cardsize:"..DataManager.CurrenRoom.cardsize)
     if DataManager.CurrenRoom.cardsize == 0 then
         y = -70
     elseif DataManager.CurrenRoom.cardsize == 1 then