diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index fc0904cd..45e5465d 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -1067,17 +1067,18 @@ function M:InitView(url) -- self._view:GetChild('player_diamond').text = self.curGroup.diamo local btn_refreshbg = self._view:GetChild("btn_refreshbg").onClick:Set(function() - if self._view:GetController("bgchange").selectedIndex == 0 then - Utils.SaveLocalFile(DataManager.SelfUser.account_id .. "bgflag", 2) - self._view:GetController("bgchange").selectedIndex = 1 + if self._view:GetController("bgchange").selectedIndex < 2 then + Utils.SaveLocalFile(DataManager.SelfUser.account_id .. "bgflag", self._view:GetController("bgchange").selectedIndex+1) + printlog(self._view:GetController("bgchange").selectedIndex) + self._view:GetController("bgchange").selectedIndex = self._view:GetController("bgchange").selectedIndex+1 else - Utils.SaveLocalFile(DataManager.SelfUser.account_id .. "bgflag", 1) + Utils.SaveLocalFile(DataManager.SelfUser.account_id .. "bgflag", 0) self._view:GetController("bgchange").selectedIndex = 0 end end) - if Utils.LoadLocalFile(DataManager.SelfUser.account_id .. "bgflag") == "2" then - self._view:GetController("bgchange").selectedIndex = 1 + if Utils.LoadLocalFile(DataManager.SelfUser.account_id .. "bgflag") then + self._view:GetController("bgchange").selectedIndex = Utils.LoadLocalFile(DataManager.SelfUser.account_id .. "bgflag") else self._view:GetController("bgchange").selectedIndex = 0 end diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua index c66e33d1..bcbeb37e 100644 --- a/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua @@ -141,6 +141,7 @@ function M:ShowStep(index) if step.cmd == Record_Event.Evt_Result then if not self.result then self.result = EXClearingView.new(self._root_view, true) + self.result:InitData(0, self._room, step.result_data) self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5 self.result._view.width = GRoot.inst.width @@ -152,7 +153,7 @@ function M:ShowStep(index) else self.result._view.visible = true end - -- self.result._view:Center() + self.result._view:Center() else if self.result then self.result._view.visible = false diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index 61b97005..dee3ab91 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -664,6 +664,7 @@ function M:__FangziTip(tip, _uid, fptype) local count = #_tlist local zdhu = false local fpao = true + for k = 1, #_tlist do local td = tip.tip_map_type[_tlist[k]][1] if td.type == 8 then @@ -686,7 +687,7 @@ function M:__FangziTip(tip, _uid, fptype) self._chipeng_tip = nil return end - + for k = 1, #_tlist do local td = tip.tip_map_type[_tlist[k]][1] local url = 'ui://Main_RunBeard/Btn_fztip' @@ -740,7 +741,7 @@ function M:__TipAction(context) local td = data[2] local tip_hu = data[3] local list = tip.tip_map_type[td.weight] - + if (#list > 1) or td.type == 1 then local chiflag = true for key, value in pairs(list) do @@ -751,7 +752,7 @@ function M:__TipAction(context) if #list > 1 then chiflag = false end - if chiflag then + if tip_hu==false and chiflag then _gamectr:SendAction(list[1]["id"]) self:__CloseTip() local info = self._player_card_info[1] @@ -783,6 +784,8 @@ function M:__TipAction(context) end end ) + + -- self._chipeng_tip.visible = false return end @@ -1029,6 +1032,7 @@ function M:OnFangziAction(...) -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Extend_Poker_FanPaoFa", "chouwei") self:PlaySound(player.self_user.sex, 'F_GuoSao') effect:GetChild('icon1').icon = UIPackage.GetItemURL('Extend_Poker_FanPaoFa', 'chouwei') + elseif fz.type == RB_FZType.Pao then -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "pao") self:PlaySound(player.self_user.sex, 'F_KaiDuo') @@ -1045,7 +1049,7 @@ function M:OnFangziAction(...) pNode:AddChild(effect) coroutine.start( function() - coroutine.wait(3) + coroutine.wait(0.5) effect:Dispose() end ) diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua index 9754a584..28063587 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua @@ -164,8 +164,6 @@ function M:ShowStep(index) self._lit_fanzi = _chipeng_tip:GetChild('lit_fanzi') self._lit_fanzi:RemoveChildrenToPool() - printlog("lingmeng ShowStep", self._step[index + 1].cmd) - pt(self._step[index + 1]) for i = 1, #step.player_card_data do local p = self._room:GetPlayerBySeat(i) local info = self._player_card_info[self:GetPos(i)] @@ -201,10 +199,6 @@ function M:ShowStep(index) if index > 1 then for k, v in pairs(self.CheckServerErrorList) do - ----printlog("k===>>>",k) - ----printlog("v===>>>",v) - ----printlog(k,index) - --pt(p.card_list) if tonumber(index + 1) > tonumber(k) then list_remove(p.card_list, v) end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/ExtendConfig.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/ExtendConfig.lua index 06c3f567..d4f8b338 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/ExtendConfig.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/ExtendConfig.lua @@ -14,7 +14,7 @@ function ExtendConfig.new() setmetatable(M, { __index = IExtendConfig }) local self = setmetatable({}, { __index = M }) self.class = 'ExtendConfig' - self.extend_id = 13 + self.extend_id = 17 self._viewMap = {} self._viewMap[ViewManager.View_Main] = EXMainView self._viewMap[ViewManager.View_PlayBack] = EXPlayBackView @@ -59,8 +59,6 @@ function M:FillRoomData(s2croom) local _tableInfo = s2croom['tableInfo'] local _config = _tableInfo['config'] - --printlog("FillRoomConfig:") - pt(_config) room.room_config = EXRoomConfig.new(_config) local playerList = _tableInfo['playerData'] diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua index 368577ba..2a2f0772 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua @@ -741,10 +741,10 @@ function M:FillItemData(room, data, item) local cards = card_list:AddItemFromPool() cards:GetChild('card_type').text = '将' cards:GetChild('card_huxi').text = win_data.opCardList[i].hu_xi - cards:GetController('c1').selectedIndex = 1 + cards:GetController('c1').selectedIndex = 0 if win_data.opCardList[i].card1 == win_data.win_card and isWin_Card == true then isWin_Card = false - cards:GetController('hu').selectedIndex = 1 + cards:GetController('hu').selectedIndex = 0 end cards:GetChild('card_1').icon = self:getCardItem('ui://Main_RunBeard/202_', win_data.opCardList[i].card1) diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua index f2b76fcc..4cc2c520 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua @@ -151,12 +151,12 @@ function M:playAnim(fzitem,fzcards, size,i,ispaly,seat) if(seat~=nil)then isaddLast = self:isAddFirst(seat) end - if(isaddLast)then + -- if(isaddLast)then local index_postion = 0 self._area_fz_list:AddChildAt(fzitem,index_postion) - else - self._area_fz_list:AddChild(fzitem) - end + -- else + -- self._area_fz_list:AddChild(fzitem) + -- end end function M:isAddFirst(seat) diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua index 0568a6d5..773800be 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua @@ -45,7 +45,6 @@ function M:__OnDragEnd(context) local _room = DataManager.CurrenRoom card.btn_card.sortingOrder = 0 - -- print("button.y"..button.y .. "_room.curren_outcard_seat".._room.curren_outcard_seat) if (button.y < -380 and _room.curren_outcard_seat == _room.self_player.seat) then button.touchable = false self.outcard_button = card diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua index 89175611..1b51014d 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua @@ -90,6 +90,7 @@ end --放字 function M:UpdateFzList( fz_list ) + printlog("UpdateFzList----") self._area_fz_list:RemoveChildren(0,-1,true) for i = 1,#fz_list do local fzitem = nil diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua index 25019b6b..ef147b8c 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua @@ -358,6 +358,7 @@ end -- -- function M:onTouchBegin(context) + printlog("onTouchBegin") if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then return end @@ -367,9 +368,10 @@ function M:onTouchBegin(context) self:ShowHuTip(card.card_item) end card.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/203_', card.card_item) - -- card.btn_card.sortingOrder = 100 + card.btn_card.sortingOrder = 100 + local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y)) - card.btn_card.xy = Vector2.New(card.btn_card.x + 20, card.btn_card.y - 50) + card.btn_card.xy = Vector2.New(card.btn_card.x + 20, card.btn_card.y - 30) card.touch_pos = xy - button.xy end @@ -459,7 +461,7 @@ function M:UpdateHandCardsPos() card_view.btn_card:RemoveFromParent() self._area_handcard_list:AddChild(card_view.btn_card) card_view.old_postion = self:GetHandCardPos(card_view, #CountCards) - card_view.btn_card:TweenMove(card_view.old_postion, 0.3) + card_view.btn_card:TweenMove(card_view.old_postion, 0.6) end self:ShowHuTip() end @@ -476,7 +478,7 @@ function M:UpdateCardDisplay() card_view.btn_card:RemoveFromParent() card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_view.card_item) self._area_handcard_list:AddChild(card_view.btn_card) - card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3) + card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.5) end end diff --git a/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info b/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info index f2fc737f..5d583df9 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info +++ b/wb_new_ui/.objs/metas/m7iejg46/hwww2f.info @@ -1,5 +1,11 @@ { "objectStatus": { + "n9_m1dc": { + "hidden": true + }, + "n8_m1dc": { + "hidden": true + }, "n12_quwh": { "hidden": true }, @@ -9,10 +15,10 @@ "n11_rfcn": { "hidden": true }, - "n9_m1dc": { + "n13_ilon": { "hidden": true }, - "n8_m1dc": { + "n16_kt8n": { "hidden": true } } diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 90f581fb..ebf47be3 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,5 +1,5 @@ { - "libview.firstColumnWidth": 522, + "libview.firstColumnWidth": 297, "expanded_nodes": [ "27vd145b", "/", @@ -28,13 +28,17 @@ "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://2d9xdj6zfn7fao", + "doc.activeDoc": "ui://v6yvqp7wf55qw5", "libview.twoColumn": false, "libview.expandedNodes": [ "2d9xdj6z", "/", - "m7iejg46", - "/" + "v6yvqp7w", + "/", + "v6yvqp7w", + "/component/", + "v6yvqp7w", + "/component/Main/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml index c9e69921..5f84694d 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml @@ -24,10 +24,10 @@