diff --git a/fk101/lua_probject/base_project/Game/View/Common/BaseWindow.lua b/fk101/lua_probject/base_project/Game/View/Common/BaseWindow.lua index 611e2468..3d7fc801 100644 --- a/fk101/lua_probject/base_project/Game/View/Common/BaseWindow.lua +++ b/fk101/lua_probject/base_project/Game/View/Common/BaseWindow.lua @@ -151,7 +151,7 @@ function M:Show() if self._queue and not _inQueue then WindowQueue[#WindowQueue + 1] = self end - AddPanel(self._root_view) + AddPanelCenter(self._root_view) if self._full then local offset = get_offset(self._full_offset) self._contentPane:MakeFullScreen() diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua index 5020d606..c9ddc1b1 100644 --- a/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua +++ b/fk101/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua @@ -1,7 +1,7 @@ local GroupPartnerStatPlay = import(".GroupPartnerStatPlay") local GroupRecordView = require "Game/View/NewGroup/GroupRecordView" local GroupPartnerStatMember = {} - +local GroupSetMemberInfoDiaoduView=import('.GroupSetMemberInfoDiaoduView') local M = GroupPartnerStatMember function GroupPartnerStatMember.new(group_id, uid, time_type, begin_time, end_time) @@ -177,6 +177,23 @@ function M:OnRenderItem(index, obj) self:getRewardsLog(0) end) + + local btn_detail_tiaoduzjM = obj:GetChild("btn_detail_tiaoduzjM") + btn_detail_tiaoduzjM.onClick:Set(function() + ViewUtil.ShowModalWait() + ControllerManager.GetController(NewGroupController):FG_GetBanMemberHB(self.group_id, data.uid, function(res) + ViewUtil.CloseModalWait() + --pt(res) + if res.ReturnCode == 0 then + local diaoduView=GroupSetMemberInfoDiaoduView.new(self.group_id, data.uid) + diaoduView:SetCurrentState(res.Data.group_black+1,res.Data) + else + ViewUtil.ErrorTip(res.ReturnCode,"获取整组调度失败！") + end + + end) + end) + local btn_member_detail = obj:GetChild("btn_member_detail") btn_member_detail.onClick:Set(function() self.uids[#self.uids + 1] = data.uid diff --git a/fk101/lua_probject/base_project/Game/View/ResultView.lua b/fk101/lua_probject/base_project/Game/View/ResultView.lua index 9a81c37f..a2b4f92c 100644 --- a/fk101/lua_probject/base_project/Game/View/ResultView.lua +++ b/fk101/lua_probject/base_project/Game/View/ResultView.lua @@ -403,8 +403,8 @@ function M:InitBigResult(room, fontsize) item:GetController('self').selectedIndex = 0 end - if item:GetChild('head') and item:GetChild('head')._iconObject then - ImageLoad.Load(player_info.head_url, item:GetChild('head')._iconObject) + if item:GetChild('btn_head') and item:GetChild('btn_head')._iconObject then + ImageLoad.Load(player_info.head_url, item:GetChild('btn_head')._iconObject) end end diff --git a/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXGameController.lua b/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXGameController.lua index a2de4c84..39460c30 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXGameController.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXGameController.lua @@ -69,12 +69,12 @@ function M:OnEventXiPaiAnim(evt_data) local p = self._room:GetPlayerById(playeridList[i]) if p== self._room.self_player then my_isXiPai=true + else other_isXiPai=true end end end - self._cacheEvent:Enqueue(function() DispatchEvent(self._dispatcher,TX_GameEvent.EventXiPai,my_isXiPai,other_isXiPai) end) diff --git a/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua b/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua index 013d7d11..1873bcbd 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua @@ -80,7 +80,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.EventXiPai,function( ... ) local arg = {...} - local currentPlayer=arg[1] + local currentPlayer1=arg[1] local currentPlayer2=arg[2] self._popEvent = false if ( currentPlayer1 ) then diff --git a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/RunBeard_ResultView.lua b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/RunBeard_ResultView.lua index c709555b..e07482a3 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/RunBeard_ResultView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/RunBeard_ResultView.lua @@ -7,6 +7,7 @@ local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) + self._full=true self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then @@ -21,6 +22,7 @@ end function M:init(url) ResultView.init(self, url) + local btn_share = self._view:GetChild('btn_share') btn_share.onClick:Set( function() diff --git a/fk101/lua_probject/extend_project/extend/zipai/fulushou/RunBeard_ResultView.lua b/fk101/lua_probject/extend_project/extend/zipai/fulushou/RunBeard_ResultView.lua index d5b16fa4..1759a8ad 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/fulushou/RunBeard_ResultView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/fulushou/RunBeard_ResultView.lua @@ -7,6 +7,7 @@ local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) + self._full=true self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then diff --git a/fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/RunBeard_ResultView.lua b/fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/RunBeard_ResultView.lua index bd11f47e..ba258bce 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/RunBeard_ResultView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/RunBeard_ResultView.lua @@ -7,6 +7,7 @@ local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) + self._full=true self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then diff --git a/fk101/lua_probject/extend_project/extend/zipai/runbeard/RunBeard_ResultView.lua b/fk101/lua_probject/extend_project/extend/zipai/runbeard/RunBeard_ResultView.lua index 9cfd5a91..e7c8a659 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/runbeard/RunBeard_ResultView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/runbeard/RunBeard_ResultView.lua @@ -7,6 +7,7 @@ local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) + self._full=true self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/RunBeard_ResultView.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/RunBeard_ResultView.lua index 9f58e592..7f2f66bc 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/RunBeard_ResultView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/RunBeard_ResultView.lua @@ -7,6 +7,7 @@ local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) + self._full=true self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/RunBeard_ResultView.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/RunBeard_ResultView.lua index 5312e8e3..9ff97556 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/RunBeard_ResultView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/RunBeard_ResultView.lua @@ -7,6 +7,7 @@ local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) setmetatable(M, {__index = ResultView}) local self = setmetatable({}, {__index = M}) + self._full=true self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then diff --git a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes index 8d790170..a11e0738 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ diff --git a/fk101/wb_new_ui/.objs/cache/9n9stu2e/prgz94.info b/fk101/wb_new_ui/.objs/cache/9n9stu2e/prgz94.info deleted file mode 100644 index 48c4e4e9..00000000 --- a/fk101/wb_new_ui/.objs/cache/9n9stu2e/prgz94.info +++ /dev/null @@ -1,3 +0,0 @@ -{ - "modificationDate": 1630347590100 -} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/cache/9n9stu2e/prgz94.wav b/fk101/wb_new_ui/.objs/cache/9n9stu2e/prgz94.wav deleted file mode 100644 index 58fb9fca..00000000 Binary files a/fk101/wb_new_ui/.objs/cache/9n9stu2e/prgz94.wav and /dev/null differ diff --git a/fk101/wb_new_ui/.objs/cache/9n9stu2e/prgz97.info b/fk101/wb_new_ui/.objs/cache/9n9stu2e/prgz97.info deleted file mode 100644 index d4322197..00000000 --- a/fk101/wb_new_ui/.objs/cache/9n9stu2e/prgz97.info +++ /dev/null @@ -1,3 +0,0 @@ -{ - "modificationDate": 1629947131815 -} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/cache/9n9stu2e/prgz97.wav b/fk101/wb_new_ui/.objs/cache/9n9stu2e/prgz97.wav deleted file mode 100644 index badab3e1..00000000 Binary files a/fk101/wb_new_ui/.objs/cache/9n9stu2e/prgz97.wav and /dev/null differ diff --git a/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info b/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info index fd649129..56d2e4c5 100644 --- a/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info +++ b/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info @@ -39,9 +39,6 @@ "n17_pt1r": { "hidden": true }, - "n70_dunj": { - "collapsed": true - }, "n51_fmkv": { "collapsed": true }, diff --git a/fk101/wb_new_ui/.objs/metas/ypulwxjh/l9mn14.info b/fk101/wb_new_ui/.objs/metas/ypulwxjh/l9mn14.info index 25d67bb8..69ee2b10 100644 --- a/fk101/wb_new_ui/.objs/metas/ypulwxjh/l9mn14.info +++ b/fk101/wb_new_ui/.objs/metas/ypulwxjh/l9mn14.info @@ -1,13 +1,99 @@ { "objectStatus": { - "n4_fux2": { + "n84_loe7": { + "locked": true + }, + "n49_g8y2": { + "locked": true, + "hidden": true + }, + "n19_pt1r": { + "locked": true, + "hidden": true + }, + "n46_n1ry": { + "locked": true, "hidden": true }, "n73_p9qe": { "hidden": true }, + "n58_fnpw": { + "locked": true, + "hidden": true + }, + "n12_nrno": { + "locked": true, + "hidden": true + }, + "n77_p9qe": { + "locked": true, + "hidden": true + }, + "n15_pt1r": { + "hidden": true + }, + "n17_pt1r": { + "hidden": true + }, + "n33_n1ry": { + "locked": true, + "hidden": true + }, + "n4_fux2": { + "hidden": true + }, + "n37_n1ry": { + "locked": true, + "hidden": true + }, + "n52_rx2e": { + "hidden": true + }, + "n68_w06x": { + "hidden": true + }, + "n85_loe7": { + "locked": true + }, + "n43_n1ry": { + "locked": true, + "hidden": true + }, + "n62_fnpw": { + "locked": true, + "hidden": true + }, "n39_n1ry": { "hidden": true + }, + "n31_n1ry": { + "locked": true, + "hidden": true + }, + "n14_pt1r": { + "hidden": true + }, + "n32_n1ry": { + "locked": true, + "hidden": true + }, + "n16_pt1r": { + "hidden": true + }, + "n56_fnpw": { + "locked": true, + "hidden": true + }, + "n54_rx2e": { + "hidden": true + }, + "n67_w06x": { + "hidden": true + }, + "n35_n1ry": { + "locked": true, + "hidden": true } } } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/yzaioi79/aen81b0.info b/fk101/wb_new_ui/.objs/metas/yzaioi79/aen81b0.info index ec2d85bf..45089b2f 100644 --- a/fk101/wb_new_ui/.objs/metas/yzaioi79/aen81b0.info +++ b/fk101/wb_new_ui/.objs/metas/yzaioi79/aen81b0.info @@ -1,13 +1,48 @@ { "objectStatus": { - "n4_tjnv": { - "collapsed": true - }, "n11_tjnv": { - "collapsed": true + "hidden": true }, - "n7_tjnv": { - "collapsed": true + "n34_aen8": { + "hidden": true + }, + "n15_tjnv": { + "hidden": true + }, + "n29_tjnv": { + "hidden": true + }, + "n6_tjnv": { + "locked": true, + "hidden": true + }, + "n3_tjnv": { + "locked": true, + "hidden": true + }, + "n10_tjnv": { + "hidden": true + }, + "n36_aen8": { + "hidden": true + }, + "n5_tjnv": { + "locked": true, + "hidden": true + }, + "n28_tjnv": { + "locked": true, + "hidden": true + }, + "n2_tjnv": { + "locked": true, + "hidden": true + }, + "n27_tjnv": { + "hidden": true + }, + "n9_tjnv": { + "hidden": true } } } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 1f60e73b..5ef841da 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -2,23 +2,22 @@ "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://27vd145bp2bz6s", - "ui://27vd145bh1uu30", - "ui://m7iejg46jgh8hwv" + "ui://27vd145bhxjc7i4q", + "ui://kplym8mus9wxa", + "ui://fnuxqeflnrnod", + "ui://c7j2rnvqtpf02f", + "ui://y8prev1ms9wx7", + "ui://3z9lj55vjokmft", + "ui://4skil1l6piv91ny", + "ui://niy3ldiwl9mny", + "ui://niy3ldiwl9mn19" ], "auxline1": true, "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46jgh8hwv", + "doc.activeDoc": "ui://27vd145bhxjc7i4q", "libview.twoColumn": false, - "libview.expandedNodes": [ - "27vd145b", - "/", - "m7iejg46", - "/", - "m7iejg46", - "/mgr/" - ], + "libview.expandedNodes": [], "snapToGrid": true, "backgroundColor": 6710886, "libview.currentGroup": "", diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml index 80e8b90e..593b4478 100644 --- a/fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml +++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml @@ -5,5 +5,5 @@ -