From f089f7a283b4da7ba00f9e68df4ec9ce4f7df386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Wed, 23 Apr 2025 20:03:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=91=E5=BE=97=E5=BF=AB=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=88=90=E5=BF=AB=E9=80=9F=E7=99=BE=E5=88=86=E7=99=BE=E6=9C=89?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/majiang/lichuan/ExtendConfig.lua | 4 ++-- .../lichuan/MJPlayerSelfCardInfoView.lua | 4 ++-- .../MJPlayerSelfCardInfoView_jiangxi.lua | 18 +++++++-------- .../RunFast_PlayerSelfPokerInfoView.lua | 23 ++++++++++++------- .../ui/Extend_MJ_FuZhou_atlas1.png.meta | 2 +- .../ui/Extend_MJ_FuZhou_atlas1_1.png.meta | 2 +- .../ui/Extend_MJ_FuZhou_atlas1_2.png.meta | 2 +- .../jinxi/ui/Extend_MJ_JinXi_atlas1.png.meta | 2 +- .../ui/Extend_MJ_NanCheng_atlas1.png.meta | 2 +- 9 files changed, 33 insertions(+), 26 deletions(-) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua b/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua index 814a3a45..010107f7 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua @@ -1,8 +1,8 @@ local EXTEND_MODEL_NAME = ... local EXGameInfo = import(".EXGameInfo") -local EXMainView = import(".EXMainView_jaingxi") --- local EXMainView = import(".EXMainView") +-- local EXMainView = import(".EXMainView_jaingxi") +local EXMainView = import(".EXMainView") local EXGameController = import(".EXGameController") local EXRoomConfig = import(".EXRoomConfig") local EXPlayBackView = import(".EXPlayBackView") diff --git a/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerSelfCardInfoView.lua index be0c9334..f855e2f3 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerSelfCardInfoView.lua @@ -1,5 +1,5 @@ -local MJPlayerSelfCardInfoView = require("main.majiang.MJPlayerSelfCardInfoView_jiangxi") -local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView_jiangxi") +local MJPlayerSelfCardInfoView = require("main.majiang.MJPlayerSelfCardInfoView") +local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView") local CardCheck = import(".CardCheck") local M = {} diff --git a/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerSelfCardInfoView_jiangxi.lua b/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerSelfCardInfoView_jiangxi.lua index 3a3f6232..6d32ddf3 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerSelfCardInfoView_jiangxi.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerSelfCardInfoView_jiangxi.lua @@ -287,15 +287,15 @@ function M:__OnDragEnd(context) button.xy = self._touchPos else -- self._area_handcard_list:AddChildAt(button, card.index) - -- if self._touchIndex ~= card.index then - -- local tempPos = self._touchPos - -- self._touchPos = button.xy - -- button:TweenMove(tempPos, 0.2) - -- else - button:TweenMove(self._touchPos, 0.2) - self._touchPos = -1 - self._touchIndex = -1 - -- end + if self._touchIndex ~= card.index then + -- local tempPos = self._touchPos + -- self._touchPos = button.xy + -- button:TweenMove(tempPos, 0.2) + else + button:TweenMove(self._touchPos, 0.2) + self._touchPos = -1 + self._touchIndex = -1 + end end end 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 80d2df4e..3736aaa0 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -214,17 +214,20 @@ function M:AddCardMoveEvent(card) return end local xy = self.cards_view:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y)) - if xy.y > -21 and xy.y < 221 then + if xy.y > -21 and xy.y < 316 then self.touchBegin = xy Stage.inst.onTouchMove:Add(self.touchMoveFun) --Stage.inst.onClick:Add(self.touchMoveFun) card.btn_card.onTouchEnd:Set( function(context) + print("============lingmeng,oveend") local xy = self.cards_view:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y)) Stage.inst.onTouchMove:Remove(self.touchMoveFun) --Stage.inst.onClick:onTouchMove(self.touchMoveFun) - if xy.y > -21 and xy.y < 221 then + -- if xy.y > -21 and xy.y < 316 then + if true then + print("lingin") if xy.x - self.touchBegin.x > 0 then local max_x = xy.x local min_x = self.touchBegin.x @@ -308,6 +311,7 @@ function M:AddCardMoveEvent(card) ViewUtil.PlaySound('RunFastNew_PK', 'extend/poker/runfast/sound/click.mp3') else + print("lingout") self.touchBegin = Vector2.New(0, 0) for k = 1, #self.card_list do local card = self.card_list[k] @@ -316,11 +320,12 @@ function M:AddCardMoveEvent(card) end end end - Stage.inst:ResetInputState() card.btn_card.onTouchEnd:Set(nil) - self:zhizhanxuanpai() + if not self._flag_xuan then + self:zhizhanxuanpai() + end end ) else @@ -341,6 +346,7 @@ function M:AddCardMoveEvent(card) end function M:zhizhanxuanpai() --智障选牌 + print("lingmengxuan", #self.send_card) -- body local temp_send_card = {} for i = 1, #self.send_card do @@ -374,9 +380,11 @@ function M:zhizhanxuanpai() --智障选牌 self.xunpai = {} end - if temp_list ~= nil and temp_list1 == nil and temp_list2 == nil and temp_bomb == nil and #temp_list > #self.xunpai then - for i = 1, #self.send_card do - self:UpdateCardMove(self.send_card[i].btn_card, false, false) + -- if temp_list ~= nil and temp_list1 == nil and temp_list2 == nil and temp_bomb == nil and #temp_list > #self.xunpai then + if temp_list ~= nil and temp_list1 == nil and temp_list2 == nil and temp_bomb == nil then + -- for i = 1, #self.send_card do + for i = 1, #self.card_list do + self:UpdateCardMove(self.card_list[i].btn_card, false, false) end for i = 1, #self.send_card do for j = 1, #temp_list do @@ -400,7 +408,6 @@ function M:TouchMoving(context) local xy = self.cards_view:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y)) self.isTouching = true if xy.x - self.touchBegin.x > 0 then -- 往右边滑 - --printlog("cccccccccccccc1111111111111111111111111") local max_x = xy.x local min_x = self.touchBegin.x for i = 1, #self.card_list do diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png.meta index dcd83647..e4352ffc 100644 --- a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png.meta +++ b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png.meta index 880a75b0..7bc83ccc 100644 --- a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png.meta +++ b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png.meta index fa28160e..b0def606 100644 --- a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png.meta +++ b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png.meta index 9bc3bcca..116d249a 100644 --- a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png.meta +++ b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/majiang/jinxi/d6500faabd8efe9ea4f5aef4daf5e9dd assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png.meta index b03654aa..6ea89f72 100644 --- a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png.meta +++ b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/majiang/nancheng/704ffdeb1d214471a2c68eb82f8ff5c9 assetBundleVariant: