同步，听牌可能会有点印象正常流程

lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua

@@ -59,16 +59,15 @@ end
 
 local function AddPlayer(data, self)
     if self.sending then
-        ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
+        ViewUtil.ErrorTip(-1, "正在操作中。。")
         return
     end
 
     -- 点击弹出选择成员界面
     local view = FamilySelectNumber.New()
     view:Show(self.root._group.id, function(number)
-
         if Exists(number.uid, data.deskList) then
-            ViewUtil.ShowBannerOnScreenCenter("设置失败,成员已经在关系中")
+            ViewUtil.ErrorTip(-1, "设置失败,成员已经在关系中")
             return
         end
 
@@ -79,7 +78,7 @@ local function AddPlayer(data, self)
         fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res)
             self.sending = false
             if res.ReturnCode ~= 0 then
-                ViewUtil.ShowBannerOnScreenCenter("设置失败")
+                ViewUtil.ErrorTip(-1, "设置失败")
                 return
             end
             data.deskList[#data.deskList + 1] = { uid = number.uid }
@@ -92,7 +91,7 @@ local function DelPalyer(data, uid, self)
     --print("删除玩家", uid)
 
     if self.sending then
-        ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
+        ViewUtil.ErrorTip(-1, "正在操作中。。")
         return
     end
 
@@ -115,7 +114,7 @@ local function DelPalyer(data, uid, self)
     fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res)
         self.sending = false
         if res.ReturnCode ~= 0 then
-            ViewUtil.ShowBannerOnScreenCenter("删除失败")
+            ViewUtil.ErrorTip(-1, "删除失败")
             return
         end
         data.deskList = RemoveItem(data.deskList, function(item)
@@ -129,7 +128,7 @@ end
 
 local function DelDesk(data, self)
     if self.sending then
-        ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
+        ViewUtil.ErrorTip(-1, "正在操作中。。")
         return
     end
 
@@ -145,7 +144,7 @@ local function ChangeName(deskData, name, self)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_SetBanTable1(self.root._group.id, deskData.deskId, AllUid(deskData.deskList), name, function(res)
         if res.ReturnCode ~= 0 then
-            ViewUtil.ShowBannerOnScreenCenter("删除失败")
+            ViewUtil.ErrorTip(-1, "删除失败")
             return
         end
         deskData.deskName = name
@@ -323,7 +322,7 @@ function BanDesk:GetBanTableCallback(res)
     addBanItem:GetController("cStyle").selectedIndex = 1
     btn_addBanItem.onClick:Set(function()
         if self.sending then
-            ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
+            ViewUtil.ErrorTip(-1, "正在操作中。。")
             return
         end
 

lua_probject/base_project/Game/View/Family/FamilyInviteFamilyView.lua

@@ -19,10 +19,10 @@ function M:init(url)
 
     local view = self._view
     view:GetChild('btn_wx').onClick:Add(function()
-        ViewUtil.ShowBannerOnScreenCenter("该功能还会开放，敬请期待")
+        ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
     end)
     view:GetChild('btn_moments').onClick:Add(function()
-        ViewUtil.ShowBannerOnScreenCenter("该功能还会开放，敬请期待")
+        ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
     end)
 end
 

lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua

@@ -51,7 +51,7 @@ local function QuitFamily(self)
     local tipsWin = MsgWindow.new(self._view, tips, MsgWindow.MsgMode.OkAndCancel)
     tipsWin.onOk:Add(function()
         if self.networkSending then
-            ViewUtil.ShowBannerOnScreenCenter("操作中，请稍后。。")
+            ViewUtil.ErrorTip(-1, "操作中，请稍后。。")
             return
         end
 
@@ -317,7 +317,7 @@ function FamilyMyFamily:Init()
 
     self.btn_hideNumber.onClick:Set(function()
         if self.networkSending == true then
-            ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后。。")
+            ViewUtil.ErrorTip(-1, "设置中，请稍后。。")
             return
         end
 
@@ -333,13 +333,13 @@ function FamilyMyFamily:Init()
             end
             self.family.isShow = 0
             self:Refalsh()
-            ViewUtil.ShowBannerOnScreenCenter("设置成功")
+            ViewUtil.ErrorTip(-1, "设置成功")
         end)
     end)
 
     self.btn_showNumber.onClick:Set(function()
         if self.networkSending == true then
-            ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后。。")
+            ViewUtil.ErrorTip(-1, "设置中，请稍后。。")
             return
         end
 
@@ -357,13 +357,13 @@ function FamilyMyFamily:Init()
             end
             self.family.isShow = 1
             self:Refalsh()
-            ViewUtil.ShowBannerOnScreenCenter("设置成功")
+            ViewUtil.ErrorTip(-1, "设置成功")
         end)
     end)
 
     self.tips_btn_comfirm.onClick:Set(function()
         if self.networkSending then
-            ViewUtil.ShowBannerOnScreenCenter("操作中，请稍后。。")
+            ViewUtil.ErrorTip(-1, "操作中，请稍后。。")
             return
         end
 

lua_probject/base_project/Game/View/FamilyView.lua

@@ -230,7 +230,7 @@ function M:init(url)
         obj.text = Utils.TextOmit(group.name, 6, "...")
         obj.onClick:Add(function()
             if self._group ~= nil and group.id == self._group.id then
-                --ViewUtil.ShowBannerOnScreenCenter("已在家族中")
+                --ViewUtil.ErrorTip(-1,"已在家族中")
                 return
             end
 

lua_probject/base_project/Game/View/LobbyView.lua

@@ -57,7 +57,7 @@ function M:InitView(url)
     local btn_shop = self._view:GetChild("btn_shop")
     btn_shop.onClick:Add(handler(self, function()
         local shopView = LobbyShopView.new(function()
-            ViewUtil.ShowBannerOnScreenCenter("该功能还会开放，敬请期待")
+            ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
             -- self:ShowPlayerInfo(1, DataManager.SelfUser.diamo, 1)
         end)
         shopView:Show()
@@ -159,7 +159,7 @@ function M:InitView(url)
         coroutine.start(function()
             coroutine.wait(3)
             ViewUtil.CloseModalWait2()
-            ViewUtil.ShowBannerOnScreenCenter("微信跳转失败")
+            ViewUtil.ErrorTip(-1, "微信跳转失败")
         end)
     end)
 

lua_probject/base_project/Game/View/MainView.lua

@@ -292,7 +292,7 @@ function M:InitView(url, isHideIpAdds)
                 self._ctr_more.selectedIndex = 0
             end
             if self._room.room_config.config.hpData.BanChat == 1 then
-                ViewUtil.ShowBannerOnScreenCenter("本房间禁止快捷聊天")
+                ViewUtil.ErrorTip(-1, "本房间禁止快捷聊天")
                 return
             end
 
@@ -327,7 +327,7 @@ function M:InitView(url, isHideIpAdds)
 
         self._chat_Talk.onTouchBegin:Set(function(context)
             if self._room.room_config.config.hpData.BanChat == 1 then
-                ViewUtil.ShowBannerOnScreenCenter("本房间禁止快捷聊天")
+                ViewUtil.ErrorTip(-1, "本房间禁止快捷聊天")
                 return
             end
 

lua_probject/base_project/Game/View/NewGroup/GroupMngSettingView.lua

@@ -4,8 +4,8 @@ local GroupMngSettingView = {}
 local M = GroupMngSettingView
 
 function GroupMngSettingView.new(gid)
-    setmetatable(M, {__index = BaseWindow})
+    setmetatable(M, { __index = BaseWindow })
-    local self = setmetatable({}, {__index = M})
+    local self = setmetatable({}, { __index = M })
     self.class = "GroupMngSettingView"
     self._close_destroy = true
     self.group_id = gid
@@ -57,10 +57,10 @@ function M:FillView()
 
     local option = group.option or 0
 
-    ctr_pt.selectedIndex = bit:_and(option,1) > 0 and 1 or 0
+    ctr_pt.selectedIndex = bit:_and(option, 1) > 0 and 1 or 0
-    ctr_wq.selectedIndex = bit:_and(option,2) > 0 and 1 or 0
+    ctr_wq.selectedIndex = bit:_and(option, 2) > 0 and 1 or 0
-    ctr_es.selectedIndex = bit:_and(option,4) > 0 and 1 or 0
+    ctr_es.selectedIndex = bit:_and(option, 4) > 0 and 1 or 0
-    ctr_ua.selectedIndex = bit:_and(option,8) > 0 and 1 or 0
+    ctr_ua.selectedIndex = bit:_and(option, 8) > 0 and 1 or 0
 
     self._view:GetChild("btn_ok").onClick:Set(function()
         ViewUtil.ShowModalWait()
@@ -83,16 +83,16 @@ function M:FillView()
 
         local option = 0
         if ctr_pt.selectedIndex == 1 then
-            option = bit:_or(option,1) 
+            option = bit:_or(option, 1)
         end
         if ctr_wq.selectedIndex == 1 then
-            option = bit:_or(option,2) 
+            option = bit:_or(option, 2)
         end
         if ctr_es.selectedIndex == 1 then
-            option = bit:_or(option,4) 
+            option = bit:_or(option, 4)
         end
         if ctr_ua.selectedIndex == 1 then
-            option = bit:_or(option,8) 
+            option = bit:_or(option, 8)
         end
 
         local showNum = 0
@@ -106,9 +106,9 @@ function M:FillView()
         fgCtr:FG_UpdateGroupInfo(data, function(res)
             ViewUtil.CloseModalWait()
             if res.ReturnCode ~= 0 then
-                ViewUtil.ErrorTip(res.ReturnCode,"设置大联盟失败。")
+                ViewUtil.ErrorTip(res.ReturnCode, "设置大联盟失败。")
             else
-                ViewUtil.ShowBannerOnScreenCenter("设置成功")
+                ViewUtil.ErrorTip(-1, "设置成功")
                 group.name = name
                 group.notice = notice
                 group.ban = ban

lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua

@@ -44,7 +44,7 @@ function M:init(url, member)
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "备注失败")
             else
-                ViewUtil.ShowBannerOnScreenCenter("备注成功")
+                ViewUtil.ErrorTip(-1, "备注成功")
                 --member.score = score
                 self:Destroy()
                 --self.callback(true)

lua_probject/base_project/Game/View/NewGroup/MngView/GroupAddMemberInfoView.lua

@@ -2,9 +2,9 @@ local GroupAddMemberInfoView = {}
 
 local M = GroupAddMemberInfoView
 
-function GroupAddMemberInfoView.new(group_id,member_id)
+function GroupAddMemberInfoView.new(group_id, member_id)
-    setmetatable(M, {__index = BaseView})
+	setmetatable(M, { __index = BaseView })
-    local self = setmetatable({}, {__index = M})
+	local self = setmetatable({}, { __index = M })
 	self.class = "GroupAddMemberInfoView"
 	self.group_id = group_id
 	self.member_id = member_id
@@ -13,31 +13,31 @@ function GroupAddMemberInfoView.new(group_id,member_id)
 end
 
 function M:init(url)
-  	BaseWindow.init(self,url)
+	BaseWindow.init(self, url)
-  	self.Tx=self._view:GetChild("btn_head")
+	self.Tx = self._view:GetChild("btn_head")
-	self.Name=self._view:GetChild("tex_name")
+	self.Name = self._view:GetChild("tex_name")
-	self.Id=self._view:GetChild("tex_id")
+	self.Id = self._view:GetChild("tex_id")
 	self._view:GetChild("btn_close").onClick:Set(
-							function ()
+		function()
 			self:Destroy()
 		end
 	)
 	self._view:GetChild("btn_qc").onClick:Set(
-							function ()
+		function()
 			self:Destroy()
 		end
 	)
 	self._view:GetChild("btn_qd").onClick:Set(
-			function ()
+		function()
 			ViewUtil.ShowModalWait()
 			local fgCtr = ControllerManager.GetController(NewGroupController)
 			fgCtr:FG_AddMember(
 				self.group_id,
 				self.member_id,
-					function (response)
+				function(response)
 					ViewUtil.CloseModalWait()
 					if (response.ReturnCode == 0) then
-							ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1)
+						ViewUtil.ErrorTip(-1, '添加成功！', 1)
 					else
 						ViewUtil.ErrorTip(response.ReturnCode, '邀请玩家失败！')
 					end
@@ -45,16 +45,13 @@ function M:init(url)
 			)
 		end
 	)
-						
 end
 
-
 function M:SetAddMember(data)
 	ImageLoad.Load(data.portrait, self.Tx._iconObject)
-	self.Name.text=data.nick
+	self.Name.text = data.nick
-	self.Id.text=data.uid
+	self.Id.text = data.uid
 	self:Show()
 end
 
-
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupBanSameTableView.lua

@@ -5,8 +5,8 @@ local GroupBanSameTableView = {}
 local M = GroupBanSameTableView
 
 function GroupBanSameTableView.new(blur_view, group_id, member_id, data)
-    setmetatable(M, {__index = BaseWindow})
+	setmetatable(M, { __index = BaseWindow })
-    local self = setmetatable({}, {__index = M})
+	local self = setmetatable({}, { __index = M })
 	self.class = "GroupBanSameTableView"
 	self._close_destroy = true
 	self._blur_view = blur_view
@@ -19,7 +19,7 @@ function GroupBanSameTableView.new(blur_view, group_id, member_id, data)
 end
 
 function M:init(url)
-  	BaseWindow.init(self,url)
+	BaseWindow.init(self, url)
 	-- 搜索结果
 	self._search_member_data = {}
 	self._search_ban_data = {}
@@ -123,7 +123,7 @@ function M:init(url)
 			ViewUtil.CloseModalWait()
 			if res.ReturnCode == 0 then
 				self:Destroy()
-    			ViewUtil.ShowBannerOnScreenCenter("禁止同桌设置成功")
+				ViewUtil.ErrorTip(-1, "禁止同桌设置成功")
 			else
 				ViewUtil.ErrorTip(res.ReturnCode, "禁止同桌设置失败")
 			end

lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua

@@ -494,7 +494,7 @@ function M:FillFagData()
                         play.maxPlayers = _data.maxPlayers
                         play.roomNum = self.hpData.tex_times_room / 1000
                         play.maxRound = res.Data.maxRound
-                        ViewUtil.ShowBannerOnScreenCenter("添加玩法成功")
+                        ViewUtil.ErrorTip(-1, "添加玩法成功")
                         self.callback(play)
                         self:Destroy()
                     else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua

@@ -588,7 +588,7 @@ function M:FillFagData()
                         play.maxPlayers = _data.maxPlayers
                         play.roomNum = self.hpData.tex_times_room / 1000
                         play.maxRound = res.Data.maxRound
-                        ViewUtil.ShowBannerOnScreenCenter("添加玩法成功")
+                        ViewUtil.ErrorTip(-1, "添加玩法成功")
                         self.callback(play)
                         self:Destroy()
                     else
@@ -1090,7 +1090,7 @@ function M:FillFagData_jiangxi()
                     play.maxPlayers = _data.maxPlayers
                     play.roomNum = self.hpData.tex_times_room / 1000
                     play.maxRound = res.Data.maxRound
-                    ViewUtil.ShowBannerOnScreenCenter("添加玩法成功")
+                    ViewUtil.ErrorTip(-1, "添加玩法成功")
                     self.callback(play)
                     self:Destroy()
                 else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua

@@ -125,7 +125,7 @@ function M:init(url)
                             member.parentId = parent_id
                             self._view:GetChild("tex_superior_id").text = parent_id
                             ctr_superior.selectedIndex = 1
-                            ViewUtil.ShowBannerOnScreenCenter("调配玩家成功")
+                            ViewUtil.ErrorTip(-1, "调配玩家成功")
                         else
                             ViewUtil.ErrorTip(res1.ReturnCode, "调配玩家失败")
                         end
@@ -183,7 +183,7 @@ function M:init(url)
                     ViewUtil.CloseModalWait()
                     if res1.ReturnCode == 0 then
                         self.callBack(true)
-                        ViewUtil.ShowBannerOnScreenCenter("已成功删除玩家")
+                        ViewUtil.ErrorTip(-1, "已成功删除玩家")
                         self:Destroy()
                     else
                         ViewUtil.ErrorTip(res1.ReturnCode, "删除成员失败")
@@ -492,7 +492,7 @@ function M:MovePartner(parent_id, member, obj)
             member.partnerLev = res1.Data.partnerLev
             obj:GetChild("tex_superior_id").text = parent_id
             obj:GetController("show_superior").selectedIndex = 1
-            ViewUtil.ShowBannerOnScreenCenter("转移成功")
+            ViewUtil.ErrorTip(-1, "转移成功")
         else
             ViewUtil.ErrorTip(res1.ReturnCode, "转移失败")
         end

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngAddMemberView.lua

@@ -45,9 +45,9 @@ function M:FillView()
 
     local cnt = self._view.numChildren - 1
 
-    for  i = 0 ,9 do        
+    for i = 0, 9 do
-        local obj = self._view:GetChild("btn_"..i)
+        local obj = self._view:GetChild("btn_" .. i)
-        obj.onClick:Add(handler(self , self.OnNumButtonAction))
+        obj.onClick:Add(handler(self, self.OnNumButtonAction))
         i = i + 1
     end
     local btn_ok = self._view:GetChild("btn_ok")
@@ -61,14 +61,14 @@ function M:FillView()
         fgCtr:FG_AddMember(self.group_id, tonumber(self._texnum_str), function(response)
             ViewUtil.CloseModalWait()
             if (response.ReturnCode == 0) then
-                ViewUtil.ShowBannerOnScreenCenter("添加成功！", 1)
+                ViewUtil.ErrorTip(-1, "添加成功！", 1)
             else
-                ViewUtil.ErrorTip(response.ReturnCode,"邀请玩家失败！")
+                ViewUtil.ErrorTip(response.ReturnCode, "邀请玩家失败！")
             end
         end)
     end)
     local btn_del = self._view:GetChild("btn_del")
-    btn_del.onClick:Add(handler(self , self.OnNumButtonAction))
+    btn_del.onClick:Add(handler(self, self.OnNumButtonAction))
 
     local ctr_mng = self._view:GetController("mng")
     if group.lev < 3 then
@@ -98,7 +98,7 @@ function M:GetJoinsData()
                 end
                 self:FillJoinList(joins)
             else
-                ViewUtil.ErrorTip(res.ReturnCode,"获取申请列表失败！")
+                ViewUtil.ErrorTip(res.ReturnCode, "获取申请列表失败！")
                 self:FillJoinList({})
             end
         end)
@@ -140,11 +140,11 @@ function M:VerifyPlayerJoin(id, allow)
 end
 
 function M:OnNumButtonAction(context)
-    local typer = string.sub(context.sender.name ,5)
+    local typer = string.sub(context.sender.name, 5)
     if typer == "del" then
         if (self._currenIndex > 0) then
             self._currenIndex = self._currenIndex - 1
-            self._texnum_str = string.sub(self._texnum_str,0,self._currenIndex)
+            self._texnum_str = string.sub(self._texnum_str, 0, self._currenIndex)
             self.tex_num.text = self._texnum_str
         end
     else
@@ -152,7 +152,6 @@ function M:OnNumButtonAction(context)
             self._currenIndex = self._currenIndex + 1
             self._texnum_str = self._texnum_str .. typer
             self.tex_num.text = self._texnum_str
-            
         end
     end
 end

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua

@@ -153,7 +153,7 @@ function M:FillView()
                     if (response.ReturnCode and response.ReturnCode == 0) then
                         GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data)
                         self:ClearNumTex()
-                        --ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1)
+                        --ViewUtil.ErrorTip(-1,'添加成功！', 1)
                     else
                         ViewUtil.ErrorTip(123456, '获取玩家失败')
                     end

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua

@@ -172,7 +172,7 @@ function M:FillView()
                     if (response.ReturnCode and response.ReturnCode == 0) then
                         GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data)
                         self:ClearNumTex()
-                        --ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1)
+                        --ViewUtil.ErrorTip(-1,'添加成功！', 1)
                     else
                         ViewUtil.ErrorTip(123456, '获取玩家失败')
                     end

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerRewardsView.lua

@@ -196,8 +196,10 @@ function M:InitView()
         self:GetRewardsLog()
     end)
     -- 时间组件初始化
-    self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0)
+    self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"),
-    self.time_panel2 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date3"), self._view:GetChild("btn_date4"), -308, 0)
+        self._view:GetChild("btn_date2"), -308, 0)
+    self.time_panel2 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date3"),
+        self._view:GetChild("btn_date4"), -308, 0)
 end
 
 -- 获取合伙人数据
@@ -405,7 +407,8 @@ function M:OnRenderRewardsItem(index, obj)
     end
     local group = DataManager.groups:get(self.group_id)
 
-	obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3, data.rewardValueType or 1)
+    obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3,
+        data.rewardValueType or 1)
     local play_name = group:getPlayName(data.pid)
     obj:GetChild("tex_name").text = play_name
     if data.rewardType == 3 or pdata.uid == DataManager.SelfUser.account_id then
@@ -415,7 +418,7 @@ function M:OnRenderRewardsItem(index, obj)
     end
     local input_type = data.rewardType == 1 and 0 or 3
     obj:GetChild("btn_set").onClick:Set(function()
-		local gfiv = GroupNumberInputView.new(self._root_view,function(num)
+        local gfiv = GroupNumberInputView.new(self._root_view, function(num)
             local tem = num
             if data.rewardType == 2 then
                 tem = ad2d(tem)
@@ -433,7 +436,8 @@ function M:OnRenderRewardsItem(index, obj)
                     ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
                 else
                     data.cur_value = tem
-            		obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value, group.lev < 3, data.rewardValueType or 1)
+                    obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value,
+                        group.lev < 3, data.rewardValueType or 1)
                 end
             end)
         end, input_type)
@@ -441,7 +445,7 @@ function M:OnRenderRewardsItem(index, obj)
     end)
     obj:GetChild("btn_set_all").onClick:Set(function()
         local msg_win = MsgWindow.new(nil, "你是否为名下所有合伙人设定此奖励数值？", MsgWindow.MsgMode.OkAndCancel)
-        msg_win.onOk:Add(function( ... )
+        msg_win.onOk:Add(function(...)
             local pdata
             if self.ctr_search.selectedIndex == 0 then
                 pdata = self.partner_data[self.lst_partner.selectedIndex + 1]
@@ -450,17 +454,17 @@ function M:OnRenderRewardsItem(index, obj)
             end
             local fgCtr = ControllerManager.GetController(NewGroupController)
             ViewUtil.ShowModalWait()
-            fgCtr:FG_SetRewards(self.group_id, data.pid, pdata.partnerLev, pdata.uid, true, data.cur_value, function(res) 
+            fgCtr:FG_SetRewards(self.group_id, data.pid, pdata.partnerLev, pdata.uid, true, data.cur_value,
+                function(res)
                     ViewUtil.CloseModalWait()
                     if res.ReturnCode ~= 0 then
                         ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
                     else
-                    ViewUtil.ShowBannerOnScreenCenter("设置合伙人奖励成功")
+                        ViewUtil.ErrorTip(-1, "设置合伙人奖励成功")
                     end
                 end)
         end)
         msg_win:Show()
-    
     end)
 end
 
@@ -477,7 +481,7 @@ function M:OnRenderLogItem(index, obj)
     obj:GetChild("tex_game").text = play_name
     obj:GetChild("tex_num").text = data.round / 100
     obj:GetChild("tex_roomid").text = data.roomid
-	obj:GetChild("tex_date").text = os.date("%m月%d日\r%H:%M",data.time)
+    obj:GetChild("tex_date").text = os.date("%m月%d日\r%H:%M", data.time)
 end
 
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua

@@ -19,8 +19,8 @@ function M:initData()
     self.lst_record.numItems = 0
     self.record_data = {}
 
-    local now_time = os.date("*t",now)
+    local now_time = os.date("*t", now)
-    local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0})
+    local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 })
     self.begin_time = today
     self.end_time = today + 86400
     self:GetRecordData(0)
@@ -63,20 +63,21 @@ function M:InitView()
         self:GetRecordData(self.lst_record.numItems)
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, nil, true)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
+        -308, 0, nil, true)
 
     local ctr_page = self._view:GetController("type")
     ctr_page.onChanged:Set(function()
         self.record_data = {}
         self.lst_record.numItems = 0
         if ctr_page.selectedIndex == 0 then
-            local now_time = os.date("*t",now)
+            local now_time = os.date("*t", now)
-            local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0})
+            local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 })
             self.begin_time = today
             self.end_time = today + 86400
         else
-            local now_time = os.date("*t",now)
+            local now_time = os.date("*t", now)
-            local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0})
+            local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 })
             self.begin_time = today - 86400 * ctr_page.selectedIndex
             self.end_time = today - 86400 * (ctr_page.selectedIndex - 1)
         end
@@ -113,7 +114,7 @@ function M:InitView()
             local fgCtr = ControllerManager.GetController(NewGroupController)
             fgCtr:FG_FindPartnerStat(
                 self.group_id,
-                qid,0, 6, time_type,self.begin_time,self.end_time,
+                qid, 0, 6, time_type, self.begin_time, self.end_time,
                 function(res)
                     -- printlog("aaaaaaaaaaaaaaaa22222222222222222222222222222")
                     -- pt(res)
@@ -131,7 +132,7 @@ function M:InitView()
 
                         for j = 1, #res.Data.members do
                             local tem = item_result:AddItemFromPool()
-                            self:FillRecordItem(res.Data.members[j],tem)
+                            self:FillRecordItem(res.Data.members[j], tem)
                         end
                     end
                 end
@@ -147,9 +148,7 @@ function M:InitView()
     )
 end
 
-
 function M:GetRecordData(index)
-
     ViewUtil.ShowModalWait()
 
     local time_type = self._view:GetController("type").selectedIndex
@@ -158,12 +157,10 @@ function M:GetRecordData(index)
     end
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GetPartnerStat(self.group_id, index, 6, time_type,self.begin_time,self.end_time,function(res)
+    fgCtr:FG_GetPartnerStat(self.group_id, index, 6, time_type, self.begin_time, self.end_time, function(res)
-
         ViewUtil.CloseModalWait()
 
         if res.ReturnCode == 0 then
-
             local members = res.Data.members
             -- printlog("aaaaaaaaaaaaaacccccccccccccccccccccccccccccccc")
             -- pt(members)
@@ -187,23 +184,21 @@ local function __showRewardsValue(rtype, cur_value, max_value, mng)
 end
 
 function M:FillRecordItem(data, obj)
-
     local group                   = DataManager.groups:get(self.group_id)
 
-    obj:GetChild("tex_name").text    = ViewUtil.stringEllipsis(data.nick).."("..data.total..")"
+    obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) .. "(" .. data.total .. ")"
     obj:GetChild("tex_id").text   = "ID:" .. data.uid
 
     local tex_total_score         = obj:GetChild("tex_total_score")
     local ctr_show_total          = obj:GetController("show_total")
     if data._total_hp then
-        
         tex_total_score.text = data._total_hp
         ctr_show_total.selectedIndex = 1
     else
         ctr_show_total.selectedIndex = 0
     end
 
-    obj:GetChild("tex_round_valid").text = d2ad(data.reward_hp+data.total_win)--d2ad(data.reward_hp) --data.valid_round / 100
+    obj:GetChild("tex_round_valid").text = d2ad(data.reward_hp + data.total_win) --d2ad(data.reward_hp) --data.valid_round / 100
     obj:GetChild("tex_round_total").text = data.total_round
     obj:GetChild("tex_total").text = d2ad(data.total_win)
     obj:GetChild("tex_round_youxiao").text = data.valid_round / 100
@@ -216,12 +211,11 @@ function M:FillRecordItem(data, obj)
         fgCtr:FG_GetTotalHp(self.group_id, data.uid, function(res)
             ViewUtil.CloseModalWait()
             if res.ReturnCode == 0 then
-                
                 local hp                      = d2ad(res.Data.hp)
                 tex_total_score.text          = hp
                 data._total_hp                = hp
                 data.total                    = res.Data.total_member - 1
-                obj:GetChild("tex_name").text    = data.nick.."("..data.total..")"
+                obj:GetChild("tex_name").text = data.nick .. "(" .. data.total .. ")"
                 ctr_show_total.selectedIndex  = 1
             end
         end)
@@ -229,11 +223,11 @@ function M:FillRecordItem(data, obj)
 
 
     local btn_award = obj:GetChild("btn_award")
-    btn_award.text = d2ad(data.reward_hp)--d2ad(data.reward_hp+data.total_win)
+    btn_award.text = d2ad(data.reward_hp) --d2ad(data.reward_hp+data.total_win)
     btn_award.onClick:Set(function()
-        
         local time_type = self._view:GetController("type").selectedIndex
-        local gniv = GroupPartnerStatPlay.new(self.group_id, data.uid, data.partnerLev, DataManager.SelfUser.account_id, time_type,self.begin_time,self.end_time)
+        local gniv = GroupPartnerStatPlay.new(self.group_id, data.uid, data.partnerLev, DataManager.SelfUser.account_id,
+            time_type, self.begin_time, self.end_time)
         gniv:Show()
     end)
 
@@ -241,7 +235,7 @@ function M:FillRecordItem(data, obj)
     btn_detail.onClick:Set(function()
         local time_type = self._view:GetController("type").selectedIndex
         --printlog("ccccccccccwwwwwwwwwwwwwwwwwwwwwwwwwwww  ",self.begin_time,"    ",self.end_time)
-        local gniv = GroupPartnerStatMember.new(self.group_id,data.uid, 0,self.begin_time,self.end_time)
+        local gniv = GroupPartnerStatMember.new(self.group_id, data.uid, 0, self.begin_time, self.end_time)
         gniv:Show()
     end)
 
@@ -249,12 +243,11 @@ function M:FillRecordItem(data, obj)
     -- btnMen.text = d2ad(data.autoscore)
     local menControl = obj:GetController("menkan")
 
-    if group.lev==1 or (group.lev==3 and group.partnerLev>0) then
+    if group.lev == 1 or (group.lev == 3 and group.partnerLev > 0) then
         if (DataManager.SelfUser.account_id ~= data.uid) then
             menControl.selectedIndex = 1
             btnMen.text = d2ad(data.autoscore)
             btnMen.touchable = true
-            
         else
             btnMen.text = d2ad(data.autoscore)
             menControl.selectedIndex = 1
@@ -265,14 +258,14 @@ function M:FillRecordItem(data, obj)
     end
 
     btnMen.onClick:Set(function()
-            local gfiv = GroupNumberInputView.new(self._root_view,function(num)       
+        local gfiv = GroupNumberInputView.new(self._root_view, function(num)
             local fgCtr = ControllerManager.GetController(NewGroupController)
             fgCtr:FG_SetPartnerThreshold(self.group_id, data.uid, num, function(res)
                 ViewUtil.CloseModalWait()
                 if res.ReturnCode ~= 0 then
-                    ViewUtil.ErrorTip(res.ReturnCode,"设置失败")
+                    ViewUtil.ErrorTip(res.ReturnCode, "设置失败")
                 else
-                    ViewUtil.ShowBannerOnScreenCenter("设置成功")
+                    ViewUtil.ErrorTip(-1, "设置成功")
                     btnMen.text = num
                     data.autoscore = ad2d(num)
                 end
@@ -287,5 +280,4 @@ function M:OnRenderRecordItem(index, obj)
     self:FillRecordItem(data, obj)
 end
 
-
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua

@@ -6,8 +6,8 @@ local GroupPartnerRewardsView = {}
 local M = GroupPartnerRewardsView
 
 function GroupPartnerRewardsView.new(group_id, partner_id, partner_lev)
-    setmetatable(M, {__index = BaseWindow})
+    setmetatable(M, { __index = BaseWindow })
-    local self = setmetatable({}, {__index = M})
+    local self = setmetatable({}, { __index = M })
     self.class = "GroupPartnerRewardsView"
     self._close_destroy = true
     self._blur_view = blur_view
@@ -46,14 +46,17 @@ function M:GetRewardsData()
             local rewards = res.Data.rewards
             self.showxipai = res.Data.showxipai == true and 1 or 0
             --pt(res)
-            if rewards and #rewards == 0 then printlog("服务器未设置合伙人奖励===>>>") return end
+            if rewards and #rewards == 0 then
+                printlog("服务器未设置合伙人奖励===>>>")
+                return
+            end
             --printlog("获取奖励===>>>",res.Data.rewards)
             --pt(res.Data.rewards)
             -- local rdata = self.rewards_data
             -- for i = 1, #rewards do
             -- 	rdata[#rdata + 1] = rewards[i]
             -- end
-            for i=1,#rewards do
+            for i = 1, #rewards do
                 self.rewards_data[i] = rewards[i]
             end
             self.lst_rewards.numItems = #self.rewards_data
@@ -88,9 +91,12 @@ function M:OnRenderRewardsItem(index, obj)
     local group = DataManager.groups:get(self.group_id)
     obj:GetController("fandian").selectedIndex = self.showxipai
     --printlog("aaaaaaaaaaaaaaaaaaaaa  ",__showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1))
-    obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1)
+    obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data
-	obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3, data.rewardValueType or 1)
+    .xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1)
-    obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, data.anchou_cur_value, data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1)
+    obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3,
+        data.rewardValueType or 1)
+    obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, data.anchou_cur_value,
+        data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1)
     local play_name = group:getPlayName(data.pid)
     obj:GetChild("tex_name").text = play_name
     if data.rewardType == 3 or self.partner_id == DataManager.SelfUser.account_id then
@@ -100,7 +106,7 @@ function M:OnRenderRewardsItem(index, obj)
     end
     local input_type = data.rewardValueType == 1 and 0 or 3
     obj:GetChild("btn_set").onClick:Set(function()
-		local gfiv = GroupNumberInputView.new(self._root_view,function(num)
+        local gfiv = GroupNumberInputView.new(self._root_view, function(num)
             local tem = num
             if data.rewardValueType == 2 then
                 tem = ad2d(tem)
@@ -115,32 +121,34 @@ function M:OnRenderRewardsItem(index, obj)
 
             local fgCtr = ControllerManager.GetController(NewGroupController)
             ViewUtil.ShowModalWait()
-            fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0,function(res) 
+            fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res)
                 ViewUtil.CloseModalWait()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
                 else
                     data.cur_value = tem
-            		obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value, group.lev < 3, data.rewardValueType or 1)
+                    obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value,
+                        group.lev < 3, data.rewardValueType or 1)
                 end
             end)
         end, input_type)
         gfiv:Show()
     end)
     obj:GetChild("btn_set_all").onClick:Set(function()
+        local msg_win = MsgWindow.new(nil, string.format("是否设定所有玩法奖励为%s%%？", data.cur_value),
+            MsgWindow.MsgMode.OkAndCancel, nil, true)
 
-        local msg_win = MsgWindow.new(nil, string.format("是否设定所有玩法奖励为%s%%？", data.cur_value), MsgWindow.MsgMode.OkAndCancel,nil,true)
+        msg_win.onOk:Add(function(...)
-       
-        msg_win.onOk:Add(function( ... )
             local single = msg_win.btnCheck.selected and 1 or 0
             local fgCtr = ControllerManager.GetController(NewGroupController)
             ViewUtil.ShowModalWait()
-            fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.cur_value,single ,function(res) 
+            fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.cur_value, single,
+                function(res)
                     ViewUtil.CloseModalWait()
                     if res.ReturnCode ~= 0 then
                         ViewUtil.ErrorTip(res.ReturnCode, "设置奖励失败")
                     else
-                    ViewUtil.ShowBannerOnScreenCenter("设置奖励成功")
+                        ViewUtil.ErrorTip(-1, "设置奖励成功")
                         -- for i = 1, #self.rewards_data do
                         --     if self.rewards_data[i].rewardValueType == data.rewardValueType then
                         --         self.rewards_data[i].cur_value = data.cur_value
@@ -152,14 +160,13 @@ function M:OnRenderRewardsItem(index, obj)
                 end)
         end)
         msg_win:Show()
-    
     end)
 
 
     --xipai_reward
     local input_type1 = data.xipai_rewardValueType == 1 and 0 or 3
     obj:GetChild("btn_set1").onClick:Set(function()
-		local gfiv = GroupNumberInputView.new(self._root_view,function(num)
+        local gfiv = GroupNumberInputView.new(self._root_view, function(num)
             local tem = num
             if data.xipai_rewardValueType == 2 then
                 tem = ad2d(tem)
@@ -175,13 +182,14 @@ function M:OnRenderRewardsItem(index, obj)
 
             local fgCtr = ControllerManager.GetController(NewGroupController)
             ViewUtil.ShowModalWait()
-            fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0,function(res) 
+            fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res)
                 ViewUtil.CloseModalWait()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌奖励失败")
                 else
                     data.xipai_cur_value = tem
-            		obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, tem, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1)
+                    obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, tem, data.xipai_max_value,
+                        group.lev < 3, data.xipai_rewardValueType or 1)
                 end
             end)
         end, input_type1)
@@ -189,18 +197,20 @@ function M:OnRenderRewardsItem(index, obj)
     end)
 
     obj:GetChild("btn_set_all1").onClick:Set(function()
-        local msg_win = MsgWindow.new(nil, string.format("是否设定所有洗牌奖励为%s%%？", data.xipai_cur_value), MsgWindow.MsgMode.OkAndCancel)
+        local msg_win = MsgWindow.new(nil, string.format("是否设定所有洗牌奖励为%s%%？", data.xipai_cur_value),
-        msg_win.onOk:Add(function( ... )
+            MsgWindow.MsgMode.OkAndCancel)
-            local single = 0--msg_win.btnCheck.selected and 1 or 0
+        msg_win.onOk:Add(function(...)
+            local single = 0 --msg_win.btnCheck.selected and 1 or 0
 
             local fgCtr = ControllerManager.GetController(NewGroupController)
             ViewUtil.ShowModalWait()
-            fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.xipai_cur_value,single,function(res) 
+            fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.xipai_cur_value,
+                single, function(res)
                 ViewUtil.CloseModalWait()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌失败")
                 else
-                    ViewUtil.ShowBannerOnScreenCenter("设置洗牌成功")
+                    ViewUtil.ErrorTip(-1, "设置洗牌成功")
                     -- printlog("ccccccccccccccccc11111111111111111111111")
                     -- pt(res)
                     -- for i = 1, #self.rewards_data do
@@ -214,14 +224,13 @@ function M:OnRenderRewardsItem(index, obj)
             end)
         end)
         msg_win:Show()
-    
     end)
 
 
     --xipai_reward
     local input_type2 = data.anchou_rewardValueType == 1 and 0 or 3
     obj:GetChild("btn_set2").onClick:Set(function()
-		local gfiv = GroupNumberInputView.new(self._root_view,function(num)
+        local gfiv = GroupNumberInputView.new(self._root_view, function(num)
             local tem = num
             if data.anchou_rewardValueType == 2 then
                 tem = ad2d(tem)
@@ -237,13 +246,14 @@ function M:OnRenderRewardsItem(index, obj)
             printlog("jefe btn_set2")
             local fgCtr = ControllerManager.GetController(NewGroupController)
             ViewUtil.ShowModalWait()
-            fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0,function(res) 
+            fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res)
                 ViewUtil.CloseModalWait()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "设置管理奖励失败")
                 else
                     data.anchou_cur_value = tem
-            		obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, tem, data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1)
+                    obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, tem,
+                        data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1)
                 end
             end)
         end, input_type2)
@@ -251,18 +261,20 @@ function M:OnRenderRewardsItem(index, obj)
     end)
 
     obj:GetChild("btn_set_all2").onClick:Set(function()
-        local msg_win = MsgWindow.new(nil, string.format("是否设定所有管理奖励为%s%%？", data.anchou_cur_value), MsgWindow.MsgMode.OkAndCancel)
+        local msg_win = MsgWindow.new(nil, string.format("是否设定所有管理奖励为%s%%？", data.anchou_cur_value),
-        msg_win.onOk:Add(function( ... )
+            MsgWindow.MsgMode.OkAndCancel)
-            local single = 0--msg_win.btnCheck.selected and 1 or 0
+        msg_win.onOk:Add(function(...)
+            local single = 0 --msg_win.btnCheck.selected and 1 or 0
 
             local fgCtr = ControllerManager.GetController(NewGroupController)
             ViewUtil.ShowModalWait()
-            fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.anchou_cur_value,single,function(res) 
+            fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.anchou_cur_value,
+                single, function(res)
                 ViewUtil.CloseModalWait()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "设置管理失败")
                 else
-                    ViewUtil.ShowBannerOnScreenCenter("设置管理成功")
+                    ViewUtil.ErrorTip(-1, "设置管理成功")
                     -- printlog("ccccccccccccccccc11111111111111111111111")
                     -- pt(res)
                     -- for i = 1, #self.rewards_data do
@@ -276,9 +288,7 @@ function M:OnRenderRewardsItem(index, obj)
             end)
         end)
         msg_win:Show()
-    
     end)
-
 end
 
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetMemberInfoDiaoduView.lua

@@ -3,20 +3,20 @@ local GroupSetMemberInfoDiaoduView = {}
 
 local M = GroupSetMemberInfoDiaoduView
 
-function GroupSetMemberInfoDiaoduView.new(group_id,member_id,group_black)
+function GroupSetMemberInfoDiaoduView.new(group_id, member_id, group_black)
-    setmetatable(M, {__index = BaseWindow})
+	setmetatable(M, { __index = BaseWindow })
-    local self = setmetatable({}, {__index = M})
+	local self = setmetatable({}, { __index = M })
 	self.class = "GroupSetMemberInfoDiaoduView"
 	self.group_id = group_id
 	self.member_id = member_id
 	self.currentSelect = 0
-	self.blackList = {{0,0},{25,0},{15,0}}
+	self.blackList = { { 0, 0 }, { 25, 0 }, { 15, 0 } }
 	self:init("ui://NewGroup/Win_SetAddPlayerHBView")
 	return self
 end
 
 function M:init(url)
-  	BaseWindow.init(self,url)
+	BaseWindow.init(self, url)
 
 	self.n99 = self._view:GetChild("n99")
 
@@ -27,7 +27,7 @@ function M:init(url)
 	self.btnRate.visible = false
 	self.n118.visible = false
 	self._view:GetChild("btn_close").onClick:Set(
-							function ()
+		function()
 			self:Destroy()
 		end
 	)
@@ -36,22 +36,22 @@ function M:init(url)
 	self.txtRate.visible = false
 	self.txtBlack = self._view:GetChild("txtBlack")
 	self.txtBan = self._view:GetChild("txtBan")
-	self.currentSelectState=self._view:GetChild("btn_current")
+	self.currentSelectState = self._view:GetChild("btn_current")
-	self.currentSelectStateText=self._view:GetChild("diaodongtext")
+	self.currentSelectStateText = self._view:GetChild("diaodongtext")
 
 	self._view:GetChild("btn_qd1").onClick:Set(
-			function ()
+		function()
 			ViewUtil.ShowModalWait()
 			local fgCtr = ControllerManager.GetController(NewGroupController)
 			fgCtr:FG_BanMemberHB(
 				self.group_id,
 				self.member_id,
 				0,
-					function (response)
+				function(response)
 					ViewUtil.CloseModalWait()
 					if (response.ReturnCode == 0) then
-							self.currentSelectStateText.text="整组调动 "..(response.Data.black+1)
+						self.currentSelectStateText.text = "整组调动 " .. (response.Data.black + 1)
-							ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1)
+						ViewUtil.ErrorTip(-1, '设置成功！', 1)
 					else
 						ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
 					end
@@ -62,18 +62,18 @@ function M:init(url)
 
 
 	self._view:GetChild("btn_qd2").onClick:Set(
-			function ()
+		function()
 			ViewUtil.ShowModalWait()
 			local fgCtr = ControllerManager.GetController(NewGroupController)
 			fgCtr:FG_BanMemberHB(
 				self.group_id,
 				self.member_id,
 				1,
-					function (response)
+				function(response)
 					ViewUtil.CloseModalWait()
 					if (response.ReturnCode == 0) then
-							self.currentSelectStateText.text="整组调动 "..(response.Data.black+1)
+						self.currentSelectStateText.text = "整组调动 " .. (response.Data.black + 1)
-							ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1)
+						ViewUtil.ErrorTip(-1, '设置成功！', 1)
 					else
 						ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
 					end
@@ -83,18 +83,18 @@ function M:init(url)
 	)
 
 	self._view:GetChild("btn_qd3").onClick:Set(
-			function ()
+		function()
 			ViewUtil.ShowModalWait()
 			local fgCtr = ControllerManager.GetController(NewGroupController)
 			fgCtr:FG_BanMemberHB(
 				self.group_id,
 				self.member_id,
 				2,
-					function (response)
+				function(response)
 					ViewUtil.CloseModalWait()
 					if (response.ReturnCode == 0) then
-							self.currentSelectStateText.text="整组调动 "..(response.Data.black+1)
+						self.currentSelectStateText.text = "整组调动 " .. (response.Data.black + 1)
-							ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1)
+						ViewUtil.ErrorTip(-1, '设置成功！', 1)
 					else
 						ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
 					end
@@ -104,13 +104,13 @@ function M:init(url)
 	)
 
 	self._view:GetChild("btnRate").onClick:Set(
-		function ()
+		function()
 			local gniv =
 				GroupNumberInputView.new(
 					self._root_view,
 					function(num)
-				if num >100 then
+						if num > 100 then
-					ViewUtil.ShowBannerOnScreenCenter('设置失败,不能超过100', 1)
+							ViewUtil.ErrorTip(-1, '设置失败,不能超过100', 1)
 							return
 						end
 						self.txtRate.text = num
@@ -121,7 +121,7 @@ function M:init(url)
 	)
 
 	self._view:GetChild("btnBlack").onClick:Set(
-		function ()
+		function()
 			local gniv =
 				GroupNumberInputView.new(
 					self._root_view,
@@ -138,7 +138,7 @@ function M:init(url)
 	self.zhengzu = self._view:GetChild("zhengzu")
 
 
-    self.zhengzu.onChanged:Set(function ()
+	self.zhengzu.onChanged:Set(function()
 		local zzValue = tonumber(self.zhengzu.value)
 		self.zm.selectedIndex = zzValue - 1
 		self.currentSelect = zzValue - 1
@@ -148,7 +148,7 @@ function M:init(url)
 	end)
 
 	self._view:GetChild("btn_ok").onClick:Set(
-		function ()
+		function()
 			ViewUtil.ShowModalWait()
 			local fgCtr = ControllerManager.GetController(NewGroupController)
 			fgCtr:FG_BanMemberHB(
@@ -157,14 +157,14 @@ function M:init(url)
 				self.currentSelect,
 				tonumber(self.txtRate.text),
 				tonumber(self.txtBlack.text),
-				function (response)
+				function(response)
 					ViewUtil.CloseModalWait()
 					if (response.ReturnCode == 0) then
-						self.currentSelectStateText.text="整组调动 "..(response.Data.ban+1)
+						self.currentSelectStateText.text = "整组调动 " .. (response.Data.ban + 1)
-						self.blackList = {{0,0},{25,0},{15,0}}
+						self.blackList = { { 0, 0 }, { 25, 0 }, { 15, 0 } }
-						self.blackList[response.Data.ban+1][1] = response.Data.ban_rate
+						self.blackList[response.Data.ban + 1][1] = response.Data.ban_rate
-						self.blackList[response.Data.ban+1][2] = response.Data.ban_max_value
+						self.blackList[response.Data.ban + 1][2] = response.Data.ban_max_value
-						ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1)
+						ViewUtil.ErrorTip(-1, '设置成功！', 1)
 					else
 						ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
 					end
@@ -174,10 +174,9 @@ function M:init(url)
 	)
 end
 
-
+function M:SetCurrentState(selectID, data)
-function M:SetCurrentState(selectID,data)
+	self.blackList = { { 0, 0 }, { 25, 0 }, { 15, 0 } }
-	self.blackList = {{0,0},{25,0},{15,0}}
+	self.currentSelectStateText.text = "整组调动 " .. selectID
-	self.currentSelectStateText.text="整组调动 "..selectID
 	self.currentSelect = selectID - 1
 	self.blackList[selectID][1] = data.ban_rate
 	self.blackList[selectID][2] = data.ban_max_value
@@ -193,9 +192,7 @@ function M:SetCurrentState(selectID,data)
 end
 
 function M:ChangeOrate()
-	
 	if tonumber(self.zhengzu.value) == 2 then
-	
 		self.n99.visible = true
 		self.btnRate.visible = true
 		self.n118.visible = true
@@ -206,13 +203,10 @@ function M:ChangeOrate()
 		self.n118.visible = false
 		self.txtRate.visible = false
 	end
-	
-
 end
 
 function M:ChangeZ(num)
 	self.zhengzu.visibleItemCount = num
 end
 
-
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetPermissionView.lua

@@ -6,8 +6,8 @@ local GroupSetPermissionView = {}
 local M = GroupSetPermissionView
 
 function GroupSetPermissionView.new(blur_view, group_id, member)
-    setmetatable(M, {__index = BaseWindow})
+	setmetatable(M, { __index = BaseWindow })
-    local self = setmetatable({}, {__index = M})
+	local self = setmetatable({}, { __index = M })
 	self.class = "GroupSetPermissionView"
 	self._close_destroy = true
 	self._blur_view = blur_view
@@ -18,7 +18,7 @@ function GroupSetPermissionView.new(blur_view, group_id, member)
 end
 
 function M:init(url)
-  	BaseWindow.init(self,url)
+	BaseWindow.init(self, url)
 	local perm_array = MngPermission.getPermData(self.member.permission)
 	for i = 1, 5 do
 		local btn_perm = self._view:GetChild("btn_" .. i)
@@ -30,7 +30,7 @@ function M:init(url)
 		local fgCtr = ControllerManager.GetController(NewGroupController)
 		fgCtr:FG_SetMngPermission(self.group_id, self.member.uid, permission, function(res)
 			if res.ReturnCode == 0 then
-        		ViewUtil.ShowBannerOnScreenCenter("设置成功")
+				ViewUtil.ErrorTip(-1, "设置成功")
 				self.member.permission = permission
 				self:Destroy()
 			else

lua_probject/base_project/Game/View/PlayerInfoView2.lua

@@ -174,7 +174,8 @@ function M:FillData(player)
             self._tex_player_id.text = "ID:" .. player.self_user.account_id
         end
     end
-    self._ctr_room_owner.selectedIndex = room.owner_id == player.self_user.account_id and 1 or 0
+    -- self._ctr_room_owner.selectedIndex = room.owner_id == player.self_user.account_id and 1 or 0
+    self._ctr_room_owner.selectedIndex = player.seat == 1 and 1 or 0
     if (DataManager.CurrenRoom.self_player ~= player) then
         self._ctr_offline.selectedIndex = player.line_state == 0 and 1 or 0
     end

lua_probject/base_project/Game/View/ResultView.lua

@@ -262,7 +262,7 @@ function M:__ShareResultStr()
         str = str .. p.nick .. sp .. p.id .. '：' .. p.score .. '\r'
     end
     GameApplication.Instance:CopyToClipboard(str)
-    ViewUtil.ShowBannerOnScreenCenter('已复制战绩')
+    ViewUtil.ErrorTip(-1, '已复制战绩')
 end
 
 function M:SetGSListlineGap(linespacing)

lua_probject/base_project/Game/View/ViewUtil.lua

@@ -81,7 +81,7 @@ end
 
 local _tip_timer
 local function __ShowTips(msg, time)
-    time = time or 2
+    time = time or 3
     if _defaultTooltipWin then
         _tip_timer:Stop()
         _defaultTooltipWin:Dispose()

lua_probject/extend_project/extend/majiang/fuzhou/CardCheck.lua

@@ -1,11 +1,11 @@
 -- 检测牌是否存在
-local function checkCard(eventCard,cardList,num)
+local function checkCard(eventCard, cardList, num)
 	num = num == nil and 1 or num
 	local result = 0
-	for i = 1,#cardList do
+	for i = 1, #cardList do
 		if (cardList[i] == eventCard) then
 			result = result + 1
-			if(result ==num) then
+			if (result == num) then
 				return true
 			end
 		end
@@ -14,24 +14,24 @@ local function checkCard(eventCard,cardList,num)
 end
 
 -- 移除指定数量的牌
-local function removeCard(cardList, card,count) 
+local function removeCard(cardList, card, count)
-	for i=1,count do
+	for i = 1, count do
-		list_remove(cardList,card)
+		list_remove(cardList, card)
 	end
 end
 
-local function checkCardAndRomve(eventCard,cardList,num)
+local function checkCardAndRomve(eventCard, cardList, num)
-	if(checkCard(eventCard,cardList,num)) then
+	if (checkCard(eventCard, cardList, num)) then
-		removeCard(cardList,eventCard,num)
+		removeCard(cardList, eventCard, num)
 		return true
 	end
 	return false
 end
 
 -- 获取列表中牌数量
-local function cardNum(eventCard,cardList) 
+local function cardNum(eventCard, cardList)
 	local result = 0
-	for i=1,#cardList do
+	for i = 1, #cardList do
 		local card = cardList[i]
 		if (card == eventCard) then
 			result = result + 1
@@ -55,15 +55,15 @@ local M = {
 
 
 function M:push(cardGroup)
-	self.stack[#self.stack+1] = cardGroup
+	self.stack[#self.stack + 1] = cardGroup
 end
 
 function M:rollBack()
 	local cardGroup = self.stack[#self.stack]
-	table.remove(self.stack,#self.stack)
+	table.remove(self.stack, #self.stack)
-	for _,card in ipairs(cardGroup) do
+	for _, card in ipairs(cardGroup) do
 		if (card == zhongid) then
-			self.zhong_count = self.zhong_count +1
+			self.zhong_count = self.zhong_count + 1
 		else
 			self.cardList[#self.cardList + 1] = card
 		end
@@ -79,7 +79,7 @@ function M:tryShunzi(card)
 		removeCard(self.cardList, card, 1)
 		removeCard(self.cardList, card + 1, 1)
 		removeCard(self.cardList, card + 2, 1)
-		local cardGroup = {card,card+1,card+2}
+		local cardGroup = { card, card + 1, card + 2 }
 		self:push(cardGroup)
 		return true
 	end
@@ -88,7 +88,7 @@ end
 
 function M:tryKezi(card)
 	if (checkCardAndRomve(card, self.cardList, 3)) then
-		local cardGroup = {card,card,card}
+		local cardGroup = { card, card, card }
 		self:push(cardGroup)
 		return true
 	end
@@ -100,7 +100,7 @@ function M:tryPair(card)
 		return false
 	end
 	if (checkCardAndRomve(card, self.cardList, 2)) then
-		local cardGroup = {card,card}
+		local cardGroup = { card, card }
 		self:push(cardGroup)
 		self.pair_count = 1
 		return true
@@ -108,22 +108,21 @@ function M:tryPair(card)
 	return false
 end
 
-
 function M:tryKezi1Zhong(card)
-	if (self.zhong_count >= 1 and checkCardAndRomve(card, self.cardList,2)) then
+	if (self.zhong_count >= 1 and checkCardAndRomve(card, self.cardList, 2)) then
-		local cardGroup = {card,card,zhongid}
+		local cardGroup = { card, card, zhongid }
 		self:push(cardGroup)
-		self.zhong_count = self.zhong_count -1
+		self.zhong_count = self.zhong_count - 1
 		return true
 	end
 	return false
 end
 
 function M:tryKezi2Zhong(card)
-	if (self.zhong_count >= 2 and checkCardAndRomve(card, self.cardList,1)) then
+	if (self.zhong_count >= 2 and checkCardAndRomve(card, self.cardList, 1)) then
-		local cardGroup = {card,zhongid,zhongid}
+		local cardGroup = { card, zhongid, zhongid }
 		self:push(cardGroup)
-		self.zhong_count = self.zhong_count -2
+		self.zhong_count = self.zhong_count - 2
 		return true
 	end
 	return false
@@ -141,8 +140,8 @@ function M:tryShunzi1Zhong(card)
 	if (checkCard(card + 1, self.cardList)) then
 		removeCard(self.cardList, card, 1)
 		removeCard(self.cardList, card + 1, 1)
-		self.zhong_count = self.zhong_count -1
+		self.zhong_count = self.zhong_count - 1
-		local cardGroup = {card,card+1,zhongid}
+		local cardGroup = { card, card + 1, zhongid }
 		self:push(cardGroup)
 		return true
 	end
@@ -150,8 +149,8 @@ function M:tryShunzi1Zhong(card)
 	if (checkCard(card + 2, self.cardList) and ((card + 1) % 100 ~= 0)) then
 		removeCard(self.cardList, card, 1)
 		removeCard(self.cardList, card + 2, 1)
-		self.zhong_count = self.zhong_count -1
+		self.zhong_count = self.zhong_count - 1
-		local cardGroup = {card,zhongid,card+2}
+		local cardGroup = { card, zhongid, card + 2 }
 		self:push(cardGroup)
 		return true
 	end
@@ -166,9 +165,9 @@ function M:tryPair1Zhong(card)
 		return false
 	end
 	removeCard(self.cardList, card, 1)
-	local cardGroup = {card,zhongid}
+	local cardGroup = { card, zhongid }
 	self:push(cardGroup)
-	self.zhong_count = self.zhong_count -1
+	self.zhong_count = self.zhong_count - 1
 	self.pair_count = 1
 	return true
 end
@@ -180,9 +179,9 @@ function M:tryPair2Zhong()
 	if (self.zhong_count < 2) then
 		return false
 	end
-	local cardGroup = {zhongid,zhongid}
+	local cardGroup = { zhongid, zhongid }
 	self:push(cardGroup)
-	self.zhong_count = self.zhong_count -2
+	self.zhong_count = self.zhong_count - 2
 	self.pair_count = 1
 	return true
 end
@@ -233,7 +232,6 @@ function M:tryWin()
 	end
 
 	if (self:tryKezi2Zhong(activeCard)) then
-
 		if (self:tryWin()) then
 			return true
 		end
@@ -271,16 +269,16 @@ function M:checkQidui()
 end
 
 function M:isQdPari(cardList)
-	if(self.qidui_pari_count == 7) then
+	if (self.qidui_pari_count == 7) then
 		return true
 	end
-	if (#cardList== 0) then
+	if (#cardList == 0) then
 		return true
 	end
 	local card = cardList[1]
 	if (cardNum(card, cardList) >= 2) then
 		removeCard(cardList, card, 2)
-		self.qidui_pari_count = self.qidui_pari_count +1
+		self.qidui_pari_count = self.qidui_pari_count + 1
 		if (self:isQdPari(cardList)) then
 			return true
 		end
@@ -289,7 +287,7 @@ function M:isQdPari(cardList)
 	if (self.hongzhong_count > 0) then
 		removeCard(cardList, card, 1)
 		self.hongzhong_count = self.hongzhong_count - 1
-		self.qidui_pari_count = self.qidui_pari_count +1
+		self.qidui_pari_count = self.qidui_pari_count + 1
 		if (self:isQdPari(cardList)) then
 			return true
 		end
@@ -297,13 +295,13 @@ function M:isQdPari(cardList)
 	return false
 end
 
-local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi)
+local function init(self, cardInhand, addCard, isZhong, qidui, eightLaizi)
 	self.stack = {}
 	self.pair_count = 0
 	self.cardList = membe_clone(cardInhand)
 	self.qidui = qidui
 	self.eight_laizi = eightLaizi
-	self.cardList[#self.cardList+1] = addCard
+	self.cardList[#self.cardList + 1] = addCard
 	if (isZhong) then
 		self.zhong_count = cardNum(zhongid, self.cardList)
 		removeCard(self.cardList, zhongid, self.zhong_count)
@@ -315,31 +313,28 @@ local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi)
 end
 
 local specialCardList = { 401, 402, 403, 404, 405, 406, 407 }
-function M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
+function M.tingPai(cardInhand, data)
-	-- printlog("isZhong", isZhong)
+	data = data or {}
-	-- printlog("qidui", qidui)
-	-- printlog("eightLaizi", eightLaizi)
-	-- pt(cardInhand)
 	local self = setmetatable({}, { __index = M })
 	local tingList = {}
 	if not cardInhand or #cardInhand == 0 then
 		return tingList
 	end
-	for k=100,300,100 do
+	for k = 100, 300, 100 do
-		for i=1,9 do
+		for i = 1, 9 do
 			local tem = k + i
-			local result = init(self,cardInhand,tem,isZhong,qidui,eightLaizi)
+			local result = init(self, cardInhand, tem, data._flag_haveLaizi, data._hu_qidui, data._data_laizi)
 			--printlog("返回结果为===>>>",result)
-			if(result) then
+			if (result) then
 				tingList[#tingList + 1] = tem
 			end
 		end
 	end
 
-	for j=1,#specialCardList do
+	for j = 1, #specialCardList do
 		local tem = specialCardList[j]
-		local result = init(self,cardInhand,tem,isZhong,qidui,eightLaizi)
+		local result = init(self, cardInhand, tem, data._flag_haveLaizi, data._hu_qidui, data._data_laizi)
-		if(result) then
+		if (result) then
 			tingList[#tingList + 1] = tem
 		end
 	end
@@ -347,32 +342,30 @@ function M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
 	return tingList
 end
 
-function M.MuiltiplteCaculateTingPai(cardInhand,isZhong,qidui,eightLaizi)
+function M.MuiltiplteCaculateTingPai(cardInhand, isZhong, qidui, eightLaizi)
-	if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo>0 then
+	if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo > 0 then
-		zhongid=DataManager.CurrenRoom.laiziInfo[1]
+		zhongid = DataManager.CurrenRoom.laiziInfo[1]
-		local tempTingList2={}
+		local tempTingList2 = {}
-		local tempTingList1=M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
+		local tempTingList1 = M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
 		if DataManager.CurrenRoom.laiziInfo[2] then
-			zhongid=DataManager.CurrenRoom.laiziInfo[2]
+			zhongid = DataManager.CurrenRoom.laiziInfo[2]
-			tempTingList2=M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
+			tempTingList2 = M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
-			zhongid=DataManager.CurrenRoom.laiziInfo[1]
+			zhongid = DataManager.CurrenRoom.laiziInfo[1]
 		end
-		local currentTingList={}
+		local currentTingList = {}
-		if #tempTingList1>0 and #tempTingList2>0 then
+		if #tempTingList1 > 0 and #tempTingList2 > 0 then
-			currentTingList=CombineDictionaryAndRemoveSomeItem(tempTingList1,tempTingList2)
+			currentTingList = CombineDictionaryAndRemoveSomeItem(tempTingList1, tempTingList2)
-		elseif #tempTingList1>0 then 
+		elseif #tempTingList1 > 0 then
-			currentTingList=tempTingList1
+			currentTingList = tempTingList1
-		elseif #tempTingList2>0 then 
+		elseif #tempTingList2 > 0 then
-			currentTingList=tempTingList2
+			currentTingList = tempTingList2
 		end
 
 		return currentTingList
-	
 	else
-		zhongid=0
+		zhongid = 0
-		return M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
+		return M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
 	end
-	
 end
 
 return M

lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua

@@ -67,7 +67,31 @@ function M:InitView(url)
     self.showNextCtr = self._view:GetController('showNext')
     self.showNextList = self._view:GetChild('list_showNext')
     self._view:GetChild('btn_showNext').onClick:Set(function()
+        coroutine.start(function()
+            local time = 0
+
+            ViewUtil:ShowModalWait2(0.01)
+            while not self._flag_getRemindCard do
+                if time > 20 then
+                    break
+                end
+                coroutine.wait(0.05)
+            end
+            ViewUtil.CloseModalWait2()
+            if self._flag_getRemindCard then
+                self.showNextCtr.selectedIndex = 1
+                self.showNextList:SetVirtual()
+                self.showNextList.itemRenderer = function(index, obj)
+                    local card = self.cardSet[index + 1]
+                    self:FillShowCards(obj, card, self.cardMap[card])
+                    obj.data = { card = card }
+                end
+                self.showNextList.numItems = #self.cardSet
+                time = time + 1
+            else
                 self:reqResidueCard()
+            end
+        end)
     end)
     self._view:GetChild('btn_closeShow').onClick:Set(function()
         self.showNextCtr.selectedIndex = 0
@@ -169,13 +193,10 @@ function M:UpdatePlayerInfoView()
 end
 
 function M:NewMJPlayerCardInfoView(view, index)
-    return MJMainView.NewMJPlayerCardInfoView(self, view, index)
-    --[[
     if index == 1 then
-        return MJPlayerSelfCardInfoView.new(view, self)
+        return MJPlayerSelfCardInfoView.new(view, self, nil, "S")
     end
-    return MJPlayerCardInfoView.new(view, self)
+    return MJMainView.NewMJPlayerCardInfoView(self, view, index)
-    ]]
 end
 
 function M:EventInit()
@@ -217,6 +238,7 @@ function M:EventInit()
         --self._viewText_testName.text = 0
         self:UpdateRound()
         self:RemoveCursor()
+        self:reqResidueCard()
         self._state.selectedIndex = 1
         self:ShowJing()
         if self._niao_View then
@@ -266,7 +288,8 @@ function M:EventInit()
         info:UpdateHandCard()
         local outcard = UIPackage.CreateObjectFromURL(_gcm_outcard_url)
         info:UpdateOutCardList(outcard, card, self._cursor)
-
+        self._player_card_info[1]._ctr_tip.selectedIndex = 0
+        self._player_card_info[1]._ctr_showGuoHu.selectedIndex = 0
         self:PlayMJSound("chupai.mp3")
         self:PlaySound("FuZhou_MJ", p.self_user.sex, tostring(card))
         if seat == _room.self_player.seat then
@@ -275,6 +298,7 @@ function M:EventInit()
     end)
     _gamectr:AddEventListener(TX_GameEvent.GetCard, function(...)
         self:__CloseTip()
+        self:reqResidueCard()
         local arg = { ... }
         local seat = arg[1]
         local card = arg[2]
@@ -542,26 +566,19 @@ function M:EventInit()
     _gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...)
         local arg = { ... }
         local residueCard = arg[1]
-        local cardMap = {}
+        self.cardMap = {}
-        local cardSet = {}
+        self.cardSet = {}
-        self.showNextCtr.selectedIndex = 1
         for i = 1, #residueCard do
             local cardNum = residueCard[i]
-            if not cardMap[cardNum] then
+            if not self.cardMap[cardNum] then
-                cardMap[cardNum] = 1
+                self.cardMap[cardNum] = 1
-                table.insert(cardSet, cardNum)
+                table.insert(self.cardSet, cardNum)
             else
-                cardMap[cardNum] = cardMap[cardNum] + 1
+                self.cardMap[cardNum] = self.cardMap[cardNum] + 1
             end
         end
-        table.sort(cardSet)
+        table.sort(self.cardSet)
-        self.showNextList:SetVirtual()
+        self._flag_getRemindCard = true
-        self.showNextList.itemRenderer = function(index, obj)
-            local card = cardSet[index + 1]
-            self:FillShowCards(obj, card, cardMap[card])
-            obj.data = { card = card }
-        end
-        self.showNextList.numItems = #cardSet
     end)
 
     --替换mianview的事件
@@ -593,12 +610,10 @@ function M:OutCard(card)
                 info:UpdateHandCard()
 
                 info:UpdateOutCardList(nil, card, self._cursor)
-                info._ctr_tip.selectedIndex = 0
-                info._ctr_showGuoHu.selectedIndex = 0
                 self:markOutCards(false, card)
                 self:PlaySound("FuZhou_MJ", self._room.self_player.self_user.sex, tostring(card))
                 self:PlayMJSound("chupai.mp3")
-                -- self:ShowHuTip()
+                self:ShowHuTip()
             end)
     else
         printlog("鬼牌不能出===>>>" .. card)
@@ -962,6 +977,7 @@ end
 -----------------------展示牌----------------------------
 
 function M:reqResidueCard()
+    self._flag_getRemindCard = false
     local _gamectr = ControllerManager.GetController(GameController)
     _gamectr:ReqResidueCard()
 end

lua_probject/extend_project/extend/majiang/fuzhou/MJPlayerSelfCardInfoView.lua

@@ -4,32 +4,29 @@ local CardCheck = import(".CardCheck")
 
 local M = {}
 --
-function M.new(view, mainView)
+function M.new(view, mainView, record, direction)
     setmetatable(MJPlayerSelfCardInfoView, { __index = MJPlayerCardInfoView })
     setmetatable(M, { __index = MJPlayerSelfCardInfoView })
     local self = setmetatable({}, { __index = M })
     self.class = "PlayerSelfCardInfoView"
     self._view = view
     self._mainView = mainView
+    self.direction = direction
     self:init()
     return self
 end
 
--- function M:ShowHuTip(card_list)
+function M:init()
---     printlog("ShowHuTip")
+    getmetatable(M).__index.init(self)
---     local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true, DataManager.CurrenRoom.room_config.Qidui,
+end
---         DataManager.CurrenRoom.room_config.Laizi)
+
---     if #tingList > 0 then
+function M:ShowHuTip(card_list)
---         if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo > 0 then
+    self._mainView._hu_tip:FillData(self:GetTingList(card_list))
---             for i = 1, #DataManager.CurrenRoom.laiziInfo do
+end
---                 if IsHasDictionary(DataManager.CurrenRoom.laiziInfo[i], tingList) == false then
+
---                     table.insert(tingList, DataManager.CurrenRoom.laiziInfo[i])
+function M:GetTingList(card_list)
---                 end
+    return CardCheck.MuiltiplteCaculateTingPai(card_list, { _hu_qidui = true })
---             end
+end
---         end
---     end
---     self._mainView._hu_tip:FillData(tingList)
--- end
 
 function M:UpdateHandCard(getcard, mp)
     MJPlayerSelfCardInfoView.UpdateHandCard(self, getcard, mp)

lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua

@@ -20,9 +20,6 @@ end
 
 function M:FillData(player)
     PlayerInfoView.FillData(self, player)
-    if player.seat == 1 then
-        self._view:GetController('room_owner').selectedIndex = 1
-    end
     -- if player.cur_hp ~= nil then
     --     self:UpdateScore(d2ad(player.cur_hp))
     -- else

lua_probject/extend_project/extend/poker/runfast/ExtendConfig.lua

@@ -80,7 +80,6 @@ function M:FillRoomData(s2croom)
     local reload = s2croom["reload"]
 
     local _tableInfo = s2croom["tableInfo"]
-
     room.xipaiScore = _tableInfo["xipai_score"]
 
     local _config = _tableInfo["config"]
@@ -133,7 +132,8 @@ function M:FillRoomData(s2croom)
     room.game_status = 0
     if reload then
         local reloadInfo = s2croom["reloadInfo"]
-
+        local bank_seat = reloadInfo["banker_seat"]
+        room.banker_seat = bank_seat
         local playing = reloadInfo["playing"]
 
         room.curren_turn_seat = reloadInfo["active_seat"]

lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua

@@ -178,6 +178,7 @@ function M:OnInitCard(evt_data)
 
     local cardlist = evt_data["cards"]
     local round = evt_data["round"]
+    local bank_seat = evt_data["bank_seat"]
     self._cacheEvent:Enqueue(
         function()
             for _, player in ipairs(self._room.player_list) do
@@ -186,6 +187,7 @@ function M:OnInitCard(evt_data)
             end
 
             self._room.curren_round = round
+            self._room.banker_seat = bank_seat
             DispatchEvent(self._dispatcher, RunFast_GameEvent.OnInitCard, round, cardlist)
         end
     )

lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua

@@ -509,6 +509,7 @@ function M:EventInit()
                 head_info._view:GetChild("shengyu").text = p.hand_count
             end
             p:Clear()
+            head_info:MarkBank(p.seat == _room.banker_seat)
             head_info:FillData(p)
             local card_info = self._player_card_info[self:GetPos(p.seat)]
             card_info:Clear()
@@ -543,8 +544,8 @@ function M:EventInit()
 
 
         self.ctr_time.selectedIndex = index
-        -- for i=1,#self._player_info do
+        -- for i = 1, #self._player_info do
-        --    if index==i then
+        --     if index == i then
         --         -- body
         --         local head_info = self._player_info[index]
         --         head_info:MarkBank(true)
@@ -1115,6 +1116,7 @@ function M:ReConnectForStart()
         head_info:UpdateLineState(player.line_state)
         head_info:UpdatePiao(player.piao)
         head_info:SetBaoDan(player.hand_count == 1)
+        head_info:MarkBank(player.seat == self._room.banker_seat)
 
         if head_info._view:GetChild("shengyu") ~= nil and head_info._view:GetController("shengyu") ~= nil then
             -- body
@@ -1193,6 +1195,7 @@ function M:ReconnectForClearing()
         head_info:UpdateLineState(player.line_state)
         --head_info._view:GetController("Oener").selectedIndex=0
         head_info:UpdatePiao(player.piao)
+        head_info:MarkBank(player.seat == self._room.banker_seat)
         if head_info._view:GetChild("shengyu") ~= nil and head_info._view:GetController("shengyu") ~= nil then
             -- body
 

lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua

@@ -398,24 +398,24 @@ function M:PlayEffect(type, callback)
             obj.visible = true
             if type == 2 then
                 obj:GetTransition('t0'):Play(1, 0, function()
-                    obj:GetChild('n11'):TweenMoveX(width * 1.03, 0.5):OnComplete(function()
+                    obj:GetChild('n11'):TweenMoveX(width * 1.03, 0.3):OnComplete(function()
                         obj:Dispose()
                         callback()
                     end)
-                    obj:GetChild('n12'):TweenMoveX(width * 1.03 - 121, 0.5)
+                    obj:GetChild('n12'):TweenMoveX(width * 1.03 - 121, 0.3)
-                    obj:GetChild('n11'):TweenFade(0, 0.5)
+                    obj:GetChild('n11'):TweenFade(0, 0.3)
-                    obj:GetChild('n12'):TweenFade(0, 0.5)
+                    obj:GetChild('n12'):TweenFade(0, 0.3)
                 end)
             elseif type == 5 or type == 8 or type == 12 then
                 obj:GetTransition('t0'):Play(1, 0, function()
-                    obj:GetChild('n13'):TweenMoveX(width * 0.7, 0.5):OnComplete(function()
+                    obj:GetChild('n13'):TweenMoveX(width * 0.7, 0.4):OnComplete(function()
                         obj:Dispose()
                         callback()
                     end)
-                    obj:GetChild('n14'):TweenMoveX(width * 0.7 - 120, 0.5)
+                    obj:GetChild('n14'):TweenMoveX(width * 0.7 - 120, 0.4)
                     obj:GetChild('n13'):TweenFade(1, 0.2):OnComplete(function()
-                        obj:GetChild('n13'):TweenFade(0, 0.3)
+                        obj:GetChild('n13'):TweenFade(0, 0.4)
-                        obj:GetChild('n14'):TweenFade(0, 0.3)
+                        obj:GetChild('n14'):TweenFade(0, 0.4)
                     end)
                 end)
             else

lua_probject/main_project/main/majiang/HuTipView.lua

@@ -8,7 +8,7 @@ local M = HuTipView
 function M.new(main_view)
 	local self = {}
 	self.class = "HuTipView"
-    setmetatable(self,{__index = HuTipView})
+	setmetatable(self, { __index = HuTipView })
 	self._main_view = main_view
 	self:init()
 	return self
@@ -16,14 +16,15 @@ end
 
 local function SetObjEnabled(obj, enabled)
 	obj.visible = enabled
-	obj.touchable = enabled
+	obj.touchable = false
 end
 function M:OnTouchBegin(context)
 	self._view_start_pos = Vector2(self._view.x, self._view.y)
 	self._touch_start_pos = self._main_view._view:GlobalToLocal(Vector2(context.inputEvent.x, context.inputEvent.y))
 end
+
 function M:OnTouchMove(context)
-	local xy = self._main_view._view:GlobalToLocal(Vector2.New(context.inputEvent.x,context.inputEvent.y))
+	local xy = self._main_view._view:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
 	local dist = Vector2(xy.x - self._touch_start_pos.x, xy.y - self._touch_start_pos.y)
 	local posx = self._view_start_pos.x + dist.x
 	local posy = self._view_start_pos.y + dist.y
@@ -36,15 +37,12 @@ end
 function M:init()
 	self._view = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Hu_tip")
 	self._main_view._view:AddChild(self._view)
-	local width = self._view.width
-	local m_width = self._main_view._view.width
-	local m_height = self._main_view._view.height
 	-- 初始位置
-	self._view.x = 0
+	self._view:Center()
-	self._view.y = 0.675 * m_height
+	self._view.y = GRoot.inst.height * 0.723
 	SetObjEnabled(self._view, false)
-	self._view.onTouchBegin:Add(handler(self, self.OnTouchBegin))
+	-- self._view.onTouchBegin:Add(handler(self, self.OnTouchBegin))
-	self._view.onTouchMove:Add(handler(self, self.OnTouchMove))
+	-- self._view.onTouchMove:Add(handler(self, self.OnTouchMove))
 end
 
 -- function M:FillData(cards)		
@@ -72,39 +70,13 @@ end
 function M:FillData(cards, posX)
 	-- local btn_showtip = self._main_view._view:GetChild("btn_showtip")
 	local lst_card = self._view:GetChild("lst_card")
-	lst_card:RemoveChildrenToPool()
+	lst_card:SetVirtual()
 	local num = #cards
 	if num > 0 then
-		local o_width = 192
+		if num == lst_card.numItems then
-		local i_width = 93
+			lst_card:RefreshVirtualList()
-		local column_gap = 43
-		lst_card.columnGap = column_gap
-		if num > 1 then
-			self._view.width = o_width + (num - 1) * i_width
 		else
-			self._view.width = o_width
+			lst_card.numItems = num
-		end
-		local count = 0
-		for i = 1, num do
-			local item = lst_card:AddItemFromPool()
-			local card = cards[i]
-			item:GetChild("icon").icon = "ui://Main_Majiang/" .. self:GetPrefix() .. "201_" .. card
-			local left_num = self._main_view:CountCardLeftNum(card)
-			local tex_num = item:GetChild("tex_num")
-			tex_num.text = left_num .. "张"
-			tex_num.visible = true
-			count = count + left_num
-		end
-		self._view:GetChild("tex_num").text = count
-		if posX then
-			if posX + self._view.width > 1300 then
-				posX = 1300 - self._view.width
-			end
-			self._view.x = posX
-			SetObjEnabled(self._view, true)
-		else
-			-- self._view.x = self._main_view._view.width * 0.2 - self._view.width * 0.5
-			SetObjEnabled(self._view, true)
 		end
 	else
 		SetObjEnabled(self._view, false)

lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua

@@ -45,21 +45,15 @@ function M:init()
     -- end
 end
 
-function M:ShowHuTip(card_list)
+function M:RemoverCardListByIndexGetCardList(index)
-    printlog("ShowHuTip")
+    local card_list = DataManager.CurrenRoom.self_player.card_list
-    local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true, DataManager.CurrenRoom.room_config.Qidui,
+    local tempCardList = {}
-        DataManager.CurrenRoom.room_config.Laizi)
+    for i = 0, (#card_list) - 1 do
-    pt(tingList)
+        if i ~= index then
-    if #tingList > 0 then
+            table.insert(tempCardList, card_list[i + 1])
-        if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo > 0 then
-            for i = 1, #DataManager.CurrenRoom.laiziInfo do
-                if IsHasDictionary(DataManager.CurrenRoom.laiziInfo[i], tingList) == false then
-                    table.insert(tingList, DataManager.CurrenRoom.laiziInfo[i])
         end
     end
-        end
+    return tempCardList
-    end
-    self._mainView._hu_tip:FillData(tingList)
 end
 
 function M:UpdateHandCard(getcard, mp)
@@ -91,9 +85,12 @@ function M:UpdateHandCard(getcard, mp)
             btn_card = self._view_handCardList:AddItemFromPool()
             btn_card.width = (GRoot.inst.width * 0.88 - self._view_handCardList.columnGap * 12) / 13
         end
-        -- btn_card.sound = "ui://Main_Majiang/click"
         self:FillHandCard(i, btn_card, tem_card, true)
-        -- btn_card.onClick:Set(handler(self, self.__OnClickHandCard))
+        local tingList = {}
+        if getcard then
+            tingList = self:GetTingList(self:RemoverCardListByIndexGetCardList(i))
+        end
+        btn_card:GetController('ting').selectedIndex = (tingList and #tingList > 0) and 1 or 0
     end
 
     if getcard then
@@ -271,7 +268,7 @@ function M:__OnClickHandCard(context)
     self._flag_seletedGet = 0
     local button = context.data
     local _room = DataManager.CurrenRoom
-
+    self:ShowHuTip(self:RemoverCardListByIndexGetCardList(self._view_handCardList.selectedIndex))
     if _room.curren_outcard_seat == _room.self_player.seat then
         if self._mainView.clickMode == "single" or Utils.IsDoubleClick(context) or self._click_index == self._view_handCardList.selectedIndex then
             local card = button.data

wb_new_ui/assets/Common/ToolsTip.xml

@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="149,88" extention="Label">
   <displayList>
-    <graph id="n0" name="n0" xy="0,0" size="149,88" group="n2" type="rect" lineSize="0" lineColor="#ffffcc00" fillColor="#80000000">
+    <graph id="n0" name="n0" xy="0,0" pivot="0.5,0.5" size="149,88" group="n2" type="rect" lineSize="0" lineColor="#ffffcc00" fillColor="#80000000">
       <relation target="n1" sidePair="width-width"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <text id="n1" name="title" xy="26,7" size="97,74" group="n2" font="Arial" fontSize="56" color="#ffffff" align="center" vAlign="middle" text="333"/>
+    <text id="n1" name="title" xy="26,7" pivot="0.5,0.5" size="97,74" group="n2" font="Arial" fontSize="56" color="#ffffff" align="center" vAlign="middle" text="333">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
     <group id="n2" name="n2" xy="0,0" size="149,88" advanced="true"/>
   </displayList>
   <relation target="n1" sidePair="width-width"/>
-  <transition name="t0" autoPlay="true">
+  <transition name="t0" autoPlay="true" frameRate="30">
-    <item time="0" type="XY" target="n2" tween="true" startValue="0,-87" endValue="0,0" duration="6" ease="Quart.Out"/>
+    <item time="0" type="Scale" target="n0" tween="true" startValue="0,0" endValue="1,1" duration="7" ease="Linear"/>
-    <item time="46" type="XY" target="n2" tween="true" startValue="0,0" endValue="0,-85" duration="14" ease="Quart.In"/>
+    <item time="0" type="Scale" target="n1" tween="true" startValue="0,0" endValue="1,1" duration="7" ease="Linear"/>
-    <item time="50" type="Alpha" target="n1" tween="true" startValue="1" endValue="0" duration="10"/>
+    <item time="0" type="Visible" target="n0" value="true"/>
+    <item time="0" type="Visible" target="n1" value="true"/>
+    <item time="96" type="Visible" target="n0" value="false"/>
+    <item time="96" type="Visible" target="n1" value="false"/>
   </transition>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_1.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="144,144" opaque="false" initName="gcm_info">
-  <controller name="room_owner" pages="0,,1," selected="0"/>
+  <controller name="room_owner" homePageType="specific" homePage="1" pages="0,,1," selected="1"/>
-  <controller name="bank" pages="0,,1," selected="0"/>
+  <controller name="bank" homePageType="specific" homePage="1" pages="0,,1," selected="1"/>
   <controller name="read" pages="0,,1," selected="0"/>
   <controller name="offline" pages="0,,1," selected="0"/>
   <controller name="mask_voice" pages="0,,1," selected="0"/>
@@ -11,7 +11,7 @@
   <controller name="text_color" pages="0,,1," selected="0"/>
   <controller name="cScore" pages="0,,1," selected="0"/>
   <controller name="baodan" pages="0,,1," selected="0"/>
-  <controller name="piaoWin" pages="0,,1," selected="1"/>
+  <controller name="piaoWin" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n8" name="ready" src="jdf3hz" fileName="component/Result/yzb.png" xy="-1,-113" visible="false">
       <gearDisplay controller="read" pages="1"/>
@@ -22,14 +22,7 @@
     <image id="n40_d2rw" name="n40" src="prgzal" fileName="component/head/tuoguan.png" xy="187,7">
       <gearDisplay controller="tuoguan" pages="1"/>
     </image>
-    <image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="0,-7">
-      <gearDisplay controller="bank" pages="1"/>
-    </image>
     <text id="n48_nkur" name="tuoguanTips" xy="-46,-39" size="237,48" visible="false" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S"/>
-    <image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="0,91" size="98,53">
-      <gearDisplay controller="room_owner" pages="1"/>
-      <relation target="" sidePair="left-left%,bottom-bottom%"/>
-    </image>
     <component id="n5" name="btn_head" src="ckvbcin" fileName="Main_New/Component/btn_head.xml" xy="0,0" size="144,144" group="n49_ckvb" aspect="true">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </component>
@@ -37,6 +30,14 @@
     <text id="n45_kx91" name="text_jifen" xy="59,188" size="48,59" scale="1.3,1" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="01">
       <relation target="n59_n9qr" sidePair="middle-middle,left-right"/>
     </text>
+    <image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="2,89" size="98,53">
+      <gearDisplay controller="room_owner" pages="1"/>
+      <relation target="" sidePair="width-width%,height-height%,left-left,bottom-bottom"/>
+    </image>
+    <image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="99,-8" size="73,68">
+      <gearDisplay controller="bank" pages="1"/>
+      <relation target="" sidePair="width-width%,height-height%,left-left,top-top"/>
+    </image>
     <text id="n51_ckvb" name="name" xy="2,138" size="180,59" font="Arial" fontSize="44" color="#ffe26d" align="center" vAlign="middle" letterSpacing="6" autoClearText="true" text="你好~凌">
       <relation target="" sidePair="left-left,top-bottom%"/>
     </text>
@@ -102,7 +103,7 @@
     <item time="18" type="Rotation" target="n63_n9qr" tween="true" startValue="20" endValue="0" duration="6" ease="Linear"/>
   </transition>
   <transition name="piaoScore">
-    <item time="0" type="Scale" target="n64_diqo" tween="true" startValue="0,1" endValue="0,0" duration="0" ease="Linear"/>
+    <item time="0" type="Scale" target="n64_diqo" value="0,1"/>
     <item time="0" type="Scale" target="n64_diqo" tween="true" startValue="0,0" endValue="1,1" duration="18" ease="Linear"/>
     <item time="0" type="Scale" target="n65_diqo" tween="true" startValue="0,0" endValue="1.1,1.1" duration="18" ease="Linear"/>
     <item time="0" type="Visible" target="n64_diqo" value="true"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="144,144" opaque="false" initName="gcm_info">
   <controller name="room_owner" pages="0,,1," selected="1"/>
-  <controller name="bank" pages="0,,1," selected="0"/>
+  <controller name="bank" pages="0,,1," selected="1"/>
   <controller name="read" pages="0,,1," selected="0"/>
   <controller name="offline" pages="0,,1," selected="0"/>
   <controller name="mask_voice" pages="0,,1," selected="0"/>
@@ -21,9 +21,6 @@
     <image id="n40_d2rw" name="n40" src="prgzal" fileName="component/head/tuoguan.png" xy="187,7">
       <gearDisplay controller="tuoguan" pages="1"/>
     </image>
-    <image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="0,-7">
-      <gearDisplay controller="bank" pages="1"/>
-    </image>
     <text id="n48_nkur" name="tuoguanTips" xy="-136,142" size="237,48" visible="false" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S">
       <relation target="n51_ckvb" sidePair="right-left"/>
     </text>
@@ -34,8 +31,13 @@
     <text id="n45_kx91" name="text_jifen" xy="-129,76" size="48,59" scale="1.3,1" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="01">
       <relation target="n59_n9qr" sidePair="middle-middle,right-left"/>
     </text>
-    <image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="0,76" visible="false">
+    <image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="2,89" size="98,53">
       <gearDisplay controller="room_owner" pages="1"/>
+      <relation target="" sidePair="width-width%,height-height%,left-left,bottom-bottom"/>
+    </image>
+    <image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="99,-8" size="73,68">
+      <gearDisplay controller="bank" pages="1"/>
+      <relation target="" sidePair="width-width%,height-height%,left-left,top-top"/>
     </image>
     <text id="n51_ckvb" name="name" xy="-248,5" size="240,59" font="Arial" fontSize="44" color="#ffe26d" align="center" vAlign="middle" letterSpacing="4" autoClearText="true" text="奥利奥生...">
       <relation target="" sidePair="right-left,bottom-top"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="144,144" opaque="false" initName="gcm_info">
-  <controller name="room_owner" pages="0,,1," selected="0"/>
+  <controller name="room_owner" pages="0,,1," selected="1"/>
-  <controller name="bank" pages="0,,1," selected="0"/>
+  <controller name="bank" pages="0,,1," selected="1"/>
   <controller name="read" pages="0,,1," selected="0"/>
   <controller name="offline" pages="0,,1," selected="0"/>
   <controller name="mask_voice" pages="0,,1," selected="0"/>
@@ -21,9 +21,6 @@
     <image id="n40_d2rw" name="n40" src="prgzal" fileName="component/head/tuoguan.png" xy="187,7">
       <gearDisplay controller="tuoguan" pages="1"/>
     </image>
-    <image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="0,-7">
-      <gearDisplay controller="bank" pages="1"/>
-    </image>
     <text id="n48_nkur" name="tuoguanTips" xy="264,142" size="237,48" visible="false" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S">
       <relation target="n51_ckvb" sidePair="right-left"/>
     </text>
@@ -31,9 +28,17 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </component>
     <group id="n49_ckvb" name="head" xy="0,0" size="144,144"/>
+    <image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="2,89" size="98,53">
+      <gearDisplay controller="room_owner" pages="1"/>
+      <relation target="" sidePair="width-width%,height-height%,left-left,bottom-bottom"/>
+    </image>
     <text id="n45_kx91" name="text_jifen" xy="214,76" size="48,59" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="01">
       <relation target="n59_n9qr" sidePair="middle-middle,left-right"/>
     </text>
+    <image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="99,-8" size="73,68">
+      <gearDisplay controller="bank" pages="1"/>
+      <relation target="" sidePair="width-width%,height-height%,left-left,top-top"/>
+    </image>
     <text id="n51_ckvb" name="name" xy="152,5" size="240,59" font="Arial" fontSize="44" color="#ffe26d" align="center" vAlign="middle" letterSpacing="4" autoClearText="true" text="奥利奥生...">
       <relation target="" sidePair="left-right,bottom-top"/>
     </text>
@@ -41,19 +46,16 @@
     <component id="n34_u4l2" name="zhuang" src="prgzac" fileName="component/head/touxiang.xml" xy="-371,-254" group="n33_e7qn" visible="false">
       <gearDisplay controller="bank" pages="1"/>
     </component>
-    <image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="-239,-225" group="n33_e7qn" visible="false">
-      <gearDisplay controller="room_owner" pages="1"/>
-    </image>
     <component id="n36_h4ge" name="n36" xy="-333,-216" size="100,100" group="n33_e7qn" touchable="false">
       <gearDisplay controller="dismiss_room" pages="1"/>
     </component>
-    <group id="n33_e7qn" name="n33" xy="-371,-254" size="157,155" group="n52_ckvb"/>
+    <group id="n33_e7qn" name="n33" xy="-371,-254" size="155,155" group="n52_ckvb"/>
     <text id="n41_i3h6" name="piao" xy="-338,-248" size="92,29" group="n52_ckvb" fontSize="20" color="#ffd100" align="center" vAlign="middle" autoSize="none" text=""/>
     <component id="n29_e54q" name="info" src="jdf3hy" fileName="component/head/HeadNameBG.xml" xy="-360,-121" group="n52_ckvb"/>
     <image id="n44_kx91" name="n44" src="jdf3hx" fileName="component/head/jfk.png" xy="-352,-71" size="132,35" group="n47_kx91"/>
     <text id="n46_kx91" name="n46" xy="-346,-69" size="48,32" group="n47_kx91" fontSize="22" color="#512e06" vAlign="middle" text="战绩"/>
     <group id="n47_kx91" name="zhanji" xy="-352,-71" size="132,35" group="n52_ckvb" advanced="true"/>
-    <group id="n52_ckvb" name="n52" xy="-371,-254" size="157,218" visible="false" advanced="true"/>
+    <group id="n52_ckvb" name="n52" xy="-371,-254" size="155,218" visible="false" advanced="true"/>
     <graph id="n32_kba2" name="offLine" xy="0,0" size="144,144" group="n53_ckvb" aspect="true" touchable="false" type="rect" lineSize="0" fillColor="#b3000000">
       <gearDisplay controller="offline" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_feiji.xml

@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="300,97" pivot="0.5,0.5" anchor="true">
+<component size="400,97" pivot="0.5,0.5" anchor="true">
   <displayList>
     <image id="n14_diqo" name="n14" src="diqocp7" fileName="Main_New/texiao/feiji/huoyan.png" xy="-274,6" size="154,48"/>
     <image id="n13_diqo" name="n13" src="diqocoh" fileName="Main_New/texiao/zi_feiji.png" xy="-63,-2"/>
   </displayList>
-  <transition name="t0">
+  <transition name="t0" frameRate="30">
-    <item time="0" type="Alpha" target="n13_diqo" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="0" type="Alpha" target="n13_diqo" tween="true" startValue="0.3" endValue="1" duration="6" ease="Linear"/>
-    <item time="0" type="Alpha" target="n14_diqo" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="0" type="Alpha" target="n14_diqo" tween="true" startValue="0.3" endValue="1" duration="7" ease="Linear"/>
-    <item time="0" type="Size" target="n14_diqo" value="191,80"/>
+    <item time="0" type="Size" target="n14_diqo" value="98,80"/>
-    <item time="0" type="XY" target="n13_diqo" tween="true" startValue="-63,-2" endValue="10,-2" duration="6" ease="Linear"/>
+    <item time="0" type="XY" target="n13_diqo" tween="true" startValue="-63,-2" endValue="50,-2" duration="6" ease="Linear"/>
-    <item time="0" type="XY" target="n14_diqo" value="-134,6"/>
+    <item time="0" type="XY" target="n14_diqo" value="-41,6"/>
-    <item time="6" type="Size" target="n14_diqo" tween="true" startValue="191,80" endValue="324,80" duration="3" ease="Linear"/>
+    <item time="6" type="Size" target="n14_diqo" tween="true" startValue="142,80" endValue="313.667,80" duration="2" ease="Linear"/>
-    <item time="6" type="XY" target="n14_diqo" tween="true" startValue="-134,6" endValue="-254,6" duration="3" ease="Linear"/>
+    <item time="6" type="XY" target="n14_diqo" tween="true" startValue="-45,6" endValue="-135.667,6" duration="2" ease="Linear"/>
-    <item time="9" type="Size" target="n14_diqo" tween="true" startValue="324,80" endValue="180,80" duration="6" ease="Linear"/>
+    <item time="7" type="XY" target="n13_diqo" tween="true" startValue="90,-2" endValue="190,-3" duration="17" ease="Linear"/>
-    <item time="9" type="XY" target="n13_diqo" tween="true" startValue="10,-2" endValue="120,-2" duration="6" ease="Linear"/>
+    <item time="8" type="Size" target="n14_diqo" tween="true" startValue="313.667,80" endValue="140,80" duration="16" ease="Linear"/>
-    <item time="9" type="XY" target="n14_diqo" tween="true" startValue="-254,6" endValue="0,6" duration="6" ease="Linear"/>
+    <item time="8" type="XY" target="n14_diqo" tween="true" startValue="-135.667,6" endValue="99.996,5" duration="16" ease="Linear"/>
-    <item time="15" type="Alpha" target="n13_diqo" value="1"/>
+    <item time="14" type="Alpha" target="n13_diqo" value="1"/>
-    <item time="15" type="Alpha" target="n14_diqo" value="1"/>
+    <item time="16" type="Alpha" target="n14_diqo" value="1"/>
-    <item time="15" type="XY" target="n13_diqo" value="120,-2"/>
-    <item time="15" type="XY" target="n14_diqo" value="0,6"/>
   </transition>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_liandui.xml

@@ -6,30 +6,62 @@
     <component id="n5_diqo" name="n5" src="diqocpw" fileName="Main_New/texiao/xingxing.xml" xy="203,-18"/>
     <component id="n6_diqo" name="n6" src="diqocpw" fileName="Main_New/texiao/xingxing.xml" xy="0,1"/>
     <component id="n7_diqo" name="n7" src="diqocpw" fileName="Main_New/texiao/xingxing.xml" xy="111,56"/>
+    <image id="n8_mhse" name="n8" src="diqocp6" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui01.png" xy="54,-3" alpha="0"/>
+    <image id="n9_mhse" name="n9" src="diqocp5" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui02.png" xy="54,-3" alpha="0"/>
+    <image id="n10_mhse" name="n10" src="diqocp4" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui03.png" xy="53,-4" alpha="0"/>
+    <image id="n11_mhse" name="n11" src="diqocp3" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui04.png" xy="55,-3" alpha="0"/>
+    <image id="n12_mhse" name="n12" src="diqocp2" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui05.png" xy="54,-3" alpha="0"/>
+    <image id="n13_mhse" name="n13" src="diqocp9" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui06.png" xy="55,-2" alpha="0"/>
+    <image id="n14_mhse" name="n14" src="diqocp1" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui07.png" xy="54,-3" alpha="0"/>
+    <image id="n15_mhse" name="n15" src="diqocoz" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui08.png" xy="54,-4" alpha="0"/>
   </displayList>
-  <transition name="t0">
+  <transition name="t0" frameRate="30">
     <item time="0" type="Alpha" target="n0_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
     <item time="0" type="Alpha" target="n1_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
     <item time="0" type="Scale" target="n0_diqo" value="1,1"/>
     <item time="0" type="Scale" target="n1_diqo" value="1,1"/>
+    <item time="0" type="Visible" target="n10_mhse" value="false"/>
+    <item time="0" type="Visible" target="n11_mhse" value="false"/>
+    <item time="0" type="Visible" target="n12_mhse" value="false"/>
+    <item time="0" type="Visible" target="n13_mhse" value="false"/>
+    <item time="0" type="Visible" target="n14_mhse" value="false"/>
+    <item time="0" type="Visible" target="n15_mhse" value="false"/>
     <item time="0" type="Visible" target="n5_diqo" value="false"/>
     <item time="0" type="Visible" target="n6_diqo" value="false"/>
     <item time="0" type="Visible" target="n7_diqo" value="false"/>
-    <item time="0" type="XY" target="n0_diqo" tween="true" startValue="0,-" endValue="55,0" duration="6" ease="Linear"/>
+    <item time="0" type="Visible" target="n8_mhse" value="false"/>
-    <item time="0" type="XY" target="n1_diqo" tween="true" startValue="203,-" endValue="138,-" duration="6" ease="Linear"/>
+    <item time="0" type="Visible" target="n9_mhse" value="false"/>
-    <item time="6" type="Scale" target="n0_diqo" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
+    <item time="0" type="XY" target="n0_diqo" tween="true" startValue="0,-" endValue="58,0" duration="4" ease="Linear"/>
-    <item time="6" type="Scale" target="n1_diqo" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
+    <item time="0" type="XY" target="n1_diqo" tween="true" startValue="203,-" endValue="144,-" duration="4" ease="Linear"/>
+    <item time="4" type="Scale" target="n0_diqo" tween="true" startValue="1,1" endValue="1.2,1.2" duration="2" ease="Linear"/>
+    <item time="4" type="Scale" target="n1_diqo" tween="true" startValue="1,1" endValue="1.2,1.2" duration="2" ease="Linear"/>
+    <item time="4" type="XY" target="n0_diqo" tween="true" startValue="58,0" endValue="44,-" duration="2" ease="Linear"/>
+    <item time="4" type="XY" target="n1_diqo" tween="true" startValue="144,-" endValue="145,-" duration="2" ease="Linear"/>
+    <item time="6" type="Scale" target="n0_diqo" tween="true" startValue="1.2,1.2" endValue="1,1" duration="3" ease="Linear"/>
+    <item time="6" type="Scale" target="n1_diqo" tween="true" startValue="1.2,1.2" endValue="1,1" duration="3" ease="Linear"/>
     <item time="6" type="Transition" target="n5_diqo" value="t0"/>
     <item time="6" type="Visible" target="n5_diqo" value="true"/>
-    <item time="6" type="XY" target="n0_diqo" tween="true" startValue="55,0" endValue="45,-" duration="4" ease="Linear"/>
+    <item time="6" type="XY" target="n0_diqo" tween="true" startValue="44,-" endValue="55,0" duration="3" ease="Linear"/>
-    <item time="6" type="XY" target="n1_diqo" tween="true" startValue="138,-" endValue="144,-" duration="4" ease="Linear"/>
+    <item time="6" type="XY" target="n1_diqo" tween="true" startValue="145,-" endValue="138,-" duration="3" ease="Linear"/>
-    <item time="10" type="Scale" target="n0_diqo" tween="true" startValue="1.2,1.2" endValue="1,1" duration="3" ease="Linear"/>
+    <item time="10" type="Visible" target="n8_mhse" value="true"/>
-    <item time="10" type="Scale" target="n1_diqo" tween="true" startValue="1.2,1.2" endValue="1,1" duration="3" ease="Linear"/>
+    <item time="11" type="Visible" target="n8_mhse" value="false"/>
-    <item time="10" type="XY" target="n0_diqo" tween="true" startValue="45,-" endValue="55,0" duration="3" ease="Linear"/>
+    <item time="12" type="Visible" target="n9_mhse" value="true"/>
-    <item time="10" type="XY" target="n1_diqo" tween="true" startValue="144,-" endValue="138,-" duration="3" ease="Linear"/>
     <item time="13" type="Transition" target="n6_diqo" value="t0"/>
     <item time="13" type="Visible" target="n6_diqo" value="true"/>
+    <item time="14" type="Visible" target="n10_mhse" value="true"/>
+    <item time="14" type="Visible" target="n9_mhse" value="false"/>
+    <item time="15" type="Visible" target="n10_mhse" value="false"/>
+    <item time="15" type="Visible" target="n11_mhse" value="true"/>
     <item time="18" type="Transition" target="n7_diqo" value="t0"/>
     <item time="18" type="Visible" target="n7_diqo" value="true"/>
+    <item time="20" type="Visible" target="n11_mhse" value="false"/>
+    <item time="20" type="Visible" target="n12_mhse" value="true"/>
+    <item time="21" type="Visible" target="n12_mhse" value="false"/>
+    <item time="21" type="Visible" target="n13_mhse" value="true"/>
+    <item time="22" type="Visible" target="n13_mhse" value="false"/>
+    <item time="22" type="Visible" target="n14_mhse" value="true"/>
+    <item time="23" type="Visible" target="n14_mhse" value="false"/>
+    <item time="23" type="Visible" target="n15_mhse" value="true"/>
+    <item time="24" type="Visible" target="n15_mhse" value="false"/>
   </transition>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_sandaidan.xml

@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="300,97" pivot="0.5,0.5" anchor="true">
   <displayList>
-    <image id="n8_diqo" name="n8" src="diqocod" fileName="Main_New/texiao/zi_sandaier01.png" xy="64,4"/>
     <image id="n9_diqo" name="n9" src="diqococ" fileName="Main_New/texiao/zi_sandaier02.png" xy="103,-6"/>
+    <image id="n8_diqo" name="n8" src="diqocod" fileName="Main_New/texiao/zi_sandaier01.png" xy="64,4"/>
     <image id="n10_diqo" name="n10" src="diqocoa" fileName="Main_New/texiao/zi_sandaiyi01.png" xy="143,7"/>
   </displayList>
-  <transition name="t0">
+  <transition name="t0" frameRate="30">
-    <item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
+    <item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0.3" endValue="1" duration="3" ease="Linear"/>
-    <item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
+    <item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0.3" endValue="1" duration="3" ease="Linear"/>
     <item time="0" type="Alpha" target="n9_diqo" value="0"/>
-    <item time="0" type="XY" target="n10_diqo" tween="true" startValue="143,78,0.477,0.804" endValue="143,24" duration="6" ease="Linear"/>
+    <item time="0" type="XY" target="n10_diqo" tween="true" startValue="154,78" endValue="153,7" duration="3" ease="Linear"/>
-    <item time="0" type="XY" target="n8_diqo" tween="true" startValue="64,58" endValue="64,4" duration="6" ease="Linear"/>
+    <item time="0" type="XY" target="n8_diqo" tween="true" startValue="53.9,58.006,0.18,0.598" endValue="53.9,3.977,0.18,0.041" duration="3" ease="Linear"/>
-    <item time="6" type="Alpha" target="n9_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
+    <item time="3" type="Alpha" target="n9_diqo" value="0.3"/>
-    <item time="6" type="XY" target="n10_diqo" tween="true" startValue="143,24" endValue="212,24" duration="6" ease="Linear"/>
+    <item time="3" type="XY" target="n9_diqo" value="111,-73"/>
-    <item time="6" type="XY" target="n8_diqo" tween="true" startValue="64,4" endValue="6,4" duration="6" ease="Linear"/>
+    <item time="5" type="Alpha" target="n9_diqo" value="1"/>
-    <item time="6" type="XY" target="n9_diqo" tween="true" startValue="103,-85" endValue="103,34" duration="6" ease="Linear"/>
+    <item time="5" type="XY" target="n10_diqo" value="186,24"/>
-    <item time="12" type="XY" target="n10_diqo" tween="true" startValue="212,24" endValue="190,24" duration="3" ease="Linear"/>
+    <item time="5" type="XY" target="n8_diqo" value="26,4"/>
-    <item time="12" type="XY" target="n8_diqo" tween="true" startValue="6,4" endValue="27,4" duration="3" ease="Linear"/>
+    <item time="5" type="XY" target="n9_diqo" value="102,-10"/>
-    <item time="12" type="XY" target="n9_diqo" tween="true" startValue="103,34" endValue="103,-6" duration="3" ease="Linear"/>
+    <item time="7" type="XY" target="n10_diqo" tween="true" startValue="189,24" endValue="186,24" duration="2" ease="Linear"/>
-    <item time="21" type="Alpha" target="n10_diqo" value="1"/>
+    <item time="7" type="XY" target="n8_diqo" tween="true" startValue="21,4" endValue="26,4" duration="2" ease="Linear"/>
-    <item time="21" type="Alpha" target="n8_diqo" value="1"/>
+    <item time="7" type="XY" target="n9_diqo" tween="true" startValue="99,10" endValue="102,-10" duration="2" ease="Linear"/>
-    <item time="21" type="Alpha" target="n9_diqo" value="1"/>
+    <item time="27" type="Alpha" target="n10_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
+    <item time="27" type="Alpha" target="n8_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
+    <item time="27" type="Alpha" target="n9_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
   </transition>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_sandaidui.xml

@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="300,97" pivot="0.5,0.5" anchor="true">
   <displayList>
-    <image id="n8_diqo" name="n8" src="diqocod" fileName="Main_New/texiao/zi_sandaier01.png" xy="64,4"/>
     <image id="n9_diqo" name="n9" src="diqococ" fileName="Main_New/texiao/zi_sandaier02.png" xy="103,-6"/>
+    <image id="n8_diqo" name="n8" src="diqocod" fileName="Main_New/texiao/zi_sandaier01.png" xy="64,4"/>
     <image id="n10_diqo" name="n10" src="diqocob" fileName="Main_New/texiao/zi_sandaier03.png" xy="143,7"/>
   </displayList>
-  <transition name="t0">
+  <transition name="t0" frameRate="30">
-    <item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
+    <item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0.3" endValue="1" duration="3" ease="Linear"/>
-    <item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
+    <item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0.3" endValue="1" duration="3" ease="Linear"/>
     <item time="0" type="Alpha" target="n9_diqo" value="0"/>
-    <item time="0" type="XY" target="n10_diqo" tween="true" startValue="143,58" endValue="143,7" duration="6" ease="Linear"/>
+    <item time="0" type="XY" target="n10_diqo" tween="true" startValue="154,58" endValue="153,7" duration="3" ease="Linear"/>
-    <item time="0" type="XY" target="n8_diqo" tween="true" startValue="64,58,0.213,0.598" endValue="64,4,0.213,0.041" duration="6" ease="Linear"/>
+    <item time="0" type="XY" target="n8_diqo" tween="true" startValue="53.9,58.006,0.18,0.598" endValue="53.9,3.977,0.18,0.041" duration="3" ease="Linear"/>
-    <item time="6" type="Alpha" target="n9_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
+    <item time="3" type="Alpha" target="n9_diqo" value="0.3"/>
-    <item time="6" type="XY" target="n10_diqo" tween="true" startValue="143,7" endValue="212,7" duration="6" ease="Linear"/>
+    <item time="3" type="XY" target="n9_diqo" value="111,-73"/>
-    <item time="6" type="XY" target="n8_diqo" tween="true" startValue="64,4,0.213,0.041" endValue="6,4" duration="6" ease="Linear"/>
+    <item time="5" type="Alpha" target="n9_diqo" value="1"/>
-    <item time="6" type="XY" target="n9_diqo" tween="true" startValue="103,-85" endValue="103,34" duration="6" ease="Linear"/>
+    <item time="5" type="XY" target="n10_diqo" value="179,7"/>
-    <item time="12" type="XY" target="n10_diqo" tween="true" startValue="212,7" endValue="180,7" duration="3" ease="Linear"/>
+    <item time="5" type="XY" target="n8_diqo" value="26,4"/>
-    <item time="12" type="XY" target="n8_diqo" tween="true" startValue="6,4" endValue="27,4" duration="3" ease="Linear"/>
+    <item time="5" type="XY" target="n9_diqo" value="102,-10"/>
-    <item time="12" type="XY" target="n9_diqo" tween="true" startValue="103,34" endValue="103,-6" duration="3" ease="Linear"/>
+    <item time="7" type="XY" target="n10_diqo" tween="true" startValue="184,7" endValue="179,7" duration="2" ease="Linear"/>
-    <item time="21" type="Alpha" target="n10_diqo" value="1"/>
+    <item time="7" type="XY" target="n8_diqo" tween="true" startValue="21,4" endValue="26,4" duration="2" ease="Linear"/>
-    <item time="21" type="Alpha" target="n8_diqo" value="1"/>
+    <item time="7" type="XY" target="n9_diqo" tween="true" startValue="99,10" endValue="102,-10" duration="2" ease="Linear"/>
-    <item time="21" type="Alpha" target="n9_diqo" value="1"/>
+    <item time="27" type="Alpha" target="n10_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
+    <item time="27" type="Alpha" target="n8_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
+    <item time="27" type="Alpha" target="n9_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
   </transition>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_shunzi.xml

@@ -6,17 +6,17 @@
       <relation target="" sidePair="left-left%"/>
     </image>
   </displayList>
-  <transition name="t0">
+  <transition name="t0" frameRate="30">
-    <item time="0" type="Alpha" target="n11_diqo" tween="true" startValue="0" endValue="1" duration="6"/>
+    <item time="0" type="Alpha" target="n11_diqo" value="0.6"/>
     <item time="0" type="Alpha" target="n12_diqo" value="0"/>
-    <item time="0" type="XY" target="n11_diqo" tween="true" startValue="-130.5,4.5" endValue="-0.5,4.5" duration="6" ease="Linear"/>
+    <item time="0" type="XY" target="n11_diqo" value="0,4"/>
-    <item time="6" type="Alpha" target="n12_diqo" value="1"/>
+    <item time="5" type="Alpha" target="n11_diqo" value="1"/>
+    <item time="5" type="XY" target="n11_diqo" tween="true" startValue="-1,4" endValue="173,4.5" duration="19" ease="Linear"/>
+    <item time="6" type="Alpha" target="n12_diqo" tween="true" startValue="0.6" endValue="1" duration="18" ease="Linear"/>
     <item time="6" type="Size" target="n12_diqo" tween="true" startValue="113,93" endValue="268,93" duration="9" ease="Linear"/>
-    <item time="6" type="XY" target="n11_diqo" tween="true" startValue="-0.5,4.5" endValue="123.5,4.5" duration="9" ease="Linear"/>
+    <item time="6" type="XY" target="n12_diqo" tween="true" startValue="0.5,6.5" endValue="0.5,6.5" duration="9" ease="Linear"/>
-    <item time="6" type="XY" target="n12_diqo" value="0.5,6.5"/>
+    <item time="14" type="Alpha" target="n11_diqo" value="1"/>
-    <item time="15" type="Alpha" target="n11_diqo" value="1"/>
+    <item time="15" type="Size" target="n12_diqo" tween="true" startValue="268,93" endValue="163,93" duration="9" ease="Linear"/>
-    <item time="15" type="Alpha" target="n12_diqo" value="1"/>
+    <item time="15" type="XY" target="n12_diqo" tween="true" startValue="0.5,6.5" endValue="143.5,6.5" duration="9" ease="Linear"/>
-    <item time="15" type="XY" target="n11_diqo" value="123.5,4.5"/>
-    <item time="15" type="XY" target="n12_diqo" value="0.5,6.5"/>
   </transition>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_sidaisab.xml

@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="300,97" pivot="0.5,0.5" anchor="true">
   <displayList>
-    <image id="n8_diqo" name="n8" src="11k4tcqf" fileName="Main_New/texiao/图层 5.png" xy="64,4"/>
     <image id="n9_diqo" name="n9" src="11k4tcqg" fileName="Main_New/texiao/图层 6.png" xy="103,-6"/>
+    <image id="n8_diqo" name="n8" src="11k4tcqf" fileName="Main_New/texiao/图层 5.png" xy="64,4"/>
     <image id="n10_diqo" name="n10" src="11k4tcqh" fileName="Main_New/texiao/组 1 拷贝.png" xy="143,7"/>
   </displayList>
-  <transition name="t0">
+  <transition name="t0" frameRate="30">
-    <item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
+    <item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0.3" endValue="1" duration="3" ease="Linear"/>
-    <item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
+    <item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0.3" endValue="1" duration="3" ease="Linear"/>
     <item time="0" type="Alpha" target="n9_diqo" value="0"/>
-    <item time="0" type="XY" target="n10_diqo" tween="true" startValue="143,58,0.477,0.598" endValue="143,4" duration="6" ease="Linear"/>
+    <item time="0" type="XY" target="n10_diqo" tween="true" startValue="154,58" endValue="153,7" duration="3" ease="Linear"/>
-    <item time="0" type="XY" target="n8_diqo" tween="true" startValue="64,58" endValue="64,4" duration="6" ease="Linear"/>
+    <item time="0" type="XY" target="n8_diqo" tween="true" startValue="53.9,58.006,0.18,0.598" endValue="53.9,3.977,0.18,0.041" duration="3" ease="Linear"/>
-    <item time="6" type="Alpha" target="n9_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
+    <item time="3" type="Alpha" target="n9_diqo" value="0.3"/>
-    <item time="6" type="XY" target="n10_diqo" tween="true" startValue="143,4" endValue="212,4" duration="6" ease="Linear"/>
+    <item time="3" type="XY" target="n9_diqo" value="111,-73"/>
-    <item time="6" type="XY" target="n8_diqo" tween="true" startValue="64,4" endValue="6,4" duration="6" ease="Linear"/>
+    <item time="5" type="Alpha" target="n9_diqo" value="1"/>
-    <item time="6" type="XY" target="n9_diqo" tween="true" startValue="103,-85" endValue="103,34" duration="6" ease="Linear"/>
+    <item time="5" type="XY" target="n10_diqo" value="175,8"/>
-    <item time="12" type="XY" target="n10_diqo" tween="true" startValue="212,4" endValue="177,4" duration="3" ease="Linear"/>
+    <item time="5" type="XY" target="n8_diqo" value="26,4"/>
-    <item time="12" type="XY" target="n8_diqo" tween="true" startValue="6,4" endValue="27,4" duration="3" ease="Linear"/>
+    <item time="5" type="XY" target="n9_diqo" value="105,-1"/>
-    <item time="12" type="XY" target="n9_diqo" tween="true" startValue="103,34" endValue="105,1" duration="3" ease="Linear"/>
+    <item time="7" type="XY" target="n10_diqo" tween="true" startValue="175,7" endValue="173,11" duration="2" ease="Linear"/>
-    <item time="21" type="Alpha" target="n10_diqo" value="1"/>
+    <item time="7" type="XY" target="n8_diqo" tween="true" startValue="21,4" endValue="26,4" duration="2" ease="Linear"/>
-    <item time="21" type="Alpha" target="n8_diqo" value="1"/>
+    <item time="7" type="XY" target="n9_diqo" tween="true" startValue="99,10" endValue="104,3" duration="2" ease="Linear"/>
-    <item time="21" type="Alpha" target="n9_diqo" value="1"/>
+    <item time="27" type="Alpha" target="n10_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
+    <item time="27" type="Alpha" target="n8_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
+    <item time="27" type="Alpha" target="n9_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
   </transition>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_zhadan.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="366,97" pivot="0.5,0.5" anchor="true">
   <displayList>
-    <image id="n13_11k4t" name="n13" src="diqocop" fileName="Main_New/texiao/zhadanqiu.png" xy="133,-141" pivot="0.5,0.5" rotation="-36"/>
+    <image id="n13_11k4t" name="n13" src="diqocop" fileName="Main_New/texiao/zhadanqiu.png" xy="133,-91" pivot="0.5,0.5" alpha="0.6" rotation="-36"/>
     <image id="n15_11k4t" name="n15" src="diqocnx" fileName="Main_New/texiao/zhadan/huoyan-zhadan01.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
     <image id="n16_11k4t" name="n16" src="diqocnv" fileName="Main_New/texiao/zhadan/huoyan-zhadan02.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
     <image id="n17_11k4t" name="n17" src="diqocnu" fileName="Main_New/texiao/zhadan/huoyan-zhadan03.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
@@ -10,20 +10,16 @@
     <image id="n20_11k4t" name="n20" src="diqocnr" fileName="Main_New/texiao/zhadan/huoyan-zhadan06.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
     <image id="n21_11k4t" name="n21" src="diqocnq" fileName="Main_New/texiao/zhadan/huoyan-zhadan07.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
     <image id="n22_11k4t" name="n22" src="diqocnp" fileName="Main_New/texiao/zhadan/huoyan-zhadan08.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
-    <image id="n23_11k4t" name="n23" src="diqocnw" fileName="Main_New/texiao/zhadan/zhongxinguang01.png" xy="68,-66" pivot="0.5,0.5" visible="false"/>
+    <image id="n23_11k4t" name="n23" src="diqocnw" fileName="Main_New/texiao/zhadan/zhongxinguang01.png" xy="68,-66" pivot="0.5,0.5" scale="0.7,0.6" visible="false"/>
-    <image id="n24_11k4t" name="n24" src="diqoco7" fileName="Main_New/texiao/zhadan/zhongxinguang02.png" xy="68,-66" pivot="0.5,0.5" visible="false"/>
+    <image id="n24_11k4t" name="n24" src="diqoco7" fileName="Main_New/texiao/zhadan/zhongxinguang02.png" xy="68,-66" pivot="0.5,0.5" skew="0.9,0.7" visible="false"/>
-    <image id="n25_11k4t" name="n25" src="diqocog" fileName="Main_New/texiao/zhadan/zhongxinguang03.png" xy="68,-66" pivot="0.5,0.5" visible="false"/>
+    <image id="n25_11k4t" name="n25" src="diqocog" fileName="Main_New/texiao/zhadan/zhongxinguang03.png" xy="68,-66" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
-    <image id="n26_11k4t" name="n26" src="diqoco8" fileName="Main_New/texiao/zhadan/zhongxinguang04.png" xy="68,-66" pivot="0.5,0.5" visible="false"/>
+    <image id="n26_11k4t" name="n26" src="diqoco8" fileName="Main_New/texiao/zhadan/zhongxinguang04.png" xy="68,-66" pivot="0.5,0.5" scale="1.6,1.4" visible="false" alpha="0.75"/>
     <image id="n14_11k4t" name="n14" src="diqocpv" fileName="Main_New/texiao/zi_zhadan.png" xy="87,0" pivot="0.5,0.5"/>
   </displayList>
-  <transition name="t0">
+  <transition name="t0" frameRate="30">
-    <item time="0" type="Alpha" target="n13_11k4t" tween="true" startValue="0.3" endValue="1" duration="4" ease="Linear"/>
     <item time="0" type="Alpha" target="n14_11k4t" value="0"/>
-    <item time="0" type="Alpha" target="n26_11k4t" value="1"/>
     <item time="0" type="Scale" target="n14_11k4t" value="1,1"/>
-    <item time="0" type="Scale" target="n23_11k4t" value="1,1"/>
+    <item time="0" type="Visible" target="n13_11k4t" value="true"/>
-    <item time="0" type="Scale" target="n25_11k4t" value="1,1"/>
-    <item time="0" type="Scale" target="n26_11k4t" value="1,1"/>
     <item time="0" type="Visible" target="n15_11k4t" value="false"/>
     <item time="0" type="Visible" target="n16_11k4t" value="false"/>
     <item time="0" type="Visible" target="n17_11k4t" value="false"/>
@@ -36,37 +32,34 @@
     <item time="0" type="Visible" target="n24_11k4t" value="false"/>
     <item time="0" type="Visible" target="n25_11k4t" value="false"/>
     <item time="0" type="Visible" target="n26_11k4t" value="false"/>
-    <item time="0" type="XY" target="n13_11k4t" tween="true" startValue="133,-141.5" endValue="133,-21" duration="4" ease="Linear"/>
+    <item time="2" type="Alpha" target="n14_11k4t" value="1"/>
-    <item time="5" type="Alpha" target="n13_11k4t" value="0"/>
+    <item time="2" type="Scale" target="n14_11k4t" tween="true" startValue="0.3,0.3" endValue="1,1" duration="5" ease="Back.Out"/>
-    <item time="5" type="Alpha" target="n14_11k4t" value="1"/>
+    <item time="2" type="Visible" target="n13_11k4t" value="false"/>
-    <item time="5" type="Scale" target="n14_11k4t" tween="true" startValue="0.3,0.3" endValue="1,1" duration="3" ease="Linear"/>
+    <item time="2" type="Visible" target="n23_11k4t" value="true"/>
-    <item time="5" type="Scale" target="n23_11k4t" tween="true" startValue="0.8,0.8" endValue="1,1" duration="1" ease="Linear"/>
+    <item time="4" type="Visible" target="n23_11k4t" value="false"/>
-    <item time="5" type="Visible" target="n23_11k4t" value="true"/>
+    <item time="4" type="Visible" target="n24_11k4t" value="true"/>
-    <item time="7" type="Visible" target="n23_11k4t" value="false"/>
+    <item time="6" type="Visible" target="n24_11k4t" value="false"/>
-    <item time="7" type="Visible" target="n24_11k4t" value="true"/>
+    <item time="6" type="Visible" target="n25_11k4t" value="true"/>
-    <item time="8" type="Scale" target="n25_11k4t" value="1.2,1.2"/>
+    <item time="7" type="Scale" target="n14_11k4t" value="1,1"/>
-    <item time="8" type="Visible" target="n24_11k4t" value="false"/>
+    <item time="8" type="Visible" target="n25_11k4t" value="false"/>
-    <item time="8" type="Visible" target="n25_11k4t" value="true"/>
+    <item time="8" type="Visible" target="n26_11k4t" value="true"/>
-    <item time="9" type="Alpha" target="n26_11k4t" tween="true" startValue="1" endValue="0.3" duration="1" ease="Linear"/>
+    <item time="10" type="Visible" target="n15_11k4t" value="true"/>
-    <item time="9" type="Scale" target="n26_11k4t" value="1.5,1.5"/>
+    <item time="10" type="Visible" target="n26_11k4t" value="false"/>
-    <item time="9" type="Visible" target="n25_11k4t" value="false"/>
+    <item time="11" type="Visible" target="n15_11k4t" value="false"/>
-    <item time="9" type="Visible" target="n26_11k4t" value="true"/>
+    <item time="11" type="Visible" target="n16_11k4t" value="true"/>
-    <item time="10" type="Alpha" target="n26_11k4t" tween="true" startValue="0.3" endValue="0" duration="1" ease="Linear"/>
+    <item time="14" type="Visible" target="n16_11k4t" value="false"/>
-    <item time="11" type="Visible" target="n15_11k4t" value="true"/>
+    <item time="14" type="Visible" target="n17_11k4t" value="true"/>
-    <item time="12" type="Visible" target="n15_11k4t" value="false"/>
+    <item time="16" type="Visible" target="n17_11k4t" value="false"/>
-    <item time="12" type="Visible" target="n16_11k4t" value="true"/>
+    <item time="16" type="Visible" target="n18_11k4t" value="true"/>
-    <item time="13" type="Visible" target="n16_11k4t" value="false"/>
+    <item time="18" type="Visible" target="n18_11k4t" value="false"/>
-    <item time="13" type="Visible" target="n17_11k4t" value="true"/>
+    <item time="18" type="Visible" target="n19_11k4t" value="true"/>
-    <item time="14" type="Visible" target="n17_11k4t" value="false"/>
+    <item time="20" type="Visible" target="n19_11k4t" value="false"/>
-    <item time="14" type="Visible" target="n18_11k4t" value="true"/>
+    <item time="20" type="Visible" target="n20_11k4t" value="true"/>
-    <item time="15" type="Visible" target="n18_11k4t" value="false"/>
+    <item time="22" type="Visible" target="n20_11k4t" value="false"/>
-    <item time="15" type="Visible" target="n19_11k4t" value="true"/>
+    <item time="22" type="Visible" target="n21_11k4t" value="true"/>
-    <item time="16" type="Visible" target="n19_11k4t" value="false"/>
+    <item time="24" type="Alpha" target="n14_11k4t" tween="true" startValue="0.6" endValue="0" duration="7" ease="Linear"/>
-    <item time="16" type="Visible" target="n20_11k4t" value="true"/>
+    <item time="24" type="Visible" target="n21_11k4t" value="false"/>
-    <item time="17" type="Visible" target="n20_11k4t" value="false"/>
+    <item time="24" type="Visible" target="n22_11k4t" value="true"/>
-    <item time="17" type="Visible" target="n21_11k4t" value="true"/>
+    <item time="26" type="Visible" target="n22_11k4t" value="false"/>
-    <item time="18" type="Visible" target="n21_11k4t" value="false"/>
-    <item time="18" type="Visible" target="n22_11k4t" value="true"/>
-    <item time="19" type="Visible" target="n22_11k4t" value="false"/>
   </transition>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageAlpha="100" designImageLayer="1">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="time" pages="0,,1,,2,,3," selected="0"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml

@@ -667,8 +667,6 @@
     <component id="diqocpw" name="xingxing.xml" path="/Main_New/texiao/"/>
     <component id="diqocpx" name="te_liandui.xml" path="/Main_New/texiao/" exported="true"/>
     <movieclip id="diqocpy" name="clip_liandui.jta" path="/Main_New/texiao/saoguang_zi/"/>
-    <component id="diqocpz" name="te_sandaidui.xml" path="/Main_New/texiao/" exported="true"/>
-    <component id="diqocq0" name="te_sandaidan.xml" path="/Main_New/texiao/" exported="true"/>
     <component id="diqocq1" name="te_shunzi.xml" path="/Main_New/texiao/" exported="true"/>
     <component id="diqocq2" name="te_feiji.xml" path="/Main_New/texiao/" exported="true"/>
     <component id="11k4tcq4" name="te_zhadan.xml" path="/Main_New/texiao/" exported="true"/>
@@ -679,7 +677,9 @@
     <image id="11k4tcqf" name="图层 5.png" path="/Main_New/texiao/"/>
     <image id="11k4tcqg" name="图层 6.png" path="/Main_New/texiao/"/>
     <image id="11k4tcqh" name="组 1 拷贝.png" path="/Main_New/texiao/"/>
-    <component id="11k4tcqi" name="te_sidaisab.xml" path="/Main_New/texiao/" exported="true"/>
+    <component id="mhsetcqk" name="te_sandaidui.xml" path="/Main_New/texiao/" exported="true"/>
+    <component id="mhsetcql" name="te_sidaisab.xml" path="/Main_New/texiao/" exported="true"/>
+    <component id="mhsetcqm" name="te_sandaidan.xml" path="/Main_New/texiao/" exported="true"/>
   </resources>
   <publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml

@@ -6,6 +6,7 @@
   <controller name="out" pages="0,,1," selected="0"/>
   <controller name="showhang" pages="0,,1," selected="0"/>
   <controller name="special_jing" pages="0,,1," selected="0"/>
+  <controller name="ting" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n3_hp0b" name="icon" xy="0,0" size="175,191" group="n13_jzul" aspect="true" url="ui://Main_Majiang/b202_203" fill="scaleFree">
       <gearXY controller="button" pages="0,1" values="0,0|0,-35"/>
@@ -32,6 +33,9 @@
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="n3_hp0b" sidePair="top-top"/>
     </image>
+    <image id="n15_mhse" name="n15" src="mhset1kp" fileName="Main_new/Main/Image/ting_corner_icon.png" xy="71,12" size="101,145">
+      <gearDisplay controller="ting" pages="1"/>
+    </image>
   </displayList>
   <Button mode="Check" sound="ui://v0j9abjyr8cy1k6" volume="0"/>
 </component>

wb_new_ui/assets/Main_Majiang/component/hu_tip/Btn_Card_Hu.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="52,73" extention="Button">
+<component size="112,190" extention="Button">
   <displayList>
-    <loader id="n1_pikf" name="icon" xy="-1,0" size="92,133" scale="0.55,0.55" url="ui://lxhyy2sd6cpqth"/>
+    <loader id="n1_pikf" name="icon" xy="0,65" size="112,115" url="ui://lxhyy2sd6cpqth"/>
-    <text id="n2_nje6" name="tex_num" xy="52,52" size="29,19" visible="false" fontSize="15" color="#ffffff" align="center" vAlign="middle" text="3张"/>
+    <text id="n2_nje6" name="title" xy="17,25" pivot="0.5,0.5" size="76,39" scale="1.3,1" font="Arial" fontSize="28" align="center" vAlign="middle" text="剩4张"/>
   </displayList>
   <Button/>
 </component>

wb_new_ui/assets/Main_Majiang/component/hu_tip/Hu_tip.xml

@@ -1,20 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="152,85" extention="Button">
+<component size="185,190" pivot="0.5,1" extention="Button">
   <displayList>
-    <graph id="n0_g4z1" name="n0" xy="0,0" size="152,85" alpha="0.7" type="rect" lineSize="0" fillColor="#ff000000" corner="10">
+    <image id="n7_mhse" name="n7" src="mhset1kn" fileName="component/hu_tip/GPS_bg.png" xy="0,0" size="185,190">
       <relation target="" sidePair="width-width,height-height"/>
-    </graph>
+    </image>
-    <image id="n1_g4z1" name="n1" src="gq7mek" fileName="component/hu_tip/common_table_tab_hu.png" xy="-1,0"/>
+    <image id="n8_mhse" name="n8" src="mhset1ko" fileName="component/hu_tip/gamexzmj_37.png" xy="27,41" size="130,108"/>
-    <list id="n3_g4z1" name="lst_card" xy="153,1" size="200,82" layout="row" colGap="3" defaultItem="ui://v0j9abjygq7mej" autoItemSize="false" vAlign="middle" autoClearItems="true">
+    <list id="n3_g4z1" name="lst_card" xy="170,0" size="0,190" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="36" defaultItem="ui://v0j9abjygq7mej" autoItemSize="false" vAlign="middle" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
       <item/>
     </list>
-    <graph id="n4_g4z1" name="n4" xy="79,9" size="2,66" type="rect" lineSize="0"/>
-    <text id="n5_g4z1" name="tex_num" xy="14,13" size="64,44" fontSize="40" color="#cccccc" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="15"/>
-    <text id="n6_g4z1" name="tex_num" xy="21,48" size="50,41" fontSize="24" color="#cccccc" align="center" vAlign="middle" autoSize="none" text="张"/>
   </displayList>
   <Button/>
+  <relation target="n3_g4z1" sidePair="width-width"/>
 </component>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1277,6 +1277,9 @@
     <image id="xx1c1ki" name="outMask.png" path="/Main_new/Main/Image/"/>
     <component id="11k4t1kj" name="Btn_MaCard.xml" path="/Main_new/Main_new_4/Component/" exported="true"/>
     <image id="11k4t1kk" name="xzmj_15.png" path="/Main_new/Main/Image/"/>
+    <image id="mhset1kn" name="GPS_bg.png" path="/component/hu_tip/"/>
+    <image id="mhset1ko" name="gamexzmj_37.png" path="/component/hu_tip/"/>
+    <image id="mhset1kp" name="ting_corner_icon.png" path="/Main_new/Main/Image/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>