714
parent
4624ad7a49
commit
c5f712125d
|
|
@ -1112,7 +1112,7 @@ function M:OnFangziAction(...)
|
|||
-- function()
|
||||
-- coroutine.wait(1.0)
|
||||
-- info:PlayingOutCardAnima()
|
||||
self:PlaySound(player.self_user.sex, 'F_GuoSao')
|
||||
self:PlaySound(player.self_user.sex, 'F_Sao')
|
||||
effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'wei')
|
||||
-- effect.touchable = false
|
||||
-- effect.x, effect.y = -250, -200
|
||||
|
|
@ -1134,7 +1134,7 @@ function M:OnFangziAction(...)
|
|||
-- function()
|
||||
-- coroutine.wait(1.2)
|
||||
-- info:PlayingOutCardAnima()
|
||||
self:PlaySound(player.self_user.sex, 'F_GuoSao')
|
||||
self:PlaySound(player.self_user.sex, 'F_Sao')
|
||||
effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'wei')
|
||||
-- effect.touchable = false
|
||||
-- effect.x, effect.y = -250, -200
|
||||
|
|
@ -1155,6 +1155,7 @@ function M:OnFangziAction(...)
|
|||
elseif fz.type == RB_FZType.Ti then
|
||||
-- self:PlaySound(player.self_user.sex, 'F_' .. fz.card)
|
||||
-- info:UpdateOutCardList(fz.card, true, true, fz.from_seat)
|
||||
self:PlaySound(player.self_user.sex, 'F_SaoChuan')
|
||||
effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'ti')
|
||||
-- effect.touchable = false
|
||||
-- effect.x, effect.y = -250, -200
|
||||
|
|
@ -1164,7 +1165,7 @@ function M:OnFangziAction(...)
|
|||
-- -- function()
|
||||
-- -- coroutine.wait(1.2)
|
||||
-- print("lingmeng tiqi")
|
||||
-- self:PlaySound(player.self_user.sex, 'F_SaoChuan')
|
||||
|
||||
-- -- info:PlayingOutCardAnima()
|
||||
-- -- end)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,114 +1,8 @@
|
|||
{
|
||||
"libview.firstColumnWidth": 522,
|
||||
"doc.openedDocs": [],
|
||||
"libview.iconScale": 0,
|
||||
"doc.openedDocs": [
|
||||
"ui://m7iejg46hsbhhjn",
|
||||
"ui://m7iejg46t1hqhxw",
|
||||
"ui://m7iejg46yvb27ik0",
|
||||
"ui://m7iejg46gojuhh5",
|
||||
"ui://m7iejg46imp57ihp",
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"ui://m7iejg46jgh8hwv",
|
||||
"ui://v6yvqp7wf55qwa",
|
||||
"ui://v6yvqp7wf55qw4",
|
||||
"ui://v6yvqp7wf55qw7",
|
||||
"ui://1utjt0r2ufu92i",
|
||||
"ui://m7iejg4610snh5j",
|
||||
"ui://1utjt0r2ufu930",
|
||||
"ui://v6yvqp7wf55qvx",
|
||||
>>>>>>> 02feaf2d431509775863b04b82094c2fb1ee8dc8
|
||||
"ui://m7iejg46f6brhww",
|
||||
"ui://m7iejg46gdye7ik8",
|
||||
"ui://m7iejg46jgh8hwv",
|
||||
"ui://ppu1wv7699we3y",
|
||||
"ui://442j0uepygxga",
|
||||
"ui://ppu1wv76j4mf9j",
|
||||
"ui://v6yvqp7waen81b0",
|
||||
"ui://m7iejg46yvb27ijw",
|
||||
"ui://v0j9abjygq7ms2",
|
||||
"ui://v6yvqp7wf55qwa",
|
||||
"ui://v6yvqp7wf55qw5",
|
||||
"ui://442j0uepona1bl",
|
||||
"ui://v6yvqp7wcyprwt",
|
||||
"ui://m7iejg46lcv1hwt",
|
||||
"ui://v6yvqp7wlvh412d",
|
||||
"ui://m7iejg46yvb27ijz"
|
||||
],
|
||||
"auxline1": true,
|
||||
"canvasColor": 10066329,
|
||||
"auxline2": true,
|
||||
<<<<<<< HEAD
|
||||
"doc.activeDoc": "ui://v6yvqp7waen81b0",
|
||||
"libview.twoColumn": false,
|
||||
"libview.expandedNodes": [
|
||||
"ppu1wv76",
|
||||
"/",
|
||||
"v6yvqp7w",
|
||||
"/",
|
||||
"v6yvqp7w",
|
||||
"/component/",
|
||||
"v6yvqp7w",
|
||||
"/component/Main/",
|
||||
"v6yvqp7w",
|
||||
"/component/Main/component/",
|
||||
"v6yvqp7w",
|
||||
"/component/Main/setting/",
|
||||
"v6yvqp7w",
|
||||
"/component/cards/",
|
||||
"v6yvqp7w",
|
||||
"/component/option/",
|
||||
"v6yvqp7w",
|
||||
"/component/option/component/",
|
||||
"v6yvqp7w",
|
||||
"/component/option/component/card/",
|
||||
"m7iejg46",
|
||||
"/",
|
||||
"m7iejg46",
|
||||
"/component/",
|
||||
"m7iejg46",
|
||||
"/component/nav/",
|
||||
"m7iejg46",
|
||||
"/mgr/",
|
||||
"m7iejg46",
|
||||
"/mgr/component/",
|
||||
"m7iejg46",
|
||||
"/mgr/component/member/",
|
||||
"m7iejg46",
|
||||
"/mgr/component/member/partner/",
|
||||
"m7iejg46",
|
||||
"/mgr/component/member/partner/images/"
|
||||
=======
|
||||
"doc.activeDoc": "ui://m7iejg4610snh5j",
|
||||
"libview.twoColumn": false,
|
||||
"libview.expandedNodes": [
|
||||
"1utjt0r2",
|
||||
"/",
|
||||
"1utjt0r2",
|
||||
"/component/",
|
||||
"1utjt0r2",
|
||||
"/component/clearing/",
|
||||
"d1qrzqpr",
|
||||
"/",
|
||||
"qubt49z8",
|
||||
"/",
|
||||
"eyxz924g",
|
||||
"/",
|
||||
"parowutd",
|
||||
"/",
|
||||
"4wmd3o8g",
|
||||
"/",
|
||||
"z3z0ysur",
|
||||
"/",
|
||||
"96mvx2ml",
|
||||
"/",
|
||||
"m7iejg46",
|
||||
"/"
|
||||
>>>>>>> 02feaf2d431509775863b04b82094c2fb1ee8dc8
|
||||
],
|
||||
"snapToGrid": true,
|
||||
"backgroundColor": 6710886,
|
||||
"libview.currentGroup": "",
|
||||
"gridSize": 30,
|
||||
"gridColor": 80
|
||||
"libview.expandedNodes": [],
|
||||
"libview.firstColumnWidth": 297,
|
||||
"libview.twoColumn": false
|
||||
}
|
||||
Loading…
Reference in New Issue