跑得快调整成快速百分百有响应效果
parent
b86601898b
commit
f089f7a283
|
|
@ -1,8 +1,8 @@
|
||||||
local EXTEND_MODEL_NAME = ...
|
local EXTEND_MODEL_NAME = ...
|
||||||
|
|
||||||
local EXGameInfo = import(".EXGameInfo")
|
local EXGameInfo = import(".EXGameInfo")
|
||||||
local EXMainView = import(".EXMainView_jaingxi")
|
-- local EXMainView = import(".EXMainView_jaingxi")
|
||||||
-- local EXMainView = import(".EXMainView")
|
local EXMainView = import(".EXMainView")
|
||||||
local EXGameController = import(".EXGameController")
|
local EXGameController = import(".EXGameController")
|
||||||
local EXRoomConfig = import(".EXRoomConfig")
|
local EXRoomConfig = import(".EXRoomConfig")
|
||||||
local EXPlayBackView = import(".EXPlayBackView")
|
local EXPlayBackView = import(".EXPlayBackView")
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
local MJPlayerSelfCardInfoView = require("main.majiang.MJPlayerSelfCardInfoView_jiangxi")
|
local MJPlayerSelfCardInfoView = require("main.majiang.MJPlayerSelfCardInfoView")
|
||||||
local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView_jiangxi")
|
local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
|
||||||
local CardCheck = import(".CardCheck")
|
local CardCheck = import(".CardCheck")
|
||||||
|
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
|
||||||
|
|
@ -287,15 +287,15 @@ function M:__OnDragEnd(context)
|
||||||
button.xy = self._touchPos
|
button.xy = self._touchPos
|
||||||
else
|
else
|
||||||
-- self._area_handcard_list:AddChildAt(button, card.index)
|
-- self._area_handcard_list:AddChildAt(button, card.index)
|
||||||
-- if self._touchIndex ~= card.index then
|
if self._touchIndex ~= card.index then
|
||||||
-- local tempPos = self._touchPos
|
-- local tempPos = self._touchPos
|
||||||
-- self._touchPos = button.xy
|
-- self._touchPos = button.xy
|
||||||
-- button:TweenMove(tempPos, 0.2)
|
-- button:TweenMove(tempPos, 0.2)
|
||||||
-- else
|
else
|
||||||
button:TweenMove(self._touchPos, 0.2)
|
button:TweenMove(self._touchPos, 0.2)
|
||||||
self._touchPos = -1
|
self._touchPos = -1
|
||||||
self._touchIndex = -1
|
self._touchIndex = -1
|
||||||
-- end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -214,17 +214,20 @@ function M:AddCardMoveEvent(card)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local xy = self.cards_view:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
|
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
|
self.touchBegin = xy
|
||||||
Stage.inst.onTouchMove:Add(self.touchMoveFun)
|
Stage.inst.onTouchMove:Add(self.touchMoveFun)
|
||||||
--Stage.inst.onClick:Add(self.touchMoveFun)
|
--Stage.inst.onClick:Add(self.touchMoveFun)
|
||||||
card.btn_card.onTouchEnd:Set(
|
card.btn_card.onTouchEnd:Set(
|
||||||
function(context)
|
function(context)
|
||||||
|
print("============lingmeng,oveend")
|
||||||
local xy =
|
local xy =
|
||||||
self.cards_view:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
|
self.cards_view:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
|
||||||
Stage.inst.onTouchMove:Remove(self.touchMoveFun)
|
Stage.inst.onTouchMove:Remove(self.touchMoveFun)
|
||||||
--Stage.inst.onClick:onTouchMove(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
|
if xy.x - self.touchBegin.x > 0 then
|
||||||
local max_x = xy.x
|
local max_x = xy.x
|
||||||
local min_x = self.touchBegin.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')
|
ViewUtil.PlaySound('RunFastNew_PK', 'extend/poker/runfast/sound/click.mp3')
|
||||||
else
|
else
|
||||||
|
print("lingout")
|
||||||
self.touchBegin = Vector2.New(0, 0)
|
self.touchBegin = Vector2.New(0, 0)
|
||||||
for k = 1, #self.card_list do
|
for k = 1, #self.card_list do
|
||||||
local card = self.card_list[k]
|
local card = self.card_list[k]
|
||||||
|
|
@ -316,11 +320,12 @@ function M:AddCardMoveEvent(card)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
Stage.inst:ResetInputState()
|
Stage.inst:ResetInputState()
|
||||||
card.btn_card.onTouchEnd:Set(nil)
|
card.btn_card.onTouchEnd:Set(nil)
|
||||||
|
|
||||||
self:zhizhanxuanpai()
|
if not self._flag_xuan then
|
||||||
|
self:zhizhanxuanpai()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
|
|
@ -341,6 +346,7 @@ function M:AddCardMoveEvent(card)
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:zhizhanxuanpai() --智障选牌
|
function M:zhizhanxuanpai() --智障选牌
|
||||||
|
print("lingmengxuan", #self.send_card)
|
||||||
-- body
|
-- body
|
||||||
local temp_send_card = {}
|
local temp_send_card = {}
|
||||||
for i = 1, #self.send_card do
|
for i = 1, #self.send_card do
|
||||||
|
|
@ -374,9 +380,11 @@ function M:zhizhanxuanpai() --智障选牌
|
||||||
self.xunpai = {}
|
self.xunpai = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
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 and #temp_list > #self.xunpai then
|
||||||
for i = 1, #self.send_card do
|
if temp_list ~= nil and temp_list1 == nil and temp_list2 == nil and temp_bomb == nil then
|
||||||
self:UpdateCardMove(self.send_card[i].btn_card, false, false)
|
-- 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
|
end
|
||||||
for i = 1, #self.send_card do
|
for i = 1, #self.send_card do
|
||||||
for j = 1, #temp_list 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))
|
local xy = self.cards_view:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
|
||||||
self.isTouching = true
|
self.isTouching = true
|
||||||
if xy.x - self.touchBegin.x > 0 then -- 往右边滑
|
if xy.x - self.touchBegin.x > 0 then -- 往右边滑
|
||||||
--printlog("cccccccccccccc1111111111111111111111111")
|
|
||||||
local max_x = xy.x
|
local max_x = xy.x
|
||||||
local min_x = self.touchBegin.x
|
local min_x = self.touchBegin.x
|
||||||
for i = 1, #self.card_list do
|
for i = 1, #self.card_list do
|
||||||
|
|
|
||||||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: extend/majiang/jinxi/d6500faabd8efe9ea4f5aef4daf5e9dd
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: extend/majiang/nancheng/704ffdeb1d214471a2c68eb82f8ff5c9
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue