hengyang
/
hengyang_client
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

换牌

master
DESKTOP-7R8JEQQ\k 2025-07-16 15:07:29 +08:00
parent 80c0d02632
commit 2a3bea4ae1
55 changed files with 376 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lua_probject/base_project/Game/View/Common/BaseView.lua
View File

@ -28,6 +28,8 @@ local view_url = {
"ui://Common/Gcm_BaseView", "ui://Common/Gcm_BaseView",
"ui://Common/Gcm_BaseView_Full" "ui://Common/Gcm_BaseView_Full"
} }
local _views = {}
--- ---
--@function [parent=#BaseView] InitView --@function [parent=#BaseView] InitView
--@param self --@param self
@ -42,6 +44,7 @@ function M:InitView(url)
self._view:AddRelation(contentPane, RelationType.Size) self._view:AddRelation(contentPane, RelationType.Size)
contentPane:AddChild(self._view) contentPane:AddChild(self._view)
self._contentPane = contentPane self._contentPane = contentPane
_views[self.class] = self
end end
function M:Show() function M:Show()
@ -84,4 +87,9 @@ end
function M:Destroy() function M:Destroy()
self._is_destroy = true self._is_destroy = true
self._root_view:Dispose() self._root_view:Dispose()
_views[self.class] = nil
end end
function BaseView.FindView(class)
return _views[class] or nil
end

47
lua_probject/base_project/Game/View/MainView.lua
View File

@ -7,8 +7,8 @@ local PlayerDistanceView = import('.PlayerDistanceView')
local FGAssistView = import('.FGAssistView') local FGAssistView = import('.FGAssistView')
local function GetSeat(data, uId) local function GetSeat(data, uId)
for _,player in pairs(data.player_list) do for _, player in pairs(data.player_list) do
if player.self_user.account_id == uId then if player.self_user.account_id == uId then
return player.seat return player.seat
end end
end end
@ -42,6 +42,7 @@ function M:init()
UIPackage.AddPackage('base/chat/ui/Chat') UIPackage.AddPackage('base/chat/ui/Chat')
self.Fix_Msg_Chat = ViewUtil.Fix_Msg_Chat -- 自动回复消息列表 self.Fix_Msg_Chat = ViewUtil.Fix_Msg_Chat -- 自动回复消息列表
self.Fix_Msg_Chat2 = nil -- 自动回复列表2 self.Fix_Msg_Chat2 = nil -- 自动回复列表2
self.class = "MainView"
self:InitView() self:InitView()
self:SetTuoGuanState() self:SetTuoGuanState()
end end
@ -999,14 +1000,27 @@ end
-- 飘字 -- 飘字
function M:OnFangziAnimation(...) function M:OnFangziAnimation(...)
print("OnFangziAnimation") print("OnFangziAnimation")
local arg = {...} local arg = { ... }
pt(arg) pt(arg)
local fz = arg[1] local fz = arg[1]
local playerid = arg[1].playerid local playerid = arg[1].playerid
local fromPlayer = arg[1].from_seat local fromPlayer = arg[1].from_seat
local type = arg[1].type local type = arg[1].type
local gang = arg[1].opengang
local player = self._player_info[self:GetPos(playerid)] local room = self._room
if gang then
local playerView = self:GetPlayerInfo(playerid)
playerView:ScoreAnimation(4)
local player = self:GetPlayer(playerid)
--playerView._view:GetChild('text_jifen').text = playerView._view:GetChild('text_jifen').text + 4
local fplayerView = self._player_info[self:GetPos(fromPlayer)]
--local nplayer = self:GetPlayer(playerid)
fplayerView:ScoreAnimation(-4)
--playerView._view:GetChild('text_jifen').text = playerView._view:GetChild('text_jifen').text - 4
end
end end
function M:OnUpdateInfo(...) function M:OnUpdateInfo(...)
@ -1137,6 +1151,15 @@ function M:SetLanguage(language)
end end
end end
function M:Missile(seat, targetSeat, missile)
local send = self._player_info[self:GetPos(seat)]
local target = self._player_info[self:GetPos(targetSeat)]
local obj = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Missile")
obj.xy = send.xy
obj:TweenMove(target.xy, 1.5)
end
-- 获取消息使用的语言、序号 -- 获取消息使用的语言、序号
function M:GetChatMsgLanguage(msg_index) function M:GetChatMsgLanguage(msg_index)
local language = math.modf(msg_index / 100) local language = math.modf(msg_index / 100)
@ -1266,6 +1289,22 @@ function M:GetPos(seat)
return ViewUtil.GetPos(self._room.self_player.seat, seat, self._room.room_config.people_num) return ViewUtil.GetPos(self._room.self_player.seat, seat, self._room.room_config.people_num)
end end
function M:GetPlayerInfo(playId)
for _, info in pairs(self._player_info) do
if info._player.self_user.account_id == playId then
return info
end
end
end
function M:GetPlayer(playId)
for _, player in pairs(self._room.player_list) do
if player.self_user.account_id == playId then
return player
end
end
end
-- 托管时关闭一些提示窗口，如起手胡、吃碰提示、海底,由扩展实现 -- 托管时关闭一些提示窗口，如起手胡、吃碰提示、海底,由扩展实现
function M:closeTipOnTuoguan() function M:closeTipOnTuoguan()
end end

45
lua_probject/base_project/Game/View/PlayerInfoView.lua
View File

@ -41,6 +41,8 @@ function M:init()
self._tex_player_name = player_name_score:GetChild('tex_player_name') self._tex_player_name = player_name_score:GetChild('tex_player_name')
self._tex_player_id = player_name_score:GetChild('tex_player_id') self._tex_player_id = player_name_score:GetChild('tex_player_id')
self._tex_score = player_name_score:GetChild('tex_score') self._tex_score = player_name_score:GetChild('tex_score')
self._list_scoreAnimation = self._view:GetChild("list_scoreAnimation")
self.cScore = self._view:GetController("cScore")
self._tex_score.visible = true self._tex_score.visible = true
self._tex_score1 = self._view:GetChild("info"):GetChild("tex_score1") self._tex_score1 = self._view:GetChild("info"):GetChild("tex_score1")
@ -360,6 +362,49 @@ function M:RemoveMarkFromHead(key)
end end
end end
function M:ScoreAnimation(score)
local imgPath = "ui://Main_Majiang/score"
local symbol = "ui://Main_Majiang/score+"
if score < 0 then
imgPath = "ui://Main_Majiang/nscore"
symbol = "ui://Main_Majiang/nscore-"
score = score * -1
end
local imgs = {}
for i = 1, score do
imgs[#imgs + 1] = imgPath .. score % 10
score = math.floor(score / 10)
if score <= 0 then
break
end
end
self._list_scoreAnimation.itemRenderer = function(index, obj)
local loader = obj:GetChild("n1")
loader.url = imgs[#imgs - index]
end
self._list_scoreAnimation.numItems = #imgs
local obj = self._list_scoreAnimation:AddItemFromPool()
local loader = obj:GetChild("n1")
loader.url = symbol
self.cScore.selectedIndex = 1
local Rxy = self._list_scoreAnimation.xy
self._list_scoreAnimation:TweenMove(Vector2.New(
self._list_scoreAnimation.x,
self._list_scoreAnimation.y - 100
), 2):OnComplete(function()
self._list_scoreAnimation.xy = Rxy
self.cScore.selectedIndex = 0
end)
self._list_scoreAnimation:TweenFade(0, 3):OnComplete(function()
self._list_scoreAnimation:TweenFade(1, 0)
end)
end
function M:Destroy() function M:Destroy()
self.isShowTGTimer = false self.isShowTGTimer = false
TimerManager.RemoveTimer(self.OnUpdate, self) TimerManager.RemoveTimer(self.OnUpdate, self)

52
lua_probject/base_project/Game/View/PlayerInfoView2.lua
View File

@ -1,3 +1,5 @@
local playerDetailView = import(".playerDetailView")
local PlayerInfoView = { local PlayerInfoView = {
_view = nil, _view = nil,
_main_view = nil, _main_view = nil,
@ -51,6 +53,9 @@ function M:init()
self._ctr_dismiss_room = view:GetController('dismiss_room') self._ctr_dismiss_room = view:GetController('dismiss_room')
self._ctr_site = view:GetController('site') self._ctr_site = view:GetController('site')
self._list_scoreAnimation = self._view:GetChild("list_scoreAnimation")
self.cScore = self._view:GetController("cScore")
self.PlayerTGTips = view:GetChild('tuoguanTips') self.PlayerTGTips = view:GetChild('tuoguanTips')
if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then
self.PlayerTGTips.displayObject.gameObject:SetActive(false) self.PlayerTGTips.displayObject.gameObject:SetActive(false)
@ -119,6 +124,8 @@ function M:FillData(player)
function() function()
--local headView = HeadView.new(self._main_view._root_view, player.self_user, self._isHideIpAdds) --local headView = HeadView.new(self._main_view._root_view, player.self_user, self._isHideIpAdds)
--headView:Show() --headView:Show()
local _playerDetailView = playerDetailView.New()
_playerDetailView:Show(player)
end end
) )
else else
@ -352,4 +359,49 @@ function M:Destroy()
self.muShiPlayerUpdate = nil self.muShiPlayerUpdate = nil
end end
function M:ScoreAnimation(score)
local imgPath = "ui://Main_Majiang/score"
local symbol = "ui://Main_Majiang/score+"
if score < 0 then
imgPath = "ui://Main_Majiang/nscore"
symbol = "ui://Main_Majiang/nscore-"
score = score * -1
end
local imgs = {}
for i = 1, score do
imgs[#imgs + 1] = imgPath .. score % 10
score = math.floor(score / 10)
if score <= 0 then
break
end
end
self._list_scoreAnimation.itemRenderer = function(index, obj)
local loader = obj:GetChild("n1")
loader.url = imgs[#imgs - index]
end
self._list_scoreAnimation.numItems = #imgs
--local obj = self._list_scoreAnimation:AddItemFromPool()
local obj = self._list_scoreAnimation:GetFromPool("ui://v0j9abjyuans1b1")
self._list_scoreAnimation:AddChildAt(obj, 0)
local loader = obj:GetChild("n1")
loader.url = symbol
self.cScore.selectedIndex = 1
local Rxy = self._list_scoreAnimation.xy
self._list_scoreAnimation:TweenMove(Vector2.New(
self._list_scoreAnimation.x,
self._list_scoreAnimation.y - 100
), 2):OnComplete(function()
self._list_scoreAnimation.xy = Rxy
self.cScore.selectedIndex = 0
end)
self._list_scoreAnimation:TweenFade(0, 3):OnComplete(function()
self._list_scoreAnimation:TweenFade(1, 0)
end)
end
return M return M

12
lua_probject/extend_project/extend/majiang/100zhang/EXClearingView.lua
View File

@ -230,7 +230,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool() hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do for i=1,#hand_cards do
local card = hand_list_view:AddItemFromPool() local card = hand_list_view:AddItemFromPool()
card.icon = "ui://Main_Majiang/202_"..hand_cards[i] card.icon = "ui://Main_Majiang/b202_"..hand_cards[i]
end end
hand_list_view.width = 52 * #hand_cards hand_list_view.width = 52 * #hand_cards
@ -243,16 +243,16 @@ function M:FillItemData(room, data, item, active_player, niao)
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3")
for j=1,3 do for j=1,3 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4")
for j=1,4 do for j=1,4 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
if fz_card[i].type == FZType.Gang_An and j == 4 then if fz_card[i].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
end end
end end
@ -504,7 +504,7 @@ function M:FillItemData(room, data, item, active_player, niao)
item:GetController("bg").selectedIndex=0 item:GetController("bg").selectedIndex=0
end end
local win_card = item:GetChild("win_card") local win_card = item:GetChild("win_card")
win_card.icon = "ui://Main_Majiang/202_"..data["win_card"] win_card.icon = "ui://Main_Majiang/b202_"..data["win_card"]
if niao and #niao>0 then if niao and #niao>0 then
local currentNiaoList=self:CalculateNiao(niao ,data["seat"]) local currentNiaoList=self:CalculateNiao(niao ,data["seat"])
@ -514,7 +514,7 @@ function M:FillItemData(room, data, item, active_player, niao)
for i = 1, #currentNiaoList do for i = 1, #currentNiaoList do
if currentNiaoList[i].score > 0 then if currentNiaoList[i].score > 0 then
local card_niao = lst_niao:AddItemFromPool() local card_niao = lst_niao:AddItemFromPool()
card_niao.icon = "ui://Main_Majiang/202_" .. currentNiaoList[i].card card_niao.icon = "ui://Main_Majiang/b202_" .. currentNiaoList[i].card
end end
end end
end end

2
lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua
View File

@ -237,7 +237,7 @@ function M:EventInit()
info:UpdateHandCard(true, true) info:UpdateHandCard(true, true)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1
info._view:AddChild(obj_win_card) info._view:AddChild(obj_win_card)
obj_win_card:Center() obj_win_card:Center()

2
lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua
View File

@ -306,7 +306,7 @@ function M:FillItemData(room, data, item, active_player)
for j = 1, 4 do for j = 1, 4 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
if fz_card[i].type == FZType.Gang_An and j == 4 then if fz_card[i].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = "ui://Main_Majiang/" .. self:GetPrefix() .. "202_" .. fz_card[i].card card.icon = "ui://Main_Majiang/" .. self:GetPrefix() .. "202_" .. fz_card[i].card
end end

2
lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua
View File

@ -585,7 +585,7 @@ function M:__FangziTip(tip)
end end
local btn_t = _lit_fanzi:AddItemFromPool(url) local btn_t = _lit_fanzi:AddItemFromPool(url)
if url == "ui://Main_Majiang/Btn_hu" and td.card then if url == "ui://Main_Majiang/Btn_hu" and td.card then
btn_t:GetChild("hupai").icon = "ui://Main_Majiang/202_" .. td.card btn_t:GetChild("hupai").icon = "ui://Main_Majiang/b202_" .. td.card
btn_t:GetController("hupai").selectedIndex = 1 btn_t:GetController("hupai").selectedIndex = 1
end end
btn_t.icon = "ui://Main_Majiang/fztip_" .. weight btn_t.icon = "ui://Main_Majiang/fztip_" .. weight

12
lua_probject/extend_project/extend/majiang/chaoshan/EXClearingView.lua
View File

@ -230,7 +230,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool() hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do for i=1,#hand_cards do
local card = hand_list_view:AddItemFromPool() local card = hand_list_view:AddItemFromPool()
card.icon = "ui://Main_Majiang/202_"..hand_cards[i] card.icon = "ui://Main_Majiang/b202_"..hand_cards[i]
end end
hand_list_view.width = 52 * #hand_cards hand_list_view.width = 52 * #hand_cards
@ -243,16 +243,16 @@ function M:FillItemData(room, data, item, active_player, niao)
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3")
for j=1,3 do for j=1,3 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4")
for j=1,4 do for j=1,4 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
if fz_card[i].type == FZType.Gang_An and j == 4 then if fz_card[i].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
end end
end end
@ -504,7 +504,7 @@ function M:FillItemData(room, data, item, active_player, niao)
item:GetController("bg").selectedIndex=0 item:GetController("bg").selectedIndex=0
end end
local win_card = item:GetChild("win_card") local win_card = item:GetChild("win_card")
win_card.icon = "ui://Main_Majiang/202_"..data["win_card"] win_card.icon = "ui://Main_Majiang/b202_"..data["win_card"]
if niao and #niao>0 then if niao and #niao>0 then
local currentNiaoList=self:CalculateNiao(niao ,data["seat"]) local currentNiaoList=self:CalculateNiao(niao ,data["seat"])
@ -514,7 +514,7 @@ function M:FillItemData(room, data, item, active_player, niao)
for i = 1, #currentNiaoList do for i = 1, #currentNiaoList do
if currentNiaoList[i].score > 0 then if currentNiaoList[i].score > 0 then
local card_niao = lst_niao:AddItemFromPool() local card_niao = lst_niao:AddItemFromPool()
card_niao.icon = "ui://Main_Majiang/202_" .. currentNiaoList[i].card card_niao.icon = "ui://Main_Majiang/b202_" .. currentNiaoList[i].card
end end
end end
end end

2
lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua
View File

@ -237,7 +237,7 @@ function M:EventInit()
info:UpdateHandCard(true, true) info:UpdateHandCard(true, true)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1
info._view:AddChild(obj_win_card) info._view:AddChild(obj_win_card)
obj_win_card:Center() obj_win_card:Center()

16
lua_probject/extend_project/extend/majiang/chaozhou/EXClearingView.lua
View File

@ -303,7 +303,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool() hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do for i=1,#hand_cards do
local card = hand_list_view:AddItemFromPool() local card = hand_list_view:AddItemFromPool()
card.icon = "ui://Main_Majiang/202_"..hand_cards[i] card.icon = "ui://Main_Majiang/b202_"..hand_cards[i]
end end
hand_list_view.width = 52 * #hand_cards hand_list_view.width = 52 * #hand_cards
@ -316,16 +316,16 @@ function M:FillItemData(room, data, item, active_player, niao)
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3")
for j=1,3 do for j=1,3 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4")
for j=1,4 do for j=1,4 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
if fz_card[i].type == FZType.Gang_An and j == 4 then if fz_card[i].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
end end
end end
@ -577,15 +577,15 @@ function M:FillItemData(room, data, item, active_player, niao)
item:GetController("bg").selectedIndex=0 item:GetController("bg").selectedIndex=0
end end
local win_card = item:GetChild("win_card") local win_card = item:GetChild("win_card")
win_card.icon = "ui://Main_Majiang/202_"..data["win_card"] win_card.icon = "ui://Main_Majiang/b202_"..data["win_card"]
--[[if is_win then --[[if is_win then
win_card.icon = "ui://Main_Majiang/202_"..data["win_card"] win_card.icon = "ui://Main_Majiang/b202_"..data["win_card"]
local lst_niao = item:GetChild("list_niao") local lst_niao = item:GetChild("list_niao")
lst_niao:RemoveChildrenToPool() lst_niao:RemoveChildrenToPool()
for i = 1, #niao do for i = 1, #niao do
if niao[i].score > 0 then if niao[i].score > 0 then
local card_niao = lst_niao:AddItemFromPool() local card_niao = lst_niao:AddItemFromPool()
card_niao.icon = "ui://Main_Majiang/202_" .. niao[i].card card_niao.icon = "ui://Main_Majiang/b202_" .. niao[i].card
end end
end end
end--]] end--]]
@ -598,7 +598,7 @@ function M:FillItemData(room, data, item, active_player, niao)
for i = 1, #currentNiaoList do for i = 1, #currentNiaoList do
if currentNiaoList[i].score > 0 then if currentNiaoList[i].score > 0 then
local card_niao = lst_niao:AddItemFromPool() local card_niao = lst_niao:AddItemFromPool()
card_niao.icon = "ui://Main_Majiang/202_" .. currentNiaoList[i].card card_niao.icon = "ui://Main_Majiang/b202_" .. currentNiaoList[i].card
end end
end end
end end

2
lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua
View File

@ -237,7 +237,7 @@ function M:EventInit()
info:UpdateHandCard(true, true) info:UpdateHandCard(true, true)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1
info._view:AddChild(obj_win_card) info._view:AddChild(obj_win_card)
obj_win_card:Center() obj_win_card:Center()

12
lua_probject/extend_project/extend/majiang/chaozhougui/EXClearingView.lua
View File

@ -230,7 +230,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool() hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do for i=1,#hand_cards do
local card = hand_list_view:AddItemFromPool() local card = hand_list_view:AddItemFromPool()
card.icon = "ui://Main_Majiang/202_"..hand_cards[i] card.icon = "ui://Main_Majiang/b202_"..hand_cards[i]
end end
hand_list_view.width = 52 * #hand_cards hand_list_view.width = 52 * #hand_cards
@ -243,16 +243,16 @@ function M:FillItemData(room, data, item, active_player, niao)
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3")
for j=1,3 do for j=1,3 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4")
for j=1,4 do for j=1,4 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
if fz_card[i].type == FZType.Gang_An and j == 4 then if fz_card[i].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
end end
end end
@ -514,7 +514,7 @@ function M:FillItemData(room, data, item, active_player, niao)
item:GetController("bg").selectedIndex=0 item:GetController("bg").selectedIndex=0
end end
local win_card = item:GetChild("win_card") local win_card = item:GetChild("win_card")
win_card.icon = "ui://Main_Majiang/202_"..data["win_card"] win_card.icon = "ui://Main_Majiang/b202_"..data["win_card"]
if niao and #niao>0 then if niao and #niao>0 then
local currentNiaoList=self:CalculateNiao(niao ,data["seat"]) local currentNiaoList=self:CalculateNiao(niao ,data["seat"])
@ -524,7 +524,7 @@ function M:FillItemData(room, data, item, active_player, niao)
for i = 1, #currentNiaoList do for i = 1, #currentNiaoList do
if currentNiaoList[i].score > 0 then if currentNiaoList[i].score > 0 then
local card_niao = lst_niao:AddItemFromPool() local card_niao = lst_niao:AddItemFromPool()
card_niao.icon = "ui://Main_Majiang/202_" .. currentNiaoList[i].card card_niao.icon = "ui://Main_Majiang/b202_" .. currentNiaoList[i].card
end end
end end
end end

2
lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua
View File

@ -237,7 +237,7 @@ function M:EventInit()
info:UpdateHandCard(true, true) info:UpdateHandCard(true, true)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1
info._view:AddChild(obj_win_card) info._view:AddChild(obj_win_card)
obj_win_card:Center() obj_win_card:Center()

6
lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua
View File

@ -166,7 +166,7 @@ function M:fillResult0(room, peopleNum, result)
for l = 1, 4 do for l = 1, 4 do
local card = item:GetChild(string.format("Btn_Card%d", l)) local card = item:GetChild(string.format("Btn_Card%d", l))
if fzCardInfo[j].type == FZType.Gang_An and j == 4 then if fzCardInfo[j].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), fzCardInfo[j].card) card.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), fzCardInfo[j].card)
print("===============================FZType.Gang", room.jing, fzCardInfo[j].card) print("===============================FZType.Gang", room.jing, fzCardInfo[j].card)
@ -214,7 +214,7 @@ function M:fillResult0(room, peopleNum, result)
end end
huCardBtn.icon = string.format("ui://Main_Majiang/202_%d", infoList.win_card) huCardBtn.icon = string.format("ui://Main_Majiang/b202_%d", infoList.win_card)
if room.jing == infoList.win_card then if room.jing == infoList.win_card then
huCardBtn:GetController('jing').selectedIndex = 1 huCardBtn:GetController('jing').selectedIndex = 1
end end
@ -223,7 +223,7 @@ function M:fillResult0(room, peopleNum, result)
jiangMaList.visible = true jiangMaList.visible = true
jiangMaList:SetVirtual() jiangMaList:SetVirtual()
jiangMaList.itemRenderer = function(index, obj) jiangMaList.itemRenderer = function(index, obj)
obj.icon = string.format("ui://Main_Majiang/202_%d", infoJiangma[index + 1].card) obj.icon = string.format("ui://Main_Majiang/b202_%d", infoJiangma[index + 1].card)
obj:GetController('bg').selectedIndex = infoJiangma[index + 1].score obj:GetController('bg').selectedIndex = infoJiangma[index + 1].score
obj:GetController('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0 obj:GetController('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0
end end

2
lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
View File

@ -357,7 +357,7 @@ function M:EventInit()
info:UpdateHandCard(false, false) info:UpdateHandCard(false, false)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1
info._view:AddChild(obj_win_card) info._view:AddChild(obj_win_card)
obj_win_card:Center() obj_win_card:Center()

12
lua_probject/extend_project/extend/majiang/gejiu/EXClearingView.lua
View File

@ -237,7 +237,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool() hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do for i=1,#hand_cards do
local card = hand_list_view:AddItemFromPool() local card = hand_list_view:AddItemFromPool()
card.icon = "ui://Main_Majiang/202_"..hand_cards[i] card.icon = "ui://Main_Majiang/b202_"..hand_cards[i]
end end
hand_list_view.width = 52 * #hand_cards hand_list_view.width = 52 * #hand_cards
@ -252,7 +252,7 @@ function M:FillItemData(room, data, item, active_player, niao)
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3")
for j=1,3 do for j=1,3 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
elseif fz_card[i].type == FZType.Chi then elseif fz_card[i].type == FZType.Chi then
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3")
@ -265,9 +265,9 @@ function M:FillItemData(room, data, item, active_player, niao)
for j=1,4 do for j=1,4 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
if fz_card[i].type == FZType.Gang_An and j == 4 then if fz_card[i].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
end end
end end
@ -482,7 +482,7 @@ function M:FillItemData(room, data, item, active_player, niao)
item:GetController("bg").selectedIndex=0 item:GetController("bg").selectedIndex=0
end end
local win_card = item:GetChild("win_card") local win_card = item:GetChild("win_card")
win_card.icon = "ui://Main_Majiang/202_"..data["win_card"] win_card.icon = "ui://Main_Majiang/b202_"..data["win_card"]
if niao and #niao>0 then if niao and #niao>0 then
local currentNiaoList=self:CalculateNiao(niao ,data["seat"]) local currentNiaoList=self:CalculateNiao(niao ,data["seat"])
@ -492,7 +492,7 @@ function M:FillItemData(room, data, item, active_player, niao)
for i = 1, #currentNiaoList do for i = 1, #currentNiaoList do
if currentNiaoList[i].score > 0 then if currentNiaoList[i].score > 0 then
local card_niao = lst_niao:AddItemFromPool() local card_niao = lst_niao:AddItemFromPool()
card_niao.icon = "ui://Main_Majiang/202_" .. currentNiaoList[i].card card_niao.icon = "ui://Main_Majiang/b202_" .. currentNiaoList[i].card
end end
end end
end end

2
lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua
View File

@ -238,7 +238,7 @@ function M:EventInit()
info:UpdateHandCard(true, true) info:UpdateHandCard(true, true)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1
info._view:AddChild(obj_win_card) info._view:AddChild(obj_win_card)
obj_win_card:Center() obj_win_card:Center()

12
lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua
View File

@ -216,7 +216,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool() hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do for i=1,#hand_cards do
local card = hand_list_view:AddItemFromPool() local card = hand_list_view:AddItemFromPool()
card.icon = "ui://Main_Majiang/202_"..hand_cards[i] card.icon = "ui://Main_Majiang/b202_"..hand_cards[i]
end end
hand_list_view.width = 52 * #hand_cards hand_list_view.width = 52 * #hand_cards
@ -229,16 +229,16 @@ function M:FillItemData(room, data, item, active_player, niao)
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3")
for j=1,3 do for j=1,3 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4")
for j=1,4 do for j=1,4 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
if fz_card[i].type == FZType.Gang_An and j == 4 then if fz_card[i].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
end end
end end
@ -283,13 +283,13 @@ function M:FillItemData(room, data, item, active_player, niao)
end end
local win_card = item:GetChild("win_card") local win_card = item:GetChild("win_card")
if is_win then if is_win then
win_card.icon = "ui://Main_Majiang/202_"..data["win_card"] win_card.icon = "ui://Main_Majiang/b202_"..data["win_card"]
local lst_niao = item:GetChild("list_niao") local lst_niao = item:GetChild("list_niao")
lst_niao:RemoveChildrenToPool() lst_niao:RemoveChildrenToPool()
for i = 1, #niao do for i = 1, #niao do
if niao[i].score > 0 then if niao[i].score > 0 then
local card_niao = lst_niao:AddItemFromPool() local card_niao = lst_niao:AddItemFromPool()
card_niao.icon = "ui://Main_Majiang/202_" .. niao[i].card card_niao.icon = "ui://Main_Majiang/b202_" .. niao[i].card
end end
end end
end end

4
lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua
View File

@ -194,7 +194,7 @@ function M:EventInit()
info:UpdateHandCard(true, true) info:UpdateHandCard(true, true)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1
info._view:AddChild(obj_win_card) info._view:AddChild(obj_win_card)
obj_win_card:Center() obj_win_card:Center()
@ -396,7 +396,7 @@ function M:__FangziTip(tip, weight)
if td_weight == 8 then url = "ui://Main_Majiang/Btn_hu" end if td_weight == 8 then url = "ui://Main_Majiang/Btn_hu" end
local btn_t = _lit_fanzi:AddItemFromPool(url) local btn_t = _lit_fanzi:AddItemFromPool(url)
if url == "ui://Main_Majiang/Btn_hu" then if url == "ui://Main_Majiang/Btn_hu" then
btn_t:GetChild("hupai").icon="ui://Main_Majiang/202_" .. td.card btn_t:GetChild("hupai").icon="ui://Main_Majiang/b202_" .. td.card
btn_t:GetController("hupai").selectedIndex=1 btn_t:GetController("hupai").selectedIndex=1
end end
btn_t.icon = "ui://Main_Majiang/fztip_"..td_weight btn_t.icon = "ui://Main_Majiang/fztip_"..td_weight

6
lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua
View File

@ -166,7 +166,7 @@ function M:fillResult0(room, peopleNum, result)
for l = 1, 4 do for l = 1, 4 do
local card = item:GetChild(string.format("Btn_Card%d", l)) local card = item:GetChild(string.format("Btn_Card%d", l))
if fzCardInfo[j].type == FZType.Gang_An and j == 4 then if fzCardInfo[j].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), fzCardInfo[j].card) card.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), fzCardInfo[j].card)
print("===============================FZType.Gang", room.jing, fzCardInfo[j].card) print("===============================FZType.Gang", room.jing, fzCardInfo[j].card)
@ -213,13 +213,13 @@ function M:fillResult0(room, peopleNum, result)
ziMoCtr.selectedIndex = 1 ziMoCtr.selectedIndex = 1
end end
huCardBtn.icon = string.format("ui://Main_Majiang/202_%d", infoList.win_card) huCardBtn.icon = string.format("ui://Main_Majiang/b202_%d", infoList.win_card)
huCardBtn.visible = true huCardBtn.visible = true
jiangMaList.visible = true jiangMaList.visible = true
jiangMaList:SetVirtual() jiangMaList:SetVirtual()
jiangMaList.itemRenderer = function(index, obj) jiangMaList.itemRenderer = function(index, obj)
obj.icon = string.format("ui://Main_Majiang/202_%d", infoJiangma[index + 1].card) obj.icon = string.format("ui://Main_Majiang/b202_%d", infoJiangma[index + 1].card)
obj:GetController('bg').selectedIndex = infoJiangma[index + 1].score obj:GetController('bg').selectedIndex = infoJiangma[index + 1].score
obj:GetController('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0 obj:GetController('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0
end end

12
lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
View File

@ -354,7 +354,7 @@ function M:EventInit()
info:UpdateHandCard(true, false) info:UpdateHandCard(true, false)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1
info._view:AddChild(obj_win_card) info._view:AddChild(obj_win_card)
obj_win_card:Center() obj_win_card:Center()
@ -683,27 +683,27 @@ function M:__FangziTip(tip, weight)
index = index + 1 index = index + 1
if _tlist[index].type == FZType.HU then if _tlist[index].type == FZType.HU then
type.selectedIndex = 4 type.selectedIndex = 4
obj:GetChild('btn_Card1').icon = string.format('ui://Main_Majiang/202_%d', _tlist[index].card) obj:GetChild('btn_Card1').icon = string.format('ui://Main_Majiang/b202_%d', _tlist[index].card)
elseif _tlist[index].type == FZType.Chi then elseif _tlist[index].type == FZType.Chi then
type.selectedIndex = FZType.Chi type.selectedIndex = FZType.Chi
for i = 1, 3 do for i = 1, 3 do
obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/202_%d', obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/b202_%d',
_tlist[index].opcard[i]) _tlist[index].opcard[i])
end end
elseif _tlist[index].type == FZType.Peng then elseif _tlist[index].type == FZType.Peng then
type.selectedIndex = FZType.Peng type.selectedIndex = FZType.Peng
for i = 1, 3 do for i = 1, 3 do
obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/202_%d', obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/b202_%d',
_tlist[index].card) _tlist[index].card)
end end
else else
for i = 1, 4 do for i = 1, 4 do
obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/202_%d', obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/b202_%d',
_tlist[index].card) _tlist[index].card)
end end
type.selectedIndex = FZType.Gang type.selectedIndex = FZType.Gang
if _tlist[index].type == FZType.Gang_An then if _tlist[index].type == FZType.Gang_An then
obj:GetChild('btn_Card4').icon = 'ui://Main_Majiang/202_00' obj:GetChild('btn_Card4').icon = 'ui://Main_Majiang/b202_00'
end end
end end
obj.onClick:Set(function() obj.onClick:Set(function()

6
lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
View File

@ -179,7 +179,7 @@ function M:fillResult0(room, peopleNum, result)
for l = 1, 4 do for l = 1, 4 do
local card = item:GetChild(string.format("Btn_Card%d", l)) local card = item:GetChild(string.format("Btn_Card%d", l))
if fzCardInfo[j].type == FZType.Gang_An and j == 4 then if fzCardInfo[j].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), fzCardInfo[j].card) card.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), fzCardInfo[j].card)
print("===============================FZType.Gang", room.jing, fzCardInfo[j].card) print("===============================FZType.Gang", room.jing, fzCardInfo[j].card)
@ -226,7 +226,7 @@ function M:fillResult0(room, peopleNum, result)
ziMoCtr.selectedIndex = 1 ziMoCtr.selectedIndex = 1
end end
huCardBtn.icon = string.format("ui://Main_Majiang/202_%d", infoList.win_card) huCardBtn.icon = string.format("ui://Main_Majiang/b202_%d", infoList.win_card)
if room.jing == infoList.win_card then if room.jing == infoList.win_card then
huCardBtn:GetController('jing').selectedIndex = 1 huCardBtn:GetController('jing').selectedIndex = 1
end end
@ -235,7 +235,7 @@ function M:fillResult0(room, peopleNum, result)
jiangMaList.visible = true jiangMaList.visible = true
jiangMaList:SetVirtual() jiangMaList:SetVirtual()
jiangMaList.itemRenderer = function(index, obj) jiangMaList.itemRenderer = function(index, obj)
obj.icon = string.format("ui://Main_Majiang/202_%d", infoJiangma[index + 1].card) obj.icon = string.format("ui://Main_Majiang/b202_%d", infoJiangma[index + 1].card)
obj:GetController('bg').selectedIndex = infoJiangma[index + 1].score obj:GetController('bg').selectedIndex = infoJiangma[index + 1].score
obj:GetController('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0 obj:GetController('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0
end end

12
lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
View File

@ -358,7 +358,7 @@ function M:EventInit()
info:UpdateHandCard(false, false) info:UpdateHandCard(false, false)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1
info._view:AddChild(obj_win_card) info._view:AddChild(obj_win_card)
obj_win_card:Center() obj_win_card:Center()
@ -689,27 +689,27 @@ function M:__FangziTip(tip, weight)
index = index + 1 index = index + 1
if _tlist[index].type == FZType.HU then if _tlist[index].type == FZType.HU then
type.selectedIndex = 4 type.selectedIndex = 4
obj:GetChild('btn_Card1').icon = string.format('ui://Main_Majiang/202_%d', _tlist[index].card) obj:GetChild('btn_Card1').icon = string.format('ui://Main_Majiang/b202_%d', _tlist[index].card)
elseif _tlist[index].type == FZType.Chi then elseif _tlist[index].type == FZType.Chi then
type.selectedIndex = FZType.Chi type.selectedIndex = FZType.Chi
for i = 1, 3 do for i = 1, 3 do
obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/202_%d', obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/b202_%d',
_tlist[index].opcard[i]) _tlist[index].opcard[i])
end end
elseif _tlist[index].type == FZType.Peng then elseif _tlist[index].type == FZType.Peng then
type.selectedIndex = FZType.Peng type.selectedIndex = FZType.Peng
for i = 1, 3 do for i = 1, 3 do
obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/202_%d', obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/b202_%d',
_tlist[index].card) _tlist[index].card)
end end
else else
for i = 1, 4 do for i = 1, 4 do
obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/202_%d', obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/b202_%d',
_tlist[index].card) _tlist[index].card)
end end
type.selectedIndex = FZType.Gang type.selectedIndex = FZType.Gang
if _tlist[index].type == FZType.Gang_An then if _tlist[index].type == FZType.Gang_An then
obj:GetChild('btn_Card4').icon = 'ui://Main_Majiang/202_00' obj:GetChild('btn_Card4').icon = 'ui://Main_Majiang/b202_00'
end end
end end
obj.onClick:Set(function() obj.onClick:Set(function()

6
lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua
View File

@ -164,7 +164,7 @@ function M:fillResult0(room, peopleNum, result)
for l = 1, 4 do for l = 1, 4 do
local card = item:GetChild(string.format("Btn_Card%d", l)) local card = item:GetChild(string.format("Btn_Card%d", l))
if fzCardInfo[j].type == FZType.Gang_An and j == 4 then if fzCardInfo[j].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), fzCardInfo[j].card) card.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), fzCardInfo[j].card)
print("===============================FZType.Gang", room.jing, fzCardInfo[j].card) print("===============================FZType.Gang", room.jing, fzCardInfo[j].card)
@ -213,13 +213,13 @@ function M:fillResult0(room, peopleNum, result)
ziMoCtr.selectedIndex = 1 ziMoCtr.selectedIndex = 1
end end
huCardBtn.icon = string.format("ui://Main_Majiang/202_%d", infoList.win_card) huCardBtn.icon = string.format("ui://Main_Majiang/b202_%d", infoList.win_card)
huCardBtn.visible = true huCardBtn.visible = true
jiangMaList.visible = true jiangMaList.visible = true
jiangMaList:SetVirtual() jiangMaList:SetVirtual()
jiangMaList.itemRenderer = function(index, obj) jiangMaList.itemRenderer = function(index, obj)
obj.icon = string.format("ui://Main_Majiang/202_%d", infoJiangma[index + 1].card) obj.icon = string.format("ui://Main_Majiang/b202_%d", infoJiangma[index + 1].card)
obj:GetController('bg').selectedIndex = infoJiangma[index + 1].score obj:GetController('bg').selectedIndex = infoJiangma[index + 1].score
obj:GetController('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0 obj:GetController('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0
end end

12
lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
View File

@ -356,7 +356,7 @@ function M:EventInit()
info:UpdateHandCard(false, false) info:UpdateHandCard(false, false)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1
info._view:AddChild(obj_win_card) info._view:AddChild(obj_win_card)
obj_win_card:Center() obj_win_card:Center()
@ -688,27 +688,27 @@ function M:__FangziTip(tip, weight)
index = index + 1 index = index + 1
if _tlist[index].type == FZType.HU then if _tlist[index].type == FZType.HU then
type.selectedIndex = 4 type.selectedIndex = 4
obj:GetChild('btn_Card1').icon = string.format('ui://Main_Majiang/202_%d', _tlist[index].card) obj:GetChild('btn_Card1').icon = string.format('ui://Main_Majiang/b202_%d', _tlist[index].card)
elseif _tlist[index].type == FZType.Chi then elseif _tlist[index].type == FZType.Chi then
type.selectedIndex = FZType.Chi type.selectedIndex = FZType.Chi
for i = 1, 3 do for i = 1, 3 do
obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/202_%d', obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/b202_%d',
_tlist[index].opcard[i]) _tlist[index].opcard[i])
end end
elseif _tlist[index].type == FZType.Peng then elseif _tlist[index].type == FZType.Peng then
type.selectedIndex = FZType.Peng type.selectedIndex = FZType.Peng
for i = 1, 3 do for i = 1, 3 do
obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/202_%d', obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/b202_%d',
_tlist[index].card) _tlist[index].card)
end end
else else
for i = 1, 4 do for i = 1, 4 do
obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/202_%d', obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/b202_%d',
_tlist[index].card) _tlist[index].card)
end end
type.selectedIndex = FZType.Gang type.selectedIndex = FZType.Gang
if _tlist[index].type == FZType.Gang_An then if _tlist[index].type == FZType.Gang_An then
obj:GetChild('btn_Card4').icon = 'ui://Main_Majiang/202_00' obj:GetChild('btn_Card4').icon = 'ui://Main_Majiang/b202_00'
end end
end end
obj.onClick:Set(function() obj.onClick:Set(function()

2
lua_probject/extend_project/extend/majiang/qizhiba/main/HuTipView.lua
View File

@ -66,7 +66,7 @@ end
-- end -- end
-- for i = 1, num do -- for i = 1, num do
-- local item = lst_card:AddItemFromPool() -- local item = lst_card:AddItemFromPool()
-- item:GetChild("icon").icon = "ui://Main_Majiang/202_" .. cards[i] -- item:GetChild("icon").icon = "ui://Main_Majiang/b202_" .. cards[i]
-- end -- end
-- SetObjEnabled(self._view, true) -- SetObjEnabled(self._view, true)
-- else -- else

12
lua_probject/extend_project/extend/majiang/tuidaohu/EXClearingView.lua
View File

@ -230,7 +230,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool() hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do for i=1,#hand_cards do
local card = hand_list_view:AddItemFromPool() local card = hand_list_view:AddItemFromPool()
card.icon = "ui://Main_Majiang/202_"..hand_cards[i] card.icon = "ui://Main_Majiang/b202_"..hand_cards[i]
end end
hand_list_view.width = 52 * #hand_cards hand_list_view.width = 52 * #hand_cards
@ -243,16 +243,16 @@ function M:FillItemData(room, data, item, active_player, niao)
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3")
for j=1,3 do for j=1,3 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4")
for j=1,4 do for j=1,4 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
if fz_card[i].type == FZType.Gang_An and j == 4 then if fz_card[i].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
end end
end end
@ -504,7 +504,7 @@ function M:FillItemData(room, data, item, active_player, niao)
item:GetController("bg").selectedIndex=0 item:GetController("bg").selectedIndex=0
end end
local win_card = item:GetChild("win_card") local win_card = item:GetChild("win_card")
win_card.icon = "ui://Main_Majiang/202_"..data["win_card"] win_card.icon = "ui://Main_Majiang/b202_"..data["win_card"]
if niao and #niao>0 then if niao and #niao>0 then
local currentNiaoList=self:CalculateNiao(niao ,data["seat"]) local currentNiaoList=self:CalculateNiao(niao ,data["seat"])
@ -514,7 +514,7 @@ function M:FillItemData(room, data, item, active_player, niao)
for i = 1, #currentNiaoList do for i = 1, #currentNiaoList do
if currentNiaoList[i].score > 0 then if currentNiaoList[i].score > 0 then
local card_niao = lst_niao:AddItemFromPool() local card_niao = lst_niao:AddItemFromPool()
card_niao.icon = "ui://Main_Majiang/202_" .. currentNiaoList[i].card card_niao.icon = "ui://Main_Majiang/b202_" .. currentNiaoList[i].card
end end
end end
end end

2
lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua
View File

@ -237,7 +237,7 @@ function M:EventInit()
info:UpdateHandCard(true, true) info:UpdateHandCard(true, true)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1
info._view:AddChild(obj_win_card) info._view:AddChild(obj_win_card)
obj_win_card:Center() obj_win_card:Center()

12
lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua
View File

@ -147,7 +147,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool() hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do for i=1,#hand_cards do
local card = hand_list_view:AddItemFromPool() local card = hand_list_view:AddItemFromPool()
card.icon = "ui://Main_Majiang/202_"..hand_cards[i] card.icon = "ui://Main_Majiang/b202_"..hand_cards[i]
end end
hand_list_view.width = 52 * #hand_cards hand_list_view.width = 52 * #hand_cards
@ -160,16 +160,16 @@ function M:FillItemData(room, data, item, active_player, niao)
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3")
for j=1,3 do for j=1,3 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4") local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4")
for j=1,4 do for j=1,4 do
local card = item:GetChild("card_" .. j) local card = item:GetChild("card_" .. j)
if fz_card[i].type == FZType.Gang_An and j == 4 then if fz_card[i].type == FZType.Gang_An and j == 4 then
card.icon = "ui://Main_Majiang/202_00" card.icon = "ui://Main_Majiang/b202_00"
else else
card.icon = "ui://Main_Majiang/202_"..fz_card[i].card card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end end
end end
end end
@ -214,13 +214,13 @@ function M:FillItemData(room, data, item, active_player, niao)
end end
local win_card = item:GetChild("win_card") local win_card = item:GetChild("win_card")
if is_win then if is_win then
win_card.icon = "ui://Main_Majiang/202_"..data["win_card"] win_card.icon = "ui://Main_Majiang/b202_"..data["win_card"]
local lst_niao = item:GetChild("list_niao") local lst_niao = item:GetChild("list_niao")
lst_niao:RemoveChildrenToPool() lst_niao:RemoveChildrenToPool()
for i = 1, #niao do for i = 1, #niao do
if niao[i].score > 0 then if niao[i].score > 0 then
local card_niao = lst_niao:AddItemFromPool() local card_niao = lst_niao:AddItemFromPool()
card_niao.icon = "ui://Main_Majiang/202_" .. niao[i].card card_niao.icon = "ui://Main_Majiang/b202_" .. niao[i].card
end end
end end
end end

2
lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua
View File

@ -189,7 +189,7 @@ function M:EventInit()
info:UpdateHandCard(true, true) info:UpdateHandCard(true, true)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card")
obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1
info._view:AddChild(obj_win_card) info._view:AddChild(obj_win_card)
obj_win_card:Center() obj_win_card:Center()

2
lua_probject/extend_project/extend/poker/mushi/MuShi_PlayerSelfPokerInfoView.lua
View File

@ -82,7 +82,7 @@ function M:init()
self.carText = self.carType:GetChild("n1") self.carText = self.carType:GetChild("n1")
self.carText.text = "" self.carText.text = ""
-- self.carIcon.icon = "ui://Extend_Poker_MuShi/ms_type_10" -- self.carIcon.icon = "ui://Extend_Poker_MuShi/ms_type_10"
--card_niao.icon = "ui://Main_Majiang/202_" .. currentNiaoList[i].card --card_niao.icon = "ui://Main_Majiang/b202_" .. currentNiaoList[i].card
self.btnBuPai = self._view:GetChild("bupai") self.btnBuPai = self._view:GetChild("bupai")
self.btnBu = self._view:GetChild("bubu") self.btnBu = self._view:GetChild("bubu")

2
lua_probject/main_project/main/majiang/HuTipView.lua
View File

@ -61,7 +61,7 @@ end
-- end -- end
-- for i = 1, num do -- for i = 1, num do
-- local item = lst_card:AddItemFromPool() -- local item = lst_card:AddItemFromPool()
-- item:GetChild("icon").icon = "ui://Main_Majiang/202_" .. cards[i] -- item:GetChild("icon").icon = "ui://Main_Majiang/b202_" .. cards[i]
-- end -- end
-- SetObjEnabled(self._view, true) -- SetObjEnabled(self._view, true)
-- else -- else

9
wb_new_ui/assets/Common/package.xml
View File

@ -2093,11 +2093,12 @@
<component id="qmc17jbs" name="btn_close.xml" path="/window/Component/"/> <component id="qmc17jbs" name="btn_close.xml" path="/window/Component/"/>
<image id="qmc17jbt" name="Rectangle 298.png" path="/images/" scale="9grid" scale9grid="38,38,103,66"/> <image id="qmc17jbt" name="Rectangle 298.png" path="/images/" scale="9grid" scale9grid="38,38,103,66"/>
<component id="qmc17jbu" name="btn_emoji.xml" path="/window/Component/"/> <component id="qmc17jbu" name="btn_emoji.xml" path="/window/Component/"/>
<image id="qmc17jbv" name="default3.png" path="/images/Emojies2/"/> <image id="qmc17jbv" name="default3.png" path="/images/Emojies2/" disableTrim="true"/>
<image id="qmc17jbw" name="default4.png" path="/images/Emojies2/"/> <image id="qmc17jbw" name="default4.png" path="/images/Emojies2/" disableTrim="true"/>
<image id="qmc17jbx" name="default.png" path="/images/Emojies2/"/> <image id="qmc17jbx" name="default.png" path="/images/Emojies2/" disableTrim="true"/>
<image id="qmc17jby" name="default2.png" path="/images/Emojies2/"/> <image id="qmc17jby" name="default2.png" path="/images/Emojies2/" disableTrim="true"/>
<image id="qmc17jbz" name="loginBg.png" path="/bg/" exported="true" atlas="alone"/> <image id="qmc17jbz" name="loginBg.png" path="/bg/" exported="true" atlas="alone"/>
<movieclip id="uans7jc0" name="MovieClip3.jta" path="/window/Component/"/>
</resources> </resources>
<publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048"> <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048">
<atlas name="默认" index="0"/> <atlas name="默认" index="0"/>

50
wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" bgColor="#000000"> <component size="2532,1170" bgColor="#000000">
<controller name="over" pages="0,,1," selected="0"/> <controller name="over" pages="0,,1," selected="0"/>
<controller name="main" pages="0,,1," selected="0"/> <controller name="main" pages="0,,1," selected="1"/>
<controller name="playerNum" alias="玩家数量" pages="0,两人,1,三人,2,四人" selected="0"/> <controller name="playerNum" alias="玩家数量" pages="0,两人,1,三人,2,四人" selected="1"/>
<controller name="showType" pages="0,,1," selected="0"/> <controller name="showType" pages="0,,1," selected="0"/>
<displayList> <displayList>
<image id="n110_qt01" name="n110" src="qt01ys" fileName="Main_new/Main/Image/Rectangle 212.png" xy="559,451" group="n113_qt01"/> <image id="n110_qt01" name="n110" src="qt01ys" fileName="Main_new/Main/Image/Rectangle 212.png" xy="559,451" group="n113_qt01"/>
@ -24,11 +24,11 @@
<component id="n122_yry6" name="Comp_Player1" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,219" group="n121_yry6"> <component id="n122_yry6" name="Comp_Player1" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,219" group="n121_yry6">
<gearDisplay controller="playerNum" pages="0,1,2"/> <gearDisplay controller="playerNum" pages="0,1,2"/>
</component> </component>
<component id="n123_yry6" name="Comp_Player2" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,591" group="n121_yry6"> <component id="n123_yry6" name="Comp_Player2" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,516" group="n121_yry6">
<gearDisplay controller="playerNum" pages="0,1,2"/> <gearDisplay controller="playerNum" pages="0,1,2"/>
<gearXY controller="playerNum" pages="0,1" values="96,591|96,516" default="96,417"/> <gearXY controller="playerNum" pages="0,1" values="96,591|96,516" default="96,417"/>
</component> </component>
<component id="n124_yry6" name="Comp_Player3" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,615" group="n121_yry6"> <component id="n124_yry6" name="Comp_Player3" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,813" group="n121_yry6">
<gearDisplay controller="playerNum" pages="1,2"/> <gearDisplay controller="playerNum" pages="1,2"/>
<gearXY controller="playerNum" pages="1" values="96,813" default="96,615"/> <gearXY controller="playerNum" pages="1" values="96,813" default="96,615"/>
</component> </component>
@ -48,6 +48,42 @@
<gearDisplay controller="playerNum" pages="2"/> <gearDisplay controller="playerNum" pages="2"/>
<gearXY controller="playerNum" default="96,813"/> <gearXY controller="playerNum" default="96,813"/>
</component> </component>
<list id="n145_uans" name="list_lastCard" xy="303,1038" size="1256,84" group="n121_yry6" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://v0j9abjyyry6z3" vAlign="middle">
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
</list>
<text id="n146_uans" name="n146" xy="192,1056" size="88,56" group="n121_yry6" font="Alimama FangYuanTi VF" fontSize="42" color="#c06a2d" text="剩牌"/>
<text id="n147_uans" name="n147" xy="1638,1056" size="302,56" group="n121_yry6" fontSize="42" color="#c06a2d" text="剩余50张未显示"/>
<group id="n121_yry6" name="over0" xy="96,117" size="2340,1017" group="n116_yry6" advanced="true"> <group id="n121_yry6" name="over0" xy="96,117" size="2340,1017" group="n116_yry6" advanced="true">
<gearDisplay controller="over" pages="0"/> <gearDisplay controller="over" pages="0"/>
</group> </group>
@ -73,15 +109,15 @@
<component id="n134_yry6" name="Btn_Share" src="yry6ze" fileName="Main_new/Clearing/Component/Btn_Share.xml" xy="1425,996" group="n140_yry6"/> <component id="n134_yry6" name="Btn_Share" src="yry6ze" fileName="Main_new/Clearing/Component/Btn_Share.xml" xy="1425,996" group="n140_yry6"/>
<component id="n133_yry6" name="Btn_EndRound" src="yry6zd" fileName="Main_new/Clearing/Component/Btn_EndRound.xml" xy="1761,996" group="n140_yry6"/> <component id="n133_yry6" name="Btn_EndRound" src="yry6zd" fileName="Main_new/Clearing/Component/Btn_EndRound.xml" xy="1761,996" group="n140_yry6"/>
<component id="n135_yry6" name="Btn_Copy" src="yry6zf" fileName="Main_new/Clearing/Component/Btn_Copy.xml" xy="2100,996" group="n140_yry6"/> <component id="n135_yry6" name="Btn_Copy" src="yry6zf" fileName="Main_new/Clearing/Component/Btn_Copy.xml" xy="2100,996" group="n140_yry6"/>
<component id="n136_yry6" name="Comp_ResultInfo1" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="540,228" group="n140_yry6"> <component id="n136_yry6" name="Comp_ResultInfo1" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="333,228" group="n140_yry6">
<gearDisplay controller="playerNum" pages="0,1,2"/> <gearDisplay controller="playerNum" pages="0,1,2"/>
<gearXY controller="playerNum" pages="1,2" values="333,228|333,228" default="540,228"/> <gearXY controller="playerNum" pages="1,2" values="333,228|333,228" default="540,228"/>
</component> </component>
<component id="n137_yry6" name="Comp_ResultInfo2" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1530,228" group="n140_yry6"> <component id="n137_yry6" name="Comp_ResultInfo2" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1035,228" group="n140_yry6">
<gearDisplay controller="playerNum" pages="0,1,2"/> <gearDisplay controller="playerNum" pages="0,1,2"/>
<gearXY controller="playerNum" pages="0,1" values="1530,228|1035,228" default="801,228"/> <gearXY controller="playerNum" pages="0,1" values="1530,228|1035,228" default="801,228"/>
</component> </component>
<component id="n138_yry6" name="Comp_ResultInfo3" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1269,228" group="n140_yry6"> <component id="n138_yry6" name="Comp_ResultInfo3" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1737,228" group="n140_yry6">
<gearDisplay controller="playerNum" pages="1,2"/> <gearDisplay controller="playerNum" pages="1,2"/>
<gearXY controller="playerNum" pages="1" values="1737,228" default="1269,228"/> <gearXY controller="playerNum" pages="1" values="1737,228" default="1269,228"/>
</component> </component>

2
wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_FZCard.xml
View File

@ -3,7 +3,7 @@
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/> <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<controller name="jing" pages="0,,1," selected="0"/> <controller name="jing" pages="0,,1," selected="0"/>
<displayList> <displayList>
<loader id="n3_nee3" name="icon" xy="0,0" size="60,87" url="ui://Main_Majiang/202_101" fill="scale"> <loader id="n3_nee3" name="icon" xy="0,0" size="60,87" url="ui://v0j9abjyk0pa131" fill="scale">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</loader> </loader>
<image id="n4_nee3" name="n4" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="30,31" aspect="true"> <image id="n4_nee3" name="n4" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="30,31" aspect="true">

14
wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_Tips.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="384,161" extention="Button"> <component size="384,161" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="3"/> <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<controller name="type" pages="0,过,1,吃,2,碰,3,杠,4,胡" selected="4"/> <controller name="type" pages="0,过,1,吃,2,碰,3,杠,4,胡" selected="4"/>
<displayList> <displayList>
<image id="n3_nee3" name="n3" src="nee3118" fileName="Main_new/FZTips/Image/Group 236.png" xy="0,0"> <image id="n3_nee3" name="n3" src="nee3118" fileName="Main_new/FZTips/Image/Group 236.png" xy="0,0">
@ -21,19 +21,19 @@
<image id="n8_nee3" name="n8" src="nee3114" fileName="Main_new/FZTips/Image/gang.png" xy="52,32"> <image id="n8_nee3" name="n8" src="nee3114" fileName="Main_new/FZTips/Image/gang.png" xy="52,32">
<gearDisplay controller="type" pages="3"/> <gearDisplay controller="type" pages="3"/>
</image> </image>
<component id="n9_nee3" name="btn_Card1" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="221,37"> <component id="n9_nee3" name="btn_Card1" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="221,52">
<gearDisplay controller="type" pages="1,2,3,4"/> <gearDisplay controller="type" pages="1,2,3,4"/>
<gearXY controller="type" pages="1,4" values="162,37|221,37" default="162,37"/> <gearXY controller="type" pages="1,2,3,4" values="162,52|162,52|162,52|221,52" default="162,37"/>
</component> </component>
<component id="n10_nee3" name="btn_Card2" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="218,37"> <component id="n10_nee3" name="btn_Card2" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="218,52">
<gearDisplay controller="type" pages="1,2,3"/> <gearDisplay controller="type" pages="1,2,3"/>
</component> </component>
<component id="n11_nee3" name="btn_Card3" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="274,37"> <component id="n11_nee3" name="btn_Card3" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="274,52">
<gearDisplay controller="type" pages="1,2,3"/> <gearDisplay controller="type" pages="1,2,3"/>
</component> </component>
<component id="n12_nee3" name="btn_Card4" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="218,25"> <component id="n12_nee3" name="btn_Card4" src="nee311a" fileName="Main_new/FZTips/Component/btn_FZCard.xml" xy="218,40">
<gearDisplay controller="type" pages="3"/> <gearDisplay controller="type" pages="3"/>
</component> </component>
</displayList> </displayList>
<Button downEffect="dark" downEffectValue=".8"/> <Button downEffect="dark" downEffectValue="0.8"/>
</component> </component>

9
wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml
View File

@ -10,7 +10,7 @@
<controller name="ting" pages="0,,1," selected="0"/> <controller name="ting" pages="0,,1," selected="0"/>
<controller name="text_color" pages="0,,1," selected="0"/> <controller name="text_color" pages="0,,1," selected="0"/>
<controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/> <controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/>
<controller name="cScore" alias="分数飘字" pages="0,,1," selected="0"/> <controller name="cScore" alias="分数飘字" pages="0,,1," selected="1"/>
<displayList> <displayList>
<text id="n47_nkur" name="tuoguanTips" xy="-26,-84" size="184,48" fontSize="22" color="#ff0000" align="center" vAlign="middle" autoSize="none" text="开启托管剩余时间"> <text id="n47_nkur" name="tuoguanTips" xy="-26,-84" size="184,48" fontSize="22" color="#ff0000" align="center" vAlign="middle" autoSize="none" text="开启托管剩余时间">
<gearXY controller="site" pages="2,1" values="-26,-84|154,50" default="-85,-104"/> <gearXY controller="site" pages="2,1" values="-26,-84|154,50" default="-85,-104"/>
@ -69,11 +69,12 @@
<group id="n46_rfcn" name="zhanji" xy="-10,126" size="153,58" advanced="true"> <group id="n46_rfcn" name="zhanji" xy="-10,126" size="153,58" advanced="true">
<gearXY controller="site" pages="2,1" values="-10,126|154,97" default="29,136"/> <gearXY controller="site" pages="2,1" values="-10,126|154,97" default="29,136"/>
</group> </group>
<list id="n51_qmc1" name="list_scoreAnimation" xy="-34,150" size="200,51" layout="row" overflow="scroll" defaultItem="ui://v0j9abjyqmc11ax" autoItemSize="false" align="center" vAlign="middle"> <list id="n51_qmc1" name="list_scoreAnimation" xy="-34,150" size="200,51" layout="row" selectionMode="none" defaultItem="ui://v0j9abjyuans1b1" autoItemSize="false" align="center" vAlign="middle" renderOrder="descent" autoClearItems="true">
<gearDisplay controller="cScore" pages="1"/> <gearDisplay controller="cScore" pages="1"/>
<item icon="ui://v0j9abjyqmc11ax"/> <item icon="ui://v0j9abjyqmc11ax"/>
<item url="ui://v0j9abjyqmc11b0" icon="ui://v0j9abjyqmc11b0"/> <item/>
<item url="ui://v0j9abjyqmc11as" icon="ui://v0j9abjyqmc11ay"/> <item/>
<item/>
</list> </list>
</displayList> </displayList>
</component> </component>

10
wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_2.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="132,132" initName="gcm_info"> <component size="132,132" initName="gcm_info">
<controller name="room_owner" pages="0,,1," selected="0"/> <controller name="room_owner" pages="0,,1," selected="0"/>
<controller name="bank" pages="0,,1," selected="1"/> <controller name="bank" pages="0,,1," selected="0"/>
<controller name="read" pages="0,,1," selected="0"/> <controller name="read" pages="0,,1," selected="0"/>
<controller name="offline" pages="0,,1," selected="0"/> <controller name="offline" pages="0,,1," selected="0"/>
<controller name="mask_voice" pages="0,,1," selected="0"/> <controller name="mask_voice" pages="0,,1," selected="0"/>
@ -10,6 +10,7 @@
<controller name="ting" pages="0,,1," selected="0"/> <controller name="ting" pages="0,,1," selected="0"/>
<controller name="text_color" pages="0,,1," selected="0"/> <controller name="text_color" pages="0,,1," selected="0"/>
<controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/> <controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/>
<controller name="cScore" pages="0,,1," selected="0"/>
<displayList> <displayList>
<text id="n47_nkur" name="tuoguanTips" xy="1,125" size="302,48" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间"> <text id="n47_nkur" name="tuoguanTips" xy="1,125" size="302,48" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间">
<gearXY controller="site" pages="2,1" values="1,125|154,50" default="-85,-104"/> <gearXY controller="site" pages="2,1" values="1,125|154,50" default="-85,-104"/>
@ -63,5 +64,12 @@
<group id="n46_rfcn" name="zhanji" xy="136,64" size="29,58" advanced="true"> <group id="n46_rfcn" name="zhanji" xy="136,64" size="29,58" advanced="true">
<gearXY controller="site" pages="2,1" values="136,64|154,97" default="29,136"/> <gearXY controller="site" pages="2,1" values="136,64|154,97" default="29,136"/>
</group> </group>
<list id="n50_uans" name="list_scoreAnimation" xy="-34,150" size="200,51" layout="row" selectionMode="none" defaultItem="ui://v0j9abjyuans1b1" autoItemSize="false" align="center" vAlign="middle" renderOrder="descent" autoClearItems="true">
<gearDisplay controller="cScore" pages="1"/>
<item icon="ui://v0j9abjyqmc11ax"/>
<item/>
<item/>
<item/>
</list>
</displayList> </displayList>
</component> </component>

10
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="132,132" initName="gcm_info"> <component size="132,132" initName="gcm_info">
<controller name="room_owner" pages="0,,1," selected="0"/> <controller name="room_owner" pages="0,,1," selected="0"/>
<controller name="bank" pages="0,,1," selected="1"/> <controller name="bank" pages="0,,1," selected="0"/>
<controller name="read" pages="0,,1," selected="0"/> <controller name="read" pages="0,,1," selected="0"/>
<controller name="offline" pages="0,,1," selected="0"/> <controller name="offline" pages="0,,1," selected="0"/>
<controller name="mask_voice" pages="0,,1," selected="0"/> <controller name="mask_voice" pages="0,,1," selected="0"/>
@ -10,6 +10,7 @@
<controller name="ting" pages="0,,1," selected="0"/> <controller name="ting" pages="0,,1," selected="0"/>
<controller name="text_color" pages="0,,1," selected="0"/> <controller name="text_color" pages="0,,1," selected="0"/>
<controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/> <controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/>
<controller name="cScore" pages="0,,1," selected="0"/>
<displayList> <displayList>
<text id="n47_nkur" name="tuoguanTips" xy="-85,-84" size="302,48" fontSize="22" color="#ff0000" align="center" vAlign="middle" autoSize="none" text="开启托管剩余时间"> <text id="n47_nkur" name="tuoguanTips" xy="-85,-84" size="302,48" fontSize="22" color="#ff0000" align="center" vAlign="middle" autoSize="none" text="开启托管剩余时间">
<gearXY controller="site" pages="2,1" values="-85,-84|154,50" default="-85,-104"/> <gearXY controller="site" pages="2,1" values="-85,-84|154,50" default="-85,-104"/>
@ -63,5 +64,12 @@
<gearXY controller="site" pages="2,1" values="-10,126|154,97" default="29,136"/> <gearXY controller="site" pages="2,1" values="-10,126|154,97" default="29,136"/>
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
</group> </group>
<list id="n50_uans" name="list_scoreAnimation" xy="-34,150" size="200,51" layout="row" selectionMode="none" defaultItem="ui://v0j9abjyuans1b1" autoItemSize="false" align="center" vAlign="middle" renderOrder="descent" autoClearItems="true">
<gearDisplay controller="cScore" pages="1"/>
<item icon="ui://v0j9abjyqmc11ax"/>
<item/>
<item/>
<item/>
</list>
</displayList> </displayList>
</component> </component>

14
wb_new_ui/assets/Main_Majiang/package.xml
View File

@ -1435,6 +1435,20 @@
<image id="qmc11ay" name="score0.png" path="/images/score/" exported="true"/> <image id="qmc11ay" name="score0.png" path="/images/score/" exported="true"/>
<image id="qmc11az" name="score1.png" path="/images/score/" exported="true"/> <image id="qmc11az" name="score1.png" path="/images/score/" exported="true"/>
<image id="qmc11b0" name="score2.png" path="/images/score/" exported="true"/> <image id="qmc11b0" name="score2.png" path="/images/score/" exported="true"/>
<component id="uans1b1" name="loader.xml" path="/Main_new/Main/"/>
<image id="uans1b2" name="nscore9.png" path="/images/score/" exported="true"/>
<image id="uans1b3" name="nscore-.png" path="/images/score/" exported="true" disableTrim="true"/>
<image id="uans1b4" name="nscore+.png" path="/images/score/" exported="true"/>
<image id="uans1b5" name="nscore0.png" path="/images/score/" exported="true"/>
<image id="uans1b6" name="nscore1.png" path="/images/score/" exported="true"/>
<image id="uans1b7" name="nscore2.png" path="/images/score/" exported="true"/>
<image id="uans1b8" name="nscore3.png" path="/images/score/" exported="true"/>
<image id="uans1b9" name="nscore4.png" path="/images/score/" exported="true"/>
<image id="uans1ba" name="nscore5.png" path="/images/score/" exported="true"/>
<image id="uans1bb" name="nscore6.png" path="/images/score/" exported="true"/>
<image id="uans1bc" name="nscore7.png" path="/images/score/" exported="true"/>
<image id="uans1bd" name="nscore8.png" path="/images/score/" exported="true"/>
<component id="uans1be" name="Missile.xml" path="/Main_new/Clearing/Component/" exported="true"/>
</resources> </resources>
<publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/> <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
</packageDescription> </packageDescription>

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 MiB

After

Width:  |  Height:  |  Size: 5.1 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 811 KiB

After

Width:  |  Height:  |  Size: 800 KiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 MiB

After

Width:  |  Height:  |  Size: 2.6 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 MiB

After

Width:  |  Height:  |  Size: 3.9 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 4.4 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 1.6 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 831 KiB

After

Width:  |  Height:  |  Size: 482 KiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 MiB

After

Width:  |  Height:  |  Size: 2.4 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 4.4 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
View File

Binary file not shown.

16
wb_unity_pro/Assets/StreamingAssets/init1_1.json
View File

@ -1,9 +1,9 @@
[ [
{ {
"ver": "1.0.27", "ver": "1.0.29",
"name": "跑得快", "name": "跑得快",
"check": true, "check": true,
"version": "1.0.27", "version": "1.0.29",
"game_id": "66", "game_id": "66",
"bundle": "extend/poker/runfast" "bundle": "extend/poker/runfast"
}, },
@ -32,26 +32,26 @@
"bundle": "extend/majiang/nancheng" "bundle": "extend/majiang/nancheng"
}, },
{ {
"ver": "1.0.21", "ver": "1.0.22",
"name": "黎川麻将", "name": "黎川麻将",
"check": true, "check": true,
"version": "1.0.21", "version": "1.0.22",
"game_id": "87", "game_id": "87",
"bundle": "extend/majiang/lichuan" "bundle": "extend/majiang/lichuan"
}, },
{ {
"ver": "1.0.16", "ver": "1.0.17",
"name": "金溪麻将", "name": "金溪麻将",
"check": true, "check": true,
"version": "1.0.16", "version": "1.0.17",
"game_id": "88", "game_id": "88",
"bundle": "extend/majiang/jinxi" "bundle": "extend/majiang/jinxi"
}, },
{ {
"ver": "1.0.15", "ver": "1.0.16",
"name": "抚州麻将", "name": "抚州麻将",
"check": true, "check": true,
"version": "1.0.15", "version": "1.0.16",
"game_id": "89", "game_id": "89",
"bundle": "extend/majiang/fuzhou" "bundle": "extend/majiang/fuzhou"
} }

60
wb_unity_pro/Assets/StreamingAssets/init2_1.json
View File

@ -1,109 +1,109 @@
[ [
{ {
"lua_path": "/tolua_project,/base_project,/main_project", "lua_path": "/tolua_project,/base_project,/main_project",
"ver": "1.0.6", "ver": "1.0.8",
"name": "base_script", "name": "base_script",
"check": true, "check": true,
"bundle": "base/base_script", "bundle": "base/base_script",
"version": "1.0.6" "version": "1.0.8"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "common", "name": "common",
"check": true, "check": true,
"bundle": "base/common", "bundle": "base/common",
"version": "1.0.6" "version": "1.0.8"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "login", "name": "login",
"check": true, "check": true,
"bundle": "base/login", "bundle": "base/login",
"version": "1.0.6" "version": "1.0.8"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "lobby", "name": "lobby",
"check": true, "check": true,
"bundle": "base/lobby", "bundle": "base/lobby",
"version": "1.0.6" "version": "1.0.8"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "Family", "name": "Family",
"check": true, "check": true,
"bundle": "base/Family", "bundle": "base/Family",
"version": "1.0.6" "version": "1.0.8"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "chat", "name": "chat",
"check": true, "check": true,
"bundle": "base/chat", "bundle": "base/chat",
"version": "1.0.6" "version": "1.0.8"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "newgroup", "name": "newgroup",
"check": true, "check": true,
"bundle": "base/newgroup", "bundle": "base/newgroup",
"version": "1.0.6" "version": "1.0.8"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "rank", "name": "rank",
"check": true, "check": true,
"version": "1.0.6", "version": "1.0.8",
"bundle": "base/rank" "bundle": "base/rank"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "main_majiang", "name": "main_majiang",
"check": true, "check": true,
"version": "1.0.6", "version": "1.0.8",
"bundle": "base/main_majiang" "bundle": "base/main_majiang"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "main_poker", "name": "main_poker",
"check": true, "check": true,
"version": "1.0.6", "version": "1.0.8",
"bundle": "base/main_poker" "bundle": "base/main_poker"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "main_zipai", "name": "main_zipai",
"check": true, "check": true,
"version": "1.0.6", "version": "1.0.8",
"bundle": "base/main_zipai" "bundle": "base/main_zipai"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "static", "name": "static",
"check": true, "check": true,
"bundle": "base/static", "bundle": "base/static",
"version": "1.0.6" "version": "1.0.8"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"is_res": true, "is_res": true,
"name": "embed", "name": "embed",
"check": true, "check": true,
"bundle": "base/embed", "bundle": "base/embed",
"version": "1.0.6" "version": "1.0.8"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "main_pokemajiang", "name": "main_pokemajiang",
"check": true, "check": true,
"version": "1.0.6", "version": "1.0.8",
"bundle": "base/main_pokemajiang" "bundle": "base/main_pokemajiang"
}, },
{ {
"ver": "1.0.6", "ver": "1.0.8",
"name": "main_zipaimajiang", "name": "main_zipaimajiang",
"check": true, "check": true,
"version": "1.0.6", "version": "1.0.8",
"bundle": "base/main_zipaimajiang" "bundle": "base/main_zipaimajiang"
} }
] ]

4
wb_unity_pro/ProjectSettings/ProjectSettings.asset
View File

@ -178,7 +178,7 @@ PlayerSettings:
buildNumber: buildNumber:
iPhone: 1 iPhone: 1
AndroidBundleVersionCode: 12 AndroidBundleVersionCode: 12
AndroidMinSdkVersion: 30 AndroidMinSdkVersion: 26
AndroidTargetSdkVersion: 30 AndroidTargetSdkVersion: 30
AndroidPreferredInstallLocation: 1 AndroidPreferredInstallLocation: 1
aotOptions: aotOptions:
@ -262,7 +262,7 @@ PlayerSettings:
AndroidEnableTango: 0 AndroidEnableTango: 0
androidEnableBanner: 0 androidEnableBanner: 0
androidUseLowAccuracyLocation: 0 androidUseLowAccuracyLocation: 0
androidUseCustomKeystore: 0 androidUseCustomKeystore: 1
m_AndroidBanners: m_AndroidBanners:
- width: 320 - width: 320
height: 180 height: 180