Merge branch 'master' of http://121.41.95.54:3000/aga/yunque_client2

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

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 = ""
 	--盟主头像

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
 

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