hengyang
/
hengyang_client
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

发送是否带提示

master
罗家炜 2025-09-01 23:30:10 +08:00
parent 2510dc55c0
commit 8548edac62
17 changed files with 108 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua
View File

@ -61,9 +61,10 @@ end
------------------------------------------------------------
function M:SendOutCard(card, callback)
function M:SendOutCard(data, callback)
local _data = {}
_data["card"] = card
_data["card"] = data.card
_data["isTip"] = data.isTip
local _room = self._room
local _client = ControllerManager.GameNetClinet
_client:send(TX_Protocol.GAME_DIS_CARD, _data)

7
lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
View File

@ -475,7 +475,6 @@ function M:EventInit()
end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
self:PlayMJSound("end_music.mp3")
self:UnmarkSelfTuoguan()
self._left_time = 0
self:UpdateCardBox(0)
@ -484,6 +483,9 @@ function M:EventInit()
local total_result = arg[2]
local result = arg[1]
local over = arg[3]
if over < 2 or _room.curren_round > 0 then
self:PlayMJSound("end_music.mp3")
end
self._clearingView = EXClearingView.new()
coroutine.start(function()
coroutine.wait(0.5)
@ -561,7 +563,7 @@ function M:OutCard(card)
printlog("当前出牌为===>>>" .. card)
local _gamectr = ControllerManager.GetController(GameController)
self._room.curren_outcard_seat = -1
_gamectr:SendOutCard(card, function()
_gamectr:SendOutCard({ card = card, isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 }, function()
local info = self._player_card_info[1]
self:RemoveCursor()
info:UpdateHandCard()
@ -777,7 +779,6 @@ function M:OnFangziAction(...)
local fz = arg[1]
local player = arg[2]
local index = arg[3]
printlog("OnFangziAction")
local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai
local effect = UIPackage.CreateObject("Extend_MJ_LiChuan", "FzEffect")

1
lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
View File

@ -356,6 +356,7 @@ function M:UpdateFzList(fz, index, show_card)
local FZCard = outCard:GetChild(string.format("Comp_Card%d", 4))
self:fillCard2(FZCard, FZame, fz.card)
if fz.type == FZType.Gang_An then
outCard:GetController("not_arrow").selectedIndex = 1
self:fillCard2(FZCard, FZame, '00')
if FZCard:GetController('jing') then
FZCard:GetController('jing').selectedIndex = 0

2
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml
View File

@ -113,6 +113,6 @@
<gearDisplay controller="ting" pages="1"/>
<gearXY controller="3d" pages="0" values="-2193,-1423" default="616,100"/>
</image>
<text id="n57_ogwn" name="Text_CardInfo" xy="-2587,111" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Order&quot;:&quot;desc&quot;,&#xA;&quot;Pos_X&quot;:57&#xA;}"/>
<text id="n57_ogwn" name="Text_CardInfo" xy="-2587,110" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Order&quot;:&quot;desc&quot;,&#xA;&quot;Pos_X&quot;:57&#xA;}"/>
</displayList>
</component>

4
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml
View File

@ -3,7 +3,7 @@
<controller name="button" pages="0,up,1,down" selected="0"/>
<controller name="jing" pages="0,,1," selected="1"/>
<controller name="move" pages="0,,1," selected="0"/>
<controller name="out" pages="0,,1," selected="0"/>
<controller name="out" pages="0,,1," selected="1"/>
<displayList>
<loader id="n3_hp0b" name="icon" xy="0,0" size="175,191" url="ui://Main_Majiang/b201_203" fill="scaleFree">
<gearXY controller="button" pages="0,1" values="0,0|0,-35"/>
@ -12,7 +12,7 @@
</loader>
<image id="n12_k1od" name="jing" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="71,12" size="101,145" aspect="true">
<gearDisplay controller="jing" pages="1"/>
<gearXY controller="out" pages="0,1" values="71,12|14,-14" duration="0.1"/>
<gearXY controller="out" pages="0,1" values="71,12|71,12" duration="0.1"/>
<gearLook controller="move" pages="1" values="0.3,0,0,0" default="1,0,0,0"/>
<relation target="" sidePair="width-width,height-height"/>
<relation target="n3_hp0b" sidePair="top-top"/>

8
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="456,199">
<controller name="isFour" pages="0,,1," selected="1"/>
<controller name="seat" pages="0,,1,,2,,3," selected="2"/>
<controller name="isFour" pages="0,,1," selected="0"/>
<controller name="seat" pages="0,,1,,2,,3," selected="3"/>
<controller name="not_arrow" pages="0,,1," selected="0"/>
<displayList>
<component id="n0_gi99" name="Comp_Card1" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="0,40" size="151,155">
<relation target="" sidePair="width-width%,left-left"/>
@ -16,7 +17,8 @@
<gearDisplay controller="isFour" pages="1"/>
<relation target="" sidePair="width-width%,center-center"/>
</component>
<image id="n4_qz7i" name="n4" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="206,54" pivot="0.5,0.5" size="30,32">
<image id="n4_qz7i" name="n4" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="215,14" pivot="0.5,0.5" size="30,32" rotation="-90">
<gearDisplay controller="not_arrow" pages="0"/>
<gearXY controller="seat" pages="0,1,2,3" values="215,14|215,14|206,54|215,14"/>
<gearLook controller="seat" pages="0,1,3" values="1,180,0,0|1,90,0,0|1,-90,0,0" default="1,0,0,0"/>
<relation target="" sidePair="center-center"/>

2
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ.xml
View File

@ -2,6 +2,7 @@
<component size="236,83">
<controller name="isFour" pages="0,,1," selected="0"/>
<controller name="seat" pages="0,,1,,2,,3," selected="0"/>
<controller name="not_arrow" pages="0,,1," selected="0"/>
<displayList>
<component id="n0_gi99" name="Comp_Card1" src="gi9910n" fileName="Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml" xy="0,0"/>
<component id="n1_gi99" name="Comp_Card2" src="gi9910n" fileName="Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml" xy="78,0"/>
@ -10,6 +11,7 @@
<gearDisplay controller="isFour" pages="1"/>
</component>
<image id="n4_qz7i" name="n4" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="103,14" pivot="0.5,0.5" size="30,32" rotation="180">
<gearDisplay controller="not_arrow" pages="0"/>
<gearLook controller="seat" pages="0,1,3" values="1,180,0,0|1,90,0,0|1,-90,0,0" default="1,0,0,0"/>
</image>
</displayList>

2
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ.xml
View File

@ -2,6 +2,7 @@
<component size="236,85">
<controller name="isFour" pages="0,,1," selected="0"/>
<controller name="seat" pages="0,,1,,2,,3," selected="0"/>
<controller name="not_arrow" pages="0,,1," selected="0"/>
<displayList>
<component id="n0_gi99" name="Comp_Card1" src="gi9910s" fileName="Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml" xy="0,0"/>
<component id="n1_gi99" name="Comp_Card2" src="gi9910s" fileName="Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml" xy="78,0" size="80,85"/>
@ -10,6 +11,7 @@
<gearDisplay controller="isFour" pages="1"/>
</component>
<image id="n5_qz7i" name="n5" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="103,14" pivot="0.5,0.5" size="30,32" rotation="180">
<gearDisplay controller="not_arrow" pages="0"/>
<gearLook controller="seat" pages="0,1,3" values="1,180,0,0|1,90,0,0|1,-90,0,0" default="1,0,0,0"/>
</image>
</displayList>

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he16.mp3 Normal file
View File

Binary file not shown.

22
wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he16.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 7954c9c70b85a9b4f95a6f643f1be62d
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he17.mp3 Normal file
View File

Binary file not shown.

22
wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he17.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: c00ac24510d52d846bca51580c6aee55
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he16.mp3 Normal file
View File

Binary file not shown.

22
wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he16.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 56e7067f909919241b3156491bd9e49a
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he17.mp3 Normal file
View File

Binary file not shown.

22
wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he17.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: f5ad2880cc258354a9056d7343b5b2e6
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant: