diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index cf316512..e6883925 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -1152,6 +1152,7 @@ function M:ReflashChatRoomRedPoint() end function M:Show() + ViewUtil.PlaySoundBg() Broadcast.AddListener(BroadcastEvent.OnJoinsChange, ReflashJoinsRedPoint, self) Broadcast.AddListener(BroadcastEvent.OnMemberChange, self.ReflashMember, self) Broadcast.AddListener(BroadcastEvent.OnOutFamily, self.Reflash, self) diff --git a/lua_probject/base_project/Game/View/Lobby/GamePlayDetail.lua b/lua_probject/base_project/Game/View/Lobby/GamePlayDetail.lua index b86269fe..5da993d4 100644 --- a/lua_probject/base_project/Game/View/Lobby/GamePlayDetail.lua +++ b/lua_probject/base_project/Game/View/Lobby/GamePlayDetail.lua @@ -14,17 +14,17 @@ local gamePlayDetail = { { icon0 = "jinxi0", icon1 = "jinxi1", - detail = "金溪麻将" + detail = "jinxiDetail" }, { icon0 = "fuzhou0", icon1 = "fuzhou1", - detail = "抚州麻将" + detail = "fuzhouDetail" }, { icon0 = "nancheng0", icon1 = "nancheng1", - detail = "南城麻将" + detail = "nanchengDetail" }, }, --扑克 @@ -32,7 +32,7 @@ local gamePlayDetail = { { icon0 = "paodekuai0", icon1 = "paodekuai1", - detail = "跑得快" + detail = "paodekuaiDetail" }, }, --字牌 diff --git a/lua_probject/base_project/Game/View/WitnessView.lua b/lua_probject/base_project/Game/View/WitnessView.lua index cf478d8a..7df4147e 100644 --- a/lua_probject/base_project/Game/View/WitnessView.lua +++ b/lua_probject/base_project/Game/View/WitnessView.lua @@ -196,6 +196,8 @@ function M:EventInit() end end end) + + _gamectr:AddEventListener(GameEvent.AddScore, handler(self, self.OnAddScoreAnimation)) end -- 标记自己托管 @@ -335,6 +337,41 @@ function M:DoNoticeAnimation() self._room.card_type = 1 end +function M:OnAddScoreAnimation(...) + print("OnAddScoreAnimation") + local arg = { ... } + local totalScoreList = arg[2].totalScoreList + local playerList = arg[2].playerList + local addScoreList = arg[2].addScoreList + pt(arg) + + local scoreData = {} + for i = 1, #totalScoreList do + local p = {} + + p.totalScore = totalScoreList[i] + p.player = playerList[i] + p.addScore = addScoreList[i] + + scoreData[#scoreData + 1] = p + end + + for _, p in pairs(scoreData) do + local infoView = self:GetPlayerInfo(p.player) + local player = GetPlayer(self, p.player) + player.cur_hp = p.totalScore + + if p.addScore ~= 0 then + infoView:ScoreAnimation(p.addScore) + if player.cur_hp >= 0 then + infoView._view:GetChild("text_jifen").text = "+" .. player.cur_hp + else + infoView._view:GetChild("text_jifen").text = player.cur_hp + end + end + end +end + function M:OnUpdate() local deltaTime = Time.deltaTime if (self._popEvent) then diff --git a/lua_probject/base_project/table/Table_Error_code.lua b/lua_probject/base_project/table/Table_Error_code.lua index 8bf4b150..2139302b 100644 --- a/lua_probject/base_project/table/Table_Error_code.lua +++ b/lua_probject/base_project/table/Table_Error_code.lua @@ -7,95 +7,95 @@ --- -- 网络错误码常量 数据集合 -- @type Table_Error_code_Map --- @map <#number, #Error_code> +-- @map <#number, #Error_code> --- -- 网络错误码常量 数据集合 -- @field[parent = #global] TableData#Table_Error_code_Map Table_Error_code_Map Table_Error_code_Map = { - [2]={id=2,note="登陆限制超时，请重新登陆"}, - [3]={id=3,note=""}, - [4]={id=4,note=""}, - [5]={id=5,note="玩法不可用"}, - [6]={id=6,note="游戏已停用"}, - [7]={id=7,note="房卡不足"}, - [8]={id=8,note="已经在亲友圈中"}, - [9]={id=9,note="邀请码无效"}, - [10]={id=10,note="房间已满"}, - [11]={id=11,note="房间号不存在"}, - [12]={id=12,note="此邮件不存在"}, - [13]={id=13,note="邮件已经领取"}, - [14]={id=14,note="此任务不存在"}, - [15]={id=15,note="没有亲友圈"}, - [16]={id=16,note="任务奖励已领取"}, - [18]={id=18,note="牛牛有玩家未重连成功"}, - [20]={id=20,note="排行&战绩数据获取失败"}, - [21]={id=21,note="排行数据获取失败"}, - [22]={id=22,note="战绩数据获取失败"}, - [26]={id=26,note="创建房间数达到上限"}, - [27]={id=27,note="正在游戏中，删除房间失败"}, - [28]={id=28,note="多次登录失败，禁止登录,请过段时间再次尝试"}, - [101]={id=101,note="请检查您的网络设置"}, - [102]={id=102,note="网络连接超时"}, - [500]={id=500,note=""}, - [999]={id=999,note="未知错误"}, - [17]={id=17,note="奖券不足"}, - [53]={id=53,note="与桌上玩家IP相同，进入房间失败"}, - [54]={id=54,note="与桌上玩家距离过近，进入房间失败"}, - [55]={id=55,note="GPS服务未开启，请开启GPS服务！"}, - [56]={id=56,note="不是亲友圈"}, - [57]={id=57,note="亲友圈不能退出"}, - [59]={id=59,note="无效的验证码"}, - [61]={id=61,note="手机号码已绑定玩家"}, - [80]={id=80,note="房间已删除"}, - [81]={id=81,note="是亲友圈房间"}, - [83]={id=83,note="分数已被限制，请联系管理员"}, - [1000]={id=1000,note="已申请加入"}, - [1001]={id=1001,note="成员已存在"}, - [1002]={id=1002,note="成员不存在"}, - [1003]={id=1003,note="成员存在上级合伙人"}, - [1004]={id=1004,note="玩法已满"}, - [1005]={id=1005,note="房间被删除"}, - [1007]={id=1007,note="玩法不存在"}, - [1008]={id=1008,note="不是管理员"}, - [1009]={id=1009,note="合伙人有成员"}, - [1010]={id=1010,note="目标是管理员"}, - [1011]={id=1011,note="目标是合伙人"}, - [1012]={id=1012,note="目标积分不足"}, - [1013]={id=1013,note="房卡不足"}, - [1014]={id=1014,note="没有权限"}, - [1015]={id=1015,note="积分不为0"}, - [1016]={id=1016,note="成员在房间内"}, - [1017]={id=1017,note="成员积分事件正在执行"}, - [1018]={id=1018,note="亲友圈不存在"}, - [1019]={id=1019,note="亲友圈已满"}, - [1020]={id=1020,note="亲友圈还有房间"}, - [1021]={id=1021,note="亲友圈禁止娱乐"}, - [1022]={id=1022,note="不是群主"}, - [1023]={id=1023,note="目標玩家是合伙人"}, - [1024]={id=1024,note="目標玩家不是合伙人"}, - [1025]={id=1025,note="已被管理员禁止娱乐"}, - [1026]={id=1026,note="房卡不足，无法进入房间"}, - [1027]={id=1027,note="只能创建一个亲友圈"}, - [1028]={id=1028,note="亲友圈玩法必须开启积分"}, - [1029]={id=1029,note="还存在该玩法的房间，操作失败"}, - [1030]={id=1030,note="不在此亲友圈的房间中"}, - [1031]={id=1031,note="玩家关闭被邀请"}, - [1032]={id=1032,note="创建亲友圈数达到上限"}, - [1033]={id=1033,note="亲友圈人数已满"}, - [1034]={id=1034,note="玩家在游戏中，不能下分"}, - [1035]={id=1035,note="奖励池积分不足"}, - [1036]={id=1036,note=" 奖励池没提取"}, - [1037]={id=1037,note="禁止同桌"}, - [1038]={id=1038,note="玩法禁止娱乐"}, - [1039]={id=1039,note="亲友圈已关闭申请"}, - [1040]={id=1040,note="亲友圈已停止服务"}, - [1041]={id=1041,note="不能退出亲友圈"}, - [1047]={id=1047,note="携带值超越上线, 请保存到保险箱里"}, - [1048]={id=1048,note="玩家携带值值超越上线, 请提醒保险箱里"}, - [1049]={id=1049,note="本房间禁止扔表情"}, - [10000]={id=10000,note="微信登录失败，请重新登录"}, - [10001]={id=10001,note="Error: capacity is full."}, - [10002]={id=10002,note="Error: The Queue is empty."} -} \ No newline at end of file + [2] = { id = 2, note = "登陆限制超时，请重新登陆" }, + [3] = { id = 3, note = "" }, + [4] = { id = 4, note = "" }, + [5] = { id = 5, note = "玩法不可用" }, + [6] = { id = 6, note = "游戏已停用" }, + [7] = { id = 7, note = "房卡不足" }, + [8] = { id = 8, note = "已经在亲友圈中" }, + [9] = { id = 9, note = "邀请码无效" }, + [10] = { id = 10, note = "房间已满" }, + [11] = { id = 11, note = "房间号不存在" }, + [12] = { id = 12, note = "此邮件不存在" }, + [13] = { id = 13, note = "邮件已经领取" }, + [14] = { id = 14, note = "此任务不存在" }, + [15] = { id = 15, note = "没有亲友圈" }, + [16] = { id = 16, note = "任务奖励已领取" }, + [18] = { id = 18, note = "牛牛有玩家未重连成功" }, + [20] = { id = 20, note = "排行&战绩数据获取失败" }, + [21] = { id = 21, note = "排行数据获取失败" }, + [22] = { id = 22, note = "战绩数据获取失败" }, + [26] = { id = 26, note = "创建房间数达到上限" }, + [27] = { id = 27, note = "正在游戏中，删除房间失败" }, + [28] = { id = 28, note = "多次登录失败，禁止登录,请过段时间再次尝试" }, + [101] = { id = 101, note = "请检查您的网络设置" }, + [102] = { id = 102, note = "网络连接超时" }, + [500] = { id = 500, note = "" }, + [999] = { id = 999, note = "未知错误" }, + [17] = { id = 17, note = "奖券不足" }, + [53] = { id = 53, note = "与桌上玩家IP相同，进入房间失败" }, + [54] = { id = 54, note = "与桌上玩家距离过近，进入房间失败" }, + [55] = { id = 55, note = "GPS服务未开启，请开启GPS服务！" }, + [56] = { id = 56, note = "不是亲友圈" }, + [57] = { id = 57, note = "亲友圈不能退出" }, + [59] = { id = 59, note = "无效的验证码" }, + [61] = { id = 61, note = "手机号码已绑定玩家" }, + [80] = { id = 80, note = "房间已删除" }, + [81] = { id = 81, note = "是亲友圈房间" }, + [83] = { id = 83, note = "分数已被限制，请联系管理员" }, + [1000] = { id = 1000, note = "已申请加入" }, + [1001] = { id = 1001, note = "成员已存在" }, + [1002] = { id = 1002, note = "成员不存在" }, + [1003] = { id = 1003, note = "成员存在上级合伙人" }, + [1004] = { id = 1004, note = "玩法已满" }, + [1005] = { id = 1005, note = "房间被删除" }, + [1007] = { id = 1007, note = "玩法不存在" }, + [1008] = { id = 1008, note = "不是管理员" }, + [1009] = { id = 1009, note = "合伙人有成员" }, + [1010] = { id = 1010, note = "目标是管理员" }, + [1011] = { id = 1011, note = "目标是合伙人" }, + [1012] = { id = 1012, note = "目标积分不足" }, + [1013] = { id = 1013, note = "房卡不足" }, + [1014] = { id = 1014, note = "没有权限" }, + [1015] = { id = 1015, note = "积分不为0" }, + [1016] = { id = 1016, note = "成员在房间内" }, + [1017] = { id = 1017, note = "成员积分事件正在执行" }, + [1018] = { id = 1018, note = "亲友圈不存在" }, + [1019] = { id = 1019, note = "亲友圈已满" }, + [1020] = { id = 1020, note = "亲友圈还有房间" }, + [1021] = { id = 1021, note = "亲友圈禁止娱乐" }, + [1022] = { id = 1022, note = "不是群主" }, + [1023] = { id = 1023, note = "目標玩家是合伙人" }, + [1024] = { id = 1024, note = "目標玩家不是合伙人" }, + [1025] = { id = 1025, note = "已被管理员禁止娱乐" }, + [1026] = { id = 1026, note = "分数已被限制，请联系管理员" }, + [1027] = { id = 1027, note = "只能创建一个亲友圈" }, + [1028] = { id = 1028, note = "亲友圈玩法必须开启积分" }, + [1029] = { id = 1029, note = "还存在该玩法的房间，操作失败" }, + [1030] = { id = 1030, note = "不在此亲友圈的房间中" }, + [1031] = { id = 1031, note = "玩家关闭被邀请" }, + [1032] = { id = 1032, note = "创建亲友圈数达到上限" }, + [1033] = { id = 1033, note = "亲友圈人数已满" }, + [1034] = { id = 1034, note = "玩家在游戏中，不能下分" }, + [1035] = { id = 1035, note = "奖励池积分不足" }, + [1036] = { id = 1036, note = " 奖励池没提取" }, + [1037] = { id = 1037, note = "禁止同桌" }, + [1038] = { id = 1038, note = "玩法禁止娱乐" }, + [1039] = { id = 1039, note = "亲友圈已关闭申请" }, + [1040] = { id = 1040, note = "亲友圈已停止服务" }, + [1041] = { id = 1041, note = "不能退出亲友圈" }, + [1047] = { id = 1047, note = "携带值超越上线, 请保存到保险箱里" }, + [1048] = { id = 1048, note = "玩家携带值值超越上线, 请提醒保险箱里" }, + [1049] = { id = 1049, note = "本房间禁止扔表情" }, + [10000] = { id = 10000, note = "微信登录失败，请重新登录" }, + [10001] = { id = 10001, note = "Error: capacity is full." }, + [10002] = { id = 10002, note = "Error: The Queue is empty." } +} diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua index 314bfd59..005574c5 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua @@ -5,7 +5,7 @@ local EXClearingView = {} local M = EXClearingView -function EXClearingView.new(blur_view, data) +function EXClearingView.new(root, data) setmetatable(M, { __index = ResultView }) local self = setmetatable({}, { __index = M }) self._full = true @@ -14,7 +14,7 @@ function EXClearingView.new(blur_view, data) self._root_view:GetChild("win_mode").visible = false self._currenIndex = 0 - self._blur_view = blur_view + self._root = root self._close_zone = false if data then self.flag_back = data.flag_back diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index d121f4d2..cf64d730 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -24,7 +24,7 @@ function M.new() self.HuCardImg_path = "ui://Extend_MJ_FuZhou/" self.Sound_path = "extend/majiang/fuzhou/sound/" self:init() - ViewUtil.PlayMuisc(self.asset_group, "extend/majiang/fuzhou/sound/bg.mp3") + --ViewUtil.PlayMuisc(self.asset_group, "extend/majiang/fuzhou/sound/bg.mp3") return self end @@ -563,10 +563,15 @@ function M:OutCard(card) printlog("当前出牌为===>>>" .. card) local _gamectr = ControllerManager.GetController(GameController) self._room.curren_outcard_seat = -1 - _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() + _gamectr:SendOutCard( + { + card = card, + isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 or + self._player_card_info[1]._ctr_showGuoHu.selectedIndex == 1 + }, function() + local info = self._player_card_info[1] + self:RemoveCursor() + info:UpdateHandCard() info:UpdateOutCardList(nil, card, self._cursor) info._ctr_tip.selectedIndex = 0 diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua index ea49b32a..c1948322 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua @@ -321,8 +321,7 @@ function M:EventInit() -- end -- self:RemoveCursor() if self._clearingView == nil then - self._clearingView = EXClearingView.new(self._root_view) - self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self,self.ClickSetting)) + self._clearingView = EXClearingView.new(self) coroutine.start(function() coroutine.wait(0.5) self._clearingView:Show() diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua index ed3bc704..79977615 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua @@ -5,7 +5,7 @@ local EXClearingView = {} local M = EXClearingView -function EXClearingView.new(blur_view, data) +function EXClearingView.new(root, data) setmetatable(M, { __index = ResultView }) local self = setmetatable({}, { __index = M }) self._full = true @@ -14,7 +14,7 @@ function EXClearingView.new(blur_view, data) self._root_view:GetChild("win_mode").visible = false self._currenIndex = 0 - self._blur_view = blur_view + self._root = root self._close_zone = false if data then self.flag_back = data.flag_back diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index 2fb1a8f4..c341edee 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -404,7 +404,6 @@ self:PlaySound("JinXi_MJ", p.self_user.sex, tostring(card)) end) _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...) - self:PlayMJSound("end_music.mp3") MJMainView.OnResult1(self, ...) --[[ self._popEvent = false @@ -565,10 +564,15 @@ function M:OutCard(card) printlog("当前出牌为===>>>" .. card) local _gamectr = ControllerManager.GetController(GameController) self._room.curren_outcard_seat = -1 - _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() + _gamectr:SendOutCard( + { + card = card, + isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 or + self._player_card_info[1]._ctr_showGuoHu.selectedIndex == 1 + }, function() + local info = self._player_card_info[1] + self:RemoveCursor() + info:UpdateHandCard() info:UpdateOutCardList(nil, card, self._cursor) info._ctr_tip.selectedIndex = 0 diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua index 1424b397..d7d7b5de 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua @@ -321,8 +321,7 @@ function M:EventInit() -- end -- self:RemoveCursor() if self._clearingView == nil then - self._clearingView = EXClearingView.new(self._root_view) - self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self,self.ClickSetting)) + self._clearingView = EXClearingView.new(self) coroutine.start(function() coroutine.wait(0.5) self._clearingView:Show() diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index ed9f6334..324f4574 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -24,7 +24,7 @@ function M.new() self.HuCardImg_path = "ui://Extend_MJ_LiChuan/" self.Sound_path = "extend/majiang/lichuan/sound/" self:init() - ViewUtil.PlayMuisc(self.asset_group, "extend/majiang/lichuan/sound/bg.mp3") + -- ViewUtil.PlayMuisc(self.asset_group, "extend/majiang/lichuan/sound/bg.mp3") return self end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index ac49d519..36422360 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -323,8 +323,7 @@ function M:EventInit() -- end -- self:RemoveCursor() if self._clearingView == nil then - self._clearingView = EXClearingView.new(self._root_view) - self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self, self.ClickSetting)) + self._clearingView = EXClearingView.new(self) coroutine.start(function() coroutine.wait(0.5) self._clearingView:Show() diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua index 4d54df13..d0162685 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua @@ -5,7 +5,7 @@ local EXClearingView = {} local M = EXClearingView -function EXClearingView.new(blur_view, data) +function EXClearingView.new(root, data) setmetatable(M, { __index = ResultView }) local self = setmetatable({}, { __index = M }) self._full = true @@ -14,7 +14,7 @@ function EXClearingView.new(blur_view, data) self._root_view:GetChild("win_mode").visible = false self._currenIndex = 0 - self._blur_view = blur_view + self._root = root self._close_zone = false if data then self.flag_back = data.flag_back diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index f6d42619..57dff025 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -563,10 +563,15 @@ function M:OutCard(card) printlog("当前出牌为===>>>" .. card) local _gamectr = ControllerManager.GetController(GameController) self._room.curren_outcard_seat = -1 - _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() + _gamectr:SendOutCard( + { + card = card, + isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 or + self._player_card_info[1]._ctr_showGuoHu.selectedIndex == 1 + }, function() + local info = self._player_card_info[1] + self:RemoveCursor() + info:UpdateHandCard() info:UpdateOutCardList(nil, card, self._cursor) info._ctr_tip.selectedIndex = 0 diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua index f502c835..fa64eaed 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua @@ -321,8 +321,7 @@ function M:EventInit() -- end -- self:RemoveCursor() if self._clearingView == nil then - self._clearingView = EXClearingView.new(self._root_view) - self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self,self.ClickSetting)) + self._clearingView = EXClearingView.new(self) coroutine.start(function() coroutine.wait(0.5) self._clearingView:Show() diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index f01ab863..1811605e 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -970,6 +970,7 @@ function M:Show() local win = GameInfoWindow.New() win:Show(self._room) end + self:PlayMJSound("game_backmusic.mp3") self:DoNoticeAnimation() end diff --git a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua index 13e885cc..38fd2c1b 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua @@ -32,9 +32,7 @@ function M:init() self._ctr_showGuoHu = self._view:GetController('showGuoHu') self._area_allDown.onClick:Set(function() - self._view_handCardList.selectedIndex = -1 - self._click_index = self._view_handCardList.selectedIndex - self._ctr_seletedGet.selectedIndex = 1 + self:ClearChoose() end) self._viewBtn_buGuoHu.onClick:Set(function() @@ -257,8 +255,8 @@ function M:ChangeMarkOutCards(card) elseif self._flag_seletedGet ~= 0 then lastCard = self._view_getCard:GetChildAt(0).data.card_item end - self._mainView:markOutCards(false, lastCard) - self._mainView:markOutCards(true, card) + self._mainView:markOutCards(false, lastCard) + self._mainView:markOutCards(true, card) end function M:__OnClickHandCard(context) diff --git a/lua_probject/main_project/main/majiang/MJWitnessView.lua b/lua_probject/main_project/main/majiang/MJWitnessView.lua index 6153b7f8..5b576573 100644 --- a/lua_probject/main_project/main/majiang/MJWitnessView.lua +++ b/lua_probject/main_project/main/majiang/MJWitnessView.lua @@ -51,6 +51,7 @@ function M:InitView() self.btn_setting = self._view:GetChild("btn_setting") self.btn_setting.onClick:Set(handler(self, self.ClickSetting)) + self._view_clearingFather = self._view:GetChild('clearing_show') end function M:ClickSetting() @@ -58,6 +59,11 @@ function M:ClickSetting() view:Show() end +function M:Show() + getmetatable(M).__index.Show(self) + self:PlayMJSound("game_backmusic.mp3") +end + local majiang_asset_path = "base/main_majiang/sound/" function M:PlayMJSound(path) ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path) diff --git a/wb_new_ui/assets/Common/bg/loggin_bg.png b/wb_new_ui/assets/Common/bg/loggin_bg.png index c500e78c..9177d3cb 100644 Binary files a/wb_new_ui/assets/Common/bg/loggin_bg.png and b/wb_new_ui/assets/Common/bg/loggin_bg.png differ diff --git a/wb_new_ui/assets/Hotupdate/Version.xml b/wb_new_ui/assets/Hotupdate/Version.xml index d7335c59..b1837a58 100644 --- a/wb_new_ui/assets/Hotupdate/Version.xml +++ b/wb_new_ui/assets/Hotupdate/Version.xml @@ -2,12 +2,15 @@ - - - - + + + + + + + - + @@ -20,6 +23,8 @@ - + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml b/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml index bc9ddfc4..cf1fe37c 100644 --- a/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml +++ b/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml @@ -1,10 +1,12 @@ - + - + + + + - \ No newline at end of file diff --git a/wb_new_ui/assets/Hotupdate/hall_girl_bg@2x.png b/wb_new_ui/assets/Hotupdate/hall_girl_bg@2x.png index a07214d3..b163dab6 100644 Binary files a/wb_new_ui/assets/Hotupdate/hall_girl_bg@2x.png and b/wb_new_ui/assets/Hotupdate/hall_girl_bg@2x.png differ diff --git a/wb_new_ui/assets/Hotupdate/images/denglu_icon_01.png b/wb_new_ui/assets/Hotupdate/images/denglu_icon_01.png index a7b912cc..51af172e 100644 Binary files a/wb_new_ui/assets/Hotupdate/images/denglu_icon_01.png and b/wb_new_ui/assets/Hotupdate/images/denglu_icon_01.png differ diff --git a/wb_new_ui/assets/Hotupdate/images/denglu_icon_03.png b/wb_new_ui/assets/Hotupdate/images/denglu_icon_03.png index 740d9c62..fa6e92c7 100644 Binary files a/wb_new_ui/assets/Hotupdate/images/denglu_icon_03.png and b/wb_new_ui/assets/Hotupdate/images/denglu_icon_03.png differ diff --git a/wb_new_ui/assets/Hotupdate/loggin_bg.png b/wb_new_ui/assets/Hotupdate/loggin_bg.png index c500e78c..9177d3cb 100644 Binary files a/wb_new_ui/assets/Hotupdate/loggin_bg.png and b/wb_new_ui/assets/Hotupdate/loggin_bg.png differ diff --git a/wb_new_ui/assets/Hotupdate/package.xml b/wb_new_ui/assets/Hotupdate/package.xml index 8a86c5d3..26d5f17e 100644 --- a/wb_new_ui/assets/Hotupdate/package.xml +++ b/wb_new_ui/assets/Hotupdate/package.xml @@ -12,11 +12,11 @@ - + - + diff --git a/wb_new_ui/assets/Lobby/2b25837b-0405-4fab-80d1-c15388ad67c8.png b/wb_new_ui/assets/Lobby/2b25837b-0405-4fab-80d1-c15388ad67c8.png deleted file mode 100644 index f75c41b5..00000000 Binary files a/wb_new_ui/assets/Lobby/2b25837b-0405-4fab-80d1-c15388ad67c8.png and /dev/null differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/component/fuzhouDetail.xml b/wb_new_ui/assets/Lobby/GamePlay/component/fuzhouDetail.xml new file mode 100644 index 00000000..b3cb0703 --- /dev/null +++ b/wb_new_ui/assets/Lobby/GamePlay/component/fuzhouDetail.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Lobby/GamePlay/component/jinxiDetail.xml b/wb_new_ui/assets/Lobby/GamePlay/component/jinxiDetail.xml new file mode 100644 index 00000000..2256c81e --- /dev/null +++ b/wb_new_ui/assets/Lobby/GamePlay/component/jinxiDetail.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Lobby/GamePlay/component/lichuanDetail.xml b/wb_new_ui/assets/Lobby/GamePlay/component/lichuanDetail.xml index 98a19de8..671c8c5c 100644 --- a/wb_new_ui/assets/Lobby/GamePlay/component/lichuanDetail.xml +++ b/wb_new_ui/assets/Lobby/GamePlay/component/lichuanDetail.xml @@ -2,8 +2,8 @@ - - - + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Lobby/GamePlay/component/nanchengDetail.xml b/wb_new_ui/assets/Lobby/GamePlay/component/nanchengDetail.xml new file mode 100644 index 00000000..ffd5f090 --- /dev/null +++ b/wb_new_ui/assets/Lobby/GamePlay/component/nanchengDetail.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Lobby/GamePlay/component/paodekuaiDetail.xml b/wb_new_ui/assets/Lobby/GamePlay/component/paodekuaiDetail.xml new file mode 100644 index 00000000..c33eadbb --- /dev/null +++ b/wb_new_ui/assets/Lobby/GamePlay/component/paodekuaiDetail.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail1.png b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail1.png new file mode 100644 index 00000000..27c86776 Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail1.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail2.png b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail2.png new file mode 100644 index 00000000..e5a0a511 Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail2.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail3.png b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail3.png new file mode 100644 index 00000000..4714c1a5 Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail3.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail4.png b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail4.png new file mode 100644 index 00000000..87c52c0b Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail4.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail5.png b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail5.png new file mode 100644 index 00000000..a6052de9 Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail5.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail6.png b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail6.png new file mode 100644 index 00000000..14484736 Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail6.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail7.png b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail7.png new file mode 100644 index 00000000..2ac74f1c Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/fuzhouDetail7.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/jinxiDetaill1.png b/wb_new_ui/assets/Lobby/GamePlay/image/jinxiDetaill1.png new file mode 100644 index 00000000..04b2517c Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/jinxiDetaill1.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/jinxiDetaill2.png b/wb_new_ui/assets/Lobby/GamePlay/image/jinxiDetaill2.png new file mode 100644 index 00000000..8ecad98c Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/jinxiDetaill2.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/jinxiDetaill3.png b/wb_new_ui/assets/Lobby/GamePlay/image/jinxiDetaill3.png new file mode 100644 index 00000000..a8236bb1 Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/jinxiDetaill3.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/jinxiDetaill4.png b/wb_new_ui/assets/Lobby/GamePlay/image/jinxiDetaill4.png new file mode 100644 index 00000000..ac5f7f41 Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/jinxiDetaill4.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/nanchengDetail1.png b/wb_new_ui/assets/Lobby/GamePlay/image/nanchengDetail1.png new file mode 100644 index 00000000..6c4a70d4 Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/nanchengDetail1.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/nanchengDetail2.png b/wb_new_ui/assets/Lobby/GamePlay/image/nanchengDetail2.png new file mode 100644 index 00000000..e729ffea Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/nanchengDetail2.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/nanchengDetail3.png b/wb_new_ui/assets/Lobby/GamePlay/image/nanchengDetail3.png new file mode 100644 index 00000000..ad692d8b Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/nanchengDetail3.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/nanchengDetail4.png b/wb_new_ui/assets/Lobby/GamePlay/image/nanchengDetail4.png new file mode 100644 index 00000000..dd7c88fa Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/nanchengDetail4.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/paodekuaiDetail1.png b/wb_new_ui/assets/Lobby/GamePlay/image/paodekuaiDetail1.png new file mode 100644 index 00000000..2dba4a2e Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/paodekuaiDetail1.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/paodekuaiDetail2.png b/wb_new_ui/assets/Lobby/GamePlay/image/paodekuaiDetail2.png new file mode 100644 index 00000000..c3c2bc80 Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/paodekuaiDetail2.png differ diff --git a/wb_new_ui/assets/Lobby/GamePlay/image/paodekuaiDetail3.png b/wb_new_ui/assets/Lobby/GamePlay/image/paodekuaiDetail3.png new file mode 100644 index 00000000..cdede2c4 Binary files /dev/null and b/wb_new_ui/assets/Lobby/GamePlay/image/paodekuaiDetail3.png differ diff --git a/wb_new_ui/assets/Lobby/Main_New.xml b/wb_new_ui/assets/Lobby/Main_New.xml index c9fa2d97..710545d6 100644 --- a/wb_new_ui/assets/Lobby/Main_New.xml +++ b/wb_new_ui/assets/Lobby/Main_New.xml @@ -7,25 +7,19 @@ - + - + - - - - - - - + - + @@ -72,16 +66,22 @@ - - - - + + + + + + + + + + - + @@ -98,10 +98,7 @@ - - - - + diff --git a/wb_new_ui/assets/Lobby/component/Main/Component/center/btn_createRoom.xml b/wb_new_ui/assets/Lobby/component/Main/Component/center/btn_createRoom.xml index ddd47de9..b7303a17 100644 --- a/wb_new_ui/assets/Lobby/component/Main/Component/center/btn_createRoom.xml +++ b/wb_new_ui/assets/Lobby/component/Main/Component/center/btn_createRoom.xml @@ -2,7 +2,9 @@ - + + + -