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 86424d2b..9df9fe8d 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua @@ -54,7 +54,7 @@ function M:InitView() self.begin_time, self.end_time = self.time_panel:GetDate() self.record_data = {} self.record_data.numItems = 0 - self:GetRecordData(0) + self:GetRecoedData(0) end, { showDay = group.lev < 3 and 30 or 7 }) local ctr_page = self._view:GetController("type") diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua index f93bb087..0401bb3e 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -190,15 +190,15 @@ function M:InitView(url) self._view:GetChild('info_text'):GetChild('text').text = room.room_config:GetDes() if room.room_config.Leaf == 1 then if room.room_config.people_num == 2 then - self._view:GetChild('wanfa_text').text = '二人跑得快' .. room.score_times + self._view:GetChild('wanfa_text').text = '跑得快' .. room.score_times else - self._view:GetChild('wanfa_text').text = '三人跑得快' .. room.score_times + self._view:GetChild('wanfa_text').text = '跑得快' .. room.score_times end else if room.room_config.people_num == 2 then - self._view:GetChild('wanfa_text').text = '二人跑得快' .. room.score_times + self._view:GetChild('wanfa_text').text = '跑得快' .. room.score_times else - self._view:GetChild('wanfa_text').text = '三人跑得快' .. room.score_times + self._view:GetChild('wanfa_text').text = '跑得快' .. room.score_times end end local text_playName = self._view:GetChild('text_playName') diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index 1f23385b..43da3ad1 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -342,6 +342,9 @@ function M:AddTouchMoveEvent(list) local columnGap = self._view_handCard.columnGap local oneCardWidth = CardWidth - columnGap local xy = fristCard:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y)) + if xy.y <= 0 then + return + end -- if xy.y > -21 and xy.y < 316 then self.touchBegin = xy Stage.inst.onTouchMove:Add(self.touchMoveFun) diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index d04b1886..1909dc33 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -158,7 +158,7 @@ function M:NewPlayerCardInfoView(view, index) end function M:closeTipOnTuoguan() - printlog("closeTipOnTuoguan",self._clearingView) + printlog("closeTipOnTuoguan", self._clearingView) if self._clearingView ~= nil then self._clearingView:Close() end @@ -777,7 +777,8 @@ function M:__FangziTip(tip, _uid, fptype) _chipeng_tip:Dispose() self._chipeng_tip = nil else - self._view:AddChild(_chipeng_tip) + local index = self._view:GetChildIndex(self._view:GetChild('safe_close')) + self._view:AddChildAt(_chipeng_tip,index) _chipeng_tip:Center() _chipeng_tip.x = _chipeng_tip.x + 750 _chipeng_tip.y = _chipeng_tip.y - 100 diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua index 7b54ee59..2a174cb6 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua @@ -194,6 +194,12 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu) self:BtnsSafe() end ) + local safe_close = self._view:GetChild('safe_close') + safe_close.onClick:Set( + function() + self:BtnsSafe() + end + ) self:BtnsSafe() end @@ -203,11 +209,17 @@ function M:BtnsSafe() local btn_temp2 = self._view:GetChild("Btn_jiesan_lobby") local btn_temp3 = self._view:GetChild("btn_leave_lobby") local btn_temp4 = self._view:GetChild("btn_setting") + local safe_close = self._view:GetChild('safe_close') + local btn_rule = self._view:GetChild('btn_rule') + local gcm_chat = self._view:GetChild('gcm_chat') btn_temp1.visible = not btn_temp1.visible btn_temp2.visible = not btn_temp2.visible btn_temp3.visible = not btn_temp3.visible btn_temp4.visible = not btn_temp4.visible + safe_close.visible = not safe_close.visible + btn_rule.visible = not btn_rule.visible + gcm_chat.visible = not gcm_chat.visible local safe = self._view:GetChild("safe_bg") safe.visible = not safe.visible 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 b241b6d5..db3fe6a6 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua @@ -795,8 +795,7 @@ end --计算手牌位置 function M:GetHandCardPos(cards_view, cards) local x, y = 0, 0 - local card_width = self.card_width - (self._room.change_card_display == "8_" and -2 or 5) + 4 -- 牌的宽度 - + local card_width = self.card_width - (self._room.change_card_display == "8_" and 8 or 7) + 4 -- 牌的宽度 local middle_x = self._area_handcard_list.width / 2 local start_x = middle_x - (cards / 2 * (card_width)) x = start_x + (card_width) * (cards_view.index_X - 1) diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info index c9358312..405043dc 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info @@ -1,23 +1,15 @@ { "objectStatus": { - "n131_ckvb": { - "hidden": true, - "collapsed": true - }, - "n86_q50p": { - "collapsed": true + "n166_ukp7": { + "hidden": true }, "n122_ckvb": { - "locked": true, - "collapsed": true + "locked": true }, "n121_ckvb": { "locked": true, "collapsed": true }, - "n166_ukp7": { - "hidden": true - }, "n115_rnez": { "hidden": true }, @@ -33,8 +25,9 @@ "n179_yffn": { "collapsed": true }, - "n185_yffn": { - "collapsed": true + "n131_ckvb": { + "locked": true, + "hidden": true }, "n87_q50p": { "hidden": true @@ -48,9 +41,6 @@ "n112_rnez": { "hidden": true, "collapsed": true - }, - "n155_diqo": { - "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info index 9e26dfee..53688bcf 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info @@ -1 +1,10 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n25_ckvb": { + "collapsed": true + }, + "n4_ckvb": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq4i.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq4i.info new file mode 100644 index 00000000..e6d7ae92 --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq4i.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n25_oynr": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info index a49104f2..99af9b65 100644 --- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info @@ -1,18 +1,14 @@ { "objectStatus": { - "n183_yfzf": { - "locked": true, + "n36_k3io": { "collapsed": true }, + "n206_ib2w": { + "hidden": true + }, "n154_r1mo": { "collapsed": true }, - "n150_8th3": { - "collapsed": true - }, - "n36_k3io": { - "collapsed": true - }, "n163_o49p": { "collapsed": true } diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info new file mode 100644 index 00000000..fc5c54ce --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info @@ -0,0 +1,19 @@ +{ + "objectStatus": { + "n61_mk2u": { + "hidden": true + }, + "n46_mk2u": { + "hidden": true + }, + "n60_mk2u": { + "hidden": true + }, + "n45_mk2u": { + "hidden": true + }, + "n65_mk2u": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuqc6.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuqc6.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuqc6.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 248f9c02..9c433bea 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -3,16 +3,15 @@ "libview.iconScale": 0, "doc.openedDocs": [ "ui://lkq9ne9speuq8b", - "ui://lkq9ne9speuq6p", - "ui://lkq9ne9speuq6e", - "ui://lkq9ne9speuq6r", - "ui://lkq9ne9speuq6g", - "ui://lkq9ne9speuq5a" + "ui://lkq9ne9ssyh3rk", + "ui://lkq9ne9speuq3r", + "ui://lkq9ne9so0c1ru", + "ui://lkq9ne9speuq4i" ], "test.device": "Huawei Mate20", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://lkq9ne9speuq5a", + "doc.activeDoc": "ui://lkq9ne9speuq8b", "libview.twoColumn": false, "libview.expandedNodes": [ "lkq9ne9s", @@ -20,9 +19,7 @@ "lkq9ne9s", "/component/", "lkq9ne9s", - "/component/Main/", - "lkq9ne9s", - "/component/Main/component/" + "/component/Main/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Chat/Main.xml b/wb_new_ui/assets/Chat/Main.xml index 4300637e..cd71f4a6 100644 --- a/wb_new_ui/assets/Chat/Main.xml +++ b/wb_new_ui/assets/Chat/Main.xml @@ -1,22 +1,22 @@ - + - -