diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua index 33f1bcdb..f1cfe0e3 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua @@ -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) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index e8f416e6..209f0462 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -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") diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index 9f3494fd..9a9201a1 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -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 diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml index a1b9f118..aa859783 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml @@ -113,6 +113,6 @@ - + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml index aa311a9b..6bf7890a 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml @@ -3,7 +3,7 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml index 6b5eb850..4e4fa766 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml @@ -1,7 +1,8 @@ - - + + + @@ -16,7 +17,8 @@ - + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ.xml index e51d3322..d6e64e0c 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ.xml @@ -2,6 +2,7 @@ + @@ -10,6 +11,7 @@ + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ.xml index e1f87eeb..9930eec2 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ.xml @@ -2,6 +2,7 @@ + @@ -10,6 +11,7 @@ + diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes index a5b67819..6dc74630 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he16.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he16.mp3 new file mode 100644 index 00000000..0b04f652 Binary files /dev/null and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he16.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he16.mp3.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he16.mp3.meta new file mode 100644 index 00000000..6c6de995 --- /dev/null +++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he16.mp3.meta @@ -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: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he17.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he17.mp3 new file mode 100644 index 00000000..d3f31437 Binary files /dev/null and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he17.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he17.mp3.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he17.mp3.meta new file mode 100644 index 00000000..f584f45b --- /dev/null +++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he17.mp3.meta @@ -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: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he16.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he16.mp3 new file mode 100644 index 00000000..4984890e Binary files /dev/null and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he16.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he16.mp3.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he16.mp3.meta new file mode 100644 index 00000000..bd51f177 --- /dev/null +++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he16.mp3.meta @@ -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: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he17.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he17.mp3 new file mode 100644 index 00000000..f169b0bf Binary files /dev/null and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he17.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he17.mp3.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he17.mp3.meta new file mode 100644 index 00000000..d410583a --- /dev/null +++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he17.mp3.meta @@ -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: