盟主观战可以查看双方
parent
61fc680b4a
commit
af006a117c
|
|
@ -52,7 +52,6 @@ function M:InitView()
|
|||
end
|
||||
self.lst_player_record.scrollPane.onPullUpRelease:Set(function()
|
||||
self:GetRecordData(self.lst_player_record.numItems, self.qid)
|
||||
|
||||
end)
|
||||
|
||||
self._view:GetChild("btn_search").onClick:Set(function()
|
||||
|
|
@ -75,8 +74,7 @@ function M:InitView()
|
|||
self.qid = 0
|
||||
self.player_record_data = {}
|
||||
self.lst_player_record.numItems = 0
|
||||
self.isFindCode=false
|
||||
|
||||
self.isFindCode = false
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
@ -120,7 +118,7 @@ function M:FillRecordItem(data, obj)
|
|||
local room_id = data.room_id
|
||||
local create_time = data.create_time
|
||||
local room_type_str = data.game_info.name
|
||||
local time =tonumber(create_time)
|
||||
local time = tonumber(create_time)
|
||||
local room_time_str = os.date("%Y-%m-%d %H:%M:%S", time)
|
||||
local totalScore = json.decode(data.totalScore)
|
||||
local hpOnOff = data.hpOnOff
|
||||
|
|
@ -142,18 +140,18 @@ function M:FillRecordItem(data, obj)
|
|||
|
||||
obj:GetChild("tex_time").text = room_time_str
|
||||
obj:GetChild("tex_roomid").text = room_id
|
||||
obj:GetChild("tex_times").text = d2ad(data.hp_times).."倍"
|
||||
obj:GetChild("tex_times").text = d2ad(data.hp_times) .. "倍"
|
||||
obj:GetChild("tex_game").text = play_name
|
||||
local lst_total = obj:GetChild("lst_total")
|
||||
lst_total:RemoveChildrenToPool()
|
||||
local ids = {}
|
||||
for j=1,#totalScore do
|
||||
for j = 1, #totalScore do
|
||||
local titem = lst_total:AddItemFromPool()
|
||||
local trdata = totalScore[j]
|
||||
titem:GetChild("tex_name").text = ViewUtil.stringEllipsis(trdata.nick)
|
||||
titem:GetChild("tex_id").text = trdata.accId and ("ID:"..trdata.accId) or ""
|
||||
titem:GetChild("tex_id").text = trdata.accId and ("ID:" .. trdata.accId) or ""
|
||||
|
||||
table.insert( ids,trdata.accId )
|
||||
table.insert(ids, trdata.accId)
|
||||
local score = trdata.score
|
||||
if trdata.hp == nil then
|
||||
if hpOnOff == 1 and hpType > 1 then
|
||||
|
|
@ -186,17 +184,18 @@ function M:FillRecordItem(data, obj)
|
|||
ShareChatRoom(room_id, tostring(os.time()), data.round, room_type_str, self.group_id, player_list)
|
||||
end)
|
||||
obj.onClick:Set(function()
|
||||
self:OnShowRecordInfo(data,ids)
|
||||
self:OnShowRecordInfo(data, ids)
|
||||
end)
|
||||
end
|
||||
|
||||
function M:OnRenderRecordItem(index, obj)
|
||||
local data = self.record_data[index + 1]
|
||||
data.seat = 2 - (index + 1) % 2
|
||||
self:FillRecordItem(data, obj)
|
||||
end
|
||||
|
||||
function M:OnRenderRecordItem1(index, obj)
|
||||
local data=self.tempRec[index+1]
|
||||
local data = self.tempRec[index + 1]
|
||||
self:FillRecordItem(data, obj)
|
||||
end
|
||||
|
||||
|
|
@ -205,7 +204,6 @@ function M:OnRenderPlayerRecordItem(index, obj)
|
|||
self:FillRecordItem(data, obj)
|
||||
end
|
||||
|
||||
|
||||
function M:GetRecordByRoomid()
|
||||
local qid = self._view:GetChild("tex_id").text
|
||||
ViewUtil.ShowModalWait()
|
||||
|
|
@ -222,7 +220,7 @@ function M:GetRecordByRoomid()
|
|||
ViewUtil.ErrorTip(nil, "没有找到回放")
|
||||
return
|
||||
end
|
||||
self.tempRec=res.Data.rec
|
||||
self.tempRec = res.Data.rec
|
||||
self.lst_record_find.numItems = #res.Data.rec
|
||||
|
||||
self._view:GetController("search").selectedIndex = 1
|
||||
|
|
@ -254,14 +252,14 @@ function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore,
|
|||
item:GetChild("score").text = score
|
||||
if score < 0 then item:GetController("di").selectedIndex = 1 end
|
||||
if p.portrait and p.portrait ~= "" then
|
||||
ImageLoad.Load(p.portrait, item:GetChild("n9")._iconObject, self.class, function( ... )
|
||||
ImageLoad.Load(p.portrait, item:GetChild("n9")._iconObject, self.class, function(...)
|
||||
load_head_num = load_head_num - 1
|
||||
end)
|
||||
else
|
||||
load_head_num = load_head_num - 1
|
||||
end
|
||||
end
|
||||
coroutine.start(function ( ... )
|
||||
coroutine.start(function(...)
|
||||
local left_time = 4
|
||||
while (true) do
|
||||
if load_head_num == 0 or left_time == 0 then
|
||||
|
|
@ -279,7 +277,7 @@ function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore,
|
|||
end)
|
||||
end
|
||||
|
||||
function M:OnShowRecordInfo(rdata,ids)
|
||||
function M:OnShowRecordInfo(rdata, ids)
|
||||
local ctr_record = self._view:GetController("record")
|
||||
ctr_record.selectedIndex = 1
|
||||
|
||||
|
|
@ -292,21 +290,21 @@ function M:OnShowRecordInfo(rdata,ids)
|
|||
local hpOnOff = rdata.hpOnOff
|
||||
local hpType = rdata.game_info.hpType
|
||||
local play_name = DataManager.groups:get(self.group_id):getPlayName(rdata.groupPid)
|
||||
for i = 1,round_count do
|
||||
for i = 1, round_count do
|
||||
local item = lst_recordInfo:AddItemFromPool()
|
||||
item:GetChild("tex_num").text = tostring(i)
|
||||
item:GetChild("tex_game").text = play_name
|
||||
item:GetChild("tex_times").text = d2ad(rdata.hp_times).."倍"
|
||||
item:GetChild("tex_times").text = d2ad(rdata.hp_times) .. "倍"
|
||||
item:GetChild("tex_roomid").text = rdata.room_id
|
||||
local round_score_str = rdata["round_"..i]
|
||||
local round_score_str = rdata["round_" .. i]
|
||||
local round_score_item = json.decode(round_score_str)
|
||||
local lst_total = item:GetChild("lst_total")
|
||||
lst_total:RemoveChildrenToPool()
|
||||
for k=1,#round_score_item do
|
||||
for k = 1, #round_score_item do
|
||||
local titem = lst_total:AddItemFromPool()
|
||||
local trdata = round_score_item[k]
|
||||
titem:GetChild("tex_name").text = ViewUtil.stringEllipsis(trdata.nick)
|
||||
titem:GetChild("tex_id").text = "ID:".. ids[k]
|
||||
titem:GetChild("tex_id").text = "ID:" .. ids[k]
|
||||
local score = trdata.score
|
||||
if trdata.hp == nil then
|
||||
if hpOnOff == 1 and hpType > 1 then
|
||||
|
|
@ -325,7 +323,7 @@ function M:OnShowRecordInfo(rdata,ids)
|
|||
item:GetController("person_num").selectedIndex = 0
|
||||
end
|
||||
|
||||
local btn_play =item:GetChild("btn_play")
|
||||
local btn_play = item:GetChild("btn_play")
|
||||
btn_play.onClick:Set(function()
|
||||
local group = DataManager.groups:get(self.group_id)
|
||||
if DataManager.SelfUser.playback[playback_id] ~= nil and DataManager.SelfUser.playback[playback_id][i] ~= nil then
|
||||
|
|
@ -336,7 +334,7 @@ function M:OnShowRecordInfo(rdata,ids)
|
|||
local extend = ExtendManager.GetExtendConfig(game_id)
|
||||
extend:FillPlayBackData(DataManager.SelfUser.playback[playback_id][i])
|
||||
if not room.self_player then
|
||||
room.self_player = room:GetPlayerBySeat(1)
|
||||
room.self_player = room:GetPlayerBySeat(rdata.seat)
|
||||
end
|
||||
local main = self:GenaratePlayBack(ViewManager.View_PlayBack, game_id)
|
||||
main._currentId = playback_id
|
||||
|
|
@ -349,17 +347,19 @@ function M:OnShowRecordInfo(rdata,ids)
|
|||
_data["military_id"] = playback_id
|
||||
_data["round"] = tostring(i)
|
||||
local loddyCtr1 = ControllerManager.GetController(LoddyController)
|
||||
loddyCtr1:RequestPlayBack(_data,function(code,data)
|
||||
loddyCtr1:RequestPlayBack(_data, function(code, data)
|
||||
ViewUtil.CloseModalWait()
|
||||
if code == 0 then
|
||||
if DataManager.SelfUser.playback[playback_id] ~= nil then
|
||||
DataManager.SelfUser.playback[playback_id][i] = data
|
||||
else
|
||||
local playback_data = {}
|
||||
playback_data[i] = data
|
||||
DataManager.SelfUser.playback[playback_id] = playback_data
|
||||
if group.lev == 1 then
|
||||
DataManager.CurrenRoom.self_player = DataManager.CurrenRoom:GetPlayerBySeat(rdata.seat)
|
||||
end
|
||||
|
||||
-- if DataManager.SelfUser.playback[playback_id] ~= nil then
|
||||
-- DataManager.SelfUser.playback[playback_id][i] = data
|
||||
-- else
|
||||
-- local playback_data = {}
|
||||
-- playback_data[i] = data
|
||||
-- DataManager.SelfUser.playback[playback_id] = playback_data
|
||||
-- end
|
||||
local main = self:GenaratePlayBack(ViewManager.View_PlayBack, game_id)
|
||||
main._currentId = playback_id
|
||||
main._currentRound = i
|
||||
|
|
@ -377,7 +377,7 @@ function M:OnShowRecordInfo(rdata,ids)
|
|||
end
|
||||
|
||||
function M:GenaratePlayBack(id, game_id, ...)
|
||||
local tem =nil
|
||||
local tem = nil
|
||||
local dview_class = nil
|
||||
if not dview_class then
|
||||
local exconfig = ExtendManager.GetExtendConfig(game_id)
|
||||
|
|
@ -386,7 +386,7 @@ function M:GenaratePlayBack(id, game_id, ...)
|
|||
if not dview_class then
|
||||
return
|
||||
end
|
||||
local arg = {...}
|
||||
local arg = { ... }
|
||||
tem = dview_class.new(...)
|
||||
tem.Id = id
|
||||
tem:Show()
|
||||
|
|
|
|||
|
|
@ -308,14 +308,10 @@ function M:CmdBackToLobby()
|
|||
_curren_msg:Show()
|
||||
end
|
||||
|
||||
function M:GetPos(seat,myseat)
|
||||
function M:GetPos(seat, myseat)
|
||||
local my_seat = 1
|
||||
if myseat == nil then
|
||||
for i = 1, #self._room.player_list do
|
||||
if DataManager.SelfUser.account_id == self._room.player_list[i].self_user.account_id then
|
||||
my_seat = self._room.player_list[i].seat
|
||||
end
|
||||
end
|
||||
if not myseat then
|
||||
my_seat = self._room.self_player.seat
|
||||
else
|
||||
my_seat = myseat
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ local EXGameInfo = import(".EXGameInfo")
|
|||
local EXMainView = import(".EXMainView")
|
||||
local EXGameController = import(".EXGameController")
|
||||
local EXRoomConfig = import(".EXRoomConfig")
|
||||
local EXPlayBackView =import(".EXPlayBackView")
|
||||
local EXPlayBackView = import(".EXPlayBackView")
|
||||
local MJRoom = require("main.majiang.MJRoom")
|
||||
|
||||
local ExtendConfig = {}
|
||||
|
|
@ -13,8 +13,8 @@ local M = ExtendConfig
|
|||
|
||||
|
||||
function ExtendConfig.new()
|
||||
setmetatable(M, {__index = IExtendConfig})
|
||||
local self = setmetatable({}, {__index = M})
|
||||
setmetatable(M, { __index = IExtendConfig })
|
||||
local self = setmetatable({}, { __index = M })
|
||||
self.class = "ExtendConfig"
|
||||
self.extend_id = 22
|
||||
self._viewMap = {}
|
||||
|
|
@ -55,7 +55,7 @@ function M:NewRoom()
|
|||
return MJRoom.new()
|
||||
end
|
||||
|
||||
function M:FillRoomConfig(room,_config)
|
||||
function M:FillRoomConfig(room, _config)
|
||||
room.room_config = EXRoomConfig.new(_config)
|
||||
end
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ function M:FillRoomData(s2croom)
|
|||
room.curren_outcard_seat = _reloadInfo["curren_outcard_seat"]
|
||||
room.last_outcard_seat = last_outcard_seat
|
||||
room.playing = playing
|
||||
for i=1,#_info_list do
|
||||
for i = 1, #_info_list do
|
||||
local tem = _info_list[i]
|
||||
local playerid = tem["playerid"]
|
||||
local p = room:GetPlayerById(playerid)
|
||||
|
|
@ -98,12 +98,12 @@ function M:FillRoomData(s2croom)
|
|||
p.hand_left_count = tem["card_count"]
|
||||
p.piao_niao = tem["piao_niao"] or 0
|
||||
local opcard = tem["opcard"]
|
||||
for k=1,#opcard do
|
||||
for k = 1, #opcard do
|
||||
local op = opcard[k]
|
||||
local fz = {}
|
||||
fz.type = op["type"]
|
||||
fz.card = op["card"]
|
||||
p.fz_list[#p.fz_list+1] = fz
|
||||
p.fz_list[#p.fz_list + 1] = fz
|
||||
end
|
||||
if not playing and room.curren_round > 0 then
|
||||
self.GetGameController():PlayerReady()
|
||||
|
|
@ -128,7 +128,8 @@ function M:FillPlayBackData(pd_data)
|
|||
room.curren_round = _tableInfo["round"]
|
||||
|
||||
local _info_list = _tableInfo["playerData"]
|
||||
for i = 1,#_info_list do
|
||||
|
||||
for i = 1, #_info_list do
|
||||
local _jp = _info_list[i]
|
||||
local p = room:NewPlayer()
|
||||
p.seat = _jp["seat"]
|
||||
|
|
@ -164,6 +165,7 @@ function M:FillPlayBackData(pd_data)
|
|||
|
||||
room:AddPlayer(p)
|
||||
end
|
||||
|
||||
room.cmdList = pd_data["cmdList"]
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ local ExtendConfig = {}
|
|||
local M = ExtendConfig
|
||||
|
||||
function ExtendConfig.new()
|
||||
setmetatable(M, {__index = IExtendConfig})
|
||||
local self = setmetatable({}, {__index = M})
|
||||
setmetatable(M, { __index = IExtendConfig })
|
||||
local self = setmetatable({}, { __index = M })
|
||||
self.class = 'ExtendConfig'
|
||||
self.extend_id = 13
|
||||
self._viewMap = {}
|
||||
|
|
|
|||
|
|
@ -2,22 +2,22 @@ local MJPlayerCardInfoView = import(".MJPlayerCardInfoView")
|
|||
local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
|
||||
local TableBG = import('Game.Data.TableBG')
|
||||
|
||||
---
|
||||
---
|
||||
local M = {}
|
||||
|
||||
setmetatable(M,{__index = PlayBackView})
|
||||
setmetatable(M, { __index = PlayBackView })
|
||||
|
||||
local bg_config = {
|
||||
{id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01"}
|
||||
{ id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" }
|
||||
}
|
||||
function M:InitView(url)
|
||||
UIPackage.AddPackage("base/main_majiang/ui/Main_Majiang")
|
||||
PlayBackView.InitView(self,url)
|
||||
PlayBackView.InitView(self, url)
|
||||
local _view = self._view
|
||||
self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
|
||||
TableBG.LoadTableBG(1, nil, self._root_view,bg_config)
|
||||
TableBG.LoadTableBG(1, nil, self._root_view, bg_config)
|
||||
|
||||
UpdateBeat:Add(self.OnUpdate,self)
|
||||
UpdateBeat:Add(self.OnUpdate, self)
|
||||
end
|
||||
|
||||
function M:FillRoomData()
|
||||
|
|
@ -27,13 +27,13 @@ function M:FillRoomData()
|
|||
local _player_card_info = self._player_card_info
|
||||
for i = 1, _room.room_config.people_num do
|
||||
local tem = self._view:GetChild("player_card_info" .. i)
|
||||
_player_card_info[i] = self:NewMJPlayerCardInfoView(tem,i)
|
||||
_player_card_info[i] = self:NewMJPlayerCardInfoView(tem, i)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
local list = _room.player_list
|
||||
for i=1,#list do
|
||||
for i = 1, #list do
|
||||
local p = list[i]
|
||||
local info = self._player_card_info[self:GetPos(p.seat)]
|
||||
info:SetPlayer(p)
|
||||
|
|
@ -42,7 +42,7 @@ function M:FillRoomData()
|
|||
self:SetCardBoxPosition()
|
||||
|
||||
local list = _room.player_list
|
||||
for i=1,#list do
|
||||
for i = 1, #list do
|
||||
local p = list[i]
|
||||
local info = self._player_info[self:GetPos(p.seat)]
|
||||
info._view.visible = true
|
||||
|
|
@ -53,15 +53,15 @@ end
|
|||
function M:SetCardBoxPosition()
|
||||
local _room = self._room
|
||||
for i = 1, _room.room_config.people_num do
|
||||
local tex = self._view:GetChild("cardbox"):GetChild("direction"..i)
|
||||
local tex = self._view:GetChild("cardbox"):GetChild("direction" .. i)
|
||||
local index = _room.self_player.seat + i - 1
|
||||
index = index > 4 and index - 4 or index
|
||||
tex.text = self._gamectr:GetPosString(index)
|
||||
end
|
||||
end
|
||||
|
||||
function M:NewMJPlayerCardInfoView(view,index)
|
||||
return MJPlayerCardInfoView.new(view,self)
|
||||
function M:NewMJPlayerCardInfoView(view, index)
|
||||
return MJPlayerCardInfoView.new(view, self)
|
||||
end
|
||||
|
||||
function M:NextRecordPlay()
|
||||
|
|
@ -110,7 +110,8 @@ end
|
|||
function M:ChangeTextSpeed()
|
||||
local str1 = self._play and self._speed or ""
|
||||
self._view:GetChild("panel_record"):GetChild("tex_speed").text = str1
|
||||
local str2 = not self._play and (self._playFoward and "播放暂停" or "回退暂停") or self._playFoward and (self._speed == 1 and "播放" or "快进") or (self._speed == 1 and "回退" or "快退")
|
||||
local str2 = not self._play and (self._playFoward and "播放暂停" or "回退暂停") or
|
||||
self._playFoward and (self._speed == 1 and "播放" or "快进") or (self._speed == 1 and "回退" or "快退")
|
||||
self._view:GetChild("panel_record"):GetChild("tex_2").text = str2
|
||||
local str3 = self._play and "倍速度" or ""
|
||||
self._view:GetChild("panel_record"):GetChild("tex_1").text = str3
|
||||
|
|
@ -154,11 +155,11 @@ function M:OnUpdate()
|
|||
if self._play then
|
||||
if (self._currentStep == #self.cmdList and self._playFoward) then
|
||||
self:ChangePlayState(false)
|
||||
ViewUtil.ErrorTip(nil,"当前已是录像结尾了，再次点击播放按钮可重新播放")
|
||||
ViewUtil.ErrorTip(nil, "当前已是录像结尾了，再次点击播放按钮可重新播放")
|
||||
return
|
||||
elseif (self._currentStep == 0 and not self._playFoward) then
|
||||
self:ChangePlayState(false)
|
||||
ViewUtil.ErrorTip(nil,"当前已是录像开头了，再次点击播放按钮可重新播放")
|
||||
ViewUtil.ErrorTip(nil, "当前已是录像开头了，再次点击播放按钮可重新播放")
|
||||
return
|
||||
end
|
||||
self._timer = self._timer + Time.deltaTime
|
||||
|
|
@ -184,7 +185,7 @@ end
|
|||
|
||||
function M:Destroy()
|
||||
if self._cursor then self._cursor:Dispose() end
|
||||
UpdateBeat:Remove(self.OnUpdate,self)
|
||||
UpdateBeat:Remove(self.OnUpdate, self)
|
||||
PlayBackView.Destroy(self)
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue