diff --git a/lua_probject/base_project/Game/View/Common/BaseView.lua b/lua_probject/base_project/Game/View/Common/BaseView.lua
index faa707ac..324cfe18 100644
--- a/lua_probject/base_project/Game/View/Common/BaseView.lua
+++ b/lua_probject/base_project/Game/View/Common/BaseView.lua
@@ -28,6 +28,8 @@ local view_url = {
"ui://Common/Gcm_BaseView",
"ui://Common/Gcm_BaseView_Full"
}
+
+local _views = {}
---
--@function [parent=#BaseView] InitView
--@param self
@@ -42,6 +44,7 @@ function M:InitView(url)
self._view:AddRelation(contentPane, RelationType.Size)
contentPane:AddChild(self._view)
self._contentPane = contentPane
+ _views[self.class] = self
end
function M:Show()
@@ -84,4 +87,9 @@ end
function M:Destroy()
self._is_destroy = true
self._root_view:Dispose()
+ _views[self.class] = nil
end
+
+function BaseView.FindView(class)
+ return _views[class] or nil
+end
\ No newline at end of file
diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua
index ae22f671..ecba835e 100644
--- a/lua_probject/base_project/Game/View/MainView.lua
+++ b/lua_probject/base_project/Game/View/MainView.lua
@@ -7,8 +7,8 @@ local PlayerDistanceView = import('.PlayerDistanceView')
local FGAssistView = import('.FGAssistView')
local function GetSeat(data, uId)
- for _,player in pairs(data.player_list) do
- if player.self_user.account_id == uId then
+ for _, player in pairs(data.player_list) do
+ if player.self_user.account_id == uId then
return player.seat
end
end
@@ -42,6 +42,7 @@ function M:init()
UIPackage.AddPackage('base/chat/ui/Chat')
self.Fix_Msg_Chat = ViewUtil.Fix_Msg_Chat -- 自动回复消息列表
self.Fix_Msg_Chat2 = nil -- 自动回复列表2
+ self.class = "MainView"
self:InitView()
self:SetTuoGuanState()
end
@@ -999,14 +1000,27 @@ end
-- 飘字
function M:OnFangziAnimation(...)
print("OnFangziAnimation")
- local arg = {...}
+ local arg = { ... }
pt(arg)
local fz = arg[1]
local playerid = arg[1].playerid
local fromPlayer = arg[1].from_seat
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
function M:OnUpdateInfo(...)
@@ -1137,6 +1151,15 @@ function M:SetLanguage(language)
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)
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)
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()
end
diff --git a/lua_probject/base_project/Game/View/PlayerInfoView.lua b/lua_probject/base_project/Game/View/PlayerInfoView.lua
index dbed8a23..b4fb878b 100644
--- a/lua_probject/base_project/Game/View/PlayerInfoView.lua
+++ b/lua_probject/base_project/Game/View/PlayerInfoView.lua
@@ -41,6 +41,8 @@ function M:init()
self._tex_player_name = player_name_score:GetChild('tex_player_name')
self._tex_player_id = player_name_score:GetChild('tex_player_id')
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_score1 = self._view:GetChild("info"):GetChild("tex_score1")
@@ -360,6 +362,49 @@ function M:RemoveMarkFromHead(key)
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()
self.isShowTGTimer = false
TimerManager.RemoveTimer(self.OnUpdate, self)
diff --git a/lua_probject/base_project/Game/View/PlayerInfoView2.lua b/lua_probject/base_project/Game/View/PlayerInfoView2.lua
index 9663ff5a..1ce5b86d 100644
--- a/lua_probject/base_project/Game/View/PlayerInfoView2.lua
+++ b/lua_probject/base_project/Game/View/PlayerInfoView2.lua
@@ -1,3 +1,5 @@
+local playerDetailView = import(".playerDetailView")
+
local PlayerInfoView = {
_view = nil,
_main_view = nil,
@@ -51,6 +53,9 @@ function M:init()
self._ctr_dismiss_room = view:GetController('dismiss_room')
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')
if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then
self.PlayerTGTips.displayObject.gameObject:SetActive(false)
@@ -119,6 +124,8 @@ function M:FillData(player)
function()
--local headView = HeadView.new(self._main_view._root_view, player.self_user, self._isHideIpAdds)
--headView:Show()
+ local _playerDetailView = playerDetailView.New()
+ _playerDetailView:Show(player)
end
)
else
@@ -352,4 +359,49 @@ function M:Destroy()
self.muShiPlayerUpdate = nil
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
diff --git a/lua_probject/extend_project/extend/majiang/100zhang/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/100zhang/EXClearingView.lua
index 11ed6d81..f638dcf6 100644
--- a/lua_probject/extend_project/extend/majiang/100zhang/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/100zhang/EXClearingView.lua
@@ -230,7 +230,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do
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
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")
for j=1,3 do
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
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")
for j=1,4 do
local card = item:GetChild("card_" .. j)
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
- card.icon = "ui://Main_Majiang/202_"..fz_card[i].card
+ card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end
end
end
@@ -504,7 +504,7 @@ function M:FillItemData(room, data, item, active_player, niao)
item:GetController("bg").selectedIndex=0
end
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
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
if currentNiaoList[i].score > 0 then
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
diff --git a/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua b/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua
index 77a50cea..dec4cf77 100644
--- a/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua
@@ -237,7 +237,7 @@ function M:EventInit()
info:UpdateHandCard(true, true)
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
info._view:AddChild(obj_win_card)
obj_win_card:Center()
diff --git a/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua
index 50b5ee85..1bd8ff5d 100644
--- a/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua
@@ -306,7 +306,7 @@ function M:FillItemData(room, data, item, active_player)
for j = 1, 4 do
local card = item:GetChild("card_" .. j)
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
card.icon = "ui://Main_Majiang/" .. self:GetPrefix() .. "202_" .. fz_card[i].card
end
diff --git a/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua b/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua
index 12b8a728..ac89fd5b 100644
--- a/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua
@@ -585,7 +585,7 @@ function M:__FangziTip(tip)
end
local btn_t = _lit_fanzi:AddItemFromPool(url)
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
end
btn_t.icon = "ui://Main_Majiang/fztip_" .. weight
diff --git a/lua_probject/extend_project/extend/majiang/chaoshan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/chaoshan/EXClearingView.lua
index f4d60988..cc38309c 100644
--- a/lua_probject/extend_project/extend/majiang/chaoshan/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/chaoshan/EXClearingView.lua
@@ -230,7 +230,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do
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
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")
for j=1,3 do
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
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")
for j=1,4 do
local card = item:GetChild("card_" .. j)
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
- card.icon = "ui://Main_Majiang/202_"..fz_card[i].card
+ card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end
end
end
@@ -504,7 +504,7 @@ function M:FillItemData(room, data, item, active_player, niao)
item:GetController("bg").selectedIndex=0
end
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
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
if currentNiaoList[i].score > 0 then
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
diff --git a/lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua
index 5b5905d1..cd837727 100644
--- a/lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua
@@ -237,7 +237,7 @@ function M:EventInit()
info:UpdateHandCard(true, true)
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
info._view:AddChild(obj_win_card)
obj_win_card:Center()
diff --git a/lua_probject/extend_project/extend/majiang/chaozhou/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/chaozhou/EXClearingView.lua
index 293a7f0e..ee73220b 100644
--- a/lua_probject/extend_project/extend/majiang/chaozhou/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/chaozhou/EXClearingView.lua
@@ -303,7 +303,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do
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
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")
for j=1,3 do
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
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")
for j=1,4 do
local card = item:GetChild("card_" .. j)
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
- card.icon = "ui://Main_Majiang/202_"..fz_card[i].card
+ card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end
end
end
@@ -577,15 +577,15 @@ function M:FillItemData(room, data, item, active_player, niao)
item:GetController("bg").selectedIndex=0
end
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
- 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")
lst_niao:RemoveChildrenToPool()
for i = 1, #niao do
if niao[i].score > 0 then
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--]]
@@ -598,7 +598,7 @@ function M:FillItemData(room, data, item, active_player, niao)
for i = 1, #currentNiaoList do
if currentNiaoList[i].score > 0 then
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
diff --git a/lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua
index c5a11d19..ab0848ea 100644
--- a/lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua
@@ -237,7 +237,7 @@ function M:EventInit()
info:UpdateHandCard(true, true)
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
info._view:AddChild(obj_win_card)
obj_win_card:Center()
diff --git a/lua_probject/extend_project/extend/majiang/chaozhougui/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/chaozhougui/EXClearingView.lua
index 7ec75dd7..af7fe80c 100644
--- a/lua_probject/extend_project/extend/majiang/chaozhougui/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/chaozhougui/EXClearingView.lua
@@ -230,7 +230,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do
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
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")
for j=1,3 do
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
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")
for j=1,4 do
local card = item:GetChild("card_" .. j)
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
- card.icon = "ui://Main_Majiang/202_"..fz_card[i].card
+ card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end
end
end
@@ -514,7 +514,7 @@ function M:FillItemData(room, data, item, active_player, niao)
item:GetController("bg").selectedIndex=0
end
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
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
if currentNiaoList[i].score > 0 then
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
diff --git a/lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua b/lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua
index 4cbe1951..d9d84379 100644
--- a/lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua
@@ -237,7 +237,7 @@ function M:EventInit()
info:UpdateHandCard(true, true)
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
info._view:AddChild(obj_win_card)
obj_win_card:Center()
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua
index fdf0b5bd..7b1ba9e8 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua
@@ -166,7 +166,7 @@ function M:fillResult0(room, peopleNum, result)
for l = 1, 4 do
local card = item:GetChild(string.format("Btn_Card%d", l))
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
card.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), fzCardInfo[j].card)
print("===============================FZType.Gang", room.jing, fzCardInfo[j].card)
@@ -214,7 +214,7 @@ function M:fillResult0(room, peopleNum, result)
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
huCardBtn:GetController('jing').selectedIndex = 1
end
@@ -223,7 +223,7 @@ function M:fillResult0(room, peopleNum, result)
jiangMaList.visible = true
jiangMaList:SetVirtual()
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('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0
end
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
index 7b2e1769..88d0710f 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
@@ -357,7 +357,7 @@ function M:EventInit()
info:UpdateHandCard(false, false)
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
info._view:AddChild(obj_win_card)
obj_win_card:Center()
diff --git a/lua_probject/extend_project/extend/majiang/gejiu/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/gejiu/EXClearingView.lua
index e4bd30a6..c82321cb 100644
--- a/lua_probject/extend_project/extend/majiang/gejiu/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/gejiu/EXClearingView.lua
@@ -237,7 +237,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do
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
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")
for j=1,3 do
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
elseif fz_card[i].type == FZType.Chi then
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
local card = item:GetChild("card_" .. j)
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
- card.icon = "ui://Main_Majiang/202_"..fz_card[i].card
+ card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end
end
end
@@ -482,7 +482,7 @@ function M:FillItemData(room, data, item, active_player, niao)
item:GetController("bg").selectedIndex=0
end
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
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
if currentNiaoList[i].score > 0 then
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
diff --git a/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua b/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua
index 3ef3b5b1..47d36b7b 100644
--- a/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua
@@ -238,7 +238,7 @@ function M:EventInit()
info:UpdateHandCard(true, true)
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
info._view:AddChild(obj_win_card)
obj_win_card:Center()
diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua
index d0597da6..8f76efea 100644
--- a/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua
@@ -216,7 +216,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do
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
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")
for j=1,3 do
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
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")
for j=1,4 do
local card = item:GetChild("card_" .. j)
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
- card.icon = "ui://Main_Majiang/202_"..fz_card[i].card
+ card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end
end
end
@@ -283,13 +283,13 @@ function M:FillItemData(room, data, item, active_player, niao)
end
local win_card = item:GetChild("win_card")
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")
lst_niao:RemoveChildrenToPool()
for i = 1, #niao do
if niao[i].score > 0 then
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
diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua
index b6514381..7744fc8b 100644
--- a/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua
@@ -194,7 +194,7 @@ function M:EventInit()
info:UpdateHandCard(true, true)
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
info._view:AddChild(obj_win_card)
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
local btn_t = _lit_fanzi:AddItemFromPool(url)
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
end
btn_t.icon = "ui://Main_Majiang/fztip_"..td_weight
diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua
index 82e01c09..1dc1b601 100644
--- a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua
@@ -166,7 +166,7 @@ function M:fillResult0(room, peopleNum, result)
for l = 1, 4 do
local card = item:GetChild(string.format("Btn_Card%d", l))
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
card.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), fzCardInfo[j].card)
print("===============================FZType.Gang", room.jing, fzCardInfo[j].card)
@@ -213,13 +213,13 @@ function M:fillResult0(room, peopleNum, result)
ziMoCtr.selectedIndex = 1
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
jiangMaList.visible = true
jiangMaList:SetVirtual()
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('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0
end
diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
index e5164d52..9698bb92 100644
--- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
@@ -354,7 +354,7 @@ function M:EventInit()
info:UpdateHandCard(true, false)
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
info._view:AddChild(obj_win_card)
obj_win_card:Center()
@@ -683,27 +683,27 @@ function M:__FangziTip(tip, weight)
index = index + 1
if _tlist[index].type == FZType.HU then
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
type.selectedIndex = FZType.Chi
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])
end
elseif _tlist[index].type == FZType.Peng then
type.selectedIndex = FZType.Peng
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)
end
else
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)
end
type.selectedIndex = FZType.Gang
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
obj.onClick:Set(function()
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
index ebc4e04c..0b43c9a7 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
@@ -179,7 +179,7 @@ function M:fillResult0(room, peopleNum, result)
for l = 1, 4 do
local card = item:GetChild(string.format("Btn_Card%d", l))
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
card.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), fzCardInfo[j].card)
print("===============================FZType.Gang", room.jing, fzCardInfo[j].card)
@@ -226,7 +226,7 @@ function M:fillResult0(room, peopleNum, result)
ziMoCtr.selectedIndex = 1
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
huCardBtn:GetController('jing').selectedIndex = 1
end
@@ -235,7 +235,7 @@ function M:fillResult0(room, peopleNum, result)
jiangMaList.visible = true
jiangMaList:SetVirtual()
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('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0
end
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
index 8f9a482f..b24d62fb 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
@@ -358,7 +358,7 @@ function M:EventInit()
info:UpdateHandCard(false, false)
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
info._view:AddChild(obj_win_card)
obj_win_card:Center()
@@ -689,27 +689,27 @@ function M:__FangziTip(tip, weight)
index = index + 1
if _tlist[index].type == FZType.HU then
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
type.selectedIndex = FZType.Chi
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])
end
elseif _tlist[index].type == FZType.Peng then
type.selectedIndex = FZType.Peng
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)
end
else
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)
end
type.selectedIndex = FZType.Gang
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
obj.onClick:Set(function()
diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua
index ff77cf49..0349b8a3 100644
--- a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua
@@ -164,7 +164,7 @@ function M:fillResult0(room, peopleNum, result)
for l = 1, 4 do
local card = item:GetChild(string.format("Btn_Card%d", l))
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
card.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), fzCardInfo[j].card)
print("===============================FZType.Gang", room.jing, fzCardInfo[j].card)
@@ -213,13 +213,13 @@ function M:fillResult0(room, peopleNum, result)
ziMoCtr.selectedIndex = 1
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
jiangMaList.visible = true
jiangMaList:SetVirtual()
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('jing').selectedIndex = infoJiangma[index + 1].card == room.jing and 1 or 0
end
diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
index ed5b51f1..534d5903 100644
--- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
@@ -356,7 +356,7 @@ function M:EventInit()
info:UpdateHandCard(false, false)
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
info._view:AddChild(obj_win_card)
obj_win_card:Center()
@@ -688,27 +688,27 @@ function M:__FangziTip(tip, weight)
index = index + 1
if _tlist[index].type == FZType.HU then
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
type.selectedIndex = FZType.Chi
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])
end
elseif _tlist[index].type == FZType.Peng then
type.selectedIndex = FZType.Peng
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)
end
else
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)
end
type.selectedIndex = FZType.Gang
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
obj.onClick:Set(function()
diff --git a/lua_probject/extend_project/extend/majiang/qizhiba/main/HuTipView.lua b/lua_probject/extend_project/extend/majiang/qizhiba/main/HuTipView.lua
index 9549187f..3f85ec0e 100644
--- a/lua_probject/extend_project/extend/majiang/qizhiba/main/HuTipView.lua
+++ b/lua_probject/extend_project/extend/majiang/qizhiba/main/HuTipView.lua
@@ -66,7 +66,7 @@ end
-- end
-- for i = 1, num do
-- 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
-- SetObjEnabled(self._view, true)
-- else
diff --git a/lua_probject/extend_project/extend/majiang/tuidaohu/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/tuidaohu/EXClearingView.lua
index 11ed6d81..f638dcf6 100644
--- a/lua_probject/extend_project/extend/majiang/tuidaohu/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/tuidaohu/EXClearingView.lua
@@ -230,7 +230,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do
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
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")
for j=1,3 do
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
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")
for j=1,4 do
local card = item:GetChild("card_" .. j)
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
- card.icon = "ui://Main_Majiang/202_"..fz_card[i].card
+ card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end
end
end
@@ -504,7 +504,7 @@ function M:FillItemData(room, data, item, active_player, niao)
item:GetController("bg").selectedIndex=0
end
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
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
if currentNiaoList[i].score > 0 then
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
diff --git a/lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua b/lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua
index d6378fc1..a59e8420 100644
--- a/lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua
@@ -237,7 +237,7 @@ function M:EventInit()
info:UpdateHandCard(true, true)
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
info._view:AddChild(obj_win_card)
obj_win_card:Center()
diff --git a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua
index 11b25aa3..9daafe0d 100644
--- a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua
@@ -147,7 +147,7 @@ function M:FillItemData(room, data, item, active_player, niao)
hand_list_view:RemoveChildrenToPool()
for i=1,#hand_cards do
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
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")
for j=1,3 do
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
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")
for j=1,4 do
local card = item:GetChild("card_" .. j)
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
- card.icon = "ui://Main_Majiang/202_"..fz_card[i].card
+ card.icon = "ui://Main_Majiang/b202_"..fz_card[i].card
end
end
end
@@ -214,13 +214,13 @@ function M:FillItemData(room, data, item, active_player, niao)
end
local win_card = item:GetChild("win_card")
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")
lst_niao:RemoveChildrenToPool()
for i = 1, #niao do
if niao[i].score > 0 then
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
diff --git a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua
index 013d7d11..92f49275 100644
--- a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua
@@ -189,7 +189,7 @@ function M:EventInit()
info:UpdateHandCard(true, true)
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
info._view:AddChild(obj_win_card)
obj_win_card:Center()
diff --git a/lua_probject/extend_project/extend/poker/mushi/MuShi_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/mushi/MuShi_PlayerSelfPokerInfoView.lua
index 2937df0c..80f9e854 100644
--- a/lua_probject/extend_project/extend/poker/mushi/MuShi_PlayerSelfPokerInfoView.lua
+++ b/lua_probject/extend_project/extend/poker/mushi/MuShi_PlayerSelfPokerInfoView.lua
@@ -82,7 +82,7 @@ function M:init()
self.carText = self.carType:GetChild("n1")
self.carText.text = ""
-- 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.btnBu = self._view:GetChild("bubu")
diff --git a/lua_probject/main_project/main/majiang/HuTipView.lua b/lua_probject/main_project/main/majiang/HuTipView.lua
index 372c55ca..5ae92292 100644
--- a/lua_probject/main_project/main/majiang/HuTipView.lua
+++ b/lua_probject/main_project/main/majiang/HuTipView.lua
@@ -61,7 +61,7 @@ end
-- end
-- for i = 1, num do
-- 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
-- SetObjEnabled(self._view, true)
-- else
diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml
index 92ad09be..7a3f0461 100644
--- a/wb_new_ui/assets/Common/package.xml
+++ b/wb_new_ui/assets/Common/package.xml
@@ -2093,11 +2093,12 @@
-
-
-
-
+
+
+
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml
index 6c90ea9b..06f2a73b 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml
@@ -1,8 +1,8 @@
-
-
+
+
@@ -24,11 +24,11 @@
-
+
-
+
@@ -48,6 +48,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -73,15 +109,15 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_FZCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_FZCard.xml
index 35833982..ff02d432 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_FZCard.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_FZCard.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_Tips.xml b/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_Tips.xml
index 6a92dbda..afe1560c 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_Tips.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_Tips.xml
@@ -1,6 +1,6 @@
-
+
@@ -21,19 +21,19 @@
-
+
-
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml
index 8d252c7e..d5d7a0e8 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml
@@ -10,7 +10,7 @@
-
+
@@ -69,11 +69,12 @@
-
+
-
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_2.xml
index d364eaf4..3d41a868 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_2.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_2.xml
@@ -1,7 +1,7 @@
-
+
@@ -10,6 +10,7 @@
+
@@ -63,5 +64,12 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
index 44aecd60..d832f4a3 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
@@ -1,7 +1,7 @@
-
+
@@ -10,6 +10,7 @@
+
@@ -63,5 +64,12 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index d2af391d..03c48639 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -1435,6 +1435,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png
index aa055221..d2a6c5ce 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png
index ec819adc..1093d5b6 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png
index 832d38e8..9c26b4b3 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png
index e5c00301..7b5767d0 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png
index a88dfac7..dfe33b42 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png
index 5cb64cb9..a3fd11e8 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png
index 0257d3a5..55423096 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
index b1358b1d..5ece1b0e 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
index 6bd60720..41df91d2 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png
index 6ecb3b85..d94fb7eb 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index 9d6b268c..d339a55e 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ
diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json
index a237b935..73dfe7ac 100644
--- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json
+++ b/wb_unity_pro/Assets/StreamingAssets/init1_1.json
@@ -1,9 +1,9 @@
[
{
- "ver": "1.0.27",
+ "ver": "1.0.29",
"name": "跑得快",
"check": true,
- "version": "1.0.27",
+ "version": "1.0.29",
"game_id": "66",
"bundle": "extend/poker/runfast"
},
@@ -32,26 +32,26 @@
"bundle": "extend/majiang/nancheng"
},
{
- "ver": "1.0.21",
+ "ver": "1.0.22",
"name": "黎川麻将",
"check": true,
- "version": "1.0.21",
+ "version": "1.0.22",
"game_id": "87",
"bundle": "extend/majiang/lichuan"
},
{
- "ver": "1.0.16",
+ "ver": "1.0.17",
"name": "金溪麻将",
"check": true,
- "version": "1.0.16",
+ "version": "1.0.17",
"game_id": "88",
"bundle": "extend/majiang/jinxi"
},
{
- "ver": "1.0.15",
+ "ver": "1.0.16",
"name": "抚州麻将",
"check": true,
- "version": "1.0.15",
+ "version": "1.0.16",
"game_id": "89",
"bundle": "extend/majiang/fuzhou"
}
diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json
index dbe4feae..af385fff 100644
--- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json
+++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json
@@ -1,109 +1,109 @@
[
{
"lua_path": "/tolua_project,/base_project,/main_project",
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "base_script",
"check": true,
"bundle": "base/base_script",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "common",
"check": true,
"bundle": "base/common",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "login",
"check": true,
"bundle": "base/login",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "lobby",
"check": true,
"bundle": "base/lobby",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "Family",
"check": true,
"bundle": "base/Family",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "chat",
"check": true,
"bundle": "base/chat",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "newgroup",
"check": true,
"bundle": "base/newgroup",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "rank",
"check": true,
- "version": "1.0.6",
+ "version": "1.0.8",
"bundle": "base/rank"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "main_majiang",
"check": true,
- "version": "1.0.6",
+ "version": "1.0.8",
"bundle": "base/main_majiang"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "main_poker",
"check": true,
- "version": "1.0.6",
+ "version": "1.0.8",
"bundle": "base/main_poker"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "main_zipai",
"check": true,
- "version": "1.0.6",
+ "version": "1.0.8",
"bundle": "base/main_zipai"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "static",
"check": true,
"bundle": "base/static",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"is_res": true,
"name": "embed",
"check": true,
"bundle": "base/embed",
- "version": "1.0.6"
+ "version": "1.0.8"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "main_pokemajiang",
"check": true,
- "version": "1.0.6",
+ "version": "1.0.8",
"bundle": "base/main_pokemajiang"
},
{
- "ver": "1.0.6",
+ "ver": "1.0.8",
"name": "main_zipaimajiang",
"check": true,
- "version": "1.0.6",
+ "version": "1.0.8",
"bundle": "base/main_zipaimajiang"
}
]
diff --git a/wb_unity_pro/ProjectSettings/ProjectSettings.asset b/wb_unity_pro/ProjectSettings/ProjectSettings.asset
index faebb3d4..59a779f4 100644
--- a/wb_unity_pro/ProjectSettings/ProjectSettings.asset
+++ b/wb_unity_pro/ProjectSettings/ProjectSettings.asset
@@ -178,7 +178,7 @@ PlayerSettings:
buildNumber:
iPhone: 1
AndroidBundleVersionCode: 12
- AndroidMinSdkVersion: 30
+ AndroidMinSdkVersion: 26
AndroidTargetSdkVersion: 30
AndroidPreferredInstallLocation: 1
aotOptions:
@@ -262,7 +262,7 @@ PlayerSettings:
AndroidEnableTango: 0
androidEnableBanner: 0
androidUseLowAccuracyLocation: 0
- androidUseCustomKeystore: 0
+ androidUseCustomKeystore: 1
m_AndroidBanners:
- width: 320
height: 180