diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 94f03f10..a4602b54 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1568,3 +1568,12 @@ function M:FG_Reset_Lock(group_id, tagId, flag, callback) callback(res) end) end + +function M:FG_Get_Partner(group_id, callback) + local _client = ControllerManager.GroupClient + local _data = {} + _data.id = group_id + _client:send(Protocol.WEB_GROUP_GET_PARTNER, _data, function(res) + callback(res) + end) +end diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index 1a0a3b84..a1ff8a69 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -358,6 +358,9 @@ Protocol = { --群主解除绑定 WEB_GROUP_RESET_LOCK = "group/group_reset_lock", + --获取自己所有下级成员 + WEB_GROUP_GET_PARTNER = "group/get_partner", + -------------- group-mgr -------------------- -- 进入圈子 FGMGR_ENTER_GROUP = "11001", diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupManagerStagView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupManagerStagView.lua index c40a0779..eb1d7524 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupManagerStagView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupManagerStagView.lua @@ -7,167 +7,75 @@ function GroupManagerStagView.new(root) setmetatable(M, { __index = root }) local self = setmetatable({}, { __index = M }) self.class = "GroupManagerStagView" - self:Init() - -- self:InitInfo() - return self end function M:Init() self._viewList_partner = self._view:GetChild('lst_partner') - self._data_choosePlayer = { uid = DataManager.SelfUser.account_id, nick = DataManager.SelfUser.nick_name } + self._viewList_partner:SetVirtual() + self._viewList_partner.itemRenderer = handler(self, self.PartnerRender) + self._viewList_partner.onClickItem:Set(handler(self, self.PartnerClick)) + self._data_Players = {} --将外面设置为最外圈页面 self.ctr_index.selectedIndex = #self.page_config + self._view:GetChild('btn_showAll').onClick:Set(handler(self,self.ClickShowAll)) +end + +function M:ClickShowAll() + self.ctr_index.selectedIndex = #self.page_config + local data = self._data_Players[self._viewList_partner.selectedIndex + 1] + self._view_map[#self.page_config + 1]:RefrenRecordData(data) end function M:InitInfo() - self._map_members = {} - self._viewList_partner:RemoveChildren() - local obj = self._viewList_partner:AddItemFromPool() self._ctr_tongji.selectedIndex = 1 - self:PartnerRender( - { uid = DataManager.SelfUser.account_id, nick = DataManager.SelfUser.nick_name }, obj) - -- obj:GetController('show').selectedIndex = 1 - obj.data.selected = true - ViewUtil.ShowModalWait(true, "正在获取成员中", 0.01) - self:RecursionGetNumber1(0, DataManager.SelfUser.account_id, {}) - --将外面设置为最外圈页面20.536 + self:RecursionGetNumber1() self.ctr_index.selectedIndex = #self.page_config - self._data_selectedData = obj end -function M:SetRecursionGetNumber1Info(id, tempTable) - local me = self._map_members[id] - me.data.listInfo = tempTable - me.data.listNum = #tempTable - me.data.childNum = #tempTable - for i = 1, #tempTable do - local obj = me.data.list:AddItemFromPool() - self:PartnerRender(tempTable[i], obj) +function M:PartnerClick(context) + if self.ctr_index.selectedIndex ~= #self.page_config then + self.ctr_index.selectedIndex = #self.page_config end - self:RecursionReSize(me) - self:RecursionSetScrollPannel(me, 0) + local data = self._data_Players[context.sender.selectedIndex + 1] + self._view_map[#self.page_config + 1]:RefrenRecordData(data) end -function M:PartnerRender(data, obj) +function M:PartnerRender(index, obj) + local data = self._data_Players[index + 1] obj:GetChild('text_name').text = string.format("%d", data.uid) obj:GetChild('text_id').text = data.nick - obj:GetChild('text_name1').text = string.format("%d", data.uid) - obj:GetChild('text_id1').text = data.nick - obj:GetChild('text_lev').text = data.partnerLev and data.partnerLev + 1 or 1 - obj:GetController('show').selectedIndex = data.partnerLev and 1 or 0 - obj:GetController('isLine').selectedIndex = 1 - obj.data = {} - obj.data.list = obj:GetChild('list') - obj.data.info = data - self._map_members[data.uid] = obj - obj.onClick:Set(function() - if obj.data.info.uid == DataManager.SelfUser.account_id then - if obj.data.info.uid ~= self._data_selectedData.data.info.uid then - self:RecursionReSize(self._data_selectedData, -1, true, obj.data.info.uid) - end - else - if obj.data.info.parentId and obj.data.info.parentId ~= 0 then - if obj.data.info.parentId ~= self._data_selectedData.data.info.uid then - self:RecursionReSize(self._data_selectedData, -1, true, obj.data.info.parentId) - end - local father = self._map_members[obj.data.info.parentId] - for i = 1, father.data.listNum do - father.data.list:GetChildAt(i - 1):GetController('isLine').selectedIndex = 0 - end - obj:GetController('isLine').selectedIndex = 1 - end - end - - -- if obj.data.selected then - -- self:RecursionReSize(self._data_selectedData, -1, true, obj.data.info.uid) - -- self:RecursionSetScrollPannel(obj, 0) - -- else - self._data_choosePlayer = data - if obj.data.listNum then - self:RecursionReSize(obj) - self:RecursionSetScrollPannel(obj, 0) - else - ViewUtil.ShowModalWait(true, "正在获取成员中", 0.01) - self:RecursionGetNumber1(0, data.uid, {}) - end - -- end - if self.ctr_index.selectedIndex == #self.page_config then - self._view_map[#self.page_config + 1]:RefrenRecordData(data) - else - self.ctr_index.selectedIndex = #self.page_config - end - obj.data.selected = true - self._data_selectedData = obj - -- self._ctr_tongji.selectedIndex = 1 - end) end -function M:RecursionReSize(obj, add, flag, tagFather) - --如果把小箭头取消选择状态 - if not add then - for i = 1, obj.data.listNum do - obj.data.list:GetChildAt(i - 1):GetController('isLine').selectedIndex = 1 - end - elseif add == -1 then - obj.data.selected = false - for i = 1, obj.data.listNum do - obj.data.list:GetChildAt(i - 1):GetController('isLine').selectedIndex = 0 - end - elseif add == 0 then - for i = 1, obj.data.listNum do - obj.data.list:GetChildAt(i - 1):GetController('isLine').selectedIndex = 0 - end - end - --递归把列表缩回 - obj.data.list:ResizeToFit(flag and 0 or obj.data.childNum) - if obj.data.info.parentId and obj.data.info.parentId ~= 0 then - if tagFather and obj.data.info.parentId == tagFather then - return - end - local father = self._map_members[obj.data.info.parentId] - father.data.childNum = father.data.childNum + obj.data.childNum * (add or 1) - father:GetController('isLine').selectedIndex = 1 - self:RecursionReSize(father, add or 1, flag, tagFather) - end -end - -function M:RecursionSetScrollPannel(obj, scrollIndex) - if obj.data.info.parentId and obj.data.info.parentId ~= 0 then - local father = self._map_members[obj.data.info.parentId] - self:RecursionSetScrollPannel(father, scrollIndex + father.data.list:GetChildIndex(obj) + 1) - else - self._viewList_partner.scrollPane:SetPosY(scrollIndex * 115, true) - end -end - -function M:RecursionGetNumber1(index, id, tempTable) +function M:RecursionGetNumber1() + ViewUtil.ShowModalWait(true, "正在获取成员中", 0.01) local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GroupSubMembers( + fgCtr:FG_Get_Partner( self.group_id, - index * 67, - 67, - id, function(res) if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败') ViewUtil.CloseModalWait() else - local numbers = res.Data.members - - if #numbers == 0 then - self:SetRecursionGetNumber1Info(id, tempTable) - ViewUtil.CloseModalWait() - else - for i = 1, #numbers do - if numbers[i].partnerLev ~= 0 then - table.insert(tempTable, numbers[i]) - end - end - self:RecursionGetNumber1(index + 1, id, tempTable) + self._viewList_partner:RemoveChildren() + self._data_Players = {} + table.insert(self._data_Players, + { uid = DataManager.SelfUser.account_id, nick = DataManager.SelfUser.nick_name, partnerLev = -1 }) + for i, v in ipairs(res.Data.partners) do + table.insert(self._data_Players, v) end + table.sort(self._data_Players, function(a, b) + if a.partnerLev == b.partnerLev then + return a.uid < b.uid + else + return a.partnerLev < b.partnerLev + end + end) + self._viewList_partner.numItems = #self._data_Players + self._viewList_partner.selectedIndex = 0 + self._view_map[#self.page_config + 1]:RefrenRecordData(self._data_Players[1]) end end ) diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua index 2dbcce31..1c4d4bda 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua @@ -68,15 +68,15 @@ function M:init(btn_type) self.page_config = MngPageConfig.Config[btn_type][lev] local gmsv if btn_type == 2 and lev ~= 4 then - --绑定统计代码 - self._child_statView = GroupManagerStagView.new(self) -- 初始界面 --战况是用新界面 local first_page_config = getPageConfig(19) - gmsv = first_page_config.view.new(self.group_id, self._root_view, self._child_statView._data_choosePlayer) + gmsv = first_page_config.view.new(self.group_id, self._root_view) self._view_map = {} self._view_map[#self.page_config + 1] = gmsv gmsv.id = first_page_config.id self._view:GetChild('bgWindow').text = first_page_config.title + --绑定统计代码 + self._child_statView = GroupManagerStagView.new(self) else -- 初始界面 local first_page_config = getPageConfig(self.page_config[1]) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua index 57114635..99a7ed2f 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -175,6 +175,7 @@ function M:FillView() self.tongji:initData() self.tongji:Show() end) + self._view:GetChild('btn_tongji').visible = group.lev < 3 or group.partnerLev > 0 self:GetMemberData(0) end @@ -275,7 +276,7 @@ local function __change_fag(gid, pid, is_add, cur_hp, callback) ) -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str end, - is_add and 1 or 2, + 1, cur_hp and d2ad(cur_hp) or nil ) gniv:Show() diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua index d151b347..86424d2b 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua @@ -7,11 +7,10 @@ local GroupMngPartnerStatView = {} local M = GroupMngPartnerStatView -function GroupMngPartnerStatView.new(gid, rootView, player) +function GroupMngPartnerStatView.new(gid, rootView) local self = M self.class = "GroupMngPartnerStatView" self.group_id = gid - self._data_choosePlayyer = player self:InitView() return self end @@ -25,37 +24,14 @@ function M:initData() 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 - -- print("lingmeng initData") self:GetRecordData(0) - --self:ShowPeopleNum() end --- function M:ShowPeopleNum() --- local fgCtr = ControllerManager.GetController(NewGroupController) --- fgCtr:FG_GetMembersCount(self.group_id,function(res) - --- ViewUtil.CloseModalWait() - --- if res.ReturnCode == 0 then --- self._view:GetChild('tex_memb_num').text = res.Data.member_num --- self._view:GetChild('tex_total_hp').text = d2ad(res.Data.hp_num1+res.Data.otherHp) --- end --- end) --- end - function M:InitView() self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupPartnerStat") - -- if group.lev ~= 3 then - -- self._view:GetController("mng").selectedIndex = 1 - -- end - local group = DataManager.groups:get(self.group_id) local lst_mgr_index = self._view:GetChild("lst_mgr_index") - -- lst_mgr_index.visible = false - -- if group.lev == 1 then - -- lst_mgr_index.visible = true - -- end self.lst_record = self._view:GetChild("lst_record") self.lst_record:SetVirtual() @@ -72,9 +48,6 @@ function M:InitView() self.lst_record_find.itemRenderer = function(index, obj) self:OnRenderRecordItem(index, obj) end - -- self.lst_record.scrollPane.onPullUpRelease:Set(function() - -- 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, function() @@ -101,15 +74,7 @@ function M:InitView() end self:GetRecordData(0) end) - - -- self._view:GetChild("btn_search").onClick:Set(function() - -- self.record_data = {} - -- self.lst_record.numItems = 0 - - -- self.begin_time, self.end_time = self.time_panel:GetDate() - -- self:GetRecordData(0) - -- end) - + -- 搜索玩家 local ctr_search = self._view:GetController('search') self._view:GetChild('btn_search').onClick:Set( @@ -278,55 +243,49 @@ end function M:GetRecordData(index) local group = DataManager.groups:get(self.group_id) - -- pt("lingmeng GetRecordData", self.group_id, self._data_choosePlayyer, group.lev) - -- if group.lev == 1 and self._data_choosePlayyer.uid == DataManager.SelfUser.account_id then - -- self:RecursionGetRankData(0) - -- else - self:GetRecoedData(0, 5) - -- end + -- self:GetRecoedData(0, 5) end function M:RefrenRecordData(data) self._data_choosePlayyer = data local group = DataManager.groups:get(self.group_id) - -- pt("lingmeng GetRecordData2", self.group_id, self._data_choosePlayyer, group.lev) self:GetRecoedData(0, 5) end -function M:RecursionGetRecoedData(index) - ViewUtil.ShowModalWait("正在获取数据中") - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetMemberStat(self.group_id, 0, self._data_choosePlayyer.uid, - index * 67, 67, 3, self.begin_time, self.end_time, 5, - function(res) - if res.ReturnCode == 0 then - local members = res.Data.members - if members and #members > 0 then - for i = 1, #members do - if members[i].round > 0 then - members[i].pump = 0 - members[i].pump - self.record_data[#self.record_data + 1] = members[i] - end - end - self:RecursionGetRecoedData(index + 1) - else - ViewUtil.CloseModalWait() - self.btn_totalRound:GetController("type").selectedIndex = 1 - self.btn_totalWin:GetController("type").selectedIndex = 0 - self.btn_total:GetController("type").selectedIndex = 0 - self.btn_reward:GetController("type").selectedIndex = 0 - -- table.sort(self.record_data, function(a, b) - -- return a.round > b.round - -- end) - self.lst_record.numItems = #self.record_data - end - else - ViewUtil.CloseModalWait() - ViewUtil.ErrorTip(res.ReturnCode) - return - end - end) -end +-- function M:RecursionGetRecoedData(index) +-- ViewUtil.ShowModalWait("正在获取数据中") +-- local fgCtr = ControllerManager.GetController(NewGroupController) +-- fgCtr:FG_GetMemberStat(self.group_id, 0, self._data_choosePlayyer.uid, +-- index * 67, 67, 3, self.begin_time, self.end_time, 5, +-- function(res) +-- if res.ReturnCode == 0 then +-- local members = res.Data.members +-- if members and #members > 0 then +-- for i = 1, #members do +-- if members[i].round > 0 then +-- members[i].pump = 0 - members[i].pump +-- self.record_data[#self.record_data + 1] = members[i] +-- end +-- end +-- self:RecursionGetRecoedData(index + 1) +-- else +-- ViewUtil.CloseModalWait() +-- self.btn_totalRound:GetController("type").selectedIndex = 1 +-- self.btn_totalWin:GetController("type").selectedIndex = 0 +-- self.btn_total:GetController("type").selectedIndex = 0 +-- self.btn_reward:GetController("type").selectedIndex = 0 +-- -- table.sort(self.record_data, function(a, b) +-- -- return a.round > b.round +-- -- end) +-- self.lst_record.numItems = #self.record_data +-- end +-- else +-- ViewUtil.CloseModalWait() +-- ViewUtil.ErrorTip(res.ReturnCode) +-- return +-- end +-- end) +-- end function M:GetRecoedData(index, type) if index == 0 then diff --git a/lua_probject/base_project/Game/View/PlayBackView.lua b/lua_probject/base_project/Game/View/PlayBackView.lua index 3a07d7f7..9409186e 100644 --- a/lua_probject/base_project/Game/View/PlayBackView.lua +++ b/lua_probject/base_project/Game/View/PlayBackView.lua @@ -27,7 +27,8 @@ function M:init() UIPackage.AddPackage('base/chat/ui/Chat') self.cmdList = self._room.cmdList self._eventmap = {} - -- self._full = true + self._full = true + self._full_offset = false self._put_map = false self._new_hide = false self._queue = false diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua index bcbeb37e..7b1c5fb6 100644 --- a/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua @@ -21,7 +21,7 @@ end function M:InitView(url) local room = self._room UIPackage.AddPackage("extend/majiang/hongzhong/ui/Extend_MJ_HongZhong") - MJPlayBackView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num) + MJPlayBackView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num .. "_s2") local _cardbox = self._view:GetChild("cardbox") --self._view:GetChild("panel_record"):GetChild("btn_LastStep").enabled = false self._ctr_cardbox = _cardbox:GetController("c1") @@ -288,8 +288,14 @@ function M:UpdateCardBox(seat) self._ctr_cardbox.selectedIndex = index end -function M:UpdateRound(round) - self._tex_round.text = "第 "..round.."/"..self._room.room_config.round.." 局" +function M:UpdateRound() + local currRD=self._room.curren_round + if self._room.curren_round==0 then + currRD=1 + end + + self._view:GetChild("tex_round1").text = currRD + self._view:GetChild("tex_round2").text = self._room.room_config.round end function M:UpdateStep(step) diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua index 4865ea8c..9be8fd88 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua @@ -17,8 +17,7 @@ local RunFast_Record_Event = { Evt_Pass = 'pass', Evt_NewRound = 'newindex', Evt_result = 'result', - Evt_Result = 'Result', - Evt_Opt = 'prompt' + Evt_Result = 'Result' } local default_bg = 1 @@ -82,8 +81,6 @@ function M:InitView(url) else self._view:GetChild('roominfo_panel1'):GetChild('tex_beishu').text = '' end - self._ctr_inClear = self._view:GetController('Inclear') - self._cardCheck = RunFast_CardCheck:InitFlag() self._gamectr._cardCheck = self._cardCheck @@ -94,7 +91,7 @@ function M:InitView(url) self._cmdmap[RunFast_Record_Event.Evt_Pass] = self.CmdPass self._cmdmap[RunFast_Record_Event.Evt_NewRound] = self.CmdNewRound self._cmdmap[RunFast_Record_Event.Evt_result] = self.Cmdresult - self._cmdmap[RunFast_Record_Event.Evt_Opt] = self.CmdOpt + self._cmdmap[RunFast_Record_Event.Evt_Result] = self.CmdResult end function M:NewPlayerPokerInfoView(view, index) @@ -108,11 +105,10 @@ function M:FillRoomData(data) -- print("hidezhanji 1111") self._currentStep = 1 + DataManager.CurrenRoom.pai = 0 local room = DataManager.CurrenRoom - self._room = DataManager.CurrenRoom local _player_card_info = self._player_card_info local roominfo_panel = self._view:GetChild('roominfo_panel1') - self._room.pai = 0 roominfo_panel:GetChild('tex_roomid').text = data.info.roomid roominfo_panel:GetChild('tex_gametype').text = room.room_config:GetGameName() @@ -129,6 +125,7 @@ function M:FillRoomData(data) if room.hpOnOff == 1 or room:checkHpNonnegative() then head_info._view:GetChild('zhanji').visible = true + head_info._view:GetChild('text_jifen').text = d2ad(p.total_hp) end end head_info:FillData(p) @@ -140,36 +137,10 @@ function M:FillRoomData(data) head_info:UpdatePiao(p.piao) end - self:UpdateRound(self._room.curren_round) + self:UpdateRound() self:GenerateAllStepData(data) self:ShowStep(1) - self:Play() -end - -function M:ChangePlayState(state) - self._play = state - self:ChangeTextSpeed() - local btn_play = self._view:GetChild("panel_record"):GetChild("btn_play") - if self._play then - btn_play:GetController("state").selectedIndex = 1 - else - btn_play:GetController("state").selectedIndex = 0 - end - --开始时，隐藏显示结算界面 - if state then - if self.destory_win ~= nil then - coroutine.stop(self.destory_win) - end - - self.destory_win = nil - if self.result_view then - self.result_view._root_view:RemoveFromParent() - self.result_view:Destroy() - self._ctr_inClear.selectedIndex = 0 - end - self.result_view = nil - end end function M:ShowStep(index) @@ -185,19 +156,13 @@ function M:ShowStep(index) p.out_card_list = step.player_card_data[i].out_card_list p.hand_left_count = #p.hand_list - if step.cmd == RunFast_Record_Event.Evt_Opt and step.seat == p.seat then - info._view:GetController('out_card_option2').selectedIndex = 1 - else - info._view:GetController('out_card_option2').selectedIndex = 0 - end - if p.seat ~= self._room.self_player.seat then info:UpdateHandPoker(p.hand_list, false, true) else info:InitPoker(p.hand_list, false) end - info:SetOutCardInfo(nil, false) end + if step.cmd == RunFast_Record_Event.Evt_OutCard then local seat = step.current_out_seat local p = self._room:GetPlayerBySeat(seat) @@ -230,91 +195,16 @@ function M:ShowStep(index) end end if step.cmd == RunFast_Record_Event.Evt_result then - local data = step.data - local over = 0 - local info = data.win.info - local win_seat = data.win.winseat - local remaincards = {} - -- local energyTab = arg[5] - local otherpoker_list = self._view:GetChild("otherpoker_list") - local card_info = self._player_card_info[self:GetPos(self._room.self_player.seat)] - if self.dismissWin ~= nil then - self.dismissWin:Destroy() - end - self.dismissWin = nil - if self.MypokerList ~= nil then - -- body - card_info:Clear() - card_info:InitPoker(self.MypokerList, false) - self.MypokerList = nil - end - if otherpoker_list ~= nil then - -- body - otherpoker_list:RemoveChildrenToPool() - otherpoker_list.visible = true - end + local result = step.result + for i = 1, #result do + local card_info = self._player_card_info[self:GetPos(result[i].seat)] - if self.destory_win ~= nil then - coroutine.stop(self.destory_win) - end - - self.destory_win = nil - self.destory_win = coroutine.start(function() - if win_seat == self._room.self_player.seat then - ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3") - else - ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/lose_music.mp3") + if result[i].entrust ~= nil and result[i].entrust == true then + local head_info = self._player_info[self:GetPos(result[i].seat)] + head_info:MarkTuoguan() end - coroutine.stop(self._leftClock_continue) - for i = 1, #self._player_card_info do - local card_info = self._player_card_info[i] - card_info._ctr_time_clock.selectedIndex = 0 - self._left_time = 0 - end - - for i = 1, #info do - local player = info[i] - local p = self._room:GetPlayerBySeat(player.seat) - local head_info = self._player_info[self:GetPos(player.seat)] - - end - - coroutine.wait(2) - - self.result_view = RunFast_ResultView.new(self, info, self._room.room_id, over, win_seat, 0, - remaincards) - self.result_view:SetDestroryCallback(function() - for i = 1, #self._player_card_info do - local card_info = self._player_card_info[i] - card_info.ctr_outpoker.selectedIndex = 0 - if card_info._ctr_resultOut then - card_info._ctr_resultOut.selectedIndex = 0 - end - end - end) - self.result_view:Show() - self.result_view._root_view:RemoveFromParent() - self._view:AddChildAt(self.result_view._root_view, - self._view:GetChildIndex(self._view:GetChild('mask_tips')) - 1) - if self.WinItem_view ~= nil then - self.WinItem_view:Dispose() - self.WinItem_view = nil - end - if self.rank_view ~= nil then - self.rank_view:Dispose() - self.rank_view = nil - end - - if self._room.self_player.entrust == true then - local btn_confirm = self.result_view._view:GetChild("btn_confirm") - btn_confirm.onClick:Call() - end - ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3") - end) - if over == 1 then - -- body - self:UnmarkSelfTuoguan() - ControllerManager.ChangeController(LoddyController) + -- head_info:UpdateScore(result[i].score) + card_info:PlayScore(result[i].score, false, step.win_seat == result[i].seat) end end if step.cmd == RunFast_Record_Event.Evt_Result then @@ -324,9 +214,9 @@ function M:ShowStep(index) local num = self._view:GetChildIndex(self._view:GetChild("panel_record")) self._view:AddChildAt(self.result_view._view, num) else - -- if self.result_view then - -- self.result_view:Dispose() - -- end + if self.result_view then + self.result_view:Dispose() + end end end @@ -387,7 +277,8 @@ end function M:Cmdresult(cmd, index) local data = self:CopyLastStep(index) data.cmd = cmd.cmd - data.data = cmd.data + data.result = cmd.data.result + data.win_seat = cmd.seat end function M:CmdResult(cmd, index) @@ -400,12 +291,6 @@ function M:CmdResult(cmd, index) end end -function M:CmdOpt(cmd, index) - local data = self:CopyLastStep(index) - data.cmd = cmd.cmd - data.seat = cmd.seat -end - function M:CopyLastStep(index) local step = {} local last_step = self._step[index] @@ -433,17 +318,9 @@ function M:ClearNextSeatOutCard(currenOutCardSeat) card_info:SetOutCardInfo(nil, false) end -function M:UpdateRound(round) - local total_round = self._room.room_config.Times - -- self._text_round.text = string.format("%d / %d 局", round, total_round) - if not self._text_currenRound then - self._text_currenRound = self._view:GetChild('Text_CurrenRound') - end - if not self._text_maxRound then - self._text_maxRound = self._view:GetChild('Text_MaxMaxRound') - end - self._text_currenRound.text = round - self._text_maxRound.text = string.format("/%s局", total_round) +function M:UpdateRound() + local round = self._room.curren_round + self._tex_round.text = string.format('第 %d 局', round) end function M:NextRecordPlay() @@ -456,10 +333,10 @@ function M:NextRecordPlay() self._speed = 1 self._playFoward = true self:ChangeTextSpeed() - -- if self.result_view then - -- self.result_view:Dispose() - -- self.result_view = nil - -- end + if self.result_view then + self.result_view:Dispose() + self.result_view = nil + end end function M:LastRecordPlay() @@ -471,10 +348,70 @@ function M:LastRecordPlay() self._speed = 1 self._playFoward = true self:ChangeTextSpeed() - -- if self.result_view then - -- self.result_view:Dispose() - -- self.result_view = nil - -- end + if self.result_view then + self.result_view:Dispose() + self.result_view = nil + end +end + +function M:Play() + self:ChangeAlpha() + self:ChangePlayState(not self._play) + if not self._play then + return + end + if (self._currentStep == #self.cmdList and self._playFoward) or (self._currentStep == 0 and not self._playFoward) then + self._currentStep = 0 + self._speed = 1 + self._playFoward = true + self:ChangeTextSpeed() + end +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 '快退') + 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 +end + +function M:CmdLeftArrows() + self:ChangeAlpha() + self:ChangePlayState(true) + if not self._playFoward then + if self._speed < 16 then + self._speed = self._speed * 2 + else + self._speed = 1 + end + self:ChangeTextSpeed() + else + self._speed = 1 + self._playFoward = false + self:ChangeTextSpeed() + end +end + +function M:CmdRightArrows() + self:ChangeAlpha() + self:ChangePlayState(true) + if self._playFoward then + if self._speed < 16 then + self._speed = self._speed * 2 + else + self._speed = 1 + end + self:ChangeTextSpeed() + else + self._speed = 1 + self._playFoward = true + self:ChangeTextSpeed() + end end function M:_Effect(type1, player) diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index e078dbbb..85f03107 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index f8239774..8d46756e 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png index 83b76b2d..7a8cce42 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png index 15f2dbf8..e921c960 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png index bc07b6f1..4416f295 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png index 0fd687a2..cef6e1ef 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes index 2721be6a..bd66e581 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png index 264250a7..743eac91 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png index 97e3cd5a..c1042649 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png index 998d2e45..96794687 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png index 24dfac85..17776330 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png index c1441f57..4077b487 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png index 64132595..21dde2c5 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png index cab171e9..8df0760c 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png index 7e76fd6b..70b3e020 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes index 0b6704df..4e9249b3 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes differ diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info b/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info index a8d6d570..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n47_kx91": { - "hidden": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info index a7e00e81..73dae4d0 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info @@ -12,16 +12,9 @@ "n131_ckvb": { "hidden": true }, - "n164_ukp7": { - "locked": true, - "collapsed": true - }, "n166_ukp7": { "hidden": true }, - "n163_ukp7": { - "collapsed": true - }, "n93_eclw": { "collapsed": true } diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnnx.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnnx.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnnx.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info index 356491bf..ab040c86 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info @@ -2,9 +2,6 @@ "objectStatus": { "n44_rpaz": { "collapsed": true - }, - "n47_rpaz": { - "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info b/wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info index 0a8f2d3a..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info +++ b/wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n8_yvb2": { - "locked": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info index dbca27a5..905f684a 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info @@ -1,33 +1,39 @@ { "objectStatus": { - "n33_rpaz": { + "n46_tqi8": { + "collapsed": true + }, + "n142_ufim": { "hidden": true }, "n91_task": { "hidden": true }, - "n142_ufim": { + "n51_jd7v": { "hidden": true }, "n86_t1hq": { "hidden": true }, - "n113_csp4": { + "n33_rpaz": { + "hidden": true + }, + "n112_csp4": { + "hidden": true + }, + "n86_t1hq": { + "hidden": true + }, + "n89_t1hq": { + "collapsed": true + }, + "n69_jd7v": { "hidden": true }, "n85_t1hq": { "hidden": true }, - "n35_rpaz": { - "hidden": true - }, - "n51_jd7v": { - "hidden": true - }, - "n69_jd7v": { - "hidden": true - }, - "n112_csp4": { + "n113_csp4": { "hidden": true } }, diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info index 562e1348..0be45267 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info @@ -3,14 +3,14 @@ "n85_l2u4": { "collapsed": true }, - "n108_go7q": { - "hidden": true - }, "n107_go7q": { "hidden": true }, - "n82_l2u4": { - "collapsed": true + "n108_go7q": { + "hidden": true + }, + "n59_v38k": { + "locked": true } } } \ No newline at end of file diff --git a/wb_new_ui/assets/Common/component/Win_BaseWindow.xml b/wb_new_ui/assets/Common/component/Win_BaseWindow.xml index 1b7d955a..44563f62 100644 --- a/wb_new_ui/assets/Common/component/Win_BaseWindow.xml +++ b/wb_new_ui/assets/Common/component/Win_BaseWindow.xml @@ -1,18 +1,18 @@ - + - + - + diff --git a/wb_new_ui/assets/Common/font/fontTitle/0 - 登.png b/wb_new_ui/assets/Common/font/fontTitle/0 - 登.png index 158bfd7e..a2cf1fe9 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/0 - 登.png and b/wb_new_ui/assets/Common/font/fontTitle/0 - 登.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/1 - 录.png b/wb_new_ui/assets/Common/font/fontTitle/1 - 录.png index 9130a01b..679b4389 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/1 - 录.png and b/wb_new_ui/assets/Common/font/fontTitle/1 - 录.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/10 - 战.png b/wb_new_ui/assets/Common/font/fontTitle/10 - 战.png index d30dd06c..9c26f2c3 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/10 - 战.png and b/wb_new_ui/assets/Common/font/fontTitle/10 - 战.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/11 - 况.png b/wb_new_ui/assets/Common/font/fontTitle/11 - 况.png index f65e56c1..3fc1e9e6 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/11 - 况.png and b/wb_new_ui/assets/Common/font/fontTitle/11 - 况.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/12 - 群.png b/wb_new_ui/assets/Common/font/fontTitle/12 - 群.png index 7bace172..0951d866 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/12 - 群.png and b/wb_new_ui/assets/Common/font/fontTitle/12 - 群.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/13 - 统.png b/wb_new_ui/assets/Common/font/fontTitle/13 - 统.png index 3e1e8cb4..78c31435 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/13 - 统.png and b/wb_new_ui/assets/Common/font/fontTitle/13 - 统.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/14 - 计.png b/wb_new_ui/assets/Common/font/fontTitle/14 - 计.png index e0a454d7..8f6b9027 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/14 - 计.png and b/wb_new_ui/assets/Common/font/fontTitle/14 - 计.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/15 - 操.png b/wb_new_ui/assets/Common/font/fontTitle/15 - 操.png index b0f68618..380cc685 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/15 - 操.png and b/wb_new_ui/assets/Common/font/fontTitle/15 - 操.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/16 - 作.png b/wb_new_ui/assets/Common/font/fontTitle/16 - 作.png index fdd10d68..41dbfc27 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/16 - 作.png and b/wb_new_ui/assets/Common/font/fontTitle/16 - 作.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/17 - 设.png b/wb_new_ui/assets/Common/font/fontTitle/17 - 设.png index 3c6c323e..74bdf677 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/17 - 设.png and b/wb_new_ui/assets/Common/font/fontTitle/17 - 设.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/18 - 置.png b/wb_new_ui/assets/Common/font/fontTitle/18 - 置.png index 268b8f40..0e91e530 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/18 - 置.png and b/wb_new_ui/assets/Common/font/fontTitle/18 - 置.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/19 - 房.png b/wb_new_ui/assets/Common/font/fontTitle/19 - 房.png index 9c8f0f6b..a045238f 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/19 - 房.png and b/wb_new_ui/assets/Common/font/fontTitle/19 - 房.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/2 - 疲.png b/wb_new_ui/assets/Common/font/fontTitle/2 - 疲.png index 370bb189..788f1d97 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/2 - 疲.png and b/wb_new_ui/assets/Common/font/fontTitle/2 - 疲.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/20 - 间.png b/wb_new_ui/assets/Common/font/fontTitle/20 - 间.png index 091205ef..074645ec 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/20 - 间.png and b/wb_new_ui/assets/Common/font/fontTitle/20 - 间.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/21 - 玩.png b/wb_new_ui/assets/Common/font/fontTitle/21 - 玩.png index 60eab18a..a58e357d 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/21 - 玩.png and b/wb_new_ui/assets/Common/font/fontTitle/21 - 玩.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/22 - 法.png b/wb_new_ui/assets/Common/font/fontTitle/22 - 法.png index bce94c88..be0cfd49 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/22 - 法.png and b/wb_new_ui/assets/Common/font/fontTitle/22 - 法.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/23 - 日.png b/wb_new_ui/assets/Common/font/fontTitle/23 - 日.png index 9ab37af8..13e1aab4 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/23 - 日.png and b/wb_new_ui/assets/Common/font/fontTitle/23 - 日.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/24 - 期.png b/wb_new_ui/assets/Common/font/fontTitle/24 - 期.png index f34ce007..0bd4ed32 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/24 - 期.png and b/wb_new_ui/assets/Common/font/fontTitle/24 - 期.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/25 - 修.png b/wb_new_ui/assets/Common/font/fontTitle/25 - 修.png index ca6cc2af..e9b5aa4b 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/25 - 修.png and b/wb_new_ui/assets/Common/font/fontTitle/25 - 修.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/26 - 改.png b/wb_new_ui/assets/Common/font/fontTitle/26 - 改.png index a8af70db..952e83d0 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/26 - 改.png and b/wb_new_ui/assets/Common/font/fontTitle/26 - 改.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/27 - 密.png b/wb_new_ui/assets/Common/font/fontTitle/27 - 密.png index 40bd9e99..74560cb8 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/27 - 密.png and b/wb_new_ui/assets/Common/font/fontTitle/27 - 密.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/28 - 码.png b/wb_new_ui/assets/Common/font/fontTitle/28 - 码.png index e7b336fe..0e91dce9 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/28 - 码.png and b/wb_new_ui/assets/Common/font/fontTitle/28 - 码.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/29 - 消.png b/wb_new_ui/assets/Common/font/fontTitle/29 - 消.png index 0b2f73a7..36ef7399 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/29 - 消.png and b/wb_new_ui/assets/Common/font/fontTitle/29 - 消.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/3 - 劳.png b/wb_new_ui/assets/Common/font/fontTitle/3 - 劳.png index 45dbd49f..759b9f7a 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/3 - 劳.png and b/wb_new_ui/assets/Common/font/fontTitle/3 - 劳.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/30 - 息.png b/wb_new_ui/assets/Common/font/fontTitle/30 - 息.png index fc1a8f37..cbf62c72 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/30 - 息.png and b/wb_new_ui/assets/Common/font/fontTitle/30 - 息.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/31 - 门.png b/wb_new_ui/assets/Common/font/fontTitle/31 - 门.png index d6267c92..1567b86c 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/31 - 门.png and b/wb_new_ui/assets/Common/font/fontTitle/31 - 门.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/32 - 槛.png b/wb_new_ui/assets/Common/font/fontTitle/32 - 槛.png index 9e54cdd8..1bfad916 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/32 - 槛.png and b/wb_new_ui/assets/Common/font/fontTitle/32 - 槛.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/33 - 个.png b/wb_new_ui/assets/Common/font/fontTitle/33 - 个.png index f7ff20b8..4a6cbfbf 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/33 - 个.png and b/wb_new_ui/assets/Common/font/fontTitle/33 - 个.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/34 - 人.png b/wb_new_ui/assets/Common/font/fontTitle/34 - 人.png index f7ddba91..8f607c14 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/34 - 人.png and b/wb_new_ui/assets/Common/font/fontTitle/34 - 人.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/35 - 信.png b/wb_new_ui/assets/Common/font/fontTitle/35 - 信.png index b2091127..21d1e2eb 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/35 - 信.png and b/wb_new_ui/assets/Common/font/fontTitle/35 - 信.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/36 - 邀.png b/wb_new_ui/assets/Common/font/fontTitle/36 - 邀.png index be300bd3..8f5adcfd 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/36 - 邀.png and b/wb_new_ui/assets/Common/font/fontTitle/36 - 邀.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/37 - 请.png b/wb_new_ui/assets/Common/font/fontTitle/37 - 请.png index d754b5ea..f720d461 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/37 - 请.png and b/wb_new_ui/assets/Common/font/fontTitle/37 - 请.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/38 - 保.png b/wb_new_ui/assets/Common/font/fontTitle/38 - 保.png index 7fe120cc..150025e1 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/38 - 保.png and b/wb_new_ui/assets/Common/font/fontTitle/38 - 保.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/39 - 险.png b/wb_new_ui/assets/Common/font/fontTitle/39 - 险.png index 8ba000f8..97a902fb 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/39 - 险.png and b/wb_new_ui/assets/Common/font/fontTitle/39 - 险.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/4 - 值.png b/wb_new_ui/assets/Common/font/fontTitle/4 - 值.png index fb6323ea..44286ce5 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/4 - 值.png and b/wb_new_ui/assets/Common/font/fontTitle/4 - 值.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/40 - 箱.png b/wb_new_ui/assets/Common/font/fontTitle/40 - 箱.png index c20a2297..125f7074 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/40 - 箱.png and b/wb_new_ui/assets/Common/font/fontTitle/40 - 箱.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/41 - 积.png b/wb_new_ui/assets/Common/font/fontTitle/41 - 积.png index 84c9f183..d0fda95b 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/41 - 积.png and b/wb_new_ui/assets/Common/font/fontTitle/41 - 积.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/42 - 分.png b/wb_new_ui/assets/Common/font/fontTitle/42 - 分.png index 6a41a862..d43c1b6e 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/42 - 分.png and b/wb_new_ui/assets/Common/font/fontTitle/42 - 分.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/43 - 收.png b/wb_new_ui/assets/Common/font/fontTitle/43 - 收.png index 979135e6..615fd3d9 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/43 - 收.png and b/wb_new_ui/assets/Common/font/fontTitle/43 - 收.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/44 - 益.png b/wb_new_ui/assets/Common/font/fontTitle/44 - 益.png index a48fd6c9..d7250be6 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/44 - 益.png and b/wb_new_ui/assets/Common/font/fontTitle/44 - 益.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/45 - 红.png b/wb_new_ui/assets/Common/font/fontTitle/45 - 红.png index b5481f62..9b4f3eba 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/45 - 红.png and b/wb_new_ui/assets/Common/font/fontTitle/45 - 红.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/46 - 中.png b/wb_new_ui/assets/Common/font/fontTitle/46 - 中.png index b28937ad..146d2c1f 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/46 - 中.png and b/wb_new_ui/assets/Common/font/fontTitle/46 - 中.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/47 - 转.png b/wb_new_ui/assets/Common/font/fontTitle/47 - 转.png index 9a95ef4a..b4ad9b4f 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/47 - 转.png and b/wb_new_ui/assets/Common/font/fontTitle/47 - 转.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/48 - 麻.png b/wb_new_ui/assets/Common/font/fontTitle/48 - 麻.png index 60ad4e86..d48f4795 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/48 - 麻.png and b/wb_new_ui/assets/Common/font/fontTitle/48 - 麻.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/49 - 将.png b/wb_new_ui/assets/Common/font/fontTitle/49 - 将.png index fe3deca8..4471e709 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/49 - 将.png and b/wb_new_ui/assets/Common/font/fontTitle/49 - 将.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/5 - 成.png b/wb_new_ui/assets/Common/font/fontTitle/5 - 成.png index 9d270aa6..1b97e79d 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/5 - 成.png and b/wb_new_ui/assets/Common/font/fontTitle/5 - 成.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/50 - 跑.png b/wb_new_ui/assets/Common/font/fontTitle/50 - 跑.png index cb9ed749..27470652 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/50 - 跑.png and b/wb_new_ui/assets/Common/font/fontTitle/50 - 跑.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/51 - 得.png b/wb_new_ui/assets/Common/font/fontTitle/51 - 得.png index 25a76c96..e77917e4 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/51 - 得.png and b/wb_new_ui/assets/Common/font/fontTitle/51 - 得.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/52 - 快.png b/wb_new_ui/assets/Common/font/fontTitle/52 - 快.png index 8735b5f6..ef816977 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/52 - 快.png and b/wb_new_ui/assets/Common/font/fontTitle/52 - 快.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/53 - 放.png b/wb_new_ui/assets/Common/font/fontTitle/53 - 放.png index 79525317..200e214d 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/53 - 放.png and b/wb_new_ui/assets/Common/font/fontTitle/53 - 放.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/54 - 炮.png b/wb_new_ui/assets/Common/font/fontTitle/54 - 炮.png index 45115377..ba7d766f 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/54 - 炮.png and b/wb_new_ui/assets/Common/font/fontTitle/54 - 炮.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/55 - 罚.png b/wb_new_ui/assets/Common/font/fontTitle/55 - 罚.png index ba5a3efb..4cf896db 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/55 - 罚.png and b/wb_new_ui/assets/Common/font/fontTitle/55 - 罚.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/56 - 提.png b/wb_new_ui/assets/Common/font/fontTitle/56 - 提.png index 219e6e86..ea60a671 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/56 - 提.png and b/wb_new_ui/assets/Common/font/fontTitle/56 - 提.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/57 - 示.png b/wb_new_ui/assets/Common/font/fontTitle/57 - 示.png index 157d4785..30c70bdc 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/57 - 示.png and b/wb_new_ui/assets/Common/font/fontTitle/57 - 示.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/58 - 下.png b/wb_new_ui/assets/Common/font/fontTitle/58 - 下.png index a0e8e605..3fd395c7 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/58 - 下.png and b/wb_new_ui/assets/Common/font/fontTitle/58 - 下.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/59 - 级.png b/wb_new_ui/assets/Common/font/fontTitle/59 - 级.png index 56880bec..21ecefbd 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/59 - 级.png and b/wb_new_ui/assets/Common/font/fontTitle/59 - 级.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/6 - 员.png b/wb_new_ui/assets/Common/font/fontTitle/6 - 员.png index bd785794..cb746928 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/6 - 员.png and b/wb_new_ui/assets/Common/font/fontTitle/6 - 员.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/60 - 赠.png b/wb_new_ui/assets/Common/font/fontTitle/60 - 赠.png index 53ed1d19..f0962a1e 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/60 - 赠.png and b/wb_new_ui/assets/Common/font/fontTitle/60 - 赠.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/61 - 送.png b/wb_new_ui/assets/Common/font/fontTitle/61 - 送.png index 73d1ee6f..1b67920f 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/61 - 送.png and b/wb_new_ui/assets/Common/font/fontTitle/61 - 送.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/62 - 失.png b/wb_new_ui/assets/Common/font/fontTitle/62 - 失.png index 1aef6a21..15fed304 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/62 - 失.png and b/wb_new_ui/assets/Common/font/fontTitle/62 - 失.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/63 - 败.png b/wb_new_ui/assets/Common/font/fontTitle/63 - 败.png index ea6d57d4..42ae9f21 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/63 - 败.png and b/wb_new_ui/assets/Common/font/fontTitle/63 - 败.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/64 - 胜.png b/wb_new_ui/assets/Common/font/fontTitle/64 - 胜.png index 531626f3..95c15495 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/64 - 胜.png and b/wb_new_ui/assets/Common/font/fontTitle/64 - 胜.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/65 - 利.png b/wb_new_ui/assets/Common/font/fontTitle/65 - 利.png index 5ed37dd0..d2f3b8a5 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/65 - 利.png and b/wb_new_ui/assets/Common/font/fontTitle/65 - 利.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/66 - 解.png b/wb_new_ui/assets/Common/font/fontTitle/66 - 解.png index 11b847de..7865bab7 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/66 - 解.png and b/wb_new_ui/assets/Common/font/fontTitle/66 - 解.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/67 - 散.png b/wb_new_ui/assets/Common/font/fontTitle/67 - 散.png index fb9eecc9..daeca3d0 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/67 - 散.png and b/wb_new_ui/assets/Common/font/fontTitle/67 - 散.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/68 - 再.png b/wb_new_ui/assets/Common/font/fontTitle/68 - 再.png index 41ab3265..6d02cc26 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/68 - 再.png and b/wb_new_ui/assets/Common/font/fontTitle/68 - 再.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/69 - 接.png b/wb_new_ui/assets/Common/font/fontTitle/69 - 接.png index e781e8c7..77695bc8 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/69 - 接.png and b/wb_new_ui/assets/Common/font/fontTitle/69 - 接.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/7 - 踢.png b/wb_new_ui/assets/Common/font/fontTitle/7 - 踢.png index 89eb0276..4bc8f27b 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/7 - 踢.png and b/wb_new_ui/assets/Common/font/fontTitle/7 - 踢.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/70 - 厉.png b/wb_new_ui/assets/Common/font/fontTitle/70 - 厉.png index bf8b96ba..706c1d1a 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/70 - 厉.png and b/wb_new_ui/assets/Common/font/fontTitle/70 - 厉.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/71 - 流.png b/wb_new_ui/assets/Common/font/fontTitle/71 - 流.png index 17cffb2c..565cdac4 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/71 - 流.png and b/wb_new_ui/assets/Common/font/fontTitle/71 - 流.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/72 - 局.png b/wb_new_ui/assets/Common/font/fontTitle/72 - 局.png index 0b0b0c0d..a93a143e 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/72 - 局.png and b/wb_new_ui/assets/Common/font/fontTitle/72 - 局.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/73 - 列.png b/wb_new_ui/assets/Common/font/fontTitle/73 - 列.png index 46b9adac..c6f979cf 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/73 - 列.png and b/wb_new_ui/assets/Common/font/fontTitle/73 - 列.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/74 - 表.png b/wb_new_ui/assets/Common/font/fontTitle/74 - 表.png index 3c4c2272..47194961 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/74 - 表.png and b/wb_new_ui/assets/Common/font/fontTitle/74 - 表.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/75 - 绩.png b/wb_new_ui/assets/Common/font/fontTitle/75 - 绩.png index 196b20c9..5f3b9057 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/75 - 绩.png and b/wb_new_ui/assets/Common/font/fontTitle/75 - 绩.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/76 - 队.png b/wb_new_ui/assets/Common/font/fontTitle/76 - 队.png index dc64a0e2..e413adfd 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/76 - 队.png and b/wb_new_ui/assets/Common/font/fontTitle/76 - 队.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/77 - 长.png b/wb_new_ui/assets/Common/font/fontTitle/77 - 长.png index ed0167b3..7c5ce315 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/77 - 长.png and b/wb_new_ui/assets/Common/font/fontTitle/77 - 长.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/78 - 亲.png b/wb_new_ui/assets/Common/font/fontTitle/78 - 亲.png index 845379cb..92a82d4a 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/78 - 亲.png and b/wb_new_ui/assets/Common/font/fontTitle/78 - 亲.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/79 - 友.png b/wb_new_ui/assets/Common/font/fontTitle/79 - 友.png index 54cacfab..528f8220 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/79 - 友.png and b/wb_new_ui/assets/Common/font/fontTitle/79 - 友.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/8 - 出.png b/wb_new_ui/assets/Common/font/fontTitle/8 - 出.png index 82181e0e..a3949d33 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/8 - 出.png and b/wb_new_ui/assets/Common/font/fontTitle/8 - 出.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/80 - 圈.png b/wb_new_ui/assets/Common/font/fontTitle/80 - 圈.png index e34c155f..e949e046 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/80 - 圈.png and b/wb_new_ui/assets/Common/font/fontTitle/80 - 圈.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/81 - 合.png b/wb_new_ui/assets/Common/font/fontTitle/81 - 合.png index 5388701c..985e0d86 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/81 - 合.png and b/wb_new_ui/assets/Common/font/fontTitle/81 - 合.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/82 - 伙.png b/wb_new_ui/assets/Common/font/fontTitle/82 - 伙.png new file mode 100644 index 00000000..19b29fa9 Binary files /dev/null and b/wb_new_ui/assets/Common/font/fontTitle/82 - 伙.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/9 - 记.png b/wb_new_ui/assets/Common/font/fontTitle/9 - 记.png index 2e75a364..65e12f29 100644 Binary files a/wb_new_ui/assets/Common/font/fontTitle/9 - 记.png and b/wb_new_ui/assets/Common/font/fontTitle/9 - 记.png differ diff --git a/wb_new_ui/assets/Common/font/fontTitle/fontTitle.fnt b/wb_new_ui/assets/Common/font/fontTitle/fontTitle.fnt index e6fc3705..057145b1 100644 --- a/wb_new_ui/assets/Common/font/fontTitle/fontTitle.fnt +++ b/wb_new_ui/assets/Common/font/fontTitle/fontTitle.fnt @@ -81,3 +81,4 @@ char id=20986 img=qcrm7iu6 xoffset=0 yoffset=0 xadvance=0 char id=22280 img=qcrm7iuo xoffset=0 yoffset=0 xadvance=0 char id=35760 img=qcrm7ivt xoffset=0 yoffset=0 xadvance=0 char id=21512 img=qcrm7ivu xoffset=0 yoffset=0 xadvance=0 +char id=20249 img=qcrm7ivv xoffset=0 yoffset=0 xadvance=0 diff --git a/wb_new_ui/assets/Common/images/bg_game_战绩.png b/wb_new_ui/assets/Common/images/bg_game_战绩.png new file mode 100644 index 00000000..1272b4e4 Binary files /dev/null and b/wb_new_ui/assets/Common/images/bg_game_战绩.png differ diff --git a/wb_new_ui/assets/Common/images/btn_showPartner.png b/wb_new_ui/assets/Common/images/btn_showPartner.png new file mode 100644 index 00000000..14c0303d Binary files /dev/null and b/wb_new_ui/assets/Common/images/btn_showPartner.png differ diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml index 23e7ec9b..343f3877 100644 --- a/wb_new_ui/assets/Common/package.xml +++ b/wb_new_ui/assets/Common/package.xml @@ -1352,6 +1352,9 @@ + + + diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml index 486495e0..2edcc032 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml @@ -60,7 +60,16 @@ - + +