同步梭哈结算界面

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

@@ -22,8 +22,21 @@ function FamilyNumberRecord.New(root)
     self._view:GetChild('text_residueDiamond').text = self._group.diamo
     self._view:GetChild('text_timeRecord').visible = false
 
+    local playList = self._group.playList
+    local comp_gameTypeList = self._view:GetChild('comp_gameTypeList'):GetChild('n0')
+
     self._input_IDSerach = self._view:GetChild('input_numberID')
 
+    comp_gameTypeList:SetVirtual()
+    comp_gameTypeList.itemRenderer = function(index, obj)
+        obj.title = playList[index + 1].game_name
+        obj.data = {}
+        obj.data.index = index
+        obj.data.pid = playList[index + 1].id
+    end
+    comp_gameTypeList.numItems = #playList
+
+
     self._view:GetChild('btn_clearInput').onClick:Set(function()
         self._input_IDSerach.text = ""
     end)
@@ -40,16 +53,19 @@ function FamilyNumberRecord.New(root)
     self._view:GetChild('comp_sortTypeList'):GetChild('n0').onClickItem:Set(function(context)
         self:OnClickSortType(context)
     end)
-    self._view:GetChild('comp_gameTypeList'):GetChild('n0').onClickItem:Set(function(context)
-        self:OnClickSortType(context)
+    comp_gameTypeList.onClickItem:Set(function(context)
+        self:OnClickSortType(self._group.id, context.data.pid)
     end)
 
     return self
 end
 
-function M:OnClickSortType(context)
-    print("lingmengOnClickSortType", context.data.title, context.data.text)
-    pt(getmetatable(context.data.data))
+function M:OnClickSortType(groupId, pid)
+    print("lingmengOnClickSortType")
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    fgCtr:FG_GetGroupRecord(groupId, GetPlatform(), pid, 0, 100, function(res)
+
+    end)
 end
 
 return M

lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua

@@ -330,6 +330,12 @@ function M:EventInit()
 
     _gamectr:AddEventListener(EXGameEvent.OnResult1, function(...)
         local arg = { ... }
+        self.result_view = EXResultView.new(self._root_view, self._room.player_list, self._room.room_id, 0, win_seat, 0,
+            remaincards)
+        self.result_view:InitBackReady(function()
+            self._state.selectedIndex = 0
+        end)
+        self.result_view:Show()
     end)
 
     _gamectr:AddEventListener(EXGameEvent.OnResult2, function(...)

lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua

@@ -51,7 +51,7 @@ function M:ShowTips(tipsList)
     self._view_tipsList:RemoveChildren()
     print("lingmengShowTips", #tipsList)
     for i = 1, #tipsList do
-        if tipsList[i] == 1012 then
+        if tipsList[i] == 1012 or tipsList[i] == 1014 then
             local xiaScore = { 1, 2, 5 }
             for j = 1, 3 do
                 local obj = self._view_tipsList:AddItemFromPool()

lua_probject/extend_project/extend/poker2/suoha/ExResultView.lua

@@ -17,7 +17,7 @@ function EXResultView.new(blur_view, data, roomid, over, win_seat, dissolve, rem
     self._close_zone = false
     --self._blur_view = blur_view
     self._gamectr = ControllerManager.GetController(GameController)
-    self:init("ui://Extend_Poker_SuoHa/clearing_new", data, roomid, over, win_seat, dissolve, remaincards)
+    self:init("ui://Extend_Poker_SuoHa/Clearing", data, roomid, over, win_seat, dissolve, remaincards)
     print("=======================lingmengresult", data, roomid, over, win_seat, dissolve, remaincards)
     return self
 end
@@ -25,89 +25,23 @@ end
 function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
     ResultView.init(self, url, true)
 
+    local _gamectr = ControllerManager.GetController(GameController)
     local room = DataManager.CurrenRoom
-    self._view:GetController('over').selectedIndex = 0
 
-    --按钮功能全部未开放
-    self._view:GetChild('btn_shareRecord').onClick:Set(function()
-        ViewUtil.ErrorMsg(self._view, "", "该功能还未开放")
-    end)
-    self._view:GetChild('btn_copyRecord').onClick:Set(function()
-        ViewUtil.ErrorMsg(self._view, "", "该功能还未开放")
-    end)
-    ------------------
-
-    --只有一人直接退，有两人才进正常结算
-    if not over and #data == 1 then
-        ViewManager.ChangeView(ViewManager.View_Family)
-    end
-
-    if over == 0 then
-        self._view:GetChild('btn_nextRound').onClick:Set(function()
-            self:Destroy()
-            local _gamectr = ControllerManager.GetController(GameController)
-            _gamectr:ConformToNextGame()
-        end)
-    end
-
-
-    self._view:GetChild('btn_closeRound').onClick:Set(function()
-        ViewManager.ChangeView(ViewManager.View_Family)
-    end)
-
-    self._view:GetController('win').selectedIndex = win_seat == room.self_player.seat and 1 or 0
-
-    local over0List = self._view:GetChild('list_over0')
-    over0List:SetVirtual()
-    over0List.itemRenderer = function(index, obj)
-        local info = data[index + 1]
-        local playerInfo = room:GetPlayerBySeat(info.seat)
-        obj:GetChild('name').text = playerInfo.self_user.nick_name
-        obj:GetChild('residue').text = #info.handCards
-        obj:GetChild('bomb').text = info.thisboomnum
-        obj:GetChild('score').text = info.winscore > 0 and string.format("+%d", info.winscore) or info.winscore
-    end
-    over0List.numItems = #data
-
-    if over == 1 or (not over and #data == 2) then
-        self._view:GetChild('text_roomID').text = room.room_id
-        self._view:GetChild('text_time').text = os.date('%m-%d  %H:%M', os.time())
-        self._view:GetChild('text_groupID').text = room.group_id or 0
-        for i = 1, #data do
-            local info = data[i]
-            local playerInfo = room:GetPlayerBySeat(info.seat)
-            self:FillPlayerInfoEnd(self._view:GetChild(string.format("comp_playerInfo%d_over1", i)), info, playerInfo)
+    self._view:GetChild('btn_nextRound').onClick:Set(function()
+        if self._callback_backReady then
+            self._callback_backReady()
+        else
+            _gamectr:PlayerReady()
         end
-        coroutine.start(function()
-            coroutine.wait(2)
-            self._view:GetController('over').selectedIndex = 1
-        end)
+        self:Destroy()
+    end)
+end
+
+function M:InitBackReady(callback)
+    if callback then
+        self._callback_backReady = callback
     end
 end
 
-function M:FillPlayerInfoEnd(view, info, playerInfo)
-    local room = DataManager.CurrenRoom
-
-    self:FillPlayerHead(view:GetChild('comp_playerInfo'), playerInfo)
-
-    local detailList = view:GetChild('list_detail')
-
-    self:FillDetailChild(detailList:AddItemFromPool(), "单局最高得分", info.settle_log.maxscore)
-    self:FillDetailChild(detailList:AddItemFromPool(), "打出炸弹数", info.settle_log.boomnum)
-    self:FillDetailChild(detailList:AddItemFromPool(), "胜负局数",
-        string.format("%d赢%d输", info.settle_log.winnum, room.room_config.Times - info.settle_log.winnum))
-    self:FillDetailChild(detailList:AddItemFromPool(), "总积分", info.total_score)
-end
-
-function M:FillPlayerHead(view, playerInfo)
-    ImageLoad.Load(playerInfo.self_user.head_url, view:GetChild('btn_head')._iconObject)
-    view:GetChild('text_name').text = playerInfo.self_user.nick_name
-    view:GetChild('text|_ID').text = playerInfo.self_user.account_id
-end
-
-function M:FillDetailChild(view, title, value)
-    view:GetChild('text_title').text = title
-    view:GetChild('text_value').text = value
-end
-
 return M