8.23提交

lua_probject/base_project/Game/View/Common/ModalWaitingWindow.lua

@@ -1,4 +1,3 @@
-
 ModalWaitingWindow = {
 
 }

lua_probject/base_project/Game/View/Family/FamilyEventView.lua

@@ -194,7 +194,7 @@ function M:_evtInviteResponse(...)
                             return
                         else
                             UpdateBeat:Remove(self.OnUpdate, self)
-                            ViewManager.ChangeView(ViewManager.View_Main, gameId)
+                            ViewManager.ChangeView(ViewManager.View_Main, gameId, { _flag_showTip = true })
                         end
                     end,
                     groupid,

lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua

@@ -72,7 +72,7 @@ function M:FillData()
 
     local config = ExtendManager.GetExtendConfig(play.gameId)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(play.config)
+    local gamePlay = mode:LoadConfigToDetail(play.config, play.hpData)
     self._viewText_playConfig.text = play.hp_times / 1000 .. "倍," .. gamePlay
 end
 

lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua

@@ -140,7 +140,6 @@ function FamilyMyFamily:Close()
 end
 
 function FamilyMyFamily:Refalsh()
-
     self.family = DataManager.groups.groupMap[self.groupId]
 
     self.tex_fName.text = Utils.TextOmit(self.family.name, 6, "...")
@@ -220,9 +219,11 @@ function FamilyMyFamily:Init()
         if curView.class == "FamilyMainView" then
             curView:PlayEdit()
         else
-            local view = ViewManager.ChangeView(ViewManager.View_Family, function()
+            local view = ViewManager.ChangeView(ViewManager.View_Family, {
+                _s_callback = function()
                     view:PlayEdit()
-            end)
+                end
+            })
         end
     end)
 
@@ -236,9 +237,11 @@ function FamilyMyFamily:Init()
         if curView.class == "FamilyMainView" then
             curView:ShowShop()
         else
-            local view = ViewManager.ChangeView(ViewManager.View_Family, function()
+            local view = ViewManager.ChangeView(ViewManager.View_Family, {
+                _s_callback = function()
                     view:ShowShop()
-            end)
+                end
+            })
         end
     end)
 

lua_probject/base_project/Game/View/Family/PlayEditView.lua

@@ -74,7 +74,8 @@ function PlayEditView:Init()
         local pId = playList[index].id
         -- times倍数
         local times = json.decode(playList[index].hpData).times
-        obj:GetChild('Label_details'):GetChild('title').text = times / 1000 .. "倍," .. mode:LoadConfigToDetail(playList[index].config)
+        obj:GetChild('Label_details'):GetChild('title').text = times / 1000 ..
+        "倍," .. mode:LoadConfigToDetail(playList[index].config, playList[index].hpData)
         obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc
         obj:GetChild('text_playName').text = Utils.TextOmit(playList[index].name, 6, "...")
         obj:GetController('type').selectedIndex = 1

lua_probject/base_project/Game/View/FamilyView.lua

@@ -256,10 +256,11 @@ function M:Reflash()
             --self:ConnetFamily(1, groups)
             self.list_family.numItems = #DataManager.groups.groupList
             local chooseIndex = 1
-            if FamilyView.lastId then
+            local lastID = Utils.LoadLocalFile("Family_lastID" .. DataManager.SelfUser.account_id)
+            if lastID then
+                lastID = tonumber(lastID)
                 for i = 1, #DataManager.groups.groupList do
-                    if FamilyView.lastId == DataManager.groups.groupList[i].id then
+                    if lastID == DataManager.groups.groupList[i].id then
-                        FamilyView.lastId = nil
                         chooseIndex = i
                     end
                 end
@@ -605,7 +606,8 @@ function M:UpdateFamilyRoom(fgCtr, id)
             local gameId = playGameInfoTable[roomList[newIndex].pid].gameId
             local config = ExtendManager.GetExtendConfig(gameId)
             local mode = config:GetGameInfo()
-            local gamePlay = mode:LoadConfigToDetail(playGameInfoTable[roomList[newIndex].pid].config)
+            local gamePlay = mode:LoadConfigToDetail(playGameInfoTable[roomList[newIndex].pid].config,
+                playGameInfoTable[roomList[newIndex].pid].hpData)
             local play = self._group:getPlay(roomList[newIndex].pid)
             local times = json.decode(play.hpData).times
             gamePlay = times / 1000 .. "倍," .. gamePlay
@@ -648,7 +650,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
                         else
                             UpdateBeat:Remove(self.OnUpdate, self)
                             FamilyView.lastId = self._group.id
-                            ViewManager.ChangeView(ViewManager.View_Main, gameId)
+                            ViewManager.ChangeView(ViewManager.View_Main, gameId, { _flag_showTip = true })
                         end
                     end,
                     id,
@@ -690,7 +692,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
             -- times倍数
             local times = json.decode(playList[newIndex].hpData).times
             local gamePlay = times / 1000 .. "倍,"
-            gamePlay = gamePlay .. mode:LoadConfigToDetail(playList[newIndex].config)
+            gamePlay = gamePlay .. mode:LoadConfigToDetail(playList[newIndex].config, playList[newIndex].hpData)
             obj:GetChild('Label_gameRule').title = gamePlay
             local roomName = Utils.TextOmit(playList[newIndex].name, 6, "")
             roomName = string.format("（%s）%s", playList[newIndex].game_name, roomName)
@@ -724,7 +726,8 @@ function M:UpdateFamilyRoom(fgCtr, id)
                         else
                             UpdateBeat:Remove(self.OnUpdate, self)
                             FamilyView.lastId = self._group.id
-                            ViewManager.ChangeView(ViewManager.View_Main, playList[newIndex].gameId)
+                            ViewManager.ChangeView(ViewManager.View_Main, playList[newIndex].gameId,
+                                { _flag_showTip = true })
                         end
                     end,
                     id,
@@ -821,6 +824,7 @@ function M:ConnetFamily(index, groups)
     local fgCtr = ControllerManager.GetController(NewGroupController)
 
     ViewUtil.ShowModalWait(self._root_view, "正在进入亲友圈......")
+    Utils.SaveLocalFile("Family_lastID" .. DataManager.SelfUser.account_id, self._group.id)
     self:EnterGroup(fgCtr, self._group.id)
 
     --[[

lua_probject/base_project/Game/View/Lobby/LobbySettingView.lua

@@ -59,7 +59,7 @@ function M:init(url)
     local btn_quit = view:GetChild('btn_exitAccount')
     btn_quit.onClick:Set(
         function()
-            -- GameApplication.Instance:QuitGameOnUnity();
+            Application.Quit()
         end
     )
     --[[

lua_probject/base_project/Game/View/LobbyView.lua

@@ -497,7 +497,7 @@ function M:GetPlayerInfoData()
             self:ShowPlayerInfo(data.raffle, data.diamo, data.newMail)
             if data.group_id ~= 0 then
                 -- 重连
-                self:ReconnectRoom(data.groupId)
+                -- self:ReconnectRoom(data.groupId)
             end
         end
     end)

lua_probject/base_project/Game/View/MainView.lua

@@ -274,8 +274,6 @@ function M:InitView(url, isHideIpAdds)
                 self._btn_record.onTouchEnd:Set(self.__RecordTouchEnd, self)
                 Voice.BeginRecord()
                 self._ctr_voice.selectedIndex = 1
-                self.__runwait_record = nil
-                self.__runwait_record = coroutine.start(self.__WaitRecord, self)
             end
         end)
     end
@@ -317,8 +315,7 @@ function M:InitView(url, isHideIpAdds)
     if self._chat_Talk then
         self._ctr_voice = _view:GetController('voice')
 
-        self._chat_Talk.onTouchBegin:Set(function()
+        self._chat_Talk.onTouchBegin:Set(function(context)
-        
             if self._room.room_config.config.hpData.BanChat == 1 then
                 ViewUtil.ShowBannerOnScreenCenter("本房间禁止快捷聊天")
                 return
@@ -328,12 +325,16 @@ function M:InitView(url, isHideIpAdds)
                 self:__SetRecordEnable()
             else
                 self._record_time = 0
+                self._record_pos = Vector2.New(context.inputEvent.x, context.inputEvent.y)
+                self._record_view = _view:GetChild('comp_voice')
+                self._record_view_ctr = self._record_view:GetController('ctr_cancel')
                 GameApplication.Instance.StopMusic = GameApplication.Instance.StopMusic + 1
                 self._chat_Talk.onTouchEnd:Set(self.__RecordTouchEnd, self)
+                self._chat_Talk.onTouchMove:Set(handler(self, self.__RecordTouchMove))
                 Voice.BeginRecord()
                 self._ctr_voice.selectedIndex = 1
-                self.__runwait_record = nil
+                -- self.__runwait_record = nil
-                self.__runwait_record = coroutine.start(self.__WaitRecord, self)
+                -- self.__runwait_record = coroutine.start(self.__WaitRecord, self)
             end
         end)
     end
@@ -696,6 +697,14 @@ function M:NewSettingView()
     return settingView
 end
 
+function M:__RecordTouchMove(context)
+    if Mathf.Abs(context.inputEvent.x - self._record_pos.x) >= 50 or Mathf.Abs(context.inputEvent.y - self._record_pos.y) >= 50 then
+        self._record_view_ctr.selectedIndex = 1
+    else
+        self._record_view_ctr.selectedIndex = 0
+    end
+end
+
 function M:__RecordTouchEnd()
     if (self.__runwait_record ~= nil) then
         coroutine.stop(self.__runwait_record)
@@ -1323,8 +1332,14 @@ function M:OnUpdate()
     end
     if self._view:GetChild('gcm_chat') then
         self._record_time = self._record_time + deltaTime
+        if self._record_view then
+            self._record_view.title = math.floor(self._record_time) .. "\""
+        end
     elseif self._record_time then
         self._record_time = self._record_time + deltaTime
+        if self._record_view then
+            self._record_view.title = math.floor(self._record_time) .. "\""
+        end
     end
 
     local _left_time = self._left_time

lua_probject/base_project/Game/View/RoomInfoView.lua

@@ -24,7 +24,7 @@ end
 function M:FillRoomConfig(roominfo_panel, _room)
     local config = ExtendManager.GetExtendConfig(_room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(_room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(_room.room_config.config), json.encode(_room.room_config.hpData))
     local tex_gametype = roominfo_panel:GetChild("tex_gametype")
     tex_gametype.text = _room.room_config:GetGameName()
 

lua_probject/base_project/Game/View/ViewUtil.lua

@@ -37,12 +37,21 @@ end
 
 local modal_wait_win = nil
 -- local modal_wait_win_url = "ui://Common/GlobalModalWaiting"
-function ViewUtil.ShowModalWait(blur_view, title)
+function ViewUtil.ShowModalWait(blur_view, title, time)
     ViewUtil.CloseModalWait()
+    ViewUtil.continue = coroutine.start(
+        function()
+            coroutine.wait(time or 1)
             ModalWaitingWindow.ShowModal(title)
         end
+    )
+end
 
 function ViewUtil.CloseModalWait()
+    if ViewUtil.continue then
+        coroutine.stop(ViewUtil.continue)
+        ViewUtil.continue = nil
+    end
     ModalWaitingWindow.CloseModal()
 end
 

lua_probject/base_project/Game/ViewManager.lua

@@ -99,7 +99,7 @@ function ViewManager.GetCurrenView()
   return _currenView
 end
 
-function ViewManager.ChangeViewByClass(dview_class, callback)
+function ViewManager.ChangeViewByClass(dview_class, data)
   if (_currenView ~= nil) then
     if _currenView._close_destroy then
       _currenView:Destroy()
@@ -116,7 +116,12 @@ function ViewManager.ChangeViewByClass(dview_class, callback)
   if not tem then
     tem = dview_class.new()
 
-    tem._s_callback = callback
+    if data and data._s_callback then
+      tem._s_callback = data._s_callback
+    end
+    if data then
+      tem._flag_showTip = data._flag_showTip
+    end
     _viewMap[dview_class] = tem
   end
 
@@ -128,7 +133,7 @@ function ViewManager.ChangeViewByClass(dview_class, callback)
 end
 
 local last_game_id = 0
-function ViewManager.ChangeView(id, game_id, callback)
+function ViewManager.ChangeView(id, game_id, data)
   -- if id==2 then
   -- printlog("cccccccccccccccccccccccccccccccc")
   -- printlog(debug.traceback())
@@ -148,7 +153,7 @@ function ViewManager.ChangeView(id, game_id, callback)
   if not dview_class then
     return
   end
-  return ViewManager.ChangeViewByClass(dview_class, callback)
+  return ViewManager.ChangeViewByClass(dview_class, data)
 end
 
 function ViewManager.OnApplicationPause()

lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua

@@ -132,7 +132,7 @@ end
 function M:fillResult0(room, peopleNum, result)
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
     self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
         room.room_config.round, gamePlay)
     self.list_lastCard.numItems = #result.cardList

lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua

@@ -173,13 +173,17 @@ function M:LoadConfigData(data)
     self._config:GetChild("n93").text = string.format("奖%s马", data.jiangma * 2)
 end
 
-function M:LoadConfigToDetail(data)
+function M:LoadConfigToDetail(data, hpdata)
-    
     local configData = data
     if type(data) == 'string' then
         configData = json.decode(data)
     end
 
+    local hpData = hpdata
+    if type(hpdata) == 'string' then
+        hpData = json.decode(hpdata)
+    end
+
     local returnString = string.format("人数%s人", configData.maxPlayers)
     if configData.jiangma then
         returnString = string.format("%s,%s马", returnString,
@@ -206,8 +210,29 @@ function M:LoadConfigToDetail(data)
     if configData.zuangfenfanbei then
         returnString = string.format("%s%s", returnString, configData.zikechengshun == 0 and ",庄家积分翻倍" or "")
     end
+    if configData.GPSDetection then
+        returnString = string.format("%s%s", returnString,
+            configData.GPSDetection == 0 and ",距离不限制" or string.format(",距离限制%s米", configData.GPSDetection))
+    end
+    if configData.tuoguan_active_time then
+        returnString = string.format("%s%s", returnString,
+            configData.tuoguan_active_time == 0 and ",不自动托管" or string.format(",%s秒托管", configData.tuoguan_active_time))
+    end
+    if hpData then
+        if hpData.JieShan then
+            returnString = string.format("%s%s", returnString,
+                hpData.JieShan == 1 and ",托管结束后不解散" or
+                string.format(",托管%s结束后强制解散", hpData.JieShan == 2 and "当局" or string.format("%s局", hpData.JieShan - 1)))
+        end
+        if hpData.BanChat then
+            returnString = string.format("%s%s", returnString, hpData.BanChat == 1 and ",不允许快捷聊天" or "")
+        end
+        if hpData.BanMissile then
+            returnString = string.format("%s%s", returnString, hpData.BanMissile == 1 and ",关闭互动表情" or "")
+        end
+    end
 
-    returnString = returnString .. IGameInfo.LoadConfigToDetail(self, data)
+    returnString = returnString .. IGameInfo.LoadConfigToDetail(self, data, hpdata)
 
     return returnString
 end

lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua

@@ -59,7 +59,7 @@ function M:InitView(url)
     --]]
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
     self._view:GetChild('wanfa_text').text = gamePlay
 
     self.jing = self._view:GetChild('jing')

lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua

@@ -58,7 +58,7 @@ function M:InitView(url)
     ------------------渲染桌面信息--------------------------
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
 
     self._view:GetChild('text_time').text = os.date("%H:%M", os.time())
     self._view:GetChild('text_roomId').text = room.room_id
@@ -366,7 +366,6 @@ function M:UpdateCardBox(seat)
 end
 
 function M:OnFangziAction(...)
-
     local arg = { ... }
     local _player_card_info = self._player_card_info
     local fz = arg[1]

lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua

@@ -130,7 +130,7 @@ end
 function M:fillResult0(room, peopleNum, result)
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
     self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
         room.room_config.round, gamePlay)
     self.list_lastCard.numItems = #result.cardList

lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua

@@ -169,8 +169,7 @@ function M:LoadConfigData(data)
     self._config:GetChild("n93").text = string.format("奖%s马", data.jiangma * 2)
 end
 
-function M:LoadConfigToDetail(data)
+function M:LoadConfigToDetail(data, hpData)
-    
     local configData = data
     if type(data) == 'string' then
         configData = json.decode(data)
@@ -208,8 +207,28 @@ function M:LoadConfigToDetail(data)
     if configData.sanjingjiangma then
         returnString = string.format("%s%s", returnString, configData.sanjingjiangma == 0 and ",三精算奖马" or "")
     end
-
+    if configData.GPSDetection then
-    returnString = returnString .. IGameInfo.LoadConfigToDetail(self, data)
+        returnString = string.format("%s%s", returnString,
+            configData.GPSDetection == 0 and ",距离不限制" or string.format(",距离限制%s米", configData.GPSDetection))
+    end
+    if configData.tuoguan_active_time then
+        returnString = string.format("%s%s", returnString,
+            configData.tuoguan_active_time == 0 and ",不自动托管" or string.format(",%s秒托管", configData.tuoguan_active_time))
+    end
+    if hpData then
+        if hpData.JieShan then
+            returnString = string.format("%s%s", returnString,
+                hpData.JieShan == 1 and ",托管结束后不解散" or
+                string.format(",托管%s结束后强制解散", hpData.JieShan == 2 and "当局" or string.format("%s局", hpData.JieShan - 1)))
+        end
+        if hpData.BanChat then
+            returnString = string.format("%s%s", returnString, hpData.BanChat == 1 and ",不允许快捷聊天" or "")
+        end
+        if hpData.BanMissile then
+            returnString = string.format("%s%s", returnString, hpData.BanMissile == 1 and ",关闭互动表情" or "")
+        end
+    end
+    returnString = returnString .. IGameInfo.LoadConfigToDetail(self, data, hpData)
 
     return returnString
 end

lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua

@@ -59,7 +59,7 @@ function M:InitView(url)
     --]]
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
     self._view:GetChild('wanfa_text').text = gamePlay
 
     self.jing = self._view:GetChild('jing')

lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua

@@ -57,7 +57,7 @@ function M:InitView(url)
     ------------------渲染桌面信息--------------------------
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
 
     self._view:GetChild('text_time').text = os.date("%H:%M", os.time())
     self._view:GetChild('text_roomId').text = room.room_id

lua_probject/extend_project/extend/majiang/jinxi/HuCardImg.lua

@@ -1,6 +1,6 @@
 local HuCardImg = {}
 
-HuCardImg[14] = { "tile_cs_deguo", "tile_cs_shisanlan" }
+HuCardImg[14] = { "tile_cs_shisanlan", "tile_cs_deguo" }
 HuCardImg[15] = { "tile_cs_qxshisanlan", "tile_cs_deguo" }
 HuCardImg[16] = { "tile_cs_dihu" }
 HuCardImg[17] = { "tile_cs_pinghu" }

lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua

@@ -128,7 +128,7 @@ end
 function M:fillResult0(room, peopleNum, result)
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
     self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
         room.room_config.round, gamePlay)
     self.list_lastCard.numItems = #result.cardList

lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua

@@ -246,6 +246,10 @@ function M:OnEventFzTips(evt_data)
             -- end
             tiplist:AddTip(tip)
         end
+        --排序规则，胡杠碰
+        tiplist:SortList(function(a, b)
+            return a.type < b.type
+        end)
         DispatchEvent(self._dispatcher, TX_GameEvent.FZTips, tiplist, weight)
     end)
 end

lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua

@@ -152,7 +152,6 @@ function M:LoadConfigData(data)
 end
 
 function M:LoadConfigToDetail(data)
-    
     local configData = data
     if type(data) == 'string' then
         configData = json.decode(data)
@@ -164,7 +163,28 @@ function M:LoadConfigToDetail(data)
         configData.tuoguan == 0 and string.format("%d秒后自动托管", configData.tuoguan_active_time) or "不能托管",
         configData.jingbibo == 1 and "有精必博" or "有精可胡")
 
-    returnString = returnString .. IGameInfo.LoadConfigToDetail(self, data)
+    if configData.GPSDetection then
+        returnString = string.format("%s%s", returnString,
+            configData.GPSDetection == 0 and ",距离不限制" or string.format(",距离限制%s米", configData.GPSDetection))
+    end
+    if configData.tuoguan_active_time then
+        returnString = string.format("%s%s", returnString,
+            configData.tuoguan_active_time == 0 and ",不自动托管" or string.format(",%s秒托管", configData.tuoguan_active_time))
+    end
+    if hpData then
+        if hpData.JieShan then
+            returnString = string.format("%s%s", returnString,
+                hpData.JieShan == 1 and ",托管结束后不解散" or
+                string.format(",托管%s结束后强制解散", hpData.JieShan == 2 and "当局" or string.format("%s局", hpData.JieShan - 1)))
+        end
+        if hpData.BanChat then
+            returnString = string.format("%s%s", returnString, hpData.BanChat == 1 and ",不允许快捷聊天" or "")
+        end
+        if hpData.BanMissile then
+            returnString = string.format("%s%s", returnString, hpData.BanMissile == 1 and ",关闭互动表情" or "")
+        end
+    end
+    returnString = returnString .. IGameInfo.LoadConfigToDetail(self, data, hpData)
 
     return returnString
 end

lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua

@@ -59,7 +59,7 @@ function M:InitView(url)
     --]]
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
     self._view:GetChild('wanfa_text').text = gamePlay
 
     self.jing = self._view:GetChild('jing')
@@ -637,7 +637,7 @@ function M:__FangziTip(tip, weight)
 
     local _lit_fanzi = _chipeng_tip:GetChild("list")
     --_lit_fanzi:SetVirtual()
-    local _tlist = tip.tip_map_id
+    local _tlist = tip.tip_sortList
     _lit_fanzi.itemRenderer = function(index, obj)
         local type = obj:GetController('type')
         if index == tip.tip_num then

lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua

@@ -59,7 +59,7 @@ function M:InitView(url)
     ------------------渲染桌面信息--------------------------
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
 
     self._view:GetChild('text_time').text = os.date("%H:%M", os.time())
     self._view:GetChild('text_roomId').text = room.room_id

lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua

@@ -98,6 +98,7 @@ function M:FillRoomData(s2croom)
         room.curren_outcard_seat = _reloadInfo["curren_outcard_seat"]
         room.last_outcard_seat = last_outcard_seat
         room.playing = playing
+        room.reload = reload
         if jing then
             room.jing = jing
         end

lua_probject/extend_project/extend/majiang/lichuan/HuCardImg.lua

@@ -8,7 +8,7 @@ HuCardImg[10] = { "tile_cs_deguo" }
 HuCardImg[11] = { "tile_cs_qiangganghu" }
 HuCardImg[12] = { "tile_cs_gangshanghua" }
 HuCardImg[13] = { "tile_cs_quanqiuren" }
-HuCardImg[14] = { "tile_cs_deguo", "tile_cs_shisanlan" }
+HuCardImg[14] = { "tile_cs_shisanlan", "tile_cs_deguo" }
 HuCardImg[15] = { "tile_cs_qxshisanlan", "tile_cs_deguo" }
 
 

lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua

@@ -128,7 +128,7 @@ end
 function M:fillResult0(room, peopleNum, result)
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
     self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
         room.room_config.round, gamePlay)
     self.list_lastCard.numItems = #result.cardList

lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua

@@ -179,7 +179,6 @@ function M:LoadConfigData(data)
 end
 
 function M:LoadConfigToDetail(data)
-    
     local configData = data
     if type(data) == 'string' then
         configData = json.decode(data)
@@ -195,7 +194,28 @@ function M:LoadConfigToDetail(data)
         configData.jiahu and ",可以假胡" or "", configData.fengding and ",封顶20炮" or "",
         configData.zhuanwan and "大转弯" or "小转弯")
 
-    returnString = returnString .. IGameInfo.LoadConfigToDetail(self, data)
+    if configData.GPSDetection then
+        returnString = string.format("%s%s", returnString,
+            configData.GPSDetection == 0 and ",距离不限制" or string.format(",距离限制%s米", configData.GPSDetection))
+    end
+    if configData.tuoguan_active_time then
+        returnString = string.format("%s%s", returnString,
+            configData.tuoguan_active_time == 0 and ",不自动托管" or string.format(",%s秒托管", configData.tuoguan_active_time))
+    end
+    if hpData then
+        if hpData.JieShan then
+            returnString = string.format("%s%s", returnString,
+                hpData.JieShan == 1 and ",托管结束后不解散" or
+                string.format(",托管%s结束后强制解散", hpData.JieShan == 2 and "当局" or string.format("%s局", hpData.JieShan - 1)))
+        end
+        if hpData.BanChat then
+            returnString = string.format("%s%s", returnString, hpData.BanChat == 1 and ",不允许快捷聊天" or "")
+        end
+        if hpData.BanMissile then
+            returnString = string.format("%s%s", returnString, hpData.BanMissile == 1 and ",关闭互动表情" or "")
+        end
+    end
+    returnString = returnString .. IGameInfo.LoadConfigToDetail(self, data, hpData)
 
     return returnString
 end

lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua

@@ -58,7 +58,7 @@ function M:InitView(url)
     --]]
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
     self._view:GetChild('wanfa_text').text = gamePlay
 
     self.jing = self._view:GetChild('jing')

lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua

@@ -57,7 +57,7 @@ function M:InitView(url)
     ------------------渲染桌面信息--------------------------
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
 
     self._view:GetChild('text_time').text = os.date("%H:%M", os.time())
     self._view:GetChild('text_roomId').text = room.room_id

lua_probject/extend_project/extend/zipai/fulushou/main/CardCheck.lua

@@ -87,6 +87,7 @@ local M = {
 function M:push(cardGroup)
 	self.stack[#self.stack + 1] = cardGroup
 end
+
 function M:pushhuxi(cardGroup)
 	self.stackHuxi[#self.stackHuxi + 1] = cardGroup
 end
@@ -100,24 +101,17 @@ function M:rollBack()
 	table.sort(self.cardList)
 end
 
-
-
-
 function M:tryWin(player, room)
 	return self:checkWinOpList(player, player.fz_list, room)
 end
 
-
-
 function M:checkWinOpList(player, opcardList, room)
-	local isHu=self:AnalyseChiHuCard(opcardList,room.room_config.config)
+	local isHu = self:AnalyseChiHuCard(opcardList, room.room_config.config, room.room_config.hpData)
 	return isHu
 end
 
-
 function M:AnalyseChiHuCard(opcardList, roomConfig)
 	return self:AnalyseChiHuCardEx(opcardList, roomConfig)
-	
 end
 
 function M:AnalyseChiHuCardEx(opcardList, roomConfig)
@@ -141,10 +135,8 @@ function M:AnalyseChiHuCardEx(opcardList,roomConfig)
 	else
 		return false
 	end
-	
 end
 
-
 function M:AnalyseCard(tempCardList, opCards, tagAnalyseItemList, config)
 	local cbCardCount = 0
 	for k, v in pairs(tempCardList) do
@@ -179,7 +171,6 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 			end
 
 			return false
-			
 		end
 
 		--//拆分分析
@@ -243,19 +234,9 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 							kindItem.cbCardList[3] = math.floor(k / 100) * 100 + 4
 							table.insert(tagKindList, kindItem)
 						end
-						
-						
 					end
-					
-					
-					
 				end
-				
-				
-				
-				
 			end
-			
 		end
 
 
@@ -294,9 +275,7 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 						if cbCardMap_temp[cbCardIndex] then
 							cbCardMap_temp[cbCardIndex] = cbCardMap_temp[cbCardIndex] - 1
 						end
-						
 					end
-					
 				end
 
 
@@ -312,12 +291,12 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 					end
 
 					if cbCardEye ~= 0 then
-						local result = AnalyseCardFuLuShou(cbLessKindItem, pKindItem, cbCardEye, opCards, tagAnalyseItemList, config)
+						local result = AnalyseCardFuLuShou(cbLessKindItem, pKindItem, cbCardEye, opCards,
+							tagAnalyseItemList, config)
 						if result then
 							return true
 						end
 					end
-					
 				end
 
 
@@ -332,26 +311,16 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 								cbIndex[j] = cbNewIndex + j - i + 2
 							end
 							break
-							
 						end
-						
-						
-						
 					end
 
 					if tempi == 1 then break end
-					
 				else
 					cbIndex[cbLessKindItem] = cbIndex[cbLessKindItem] + 1
 				end
-				
-					
-				
 			until (false)
 			--end
 			----
-			
-			
 		end
 
 
@@ -390,7 +359,6 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 					for i = 1, v do
 						table.insert(eyeCardList, k)
 					end
-					
 				end
 			end
 
@@ -401,7 +369,8 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 				local card2 = eyeCardList[2]
 				local card3 = eyeCardList[3]
 				local card4 = eyeCardList[4]
-				local result=AnalyseCardFuLuShouJiang(cbLessKindItem, nil, card1, card2, card3, card4, opCards, tagAnalyseItemList, config)
+				local result = AnalyseCardFuLuShouJiang(cbLessKindItem, nil, card1, card2, card3, card4, opCards,
+					tagAnalyseItemList, config)
 				if result then
 					return true
 				end
@@ -413,7 +382,8 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 				local card2 = eyeCardList[3]
 				local card3 = eyeCardList[2]
 				local card4 = eyeCardList[4]
-				local result=AnalyseCardFuLuShouJiang(cbLessKindItem, nil, card1, card2, card3, card4, opCards, tagAnalyseItemList, config)
+				local result = AnalyseCardFuLuShouJiang(cbLessKindItem, nil, card1, card2, card3, card4, opCards,
+					tagAnalyseItemList, config)
 				if result then
 					return true
 				end
@@ -424,7 +394,8 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 				local card2 = eyeCardList[4]
 				local card3 = eyeCardList[3]
 				local card4 = eyeCardList[2]
-				local result=AnalyseCardFuLuShouJiang(cbLessKindItem, nil, card1, card2, card3, card4, opCards, tagAnalyseItemList, config)
+				local result = AnalyseCardFuLuShouJiang(cbLessKindItem, nil, card1, card2, card3, card4, opCards,
+					tagAnalyseItemList, config)
 				if result then
 					return true
 				end
@@ -436,8 +407,6 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 			else
 				return false
 			end
-			
-			
 		end
 
 
@@ -501,16 +470,9 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 							kindItem.cbCardList[3] = k + 2
 							table.insert(tagKindList, kindItem)
 						end
-						
-						
-						
 					end
-					
 				end
-				
 			end
-			
-			
 		end
 
 
@@ -546,9 +508,7 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 						if cbCardMap_temp[cbCardIndex] then
 							cbCardMap_temp[cbCardIndex] = cbCardMap_temp[cbCardIndex] - 1
 						end
-						
 					end
-					
 				end
 
 
@@ -567,7 +527,6 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 							for i = 1, v do
 								table.insert(eyeCardList, k)
 							end
-							
 						end
 					end
 
@@ -578,7 +537,8 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 						local card2 = eyeCardList[2]
 						local card3 = eyeCardList[3]
 						local card4 = eyeCardList[4]
-						local result=AnalyseCardFuLuShouJiang(cbLessKindItem, nil, card1, card2, card3, card4, opCards, tagAnalyseItemList, config)
+						local result = AnalyseCardFuLuShouJiang(cbLessKindItem, nil, card1, card2, card3, card4, opCards,
+							tagAnalyseItemList, config)
 						if result then
 							return true
 						end
@@ -590,7 +550,8 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 						local card2 = eyeCardList[3]
 						local card3 = eyeCardList[2]
 						local card4 = eyeCardList[4]
-						local result=AnalyseCardFuLuShouJiang(cbLessKindItem, nil, card1, card2, card3, card4, opCards, tagAnalyseItemList, config)
+						local result = AnalyseCardFuLuShouJiang(cbLessKindItem, nil, card1, card2, card3, card4, opCards,
+							tagAnalyseItemList, config)
 						if result then
 							return true
 						end
@@ -601,7 +562,8 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 						local card2 = eyeCardList[4]
 						local card3 = eyeCardList[3]
 						local card4 = eyeCardList[2]
-						local result=AnalyseCardFuLuShouJiang(cbLessKindItem, nil, card1, card2, card3, card4, opCards, tagAnalyseItemList, config)
+						local result = AnalyseCardFuLuShouJiang(cbLessKindItem, nil, card1, card2, card3, card4, opCards,
+							tagAnalyseItemList, config)
 						if result then
 							return true
 						end
@@ -612,15 +574,12 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 					else
 						return false
 					end
-					
-					
 				end
 
 
 
 				--//设置索引
 				if cbIndex[cbLessKindItem] == #tagKindList then
-					
 					local tempi = cbLessKindItem
 					for i = cbLessKindItem, 2, -1 do
 						tempi = i - 1
@@ -630,28 +589,16 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 								cbIndex[j] = cbNewIndex + j - i + 2
 							end
 							break
-							
 						end
-
-						
-						
 					end
 
 					if tempi == 1 then break end
-					
-					
 				else
 					cbIndex[cbLessKindItem] = cbIndex[cbLessKindItem] + 1
 				end
-				
-					
-					
-				
 			until (false)
 			--end
 			--
-			
-
 		end
 
 		if #tagAnalyseItemList > 0 then break end
@@ -662,7 +609,6 @@ function M:AnalyseCard(tempCardList,opCards,tagAnalyseItemList,config)
 	if #tagAnalyseItemList > 0 then return true end
 
 	return false
-
 end
 
 function M:AnalyseCardFuLuShou(cbLessKindItem, pKindItem, eyeCard, opCards, tagAnalyseItemList, config)
@@ -700,9 +646,7 @@ function M:AnalyseCardFuLuShou(cbLessKindItem,pKindItem,eyeCard,opCards,tagAnaly
 					AnalyseItem.huxi = AnalyseItem.huxi + 4
 				end
 			end
-			
 		end
-		
 	end
 
 	--//设置牌型
@@ -732,9 +676,7 @@ function M:AnalyseCardFuLuShou(cbLessKindItem,pKindItem,eyeCard,opCards,tagAnaly
 						AnalyseItem.huxi = AnalyseItem.huxi + 4
 					end
 				end
-				
 			end
-			
 		end
 	end
 
@@ -759,11 +701,10 @@ function M:AnalyseCardFuLuShou(cbLessKindItem,pKindItem,eyeCard,opCards,tagAnaly
 		return true
 	end
 	return false
-	
-	
 end
 
-function M:AnalyseCardFuLuShouJiang(cbLessKindItem,pKindItem,card1,card2,card3,card4,opCards,tagAnalyseItemList,config)
+function M:AnalyseCardFuLuShouJiang(cbLessKindItem, pKindItem, card1, card2, card3, card4, opCards, tagAnalyseItemList,
+									config)
 	printlog("AnalyseCardFuLuShouJiang===>>>")
 	local AnalyseItem = {}
 	AnalyseItem.huxi = 0
@@ -807,9 +748,7 @@ function M:AnalyseCardFuLuShouJiang(cbLessKindItem,pKindItem,card1,card2,card3,c
 					AnalyseItem.huxi = AnalyseItem.huxi + 4
 				end
 			end
-			
 		end
-		
 	end
 
 	--//设置牌型
@@ -842,9 +781,7 @@ function M:AnalyseCardFuLuShouJiang(cbLessKindItem,pKindItem,card1,card2,card3,c
 						AnalyseItem.huxi = AnalyseItem.huxi + 4
 					end
 				end
-				
 			end
-			
 		end
 	end
 
@@ -913,7 +850,6 @@ function M:AnalyseCardFuLuShouJiang(cbLessKindItem,pKindItem,card1,card2,card3,c
 				diJin = true
 				AnalyseItem.huxi = AnalyseItem.huxi + 4
 			end
-			
 		end
 
 		if (card1 ~= card2 and IsLuShou(card1) and IsLuShou(card2) or card3 ~= card4 and IsLuShou(card3) and IsLuShou(card4)) then
@@ -929,18 +865,13 @@ function M:AnalyseCardFuLuShouJiang(cbLessKindItem,pKindItem,card1,card2,card3,c
 				diJin = true
 				AnalyseItem.huxi = AnalyseItem.huxi + 3
 			end
-		
-		
 		elseif ((card1 ~= card2 and ((math.floor(card1 / 100) ~= 1 and math.floor(card1 / 100) ~= 8 and card1 % 100 == 4) or (math.floor(card2 / 100) ~= 1 and math.floor(card2 / 100) ~= 8 and card2 % 100 == 4)) and not IsShangFu(card1)) or
 				(card3 ~= card4 and ((math.floor(card3 / 100) ~= 1 and math.floor(card3 / 100) ~= 8 and card3 % 100 == 4) or (math.floor(card4 / 100) ~= 1 and math.floor(card4 / 100) ~= 8 and card4 % 100 == 4)) and not IsShangFu(card3))) then
-					
 			if not diJin then
 				diJin = true
 				AnalyseItem.huxi = AnalyseItem.huxi + 3
 			end
-			
 		end
-		
 	end
 
 
@@ -950,15 +881,11 @@ function M:AnalyseCardFuLuShouJiang(cbLessKindItem,pKindItem,card1,card2,card3,c
 	pt(tagAnalyseItemList)
 	printlog("胡息---》》》", AnalyseItem.huxi)
 	if AnalyseItem.huxi >= 11 then
-	
 		return true
 	end
 	return false
-	
-		
 end
 
-
 function M:IsShangFu(card)
 	if card == 101 or card == 801 then
 		return true
@@ -973,7 +900,6 @@ function M:IsDaRen(card)
 	return false
 end
 
-
 function M:IsLuShou(card)
 	if card == 802 or card == 803 then
 		return true
@@ -1002,7 +928,6 @@ function M:IsFuLuShou(card)
 	return false
 end
 
-
 function M:IsShangDaRenFuLuShou(card)
 	if math.floor(card / 100) == 1 or math.floor(card / 100) == 8 then
 		return true
@@ -1010,11 +935,6 @@ function M:IsShangDaRenFuLuShou(card)
 	return false
 end
 
-
-	
-
-
-
 local function init(self, player, cardInhand, addCard, room)
 	self.stack = {}
 	self.stackHuxi = {}
@@ -1059,17 +979,13 @@ function M.tingPai(player, room)
 				printlog("胡牌值为==>>>", tem)
 				table.insert(tingList, tem)
 			end
-            
 		end
-		
 	end
 
 
 	return tingList
 end
 
-
-
 function M:getHuxi(room)
 	if room.game_id == 77 then
 		return 11

lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/ExtendConfig.lua

@@ -108,6 +108,7 @@ function M:FillRoomData(s2croom)
         local _card_list = _reloadInfo['card_list']
         local _discard = _reloadInfo['discard']
         room.discard = _discard
+        room.reload = reload
         -- local _index = _reloadInfo["typeface"]
         -- if _index ==1 then
         --    room.change_card_display = "2_"

lua_probject/main_project/main/majiang/FZData.lua

@@ -55,6 +55,7 @@ function M.new()
     setmetatable(self, { __index = FZTipList })
     self.tip_map_id = {}
     self.tip_map_type = {}
+    self.tip_sortList = {}
     self.tip_num = 0
     self.is_hu = false
     return self
@@ -71,7 +72,12 @@ function M:AddTip(tip)
         self.tip_map_type[tip.weight] = tiplist
     end
     tiplist[#tiplist + 1] = tip
+    table.insert(self.tip_sortList, tip)
     self.tip_num = self.tip_num + 1
 end
 
+function M:SortList(fct)
+    table.sort(self.tip_sortList, fct)
+end
+
 return M

lua_probject/main_project/main/majiang/GameInfoWindow.lua

@@ -8,9 +8,8 @@ function GameInfoWindow.New()
 end
 
 function GameInfoWindow:Reflash()
-
     local config = self.room.room_config.config
-    local times = self.room.room_config.config.hpData.times
+    local times = self.room.room_config.config.times
     local game_id = self.room.game_id
     local Info = ExtendManager.GetExtendConfig(game_id):GetGameInfo()
     local text = Info:LoadConfigToDetail(config)

lua_probject/main_project/main/majiang/MJCheckG.lua

@@ -29,7 +29,6 @@ function M:init(url)
     self.coroutine = coroutine.start(function(...)
         self.valueTemp = 0
         while self.valueTemp < 100 do
-
             -- 让他在72的时候卡顿一下
             if self.valueTemp > 72 and self.valueTemp < 80 then
 
@@ -41,7 +40,7 @@ function M:init(url)
         end
         showText.text = "检测完毕,环境安全"
         coroutine.wait(2)
-        self:Destroy()
+        -- self:Destroy()
     end)
 end
 

lua_probject/main_project/main/majiang/MJClearingView.lua

@@ -130,7 +130,7 @@ end
 function M:fillResult0(room, peopleNum, result)
     local config = ExtendManager.GetExtendConfig(room.game_id)
     local mode = config:GetGameInfo()
-    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
     self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
         room.room_config.round, gamePlay)
     self.list_lastCard.numItems = #result.cardList

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -786,7 +786,7 @@ function M:OnHuCard(...)
     end)
 
     coroutine.start(function()
-        coroutine.wait(1)
+        coroutine.wait(0.7)
 
         loader_HuEffect.visible = false
         local Effects = {}
@@ -847,7 +847,7 @@ end
 
 function M:Show()
     MainView.Show(self)
-    if self._room and self._room.curren_round == 0 then
+    if self._room and self._room.curren_round == 0 and self._flag_showTip then
         local win = GameInfoWindow.New()
         win:Show(self._room)
     end

wb_new_ui/assets/Main_Majiang/Main_new/Chat/Component/Comp_VoiceBegin.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2532,1170" extention="Button">
+  <controller name="ctr_cancel" pages="0,,1," selected="1"/>
+  <displayList>
+    <graph id="n0_dlc4" name="n0" xy="0,0" size="2532,1170" type="rect" lineSize="0" fillColor="#73000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <image id="n1_dlc4" name="n1" src="dlc41g9" fileName="Main_new/Chat/Image/GameCommon54.png" xy="1175,469" size="181,172">
+      <relation target="n2_dlc4" sidePair="center-center,bottom-top"/>
+    </image>
+    <text id="n2_dlc4" name="n2" xy="1018,667" size="496,79" font="ui://27vd145bh35o7ilb" fontSize="60" color="#bc1016" text="手指松开,取消发送">
+      <gearColor controller="ctr_cancel" pages="1" values="#bc1016,#000000" default="#ffffff,#000000"/>
+      <gearText controller="ctr_cancel" pages="0,1" values="手指上划,取消发送|手指松开,取消发送"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n3_dlc4" name="title" xy="1355,449" size="64,79" font="ui://27vd145bh35o7ilb" fontSize="60" color="#ffffff" text="0&quot;">
+      <relation target="n1_dlc4" sidePair="left-right,top-top"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" pivot="0.5,0.5" designImage="ui://v0j9abjyj6yy1fr" designImageAlpha="35">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -8,7 +8,7 @@
   <controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
   <controller name="more" pages="0,,1," selected="0"/>
   <controller name="witness" pages="0,,1," selected="0"/>
-  <controller name="voice" pages="0,,1," selected="0"/>
+  <controller name="voice" pages="0,,1," selected="1"/>
   <controller name="cHuCardEffect" pages="0,,1," selected="0">
     <remark page="0" value="关"/>
     <remark page="1" value="开"/>
@@ -29,7 +29,7 @@
       <gearDisplay controller="state" pages="0,2"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="730,-59" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="1,3,4" values="87,788|64,-191|62,-201" default="730,-59"/>
       <relation target="n118_pkx5" sidePair="right-left,top-top"/>
@@ -38,7 +38,7 @@
       <gearDisplay controller="state" pages="0,2"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1865,29" size="153,132">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="2701,486" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="0,1,3,4" values="2701,486|1865,29|2555,-6|2567,10" default="2007,876"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
@@ -248,17 +248,11 @@
     </component>
     <component id="n185_kzuz" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2537,30">
       <gearDisplay controller="witness" pages="1"/>
-      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
+      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
     </component>
     <component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,523" size="144,123">
       <relation target="" sidePair="right-right"/>
     </component>
-    <graph id="n188_pbp6" name="n188" xy="0,0" size="2532,1170" group="n191_pbp6" type="rect" lineSize="0" fillColor="#73000000"/>
-    <image id="n189_pbp6" name="n189" pkg="v0j9abjy" src="pbp614k" fileName="Group 205(1).png" xy="1203,522" group="n191_pbp6"/>
-    <text id="n190_pbp6" name="n190" xy="1024,667" size="484,79" group="n191_pbp6" fontSize="60" color="#ffffff" text="松开按钮发送语音"/>
-    <group id="n191_pbp6" name="chatTalk" xy="0,0" size="2532,1170" advanced="true">
-      <gearDisplay controller="voice" pages="1"/>
-    </group>
     <component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="120,855" group="n59_v38k">
       <gearDisplay controller="state" pages="3"/>
     </component>
@@ -285,5 +279,9 @@
     <movieclip id="n203_whhc" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,-574" pivot="0.5,0.5" anchor="true">
       <gearDisplay controller="cHuCardEffect" pages="1"/>
     </movieclip>
+    <component id="n207_dlc4" name="comp_voice" src="dlc41ga" fileName="Main_new/Chat/Component/Comp_VoiceBegin.xml" xy="0,0">
+      <gearDisplay controller="voice" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImage="ui://v0j9abjyj6yy1ft" designImageAlpha="0">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -8,7 +8,7 @@
   <controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
   <controller name="more" pages="0,,1," selected="0"/>
   <controller name="witness" pages="0,,1," selected="0"/>
-  <controller name="voice" pages="0,,1," selected="0"/>
+  <controller name="voice" pages="0,,1," selected="1"/>
   <controller name="cHuCardEffect" pages="0,,1," selected="0"/>
   <displayList>
     <component id="n205_hyws" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1200,366" size="435,73">
@@ -34,7 +34,7 @@
     <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
     </component>
-    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2004,77" size="153,132">
+    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2" values="1888,519|2004,77|1888,519" default="1194,274"/>
       <relation target="" sidePair="middle-middle"/>
@@ -252,17 +252,11 @@
     </component>
     <component id="n280_ogwn" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2537,30">
       <gearDisplay controller="witness" pages="1"/>
-      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
+      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
     </component>
     <component id="n281_ogwn" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,523" size="144,123">
       <relation target="" sidePair="right-right"/>
     </component>
-    <graph id="n282_ogwn" name="n282" xy="0,0" size="2532,1170" group="n285_ogwn" type="rect" lineSize="0" fillColor="#73000000"/>
-    <image id="n283_ogwn" name="n283" xy="1203,522" size="100,100" group="n285_ogwn"/>
-    <text id="n284_ogwn" name="n284" xy="1024,667" size="484,79" group="n285_ogwn" fontSize="60" color="#ffffff" text="松开按钮发送语音"/>
-    <group id="n285_ogwn" name="chatTalk" xy="0,0" size="2532,1170" advanced="true">
-      <gearDisplay controller="voice" pages="1"/>
-    </group>
     <component id="n286_ogwn" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="0,847" group="n288_ogwn">
       <gearDisplay controller="state" pages="3"/>
     </component>
@@ -289,5 +283,9 @@
     <movieclip id="n293_ogwn" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,-574" pivot="0.5,0.5" anchor="true">
       <gearDisplay controller="cHuCardEffect" pages="1"/>
     </movieclip>
+    <component id="n295_dlc4" name="comp_voice" src="dlc41ga" fileName="Main_new/Chat/Component/Comp_VoiceBegin.xml" xy="0,0">
+      <gearDisplay controller="voice" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImage="ui://v0j9abjyj6yy1fw" designImageAlpha="0">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -8,7 +8,7 @@
   <controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
   <controller name="more" pages="0,,1," selected="0"/>
   <controller name="witness" pages="0,,1," selected="0"/>
-  <controller name="voice" pages="0,,1," selected="0"/>
+  <controller name="voice" pages="0,,1," selected="1"/>
   <controller name="voice" pages="0,,1," selected="0"/>
   <controller name="cHuCardEffect" pages="0,,1," selected="0"/>
   <displayList>
@@ -255,12 +255,6 @@
     <component id="n353_ogwn" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,523" size="144,123">
       <relation target="" sidePair="right-right"/>
     </component>
-    <graph id="n354_ogwn" name="n354" xy="0,0" size="2532,1170" group="n357_ogwn" type="rect" lineSize="0" fillColor="#73000000"/>
-    <image id="n355_ogwn" name="n355" xy="1203,522" size="100,100" group="n357_ogwn"/>
-    <text id="n356_ogwn" name="n356" xy="1024,667" size="484,79" group="n357_ogwn" fontSize="60" color="#ffffff" text="松开按钮发送语音"/>
-    <group id="n357_ogwn" name="chatTalk" xy="0,0" size="2532,1170" advanced="true">
-      <gearDisplay controller="voice" pages="1"/>
-    </group>
     <component id="n358_ogwn" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="0,847" group="n360_ogwn">
       <gearDisplay controller="state" pages="3"/>
     </component>
@@ -298,5 +292,9 @@
     <group id="n370_ogwn" name="n370" xy="-143,-1398" size="2592,863" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
+    <component id="n372_dlc4" name="comp_voice" src="dlc41ga" fileName="Main_new/Chat/Component/Comp_VoiceBegin.xml" xy="0,0">
+      <gearDisplay controller="voice" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1542,6 +1542,8 @@
     <image id="smbw1g6" name="4918b5270e436c54b44d48f0bb79114 3(1).png" path="/Main_new/Image/"/>
     <component id="wcy51g7" name="Btn_Card.xml" path="/Main_new/Main_new_2/Component/NewHandCard/Component/" exported="true"/>
     <component id="wcy51g8" name="com_OutCard_Vertical.xml" path="/Main_new/Main_new_2/Component/NewHandCard/Component/"/>
+    <image id="dlc41g9" name="GameCommon54.png" path="/Main_new/Chat/Image/"/>
+    <component id="dlc41ga" name="Comp_VoiceBegin.xml" path="/Main_new/Chat/Component/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>