diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index 8d1c1ecc..da205448 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -12,6 +12,7 @@ GroupMgrEvent = { BeInvited = "be_invited", UpdateGroup = "UpdateGroup", NewMailTip = "NewMailTip", + InviteResponse = "InviteResponse", } GroupMgrController = { @@ -35,8 +36,6 @@ function GroupMgrController.new() self._eventmap = {} self._dispatcher = {} - - self._eventmap[Protocol.FGMGR_EVT_ADD_PLAY] = self.OnEvtAddPlay self._eventmap[Protocol.FGMGR_EVT_DEL_PLAY] = self.OnEvtDelPlay self._eventmap[Protocol.FGMGR_EVT_UPDATE_PLAY] = self.OnEvtUpdatePlay @@ -48,6 +47,7 @@ function GroupMgrController.new() self._eventmap[Protocol.FGMGR_EVT_INVITED] = self.OnEvtInvited self._eventmap[Protocol.FGMGR_EVT_UPDATE_GROUP] = self.OnEvtUpdateGroup self._eventmap[Protocol.FGMGR_EVT_NEW_MAIL] = self.OnEvtNewMailTip + self._eventmap[Protocol.FGMGR_RESPONSE_INVITE] = self.FG_ResponseInvited -- self:connect(callback) return self end @@ -290,10 +290,11 @@ function M:FG_GetOnlinePlayers(callback) end -- 邀请在线玩家 -function M:FG_InvitePlayer(group_id, tag, roomid, pid, game_name, callback) +function M:FG_InvitePlayer(group_id, tag, player_id, roomid, pid, game_name, callback) local _data = {} _data.id = group_id _data.tagId = tag + _data.player_id = player_id _data.roomid = roomid _data.pid = pid _data.g_name = game_name @@ -303,11 +304,21 @@ function M:FG_InvitePlayer(group_id, tag, roomid, pid, game_name, callback) end -- 回复邀请 -function M:FG_ResponseInvited(id, refuse) - local _data = {} - _data.invi_id = id - _data.refuse = refuse - self._mgr_client:send(Protocol.FGMGR_RESPONSE_INVITE, _data) +-- function M:FG_ResponseInvited(id, refuse) +-- local _data = {} +-- _data.invi_id = id +-- _data.refuse = refuse +-- self._mgr_client:send(Protocol.FGMGR_RESPONSE_INVITE, _data) +-- end + +--被邀请玩家收到邀请 +function M:FG_ResponseInvited(evt_data) + local invite_id = evt_data.invite_id + local g_name = evt_data.g_name + local roomid = evt_data.roomid + local pid = evt_data.pid + local groupid = evt_data.groupid + DispatchEvent(self._dispatcher, GroupMgrEvent.InviteResponse, invite_id, g_name, roomid, pid, groupid) end function M:PopEvent() diff --git a/lua_probject/base_project/Game/View/FGAssistInviteView.lua b/lua_probject/base_project/Game/View/FGAssistInviteView.lua index 7609b15b..99260a1d 100644 --- a/lua_probject/base_project/Game/View/FGAssistInviteView.lua +++ b/lua_probject/base_project/Game/View/FGAssistInviteView.lua @@ -2,50 +2,50 @@ local FGAssistInviteView = {} local M = FGAssistInviteView -setmetatable(M, {__index = BaseWindow}) +setmetatable(M, { __index = BaseWindow }) function FGAssistInviteView.new(blur_view, callback) - local self = setmetatable({}, {__index = M}) - self.class = "FGAssistInviteView" - self._blur_view = blur_view - self._animation = true - self._new_hide = false - self._put_map = false - self._close_destroy = true - self.callback = callback - self:initView("ui://FGAssist/panel_invite") - return self + local self = setmetatable({}, { __index = M }) + self.class = "FGAssistInviteView" + self._blur_view = blur_view + self._animation = true + self._new_hide = false + self._put_map = false + self._close_destroy = true + self.callback = callback + self:initView("ui://FGAssist/panel_invite") + return self end function M:initView(url) - self:init(url) - self.lst_player = self._view:GetChild("lst_player") - local btn_refresh = self._view:GetChild("btn_refresh") - btn_refresh.onClick:Set(function() + self:init(url) + self.lst_player = self._view:GetChild("lst_player") + local btn_refresh = self._view:GetChild("btn_refresh") + btn_refresh.onClick:Set(function() self.lst_player:RemoveChildrenToPool() - self:FillData() - end) + self:FillData() + end) - self._timer = 0 - self:FillData() - UpdateBeat:Add(self.OnUpdate,self) + self._timer = 0 + self:FillData() + UpdateBeat:Add(self.OnUpdate, self) end function M:FillData() - local mgr_ctr = ControllerManager.GetController(GroupMgrController) - if not mgr_ctr._mgr_client then - return + local mgr_ctr = ControllerManager.GetController(GroupMgrController) + if not mgr_ctr._mgr_client then + return else - self:GetOnlinePlayers() - end + self:GetOnlinePlayers() + end end function M:GetOnlinePlayers() - local mgr_ctr = ControllerManager.GetController(GroupMgrController) - mgr_ctr:FG_GetOnlinePlayers(function(res) - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取在线成员失败") - else + local mgr_ctr = ControllerManager.GetController(GroupMgrController) + mgr_ctr:FG_GetOnlinePlayers(function(res) + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取在线成员失败") + else self.players = res.Data.onlines self._view:GetController("empty").selectedIndex = #self.players == 0 and 1 or 0 self:ShowOnlinePlayers() @@ -128,4 +128,4 @@ function M:Destroy() end end -return M \ No newline at end of file +return M diff --git a/lua_probject/base_project/Game/View/FGAssistView.lua b/lua_probject/base_project/Game/View/FGAssistView.lua index 057adb54..2f0b6a31 100644 --- a/lua_probject/base_project/Game/View/FGAssistView.lua +++ b/lua_probject/base_project/Game/View/FGAssistView.lua @@ -68,9 +68,14 @@ function M:PlayerRenderer(index, obj) btn_invite.onClick:Set(function() local mgr_ctr = ControllerManager.GetController(GroupMgrController) local room = DataManager.CurrenRoom - mgr_ctr:FG_InvitePlayer(self.group_id, self._data_number[i].uid, room.room_id, room.play_id, + mgr_ctr:FG_InvitePlayer(self.group_id, self._data_number[i].uid, DataManager.SelfUser.account_id, room.room_id, + room.play_id, room.room_config:GetGameName(), - function() + function(res) + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "邀请失败") + else + end end) end) end diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua new file mode 100644 index 00000000..766c9b7a --- /dev/null +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -0,0 +1,122 @@ +local FGInvitedMsgView = import('.FamilyInvitedMsgView') + + +local FamilyEventView = {} + +local M = FamilyEventView + +function FamilyEventView.new(root) + setmetatable(M, { __index = root }) + local self = setmetatable({}, { __index = M }) + + local mgr_ctr = self._mgr_ctr + mgr_ctr:AddEventListener(GroupMgrEvent.AddPlay, handler(self, self._evtAddPlay)) + mgr_ctr:AddEventListener(GroupMgrEvent.DelPlay, handler(self, self._evtDelPlay)) + mgr_ctr:AddEventListener(GroupMgrEvent.UpdatePlay, handler(self, self._evtUpdatePlay)) + mgr_ctr:AddEventListener(GroupMgrEvent.AddRoom, handler(self, self._evtAddRoom)) + mgr_ctr:AddEventListener(GroupMgrEvent.DelRoom, handler(self, self._evtDelRoom)) + mgr_ctr:AddEventListener(GroupMgrEvent.UpdateRoom, handler(self, self._evtUpdateRoom)) + mgr_ctr:AddEventListener(GroupMgrEvent.UpdatePlayerInfo, handler(self, self._evtUpdatePlayerInfo)) + mgr_ctr:AddEventListener(GroupMgrEvent.BeInvited, handler(self, self._evtInvited)) + mgr_ctr:AddEventListener(GroupMgrEvent.UpdateGroup, handler(self, self._evtUpdateGroup)) + mgr_ctr:AddEventListener(GroupMgrEvent.NewMailTip, handler(self, self._evtNewMailTip)) + mgr_ctr:AddEventListener(GroupMgrEvent.InviteResponse, handler(self, self._evtInviteResponse)) + return self +end + +function M:_evtAddPlay(...) + local arg = { ... } + print("family event _evtAddPlay") +end + +function M:_evtDelPlay(...) + local arg = { ... } + print("family event _evtDelPlay") +end + +function M:_evtUpdatePlay(...) + local arg = { ... } + print("family event _evtUpdatePlay") +end + +function M:_evtAddRoom(...) + local arg = { ... } + print("family event _evtAddRoom") +end + +function M:_evtDelRoom(...) + local arg = { ... } + print("family event _evtDelRoom") +end + +function M:_evtUpdateRoom(...) + local arg = { ... } + print("family event _evtUpdateRoom") +end + +function M:_evtUpdatePlayerInfo(...) + local arg = { ... } + print("family event _evtUpdatePlayerInfo") +end + +function M:_evtInvited(...) + local arg = { ... } + print("family event _evtInvited") +end + +function M:_evtUpdateGroup(...) + local arg = { ... } + print("family event _evtUpdateGroup") +end + +function M:_evtNewMailTip(...) + local arg = { ... } + print("family event _evtNewMailTip") +end + +function M:_evtInviteResponse(...) + local arg = { ... } + local invite_id = arg[1] + local g_name = arg[2] + local roomid = arg[3] + local pid = arg[4] + local groupid = arg[5] + local roomCtr = ControllerManager.GetController(RoomController) + local gameId = DataManager.groups:get(groupid):getPlay(pid).gameId + local imv = + FGInvitedMsgView.new( + self._root_view, + groupid, + pid, + invite_id, + function() + roomCtr:PublicJoinRoom( + Protocol.WEB_FG_JOIN_ROOM, + roomid, + groupid, + function(response) + if (response.ReturnCode == -1) then + ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, 'response.ReturnCode == -1') + -- RestartGame() + return + end + + if response.ReturnCode ~= 0 then + ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败') + -- ViewManager.ChangeView(ViewManager.View_Lobby) + return + else + UpdateBeat:Remove(self.OnUpdate, self) + ViewManager.ChangeView(ViewManager.View_Main, gameId) + end + end, + groupid, + pid + ) + end + ) + -- imv:FillData(data) + imv:Show() +end + +return M diff --git a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua new file mode 100644 index 00000000..7849c3c7 --- /dev/null +++ b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua @@ -0,0 +1,66 @@ +-- 被邀请界面 +local FGInvitedMsgView = {} + +local M = FGInvitedMsgView +setmetatable(M, { __index = BaseWindow }) + +function FGInvitedMsgView.new(groupid, pid, invite_id, blur_view, callback) + print("lingmeng FGAssistInviteView") + local self = setmetatable({}, { __index = M }) + self.class = "FGAssistInviteView" + self._blur_view = blur_view + self._animation = true + self._new_hide = false + self._put_map = false + self._close_destroy = true + self.groupid = groupid + self.pid = pid + self.invite_id = invite_id + self.callback = callback + print("lingmeng FGAssistInviteView1") + + self:initView("ui://FGAssist/panel_invite") + print("lingmeng FGAssistInviteView2") + + return self +end + +function M:initView(url) + BaseWindow.init(self, url) + print("lingmeng FGAssistInviteView3") + self._viewText_groupName = self._view:GetChild('tex_group_name') + self._viewText_gameName = self._view:GetChild('tex_game_name') + self._viewText_inviteName = self._view:GetChild('tex_name') + self._viewText_playName = self._view:GetChild('tex_play_name') + self._viewText_playConfig = self._view:GetChild('text_play_config') + + print("lingmeng FGAssistInviteView4") + + self._view:GetChild('btn_no').onClick:Set(function() + print("lingmeng btn_no") + self:Destroy() + end) + + print("lingmeng FGAssistInviteView5") + + self._view:GetChild('btn_yes').onClick:Set(function() + print("lingmeng btn_yes", self.callback) + + if self.callback then + self.callback() + end + self:Destroy() + end) + print("lingmeng FGAssistInviteViewend") + self:FillData() +end + +function M:FillData() + +end + +function M:Destroy() + BaseWindow.Destroy(self) +end + +return M diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 8fd7c0ab..440e0788 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -9,6 +9,7 @@ local FamilyNumberRecord = import(".Family.FamilyNumberRecord") local FamilyAuditNumber = import(".Family.FamilyAuditNumber") local FamilyJoinAndCreate = import(".Family.FamilyJoinAndCreate") local FamilyBanDeskmate = import(".Family.FamilyBanDeskmate") +local FamilyEventView = import(".Family.FamilyEventView") --- FamilyView = {} @@ -35,6 +36,7 @@ function M:init(url) self.familyType = view:GetController('familyType') self.btn_close = view:GetChild('btn_close') + self._mgr_ctr = ControllerManager.GetController(GroupMgrController) self:InitCloseClick() @@ -52,6 +54,11 @@ function M:init(url) self._child_familyNumberRecord = FamilyNumberRecord.New(self) self.lastType = 1 end) + + if FamilyEventView then + self._familyEventView = FamilyEventView.new(self) + self._familyEventView:_evtAddPlay() + end end function M:InitCloseClick() @@ -391,6 +398,21 @@ function M:OnUpdate() local fgCtr = ControllerManager.GetController(NewGroupController) local heatTime = os.time() -- --12001事件 + local func = self._mgr_ctr:PopEvent() + if (func ~= nil) then + local success, result = pcall(func) + if success then + + else + print("witness error") + print(result) + -- self._gamectr = ControllerManager.GetController(GameController) + -- if self._gamectr then + -- self._gamectr:ResetConnect() + -- end + end + --func() + end if self._group.update_room then -- if self._roomNum == self._group.room_num then -- for i = 1, self._group.room_num do diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index c2411f80..271282a1 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -404,7 +404,7 @@ function M:EventInit() --- local isZiMo = win_seat == lose_seat DataManager.CurrenRoom.isZiMoHu = isZiMo - local hu_sound = isZiMo and ("zimo" .. math.random(1, 3)) or ("hu" .. math.random(1, 2)) + local hu_sound = isZiMo and ("zimo") or ("hu") printlog("声音====>>>", hu_sound) self:PlaySound("FuZhou_MJ", player.self_user.sex, hu_sound) @@ -420,6 +420,10 @@ function M:EventInit() local tem = win_list[i] if tem.type > 0 and tem.type < 32 then local com_name = "he" .. tem.type + printlog("声音====>>>", com_name) + ViewUtil.PlaySound("FuZhou_MJ", + string.format("extend/majiang/fuhzou/sound/%s/%s.mp3", ViewUtil.Sex_Chat[player.self_user.sex], + com_name)) local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_FuZhou/" .. com_name) coroutine.wait(0.3) end @@ -802,16 +806,16 @@ function M:OnFangziAction(...) -- local pNode = info._mask_liangpai local effect = UIPackage.CreateObject("Extend_MJ_FuZhou", "FzEffect") if fz.type == FZType.Peng then - self:PlaySound("FuZhou_MJ", player.self_user.sex, "peng" .. math.random(1, 3)) + self:PlaySound("FuZhou_MJ", player.self_user.sex, "peng") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰") -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框") elseif fz.type == FZType.Chi then - self:PlaySound("FuZhou_MJ", player.self_user.sex, "chi" .. math.random(1, 3)) + self:PlaySound("FuZhou_MJ", player.self_user.sex, "chi") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃") else - self:PlaySound("FuZhou_MJ", player.self_user.sex, "gang" .. math.random(1, 2)) + self:PlaySound("FuZhou_MJ", player.self_user.sex, "gang") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠") -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框") diff --git a/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua b/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua index 570ca54d..3ef3b5b1 100644 --- a/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua @@ -10,8 +10,8 @@ local M = {} --- Create a new ZZ_MainView function M.new() - setmetatable(M,{__index = MJMainView}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = MJMainView }) + local self = setmetatable({}, { __index = M }) self.class = "MainView" self.asset_group = "GeJiu_MJ" self:init() @@ -25,78 +25,75 @@ function M:InitView(url) self._gps_style = 1 self._full = true UIPackage.AddPackage("extend/majiang/gejiu/ui/Extend_MJ_GeJiu") - MJMainView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num .. "_s2") + MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2") self._hu_tip = HuTipView.new(self) - self._view:GetChild('wanfa_text').text =room.room_config.people_num .. '人个旧麻将 ' .. room.score_times .. '倍' - - self.selectLaiziBtn=self._view:GetChild('selectlaizi') - self.Laizi1Btn=self._view:GetChild('selectgang1') - self.Laizi2Btn=self._view:GetChild('selectgang2') - self._view:GetChild("n108").visible = true - self.Laizi1Btn.visible=true - self.Laizi2Btn.visible=true - self.bugangnum = self._view:GetChild("bugangnum") - - self:PlayerChangeLineState() + self._view:GetChild('wanfa_text').text = room.room_config.people_num .. '人个旧麻将 ' .. room.score_times .. '倍' - if room.playing or room.curren_round > 0 then + self.selectLaiziBtn = self._view:GetChild('selectlaizi') + self.Laizi1Btn = self._view:GetChild('selectgang1') + self.Laizi2Btn = self._view:GetChild('selectgang2') + self._view:GetChild("n108").visible = true + self.Laizi1Btn.visible = true + self.Laizi2Btn.visible = true + self.bugangnum = self._view:GetChild("bugangnum") + + self:PlayerChangeLineState() + + if room.playing or room.curren_round > 0 then self:ReloadRoom() end end -function M:__BuGang(card1,card2, callback) +function M:__BuGang(card1, card2, callback) + local _gang_tip_choice = UIPackage.CreateObject("Extend_MJ_GeJiu", "Gang_tip_choice") + _gang_tip_choice.visible = true - local _gang_tip_choice = UIPackage.CreateObject("Extend_MJ_GeJiu", "Gang_tip_choice") - _gang_tip_choice.visible = true - - local gangcard1 = _gang_tip_choice:GetChild("card1") - local gangcard2 = _gang_tip_choice:GetChild("card2") + local gangcard1 = _gang_tip_choice:GetChild("card1") + local gangcard2 = _gang_tip_choice:GetChild("card2") - - gangcard1.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..card1) - gangcard2.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..card2) - gangcard1.onClick:Add(function() - callback(card1) - end) + gangcard1.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" .. card1) + gangcard2.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" .. card2) - gangcard2.onClick:Add(function() - callback(card2) - end) + gangcard1.onClick:Add(function() + callback(card1) + end) - _gang_tip_choice.xy = Vector2((self._view.width - _gang_tip_choice.width)/2, (self._view.height - _gang_tip_choice.height)/2) - self._view:AddChild(_gang_tip_choice) - self._gang_tip_choice = _gang_tip_choice + gangcard2.onClick:Add(function() + callback(card2) + end) + + _gang_tip_choice.xy = Vector2((self._view.width - _gang_tip_choice.width) / 2, + (self._view.height - _gang_tip_choice.height) / 2) + self._view:AddChild(_gang_tip_choice) + self._gang_tip_choice = _gang_tip_choice end +function M:SetShowGangZiProcess(currentLaizi1ID, currentLaizi2ID, bugangnum, isShowAnim) + --zhongid=currentLaizi1ID + if isShowAnim == nil then isShowAnim = false end -function M:SetShowGangZiProcess(currentLaizi1ID,currentLaizi2ID,bugangnum,isShowAnim) - --zhongid=currentLaizi1ID - if isShowAnim==nil then isShowAnim=false end - - self:SetGangZiCard(self.Laizi1Btn,currentLaizi1ID) - self:SetGangZiCard(self.Laizi2Btn,currentLaizi2ID) - self:IsShowGangZi(self.Laizi1Btn,true) - self:IsShowGangZi(self.Laizi2Btn,true) - self.bugangnum.text = "当前 "..bugangnum.." 杠" - + self:SetGangZiCard(self.Laizi1Btn, currentLaizi1ID) + self:SetGangZiCard(self.Laizi2Btn, currentLaizi2ID) + self:IsShowGangZi(self.Laizi1Btn, true) + self:IsShowGangZi(self.Laizi2Btn, true) + self.bugangnum.text = "当前 " .. bugangnum .. " 杠" end - function M:HideAllGangZiCard() - self.Laizi1Btn.visible=false - self.Laizi2Btn.visible=false - self.selectLaiziBtn.visible=false - --self.LaiziBG.visible=false + self.Laizi1Btn.visible = false + self.Laizi2Btn.visible = false + self.selectLaiziBtn.visible = false + --self.LaiziBG.visible=false end -function M:SetGangZiCard(btn,cardId) - btn.icon='ui://Main_Majiang/' ..get_majiang_prefix(DataManager.CurrenRoom.game_id).."201_"..cardId +function M:SetGangZiCard(btn, cardId) + btn.icon = 'ui://Main_Majiang/' .. get_majiang_prefix(DataManager.CurrenRoom.game_id) .. "201_" .. cardId end -function M:IsShowGangZi(btn,isShow) - btn.visible=isShow +function M:IsShowGangZi(btn, isShow) + btn.visible = isShow end function M:UpdateRound() @@ -105,72 +102,72 @@ function M:UpdateRound() end function M:InitPlayerInfoView() - self._player_info = {} + self._player_info = {} local _player_info = self._player_info for i = 1, self._room.room_config.people_num do local tem = self._view:GetChild("player_info" .. i) - _player_info[i] = PlayerInfoView.new(tem,self) + _player_info[i] = PlayerInfoView.new(tem, self) tem.visible = false end end -function M:NewMJPlayerCardInfoView(view,index) - if index == 1 then - return MJPlayerSelfCardInfoView.new(view,self) +function M:NewMJPlayerCardInfoView(view, index) + if index == 1 then + return MJPlayerSelfCardInfoView.new(view, self) end - return MJPlayerCardInfoView.new(view,self) + return MJPlayerCardInfoView.new(view, self) end function M:EventInit() - -- UIPackage.AddPackage("extend/majiang/hongzhong/ui/Extend_MJ_HongZhong") - MainView.EventInit(self) + -- UIPackage.AddPackage("extend/majiang/hongzhong/ui/Extend_MJ_HongZhong") + MainView.EventInit(self) local _room = self._room local _view = self._view local _gcm_outcard_url = UIPackage.GetItemURL("Main_Majiang", "Gcm_OutCard") local _player_info = self._player_info - local _gamectr = self._gamectr + local _gamectr = self._gamectr - _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...) - local arg = {...} - self:SetShowLaiZiProcess(arg[1],arg[2],arg[3],arg[4]) + _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...) + local arg = { ... } + self:SetShowLaiZiProcess(arg[1], arg[2], arg[3], arg[4]) end) _gamectr:AddEventListener(TX_GameEvent.SendGangZi, function(...) - local arg = {...} - self:SetShowGangZiProcess(arg[1],arg[2],arg[3],arg[4]) + local arg = { ... } + self:SetShowGangZiProcess(arg[1], arg[2], arg[3], arg[4]) end) - _gamectr:AddEventListener(TX_GameEvent.EventBuGang, function(...) - local arg = {...} - self:__BuGang(arg[1],arg[2], - function(id) - printlog(id) - _gamectr:SendGangCard(id) - self:__CloseGangTip() - end) + _gamectr:AddEventListener(TX_GameEvent.EventBuGang, function(...) + local arg = { ... } + self:__BuGang(arg[1], arg[2], + function(id) + printlog(id) + _gamectr:SendGangCard(id) + self:__CloseGangTip() + end) end) - _gamectr:AddEventListener(TX_GameEvent.SendCards,function( ... ) + _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) -- self:ShowHuTip() self:UpdateRound() self._state.selectedIndex = 1 local list = _room.player_list - for i=1,#list do + for i = 1, #list do local p = list[i] local info = self._player_info[self:GetPos(p.seat)] info:FillData(p) info:MarkBank(p.seat == _room.banker_seat) info:Ready(false) local card_info = self._player_card_info[self:GetPos(p.seat)] - card_info:UpdateHandCard() + card_info:UpdateHandCard() end end) - _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) - local arg = {...} + _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) + local arg = { ... } self._left_time = 15 local seat = arg[1] self:UpdateCardBox(self:GetPos(seat)) @@ -184,11 +181,11 @@ function M:EventInit() info:UpdateHandCard(true) end) - local _gcm_outcard_url ="ui://Main_Majiang/Gcm_OutCard" + local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard" _gamectr:AddEventListener(TX_GameEvent.OutCard, function(...) self:__CloseTip() self._left_time = 0 - local arg = {...} + local arg = { ... } local p = arg[1] local card = arg[2] local seat = p.seat @@ -205,7 +202,7 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.GetCard, function(...) self:__CloseTip() - local arg = {...} + local arg = { ... } local seat = arg[1] local card = arg[2] -- self._tex_leftTime.text = arg[3] @@ -216,27 +213,27 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.FZTips, function(...) - local arg = {...} + local arg = { ... } local _tip = arg[1] local weight = arg[2] self:__FangziTip(_tip, weight) end) - _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self,self.OnFangziAction)) + _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction)) _gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...) self._left_time = 0 self:UpdateCardBox(0) self:__CloseTip() self._popEvent = false - local arg = {...} + local arg = { ... } local win_seat = arg[1] - local lose_seat = arg[2] - local win_card = arg[3] - local cards = arg[4] - local win_list = arg[5] - local index = self:GetPos(win_seat) - local info = self._player_card_info[index] + local lose_seat = arg[2] + local win_card = arg[3] + local cards = arg[4] + local win_list = arg[5] + local index = self:GetPos(win_seat) + local info = self._player_card_info[index] self:RemoveCursor() info:UpdateHandCard(true, true) @@ -258,73 +255,72 @@ function M:EventInit() if win_seat == lose_seat then url = "ui://Main_Majiang/eff_zimo" end - + local he = UIPackage.CreateObjectFromURL(url) pNode:AddChild(he) he:GetTransition("t2"):Play() - he:Center() - if _room.room_config.people_num==2 then - if win_seat ~= _room.self_player.seat then - he.scaleY = 0.4 - he.scaleX = 0.4 - he.x = he.width * 0.4 * 0.5 * -1 - he.y = he.height * 0.4 * 0.5 * -1 - end - end - - if win_seat == _room.self_player.seat then - printlog("自己位置=====") - he:Center() + he:Center() + if _room.room_config.people_num == 2 then + if win_seat ~= _room.self_player.seat then + he.scaleY = 0.4 + he.scaleX = 0.4 + he.x = he.width * 0.4 * 0.5 * -1 + he.y = he.height * 0.4 * 0.5 * -1 + end + end + + if win_seat == _room.self_player.seat then + printlog("自己位置=====") + he:Center() elseif url == "ui://Main_Majiang/eff_zimo" then - printlog("自摸地址==========") + printlog("自摸地址==========") he.scaleY = 0.4 he.scaleX = 0.4 he.x = he.width * 0.4 * 0.5 * -1 he.y = he.height * 0.4 * 0.5 * -1 end - - - - --- - local isZiMo=win_seat==lose_seat - DataManager.CurrenRoom.isZiMoHu=isZiMo - local hu_sound = isZiMo and ("zimo"..math.random(1, 3)) or ("hu"..math.random(1, 2)) - printlog("声音====>>>",hu_sound) - self:PlaySound("GeJiu_MJ",player.self_user.sex, hu_sound) - - local pNode = info._view - local url = "eff_list1" + + + + --- + local isZiMo = win_seat == lose_seat + DataManager.CurrenRoom.isZiMoHu = isZiMo + local hu_sound = isZiMo and ("zimo" .. math.random(1, 3)) or ("hu" .. math.random(1, 2)) + printlog("声音====>>>", hu_sound) + self:PlaySound("GeJiu_MJ", player.self_user.sex, hu_sound) + + local pNode = info._view + local url = "eff_list1" local he_list = UIPackage.CreateObjectFromURL("ui://Extend_MJ_GeJiu/" .. url) he_list.touchable = false pNode:AddChild(he_list) he_list:Center() - + coroutine.start(function() - for i = 1 ,#win_list do - local tem = win_list[i] - if tem.type>0 and tem.type<32 then - local com_name = "he" .. tem.type - local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_GeJiu/" .. com_name) - coroutine.wait(0.3) - end - - end - - coroutine.wait(2) - obj_win_card:Dispose() - he:Dispose() - he_list:Dispose() - self._popEvent = true + for i = 1, #win_list do + local tem = win_list[i] + if tem.type > 0 and tem.type < 32 then + local com_name = "he" .. tem.type + local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_GeJiu/" .. com_name) + coroutine.wait(0.3) + end + end + + coroutine.wait(2) + obj_win_card:Dispose() + he:Dispose() + he_list:Dispose() + self._popEvent = true end) end) _gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...) - local arg = {...} + local arg = { ... } self._popEvent = false local list = arg[1] local start_seat = arg[2] - -- ViewUtil.PlaySound("GeJiu_MJ", "extend/majiang/chaozhou/sound/zhuaniao.mp3") - coroutine.start(self.RunNiao,self,list, start_seat) + -- ViewUtil.PlaySound("GeJiu_MJ", "extend/majiang/chaozhou/sound/zhuaniao.mp3") + coroutine.start(self.RunNiao, self, list, start_seat) end) _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...) @@ -333,7 +329,7 @@ function M:EventInit() self._left_time = 0 self:UpdateCardBox(0) self._ctr_cardbox.selectedIndex = 0 - local arg = {...} + local arg = { ... } local result = arg[1] local liuju = result.liuju local data = result.info_list @@ -351,11 +347,11 @@ function M:EventInit() self:RemoveCursor() if self._clearingView == nil then self._clearingView = EXClearingView.new(self._root_view) - coroutine.start(function() + coroutine.start(function() coroutine.wait(0.5) self._clearingView:Show() self._popEvent = true - end) + end) end if _room.curren_round ~= _room.room_config.round then @@ -373,7 +369,7 @@ function M:EventInit() end info:UpdateScore() info._view:GetChild("zhanji").visible = true - local num = data[i].hp_info.total_hp + local num = data[i].hp_info.total_hp if num > 0 then info._view:GetController("text_color").selectedIndex = 0 info._view:GetChild("text_jifen").text = "+" .. d2ad(num) @@ -391,7 +387,7 @@ function M:EventInit() self._clearingView = nil end) end - self._player_card_info[1]:ShowHuTip() + self._player_card_info[1]:ShowHuTip() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) @@ -399,7 +395,7 @@ function M:EventInit() self._left_time = 0 self:UpdateCardBox(0) self._ctr_cardbox.selectedIndex = 0 - local arg = {...} + local arg = { ... } local total_result = arg[2] local result = arg[1] local over = arg[3] @@ -407,7 +403,7 @@ function M:EventInit() coroutine.start(function() coroutine.wait(0.5) self._clearingView:Show() - end) + end) self._clearingView:InitData(over, _room, result, total_result) ControllerManager.ChangeController(LoddyController) end) @@ -415,21 +411,21 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.EvnetPiaoTip, function() self:UpdateRound() self._tex_LeftCard.text = "0" - self._state.selectedIndex = 1 + self._state.selectedIndex = 1 self:__PiaoNiaoTip() end) _gamectr:AddEventListener(TX_GameEvent.EvnetPiao, function(...) - local arg = {...} + local arg = { ... } local seat = arg[1] local num = arg[2] if num > 0 then local head_info = self._player_info[self:GetPos(seat)] head_info._view:GetChild("mask_piao").title = "飘分 " .. num head_info._view:GetController("piao_niao").selectedIndex = 1 - end + end if seat == _room.self_player.seat then - if self._com_piao and _room.self_player.entrust then + if self._com_piao and _room.self_player.entrust then self._com_piao:Dispose() self._com_piao = nil _room.curren_round = _room.curren_round - 1 @@ -440,21 +436,21 @@ end function M:OutCard(card) if card ~= 0 then - printlog("当前出牌为===>>>"..card) + printlog("当前出牌为===>>>" .. card) local _gamectr = ControllerManager.GetController(GameController) self._room.curren_outcard_seat = -1 _gamectr:SendOutCard(card, function() - local info = self._player_card_info[1] - self:RemoveCursor() - info:UpdateHandCard() + local info = self._player_card_info[1] + self:RemoveCursor() + info:UpdateHandCard() - info:UpdateOutCardList(nil, card, self._cursor) - self:PlaySound("GeJiu_MJ", self._room.self_player.self_user.sex,tostring(card)) - self:PlayMJSound("chupai.mp3") - -- self:ShowHuTip() - end) - else - printlog("鬼牌不能出===>>>"..card) + info:UpdateOutCardList(nil, card, self._cursor) + self:PlaySound("GeJiu_MJ", self._room.self_player.self_user.sex, tostring(card)) + self:PlayMJSound("chupai.mp3") + -- self:ShowHuTip() + end) + else + printlog("鬼牌不能出===>>>" .. card) end end @@ -476,16 +472,16 @@ function M:__FangziTip(tip, weight) local count = #_tlist table.sort(_tlist) local isHu = false - for k=1,#_tlist do + for k = 1, #_tlist do local td = tip.tip_map_type[_tlist[k]][1] local url = "ui://Main_Majiang/Btn_fztip" local td_weight = td.weight if td_weight == 16 then td_weight = 8 end if td_weight == 8 then url = "ui://Main_Majiang/Btn_hu" end local btn_t = _lit_fanzi:AddItemFromPool(url) - btn_t.icon = "ui://Main_Majiang/fztip_"..td_weight + btn_t.icon = "ui://Main_Majiang/fztip_" .. td_weight btn_t.data = { tip, td } - btn_t.onClick:Add(self.__TipAction,self) + btn_t.onClick:Add(self.__TipAction, self) end -- if not (tonumber(weight) >= 16) then @@ -494,7 +490,7 @@ function M:__FangziTip(tip, weight) _btn_pass.onClick:Set(function() if tonumber(weight) >= 8 then local guo_msg = MsgWindow.new(self._root_view, "确定要点过吗?", MsgWindow.MsgMode.OkAndCancel) - guo_msg.onOk:Add(function() + guo_msg.onOk:Add(function() _gamectr:SendAction(0) _chipeng_tip:Dispose() self._chipeng_tip = nil @@ -540,52 +536,58 @@ function M:_ChiView(tiplist, callback) self._chipeng_tip.visible = false printlog("_ChiView") pt(tiplist) - local _pop_tip_choice = UIPackage.CreateObject("Extend_MJ_GeJiu", "Pop_tip_choice") - local list_choose1 = _pop_tip_choice:GetChild("Lst_choose") - local list_choose2 = _pop_tip_choice:GetChild("Lst_choose2") - local crossCtr = _pop_tip_choice:GetController("state") - crossCtr.selectedIndex = #tiplist == 3 and 0 or (#tiplist == 2 and 1 or (#tiplist == 4 and 2 or (#tiplist == 5 and 3 or 4))) - _pop_tip_choice:GetChild("Btn_cross").onClick:Add(function() - _pop_tip_choice:Dispose() - self._chipeng_tip.visible = true - end) - list_choose1:RemoveChildrenToPool() - list_choose2:RemoveChildrenToPool() - for i = 1, #tiplist do - local list_choose = i <= 3 and list_choose1 or list_choose2 - local item_choose = list_choose:AddItemFromPool() - item_choose:GetController("type").selectedIndex = (1 == tiplist[i].weight or 2 == tiplist[i].weight) and 1 or 0 - if tiplist[i].weight ~= 1 then - for j = 1, 4 do - item_choose:GetChild("card"..j).icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..tiplist[i].card) - end - else - local tem = {} - table.insert(tem, tiplist[i].opcard[1]) - table.insert(tem, tiplist[i].opcard[2]) - local tcard = tiplist[i].card - table.insert(tem, tcard) - table.sort(tem, function(a, b) - return a < b - end) - item_choose:GetChild("card1").icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..tem[1]) - item_choose:GetChild("card2").icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..tem[2]) - item_choose:GetChild("card4").icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..tem[3]) - local cardpos = tem[2] > tcard and 1 or (tem[2] < tcard and 4 or 2) - item_choose:GetChild("card" .. cardpos):GetController("color").selectedIndex = 1 - end - item_choose.onClick:Add(function() - callback(tiplist[i].id) - end) - end - _pop_tip_choice.xy = Vector2((self._view.width - _pop_tip_choice.width)/2, (self._view.height - _pop_tip_choice.height)/2) - self._view:AddChild(_pop_tip_choice) - self._pop_tip_choice = _pop_tip_choice + local _pop_tip_choice = UIPackage.CreateObject("Extend_MJ_GeJiu", "Pop_tip_choice") + local list_choose1 = _pop_tip_choice:GetChild("Lst_choose") + local list_choose2 = _pop_tip_choice:GetChild("Lst_choose2") + local crossCtr = _pop_tip_choice:GetController("state") + crossCtr.selectedIndex = #tiplist == 3 and 0 or + (#tiplist == 2 and 1 or (#tiplist == 4 and 2 or (#tiplist == 5 and 3 or 4))) + _pop_tip_choice:GetChild("Btn_cross").onClick:Add(function() + _pop_tip_choice:Dispose() + self._chipeng_tip.visible = true + end) + list_choose1:RemoveChildrenToPool() + list_choose2:RemoveChildrenToPool() + for i = 1, #tiplist do + local list_choose = i <= 3 and list_choose1 or list_choose2 + local item_choose = list_choose:AddItemFromPool() + item_choose:GetController("type").selectedIndex = (1 == tiplist[i].weight or 2 == tiplist[i].weight) and 1 or 0 + if tiplist[i].weight ~= 1 then + for j = 1, 4 do + item_choose:GetChild("card" .. j).icon = UIPackage.GetItemURL("Main_Majiang", + self:GetPrefix() .. "202_" .. tiplist[i].card) + end + else + local tem = {} + table.insert(tem, tiplist[i].opcard[1]) + table.insert(tem, tiplist[i].opcard[2]) + local tcard = tiplist[i].card + table.insert(tem, tcard) + table.sort(tem, function(a, b) + return a < b + end) + item_choose:GetChild("card1").icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" .. + tem[1]) + item_choose:GetChild("card2").icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" .. + tem[2]) + item_choose:GetChild("card4").icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" .. + tem[3]) + local cardpos = tem[2] > tcard and 1 or (tem[2] < tcard and 4 or 2) + item_choose:GetChild("card" .. cardpos):GetController("color").selectedIndex = 1 + end + item_choose.onClick:Add(function() + callback(tiplist[i].id) + end) + end + _pop_tip_choice.xy = Vector2((self._view.width - _pop_tip_choice.width) / 2, + (self._view.height - _pop_tip_choice.height) / 2) + self._view:AddChild(_pop_tip_choice) + self._pop_tip_choice = _pop_tip_choice end function M:OnFangziAction(...) self:__CloseTip() - local arg = {...} + local arg = { ... } local _player_card_info = self._player_card_info local fz = arg[1] local player = arg[2] @@ -595,27 +597,27 @@ function M:OnFangziAction(...) local pNode = info._mask_liangpai local effect = UIPackage.CreateObject("Extend_MJ_GeJiu", "FzEffect") if fz.type == FZType.Peng then - self:PlaySound("GeJiu_MJ", player.self_user.sex,"peng"..math.random(1, 3)) + self:PlaySound("GeJiu_MJ", player.self_user.sex, "peng" .. math.random(1, 3)) effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰") -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框") elseif fz.type == FZType.Chi then - self:PlaySound("GeJiu_MJ", player.self_user.sex,"chi"..math.random(1, 3)) + self:PlaySound("GeJiu_MJ", player.self_user.sex, "chi" .. math.random(1, 3)) effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃") else - self:PlaySound("GeJiu_MJ", player.self_user.sex,"gang"..math.random(1, 2)) + self:PlaySound("GeJiu_MJ", player.self_user.sex, "gang") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠") - effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠") - -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框") + effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠") + -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框") end effect.touchable = false effect:GetTransition("t2"):Play() pNode:AddChild(effect) coroutine.start(function() - coroutine.wait(0.3) - self._popEvent = true - end) + coroutine.wait(0.3) + self._popEvent = true + end) coroutine.start(function() coroutine.wait(2) effect:Dispose() @@ -636,13 +638,13 @@ end function M:RunNiao(list, start_seat) local _room = self._room --local _niao_View = self._niao_View - self._niao_View = UIPackage.CreateObject("Extend_MJ_GeJiu","Panel_Birds") + self._niao_View = UIPackage.CreateObject("Extend_MJ_GeJiu", "Panel_Birds") self._view:AddChild(self._niao_View) self._niao_View:Center() local _niao_View = self._niao_View local list_niao_card = self._niao_View:GetChild("Lst_birds") list_niao_card:RemoveChildrenToPool() - for i = 1, #list do + for i = 1, #list do --添加背面的麻將 local item = list_niao_card:AddItemFromPool() item.icon = UIPackage.GetItemURL("Main_Majiang", "202_00") @@ -654,7 +656,7 @@ function M:RunNiao(list, start_seat) local card = list[i].card coroutine.wait(0.3) item:GetTransition("appear"):Play() - item.icon = UIPackage.GetItemURL("Main_Majiang", "201_"..card) + item.icon = UIPackage.GetItemURL("Main_Majiang", "201_" .. card) if list[i].score > 0 then item:GetController("bg").selectedIndex = 1 end end coroutine.start(function() @@ -679,17 +681,17 @@ end -- end function M:__PiaoNiaoTip() - local obj_piao = UIPackage.CreateObject("Main_Majiang", "panel_piao_niao") - self._view:AddChild(obj_piao) - obj_piao.x = (self._view.width - obj_piao.width) * 0.5 - obj_piao.y = self._view.height * 0.6 - for i = 1, 4 do - obj_piao:GetChild("btn_" .. i).onClick:Add(function() - self._gamectr:SendAction(i - 1) - obj_piao:Dispose() - end) - end - self._com_piao = obj_piao + local obj_piao = UIPackage.CreateObject("Main_Majiang", "panel_piao_niao") + self._view:AddChild(obj_piao) + obj_piao.x = (self._view.width - obj_piao.width) * 0.5 + obj_piao.y = self._view.height * 0.6 + for i = 1, 4 do + obj_piao:GetChild("btn_" .. i).onClick:Add(function() + self._gamectr:SendAction(i - 1) + obj_piao:Dispose() + end) + end + self._com_piao = obj_piao end function M:ReloadRoom(bskip) @@ -702,37 +704,37 @@ function M:ReloadRoom(bskip) -- end if bskip == nil or bskip == false then - if not room.playing then - self._state.selectedIndex = 2 - else - self._state.selectedIndex = 1 - self._room._reload_flag = true - end + if not room.playing then + self._state.selectedIndex = 2 + else + self._state.selectedIndex = 1 + self._room._reload_flag = true + end end - + for i = 1, #room.player_list do local p = room.player_list[i] local info = self._player_card_info[self:GetPos(p.seat)] for i = 1, #p.fz_list do info:UpdateFzList(p.fz_list[i], -1) end - info:UpdateHandCard() + info:UpdateHandCard() local head_info = self._player_info[self:GetPos(p.seat)] head_info:UpdateScore() head_info._view:GetChild('zhanji').visible = true - local num = p.total_hp or 0 - if num > 0 then - head_info._view:GetController('text_color').selectedIndex = 0 - head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num) - else - head_info._view:GetController('text_color').selectedIndex = 1 - head_info._view:GetChild('text_jifen').text = d2ad(num) - end + local num = p.total_hp or 0 + if num > 0 then + head_info._view:GetController('text_color').selectedIndex = 0 + head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num) + else + head_info._view:GetController('text_color').selectedIndex = 1 + head_info._view:GetChild('text_jifen').text = d2ad(num) + end if p.seat == room.last_outcard_seat then local card = p.outcard_list[#p.outcard_list] - info:UpdateOutCardList(nil,card, self._cursor) + info:UpdateOutCardList(nil, card, self._cursor) elseif p.seat == room.curren_outcard_seat then info:UpdateHandCard(true) info:UpdateOutCardList() @@ -746,34 +748,34 @@ function M:ReloadRoom(bskip) -- self._player_info[self:GetPos(p.seat)]:Ready(true) -- end if bskip == nil or bskip == false then - if p.ready and room.playing == false then - self._player_info[self:GetPos(p.seat)]:Ready(true) - end - end - if p.piao_niao~=nil and p.piao_niao > 0 then + if p.ready and room.playing == false then + self._player_info[self:GetPos(p.seat)]:Ready(true) + end + end + if p.piao_niao ~= nil and p.piao_niao > 0 then local head_info = self._player_info[self:GetPos(p.seat)] head_info._view:GetChild("mask_piao").title = "飘分 " .. p.piao_niao head_info._view:GetController("piao_niao").selectedIndex = 1 end end -- self:ShowHuTip() - + if bskip == nil or bskip == false then self:UpdateCardBox(self:GetPos(room.curren_outcard_seat)) self._tex_LeftCard.text = room.left_count self:UpdateRound() - end + end end function M:PlayerChangeLineState() - -- local isOutCard = true - -- local str = "玩家 " - -- for _ , player in ipairs(self._room.player_list) do - -- if player.line_state == 0 then - -- isOutCard = false - -- end - -- end - -- self._player_card_info[1]._area_handcard_list.touchable = isOutCard + -- local isOutCard = true + -- local str = "玩家 " + -- for _ , player in ipairs(self._room.player_list) do + -- if player.line_state == 0 then + -- isOutCard = false + -- end + -- end + -- self._player_card_info[1]._area_handcard_list.touchable = isOutCard end function M:UpdateCardBox(seat) @@ -796,7 +798,6 @@ function M:__CloseTip() self._pop_tip_choice:Dispose() self._pop_tip_choice = nil end - end function M:__CloseGangTip() @@ -806,8 +807,6 @@ function M:__CloseGangTip() end end - - function M:closeTipOnTuoguan() self:__CloseTip() end @@ -817,4 +816,4 @@ function M:Destroy() UIPackage.RemovePackage("extend/majiang/gejiu/ui/Extend_MJ_GeJiu") end -return M \ No newline at end of file +return M diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index 4d1037a7..dff0564b 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -404,7 +404,7 @@ function M:EventInit() --- local isZiMo = win_seat == lose_seat DataManager.CurrenRoom.isZiMoHu = isZiMo - local hu_sound = isZiMo and ("zimo" .. math.random(1, 3)) or ("hu" .. math.random(1, 2)) + local hu_sound = isZiMo and ("zimo") or ("hu") printlog("声音====>>>", hu_sound) self:PlaySound("JinXi_MJ", player.self_user.sex, hu_sound) @@ -420,6 +420,10 @@ function M:EventInit() local tem = win_list[i] if tem.type > 0 and tem.type < 32 then local com_name = "he" .. tem.type + printlog("声音====>>>", com_name) + ViewUtil.PlaySound("JinXi_MJ", + string.format("extend/majiang/jinxi/sound/%s/%s.mp3", ViewUtil.Sex_Chat[player.self_user.sex], + com_name)) local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_JinXi/" .. com_name) coroutine.wait(0.3) end @@ -803,16 +807,16 @@ function M:OnFangziAction(...) -- local pNode = info._mask_liangpai local effect = UIPackage.CreateObject("Extend_MJ_JinXi", "FzEffect") if fz.type == FZType.Peng then - self:PlaySound("JinXi_MJ", player.self_user.sex, "peng" .. math.random(1, 3)) + self:PlaySound("FuZhou_MJ", player.self_user.sex, "peng") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰") -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框") elseif fz.type == FZType.Chi then - self:PlaySound("JinXi_MJ", player.self_user.sex, "chi" .. math.random(1, 3)) + self:PlaySound("JinXi_MJ", player.self_user.sex, "chi") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃") else - self:PlaySound("JinXi_MJ", player.self_user.sex, "gang" .. math.random(1, 2)) + self:PlaySound("JinXi_MJ", player.self_user.sex, "gang") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠") -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框") diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 47676d01..e5d4dbf2 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -402,7 +402,7 @@ function M:EventInit() --- local isZiMo = win_seat == lose_seat DataManager.CurrenRoom.isZiMoHu = isZiMo - local hu_sound = isZiMo and ("zimo" .. math.random(1, 3)) or ("hu" .. math.random(1, 2)) + local hu_sound = isZiMo and ("zimo") or ("hu") printlog("声音====>>>", hu_sound) self:PlaySound("LiChuan_MJ", player.self_user.sex, hu_sound) @@ -418,6 +418,10 @@ function M:EventInit() local tem = win_list[i] if tem.type > 0 and tem.type < 32 then local com_name = "he" .. tem.type + printlog("声音====>>>", com_name) + ViewUtil.PlaySound("LiChuan_MJ", + string.format("extend/majiang/lichuan/sound/%s/%s.mp3", ViewUtil.Sex_Chat[player.self_user.sex], + com_name)) local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_LiChuan/" .. com_name) coroutine.wait(0.3) end @@ -805,16 +809,16 @@ function M:OnFangziAction(...) -- local pNode = info._mask_liangpai local effect = UIPackage.CreateObject("Extend_MJ_LiChuan", "FzEffect") if fz.type == FZType.Peng then - self:PlaySound("LiChuan_MJ", player.self_user.sex, "peng" .. math.random(1, 3)) + self:PlaySound("FuZhou_MJ", player.self_user.sex, "peng") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰") -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框") elseif fz.type == FZType.Chi then - self:PlaySound("LiChuan_MJ", player.self_user.sex, "chi" .. math.random(1, 3)) + self:PlaySound("LiChuan_MJ", player.self_user.sex, "chi") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃") else - self:PlaySound("LiChuan_MJ", player.self_user.sex, "gang" .. math.random(1, 2)) + self:PlaySound("LiChuan_MJ", player.self_user.sex, "gang") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠") -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框") diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index 87ff7045..ff2752af 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -403,7 +403,7 @@ function M:EventInit() --- local isZiMo = win_seat == lose_seat DataManager.CurrenRoom.isZiMoHu = isZiMo - local hu_sound = isZiMo and ("zimo" .. math.random(1, 3)) or ("hu" .. math.random(1, 2)) + local hu_sound = isZiMo and ("zimo") or ("hu") printlog("声音====>>>", hu_sound) self:PlaySound("NanCheng_MJ", player.self_user.sex, hu_sound) @@ -419,6 +419,10 @@ function M:EventInit() local tem = win_list[i] if tem.type > 0 and tem.type < 32 then local com_name = "he" .. tem.type + printlog("声音====>>>", com_name) + ViewUtil.PlaySound("NanCheng_MJ", + string.format("extend/majiang/nancheng/sound/%s/%s.mp3", ViewUtil.Sex_Chat[player.self_user.sex], + com_name)) local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_NanCheng/" .. com_name) print("lingmenghe", "ui://Extend_MJ_NanCheng/" .. com_name) coroutine.wait(0.3) @@ -805,16 +809,16 @@ function M:OnFangziAction(...) -- local pNode = info._mask_liangpai local effect = UIPackage.CreateObject("Extend_MJ_NanCheng", "FzEffect") if fz.type == FZType.Peng then - self:PlaySound("NanCheng_MJ", player.self_user.sex, "peng" .. math.random(1, 3)) + self:PlaySound("FuZhou_MJ", player.self_user.sex, "peng") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰") -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框") elseif fz.type == FZType.Chi then - self:PlaySound("NanCheng_MJ", player.self_user.sex, "chi" .. math.random(1, 3)) + self:PlaySound("NanCheng_MJ", player.self_user.sex, "chi") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃") else - self:PlaySound("NanCheng_MJ", player.self_user.sex, "gang" .. math.random(1, 2)) + self:PlaySound("NanCheng_MJ", player.self_user.sex, "gang") effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠") effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠") -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框") diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he1.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he1.png index 6d9aebc2..0e7eae2a 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he1.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he1.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he10.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he10.png index 4d5e3565..0d5e5e52 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he10.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he10.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he11.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he11.png index 64843de3..43915c2f 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he11.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he11.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he12.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he12.png index fb27131b..6549fc89 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he12.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he12.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he13.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he13.png index 12d01d64..6c7c4399 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he13.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he13.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he14.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he14.png index 353522c0..bd935d80 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he14.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he14.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he15.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he15.png index af56f891..57c260de 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he15.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he15.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he16.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he16.png index 275e5abf..f339999c 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he16.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he16.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he17.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he17.png index 2d1937e2..7c44e190 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he17.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he17.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he18.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he18.png index 82e2c438..ba845a39 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he18.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he18.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he19.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he19.png index 01cd277a..e33dda0c 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he19.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he19.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he2.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he2.png index 9f1615e4..9c27b6d0 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he2.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he2.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he20.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he20.png index 122cc533..98c40d74 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he20.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he20.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he21.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he21.png index 7e75d55a..2c7b11a6 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he21.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he21.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he22.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he22.png index 01014ff3..089b28ff 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he22.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he22.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he23.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he23.png index 6bf6e563..5965df5d 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he23.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he23.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he24.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he24.png index bd8f951b..a7a09156 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he24.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he24.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he25.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he25.png index 9f5cdc6c..a1a61a6c 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he25.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he25.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he26.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he26.png index a1a2fd3b..cbf2fed8 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he26.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he26.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he27.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he27.png index 97cf5490..69c2860e 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he27.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he27.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he28.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he28.png index 31361404..43d3419d 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he28.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he28.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he29.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he29.png index a9d24116..ad00cc0f 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he29.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he29.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he3.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he3.png index 31d0fa1f..189107b0 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he3.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he3.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he30.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he30.png index 1e90cee6..cb6adb57 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he30.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he30.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he31.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he31.png index 9cbcd163..4b20b03b 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he31.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he31.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he32.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he32.png index adeb11a8..3aee4a78 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he32.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he32.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he33.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he33.png index 260ec2ae..7531360d 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he33.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he33.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he34.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he34.png index cb264b29..621a188e 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he34.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he34.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he35.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he35.png index 6eeeae33..7f3e6ef1 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he35.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he35.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he36.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he36.png index 2db680ed..66598a4e 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he36.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he36.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he37.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he37.png index 211b2541..d0a02cd9 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he37.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he37.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he38.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he38.png index 61a71550..17766357 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he38.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he38.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he39.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he39.png index 97074dd6..4ab8f4ed 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he39.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he39.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he4.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he4.png index d3ce210a..65262d59 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he4.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he4.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he40.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he40.png index 125775a7..82a22595 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he40.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he40.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he41.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he41.png index 23c2f18f..441e806f 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he41.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he41.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he42.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he42.png index dbca9d81..771e94f5 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he42.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he42.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he43.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he43.png index ba261bb6..4d2bf4b0 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he43.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he43.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he44.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he44.png index 29908ffa..554b5e8e 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he44.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he44.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he5.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he5.png index 60200da6..b788619e 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he5.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he5.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he6.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he6.png index dbd34321..8145c5a3 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he6.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he6.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he7.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he7.png index e16ad703..d2f82324 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he7.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he7.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he8.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he8.png index 71354d5b..dab9b4fe 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he8.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he8.png differ diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he9.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he9.png index 4bc094df..a948c166 100644 Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he9.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he9.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he1.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he1.png index 46d5d6e5..0e7eae2a 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he1.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he1.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he10.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he10.png index 932d5ced..0d5e5e52 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he10.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he10.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he11.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he11.png index 48a47a70..43915c2f 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he11.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he11.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he12.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he12.png index 7bb231f8..6549fc89 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he12.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he12.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he13.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he13.png index f0913577..6c7c4399 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he13.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he13.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he14.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he14.png index 15838161..bd935d80 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he14.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he14.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he15.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he15.png index af56f891..57c260de 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he15.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he15.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he16.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he16.png index 275e5abf..f339999c 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he16.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he16.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he17.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he17.png index 2d1937e2..7c44e190 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he17.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he17.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he2.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he2.png index 43deb455..9c27b6d0 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he2.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he2.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he3.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he3.png index d6f27e2c..189107b0 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he3.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he3.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he4.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he4.png index 9e64befa..65262d59 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he4.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he4.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he5.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he5.png index 5ec402e5..b788619e 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he5.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he5.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he6.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he6.png index 5718a24a..8145c5a3 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he6.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he6.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he7.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he7.png index 34c9ff29..d2f82324 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he7.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he7.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he8.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he8.png index 5ab8a471..dab9b4fe 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he8.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he8.png differ diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he9.png b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he9.png index 0ac78f0f..a948c166 100644 Binary files a/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he9.png and b/wb_new_ui/assets/Extend_MJ_JinXi/component/hu_effect/image/he9.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he1.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he1.png index 46d5d6e5..0e7eae2a 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he1.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he1.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he10.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he10.png index 0063c72a..e92b1fa0 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he10.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he10.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he11.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he11.png index 8c891033..ba845a39 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he11.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he11.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he12.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he12.png index 39fbfe0f..e33dda0c 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he12.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he12.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he13.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he13.png index bccacdeb..4310d9fa 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he13.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he13.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he2.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he2.png index 43deb455..9c27b6d0 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he2.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he2.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he3.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he3.png index d6f27e2c..189107b0 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he3.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he3.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he4.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he4.png index 9e64befa..65262d59 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he4.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he4.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he5.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he5.png index 5ec402e5..b788619e 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he5.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he5.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he6.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he6.png index 5ab8a471..dab9b4fe 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he6.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he6.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he7.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he7.png index b3128b50..57c260de 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he7.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he7.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he8.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he8.png index 7735102d..f339999c 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he8.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he8.png differ diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he9.png b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he9.png index 29779edb..7c44e190 100644 Binary files a/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he9.png and b/wb_new_ui/assets/Extend_MJ_LiChuan/component/hu_effect/image/he9.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he1.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he1.png index 46d5d6e5..0e7eae2a 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he1.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he1.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he10.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he10.png index 932d5ced..0d5e5e52 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he10.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he10.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he11.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he11.png index 48a47a70..43915c2f 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he11.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he11.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he12.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he12.png index 7bb231f8..6549fc89 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he12.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he12.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he13.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he13.png index f0913577..6c7c4399 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he13.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he13.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he14.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he14.png index 15838161..bd935d80 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he14.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he14.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he15.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he15.png index af56f891..57c260de 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he15.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he15.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he16.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he16.png index 275e5abf..f339999c 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he16.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he16.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he17.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he17.png index 2d1937e2..7c44e190 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he17.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he17.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he2.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he2.png index 43deb455..9c27b6d0 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he2.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he2.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he3.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he3.png index d6f27e2c..189107b0 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he3.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he3.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he4.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he4.png index 9e64befa..65262d59 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he4.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he4.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he5.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he5.png index 5ec402e5..b788619e 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he5.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he5.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he6.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he6.png index 5718a24a..8145c5a3 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he6.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he6.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he7.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he7.png index 34c9ff29..d2f82324 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he7.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he7.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he8.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he8.png index 5ab8a471..dab9b4fe 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he8.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he8.png differ diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he9.png b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he9.png index 0ac78f0f..a948c166 100644 Binary files a/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he9.png and b/wb_new_ui/assets/Extend_MJ_NanCheng/component/hu_effect/image/he9.png differ diff --git a/wb_new_ui/assets/FGAssist/invite/image/invited/Group 360.png b/wb_new_ui/assets/FGAssist/invite/image/invited/Group 360.png new file mode 100644 index 00000000..f7a3c546 Binary files /dev/null and b/wb_new_ui/assets/FGAssist/invite/image/invited/Group 360.png differ diff --git a/wb_new_ui/assets/FGAssist/invite/image/invited/Group 361.png b/wb_new_ui/assets/FGAssist/invite/image/invited/Group 361.png new file mode 100644 index 00000000..1e8297c1 Binary files /dev/null and b/wb_new_ui/assets/FGAssist/invite/image/invited/Group 361.png differ diff --git a/wb_new_ui/assets/FGAssist/invite/image/invited/Group 545.png b/wb_new_ui/assets/FGAssist/invite/image/invited/Group 545.png new file mode 100644 index 00000000..aad0768b Binary files /dev/null and b/wb_new_ui/assets/FGAssist/invite/image/invited/Group 545.png differ diff --git a/wb_new_ui/assets/FGAssist/invite/image/invited/Rectangle 257.png b/wb_new_ui/assets/FGAssist/invite/image/invited/Rectangle 257.png new file mode 100644 index 00000000..13f0212d Binary files /dev/null and b/wb_new_ui/assets/FGAssist/invite/image/invited/Rectangle 257.png differ diff --git a/wb_new_ui/assets/FGAssist/invite/panel_invited--.xml b/wb_new_ui/assets/FGAssist/invite/panel_invited--.xml new file mode 100644 index 00000000..6a221383 --- /dev/null +++ b/wb_new_ui/assets/FGAssist/invite/panel_invited--.xml @@ -0,0 +1,33 @@ + + + + + +