diff --git a/lua_probject/base_project/Game/View/FGAssistView.lua b/lua_probject/base_project/Game/View/FGAssistView.lua index 8c53450b..cb0881be 100644 --- a/lua_probject/base_project/Game/View/FGAssistView.lua +++ b/lua_probject/base_project/Game/View/FGAssistView.lua @@ -7,9 +7,8 @@ local M = FGAssistView setmetatable(M, { __index = BaseWindow }) local function SortMembers(Members) - -- ↓↓↓去掉用户自己 - for _,player in pairs(Members) do + for _, player in pairs(Members) do if player.uid == DataManager.SelfUser.account_id then Members[_] = nil end @@ -109,7 +108,6 @@ function M:FillData() end function M:ReFalsh(...) - --[[ local arg = { ... } local group = DataManager.groups:get(self.group_id) @@ -133,7 +131,7 @@ function M:ReFalsh(...) local group = DataManager.groups:get(self.group_id) self._data_number = SortMembers(group.members) --group.members - self.lst_player.numItems = #self._data_number --#group.members + self.lst_player.numItems = #self._data_number --#group.members end function M:PlayerRenderer(index, obj) @@ -142,8 +140,10 @@ function M:PlayerRenderer(index, obj) local btn_invite = obj:GetChild('btn_invite') btn_invite:GetController('online').selectedIndex = 0 + btn_invite.touchable = false if self._data_number[i].uid ~= DataManager.SelfUser.account_id and self._data_number[i].online == 1 and self._data_number[i].playing ~= "startPlaying" then btn_invite:GetController('online').selectedIndex = 1 + btn_invite.touchable = true end --btn_invite:GetController('online').selectedIndex = self._data_number[i].uid == DataManager.SelfUser.account_id and 0 or self._data_number[i].online @@ -160,6 +160,9 @@ function M:PlayerRenderer(index, obj) local loader = obj:GetChild("btn_head"):GetChild("icon") ImageLoad.Load(self._data_number[i].portrait, loader) btn_invite.onClick:Set(function() + obj:GetController('type').selectedIndex = 2 + btn_invite.touchable = false + btn_invite:GetController('online').selectedIndex = 0 local mgr_ctr = ControllerManager.GetController(GroupMgrController) local room = DataManager.CurrenRoom mgr_ctr:FG_InvitePlayer(self.group_id, self._data_number[i].uid, DataManager.SelfUser.account_id, room.room_id, diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index 9d843a47..ca162309 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -276,6 +276,8 @@ function M:NumverRecordRenderer() obj:GetChild('text_round').text = info.childNum obj:GetChild('text_score').text = info.totalScore obj:GetChild('text_winNum').text = info.winNum + obj:GetChild('btn_lookRecord').touchable = info.childNum ~= 0 + obj:GetChild('btn_lookRecord'):GetController('cColor').selectedIndex = info.childNum ~= 0 and 0 or 1 obj:GetChild('btn_lookRecord').onClick:Set(function() self._flag_unReadDetail = true self.ctr_numberRecord.selectedIndex = 2 @@ -293,6 +295,8 @@ function M:NumverRecordRenderer() obj:GetChild('text_round').text = info.childNum obj:GetChild('text_score').text = info.totalScore obj:GetChild('text_winNum').text = info.winNum + obj:GetChild('btn_lookRecord').touchable = info.childNum ~= 0 + obj:GetChild('btn_lookRecord'):GetController('cColor').selectedIndex = info.childNum ~= 0 and 0 or 1 obj:GetChild('btn_lookRecord').onClick:Set(function() self._flag_unReadDetail = true self.ctr_numberRecord.selectedIndex = 2 @@ -372,6 +376,17 @@ function M:RecordItemDetailRender(round, allDate, rdata, obj) for i = 1, #rdata do local obj2 = list:AddItemFromPool() obj2:GetChild('title').text = rdata[i].score + if round == tonumber(allDate.round) and allDate.applyDismisUserId and allDate.applyDismisUserId ~= "null" then + obj2:GetController('jiesan').selectedIndex = rdata[i].nick == allDate.applyDismisUserId and 1 or 2 + else + obj2:GetController('jiesan').selectedIndex = 0 + end + end + if round == tonumber(allDate.round) then + obj:GetController('jiesan_mng').selectedIndex = (not allDate.applyDismisUserId or allDate.applyDismisUserId == "null") and + 1 or 0 + else + obj:GetController('jiesan_mng').selectedIndex = 0 end local btn_play = obj:GetChild("n10") diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index bc4c18a4..a0d02e1b 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -689,10 +689,7 @@ function M:UpdateFamilyRoom(fgCtr, id) local newIndex = index - #roomList + 1 local config = ExtendManager.GetExtendConfig(playList[newIndex].gameId) local mode = config:GetGameInfo() - -- times倍数 - local times = json.decode(playList[newIndex].hpData).times - local gamePlay = times / 1000 .. "倍," - gamePlay = gamePlay .. mode:LoadConfigToDetail(playList[newIndex].config, playList[newIndex].hpData) + local 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) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua index e5a0fbe6..8ac25c3a 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua @@ -183,6 +183,8 @@ function M:FillGameData() self.cJiesan.selectedIndex = hpData.JieShan - 1 self.cChat.selectedIndex = hpData.BanChat self.cMisslie.selectedIndex = hpData.BanMissile + else + self.cGps.selectedIndex = 2 end end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua index f28f944b..0062877d 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua @@ -173,18 +173,24 @@ 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 = data.hpData + pt("lingemng", data) + local hpData = configData.hpData or hpdata if type(hpData) == 'string' then hpData = json.decode(hpData) end - local returnString = string.format("人数%s人", configData.maxPlayers) + local returnString = "" + if hpData then + returnString = string.format("%s倍,", hpData.times / 1000) + end + + returnString = string.format("%s人数%s人", returnString, configData.maxPlayers) if configData.jiangma then returnString = string.format("%s,%s马", returnString, configData.jiangma == 0 and "不奖" or string.format("奖%s", configData.jiangma * 2)) diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua index 0a98c6cd..aef7f81c 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua @@ -169,18 +169,24 @@ 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 = data.hpData + pt("lingemng", data) + local hpData = configData.hpData or hpdata if type(hpData) == 'string' then hpData = json.decode(hpData) end - local returnString = string.format("人数%s人", configData.maxPlayers) + local returnString = "" + if hpData then + returnString = string.format("%s倍,", hpData.times / 1000) + end + + returnString = string.format("%s人数%s人", returnString, configData.maxPlayers) if configData.jiangma then returnString = string.format("%s,%s马", returnString, configData.jiangma == 0 and "不奖" or string.format("奖%s", configData.jiangma * 2)) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua index 2ef54bac..b967e8ed 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua @@ -151,18 +151,26 @@ function M:LoadConfigData(data) _config:GetController("jingbibo").selectedIndex = 1 - data.jingbibo 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 = data.hpData + pt("lingemng", data) + local hpData = configData.hpData or hpdata if type(hpData) == 'string' then hpData = json.decode(hpData) end - local returnString = string.format("人数%s人,%s,%s,%s", configData.maxPlayers, + local returnString = "" + if hpData then + returnString = string.format("%s倍,", hpData.times / 1000) + end + + returnString = string.format("%s人数%s人", returnString, configData.maxPlayers) + + returnString = string.format("%s,%s,%s,%s", returnString, configData.maxPlayers, configData.zimo == 0 and "只能自摸" or "自摸可点炮", configData.tuoguan == 0 and string.format("%d秒后自动托管", configData.tuoguan_active_time) or "不能托管", configData.jingbibo == 1 and "有精必博" or "有精可胡") diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua index e079207d..3ea96079 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua @@ -178,18 +178,26 @@ function M:LoadConfigData(data) -- end 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 = data.hpData + pt("lingemng", data) + local hpData = configData.hpData or hpdata if type(hpData) == 'string' then hpData = json.decode(hpData) end - local returnString = string.format("人数%s人,%s马%s%s%s%s%s%s,%s", configData.maxPlayers, + local returnString = "" + if hpData then + returnString = string.format("%s倍,", hpData.times / 1000) + end + + returnString = string.format("%s人数%s人", returnString, configData.maxPlayers) + + returnString = string.format("%s,%s马%s%s%s%s%s%s,%s", returnString, configData.maxPlayers, configData.jiangma and string.format("奖%d", configData.jiangma * 2) or "不奖", configData.shaozhuang and ",有烧庄" or "", configData.zuoma and ",庄家坐马" or "", diff --git a/lua_probject/main_project/main/majiang/GameInfoWindow.lua b/lua_probject/main_project/main/majiang/GameInfoWindow.lua index 48f01ff1..d0fde71a 100644 --- a/lua_probject/main_project/main/majiang/GameInfoWindow.lua +++ b/lua_probject/main_project/main/majiang/GameInfoWindow.lua @@ -9,12 +9,10 @@ end function GameInfoWindow:Reflash() local config = self.room.room_config.config - 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) - self.tex_tex.text = times / 1000 .. "倍," .. text + self.tex_tex.text = Info:LoadConfigToDetail(config) end function GameInfoWindow:Show(room) diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index 473c935f..f7628044 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -786,7 +786,7 @@ function M:OnHuCard(...) end) coroutine.start(function() - coroutine.wait(0.7) + coroutine.wait(0.5) loader_HuEffect.visible = false local Effects = {} diff --git a/wb_new_ui/assets/FGAssist/invite/component/invite/btn_invite.xml b/wb_new_ui/assets/FGAssist/invite/component/invite/btn_invite.xml index 0773411c..261e3176 100644 --- a/wb_new_ui/assets/FGAssist/invite/component/invite/btn_invite.xml +++ b/wb_new_ui/assets/FGAssist/invite/component/invite/btn_invite.xml @@ -1,6 +1,6 @@ - + @@ -11,5 +11,5 @@ -