diff --git a/lua_probject/base_project/Game/ExtendHotupdate.lua b/lua_probject/base_project/Game/ExtendHotupdate.lua
index d7ea7bec..7f8b7834 100644
--- a/lua_probject/base_project/Game/ExtendHotupdate.lua
+++ b/lua_probject/base_project/Game/ExtendHotupdate.lua
@@ -46,9 +46,9 @@ ExtendHotupdate = {
-- 正常
VERSION_NORMAL = 0,
-- 下载
- VERSION_DOWN = 0,
+ VERSION_DOWN = 1,
-- 更新
- VERSION_UPDATE = 0,
+ VERSION_UPDATE = 2,
}
function ExtendHotupdate.UpdateGameList(list, callback)
diff --git a/lua_probject/base_project/Game/View/PlayerInfoView2.lua b/lua_probject/base_project/Game/View/PlayerInfoView2.lua
index cd36e4a4..c1390c95 100644
--- a/lua_probject/base_project/Game/View/PlayerInfoView2.lua
+++ b/lua_probject/base_project/Game/View/PlayerInfoView2.lua
@@ -190,7 +190,7 @@ function M:UpdateScore(score, doAnimation)
self._tex_score.text = tostring(score)
if doAnimation then
- self:ScoreAnimation(lastScore - score)
+ self:ScoreAnimation(score - lastScore)
end
end
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
index 2fce60df..bb16c171 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
@@ -184,10 +184,13 @@ function M:UpdatePlayerInfoView()
end
function M:NewMJPlayerCardInfoView(view, index)
+ return MJMainView.NewMJPlayerCardInfoView(self, view, index)
+ --[[
if index == 1 then
return MJPlayerSelfCardInfoView.new(view, self)
end
return MJPlayerCardInfoView.new(view, self)
+ ]]
end
function M:EventInit()
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua
index f682eae2..24efda2a 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua
@@ -160,6 +160,7 @@ function M:EventInit()
info:MarkBank(p.seat == _room.banker_seat)
info:Ready(false)
local card_info = self._player_card_info[self:GetPos(p.seat)]
+ card_info:Clear()
card_info:UpdateHandCardWitness()
end
end)
@@ -342,10 +343,13 @@ function M:InitPlayerInfoView()
end
function M:NewMJPlayerCardInfoView(view, index)
+ return MJMainView.NewMJPlayerCardInfoView(self, view, index)
+ --[[
if index == 1 then
return MJPlayerSelfCardInfoView.new(view, self)
end
return MJPlayerCardInfoView.new(view, self)
+ ]]
end
function M:RemoveCursor()
diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
index 2c36ab8b..83f496e0 100644
--- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
@@ -184,10 +184,13 @@ function M:UpdatePlayerInfoView()
end
function M:NewMJPlayerCardInfoView(view, index)
+ return MJMainView.NewMJPlayerCardInfoView(self, view, index)
+ --[[
if index == 1 then
return MJPlayerSelfCardInfoView.new(view, self)
end
return MJPlayerCardInfoView.new(view, self)
+ ]]
end
function M:EventInit()
@@ -238,6 +241,7 @@ function M:EventInit()
info:MarkBank(p.seat == _room.banker_seat)
info:Ready(false)
local card_info = self._player_card_info[self:GetPos(p.seat)]
+ card_info:Clear()
card_info:UpdateHandCard()
end
end)
diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua
index d6223c81..ba1f170d 100644
--- a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua
+++ b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua
@@ -159,6 +159,7 @@ function M:EventInit()
info:MarkBank(p.seat == _room.banker_seat)
info:Ready(false)
local card_info = self._player_card_info[self:GetPos(p.seat)]
+ card_info:Clear()
card_info:UpdateHandCardWitness()
end
end)
@@ -341,10 +342,13 @@ function M:InitPlayerInfoView()
end
function M:NewMJPlayerCardInfoView(view, index)
+ return MJMainView.NewMJPlayerCardInfoView(self, view, index)
+ --[[
if index == 1 then
return MJPlayerSelfCardInfoView.new(view, self)
end
return MJPlayerCardInfoView.new(view, self)
+ ]]
end
function M:RemoveCursor()
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
index 2678ba90..566dd0a5 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
@@ -183,10 +183,13 @@ function M:UpdatePlayerInfoView()
end
function M:NewMJPlayerCardInfoView(view, index)
+ return MJMainView.NewMJPlayerCardInfoView(self, view, index)
+ --[[
if index == 1 then
return MJPlayerSelfCardInfoView.new(view, self)
end
return MJPlayerCardInfoView.new(view, self)
+ ]]
end
function M:EventInit()
@@ -238,6 +241,7 @@ function M:EventInit()
info:MarkBank(p.seat == _room.banker_seat)
info:Ready(false)
local card_info = self._player_card_info[self:GetPos(p.seat)]
+ card_info:Clear()
card_info:UpdateHandCard()
end
end)
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
index 87ad2468..a9b6c4fe 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
@@ -184,6 +184,7 @@ function M:EventInit()
info:MarkBank(p.seat == _room.banker_seat)
info:Ready(false)
local card_info = self._player_card_info[self:GetPos(p.seat)]
+ card_info:Clear()
card_info:UpdateHandCardWitness()
end
end)
@@ -366,10 +367,13 @@ function M:InitPlayerInfoView()
end
function M:NewMJPlayerCardInfoView(view, index)
+ return MJMainView.NewMJPlayerCardInfoView(self, view, index)
+ --[[
if index == 1 then
return MJPlayerSelfCardInfoView.new(view, self)
end
return MJPlayerCardInfoView.new(view, self)
+ ]]
end
function M:RemoveCursor()
diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
index 071cf20a..d0586b23 100644
--- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
@@ -182,10 +182,13 @@ function M:UpdatePlayerInfoView()
end
function M:NewMJPlayerCardInfoView(view, index)
+ return MJMainView.NewMJPlayerCardInfoView(self, view, index)
+ --[[
if index == 1 then
return MJPlayerSelfCardInfoView.new(view, self)
end
return MJPlayerCardInfoView.new(view, self)
+ ]]
end
function M:EventInit()
@@ -236,6 +239,7 @@ function M:EventInit()
info:MarkBank(p.seat == _room.banker_seat)
info:Ready(false)
local card_info = self._player_card_info[self:GetPos(p.seat)]
+ card_info:Clear()
card_info:UpdateHandCard()
end
end)
diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua
index 5fe70e9a..a9df19b9 100644
--- a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua
+++ b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua
@@ -159,6 +159,7 @@ function M:EventInit()
info:MarkBank(p.seat == _room.banker_seat)
info:Ready(false)
local card_info = self._player_card_info[self:GetPos(p.seat)]
+ card_info:Clear()
card_info:UpdateHandCardWitness()
end
end)
@@ -341,10 +342,13 @@ function M:InitPlayerInfoView()
end
function M:NewMJPlayerCardInfoView(view, index)
+ return MJMainView.NewMJPlayerCardInfoView(self, view, index)
+ --[[
if index == 1 then
return MJPlayerSelfCardInfoView.new(view, self)
end
return MJPlayerCardInfoView.new(view, self)
+ ]]
end
function M:RemoveCursor()
diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua
index 986bcc68..f5b59013 100644
--- a/lua_probject/main_project/main/majiang/MJMainView.lua
+++ b/lua_probject/main_project/main/majiang/MJMainView.lua
@@ -586,10 +586,33 @@ function M:PlayerChangeLineState()
end
function M:NewMJPlayerCardInfoView(view, index)
- if index == 1 then
- return MJPlayerSelfCardInfoView.new(view, self)
+ local infoView = {}
+ if self._room.room_config.people_num == 2 then
+ if index == 1 then
+ infoView = MJPlayerSelfCardInfoView.new(view, self, nil, "S")
+ elseif index == 2 then
+ infoView = MJPlayerCardInfoView.new(view, self, nil, "N")
+ end
+ elseif self._room.room_config.people_num == 3 then
+ if index == 1 then
+ infoView = MJPlayerSelfCardInfoView.new(view, self, nil, "S")
+ elseif index == 2 then
+ infoView = MJPlayerCardInfoView.new(view, self, nil, "E")
+ elseif index == 3 then
+ infoView = MJPlayerCardInfoView.new(view, self, nil, "N")
+ end
+ elseif self._room.room_config.people_num == 4 then
+ if index == 1 then
+ infoView = MJPlayerSelfCardInfoView.new(view, self, nil, "S")
+ elseif index == 2 then
+ infoView = MJPlayerCardInfoView.new(view, self, nil, "E")
+ elseif index == 3 then
+ infoView = MJPlayerCardInfoView.new(view, self, nil, "N")
+ elseif index == 4 then
+ infoView = MJPlayerCardInfoView.new(view, self, nil, "W")
+ end
end
- return MJPlayerCardInfoView.new(view, self)
+ return infoView
end
function M:RemoveCursor()
@@ -677,7 +700,7 @@ function M:OnResult1(...)
p.total_score = data[i].total_score
local card_info = self._player_card_info[self:GetPos(p.seat)]
local info = self._player_info[self:GetPos(p.seat)]
- card_info:Clear()
+ --card_info:Clear()
card_info:ResetCardType()
if _room:checkHpNonnegative() then
p.cur_hp = data[i].total_score
@@ -698,7 +721,7 @@ function M:OnResult1(...)
p.fz_list = {}
end
DataManager.CurrenRoom.self_player.card_list = {}
- self._state.selectedIndex = 2
+ --self._state.selectedIndex = 2
self._clearingView = nil
end)
end
@@ -804,9 +827,9 @@ function M:OnHuCard(...)
end
-- 扣分动画
- for _, player in pairs(scoreData) do
- local infoView = self._player_info[self:GetPos(player.seat)]
- infoView:UpdateScore(player.total_score, true)
+ for _, pScore in pairs(scoreData) do
+ local infoView = self._player_info[self:GetPos(pScore.seat)]
+ infoView:UpdateScore(pScore.total_score, true)
end
coroutine.wait(0.5)
diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
index b60a6d67..6113064f 100644
--- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
+++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
@@ -36,12 +36,13 @@ end
local M = PlayerCardInfoView
--- Create a new PlayerCardInfoView
-function M.new(view, mainView, record)
+function M.new(view, mainView, record, direction)
local self = {}
setmetatable(self, { __index = M })
self._view = view
self._mainView = mainView
self._flag_record = record
+ self.direction = direction
self:init()
return self
end
@@ -63,6 +64,14 @@ function M:init()
self._view_handCardList = self._view:GetChild('List_HandCard2')
self._view_getCard = self._view:GetChild('Btn_HandCard2')
end
+
+ if self.direction == "S" then
+ self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowHorizontal_left2right_bottom2top
+ elseif self.direction == "N" then
+ self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowHorizontal_right2left_top2bottom
+ elseif self.direction == "E" then
+ self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowVertical_right2left_bottom2top
+ end
end
function M:SetPlayer(p)
@@ -465,7 +474,6 @@ function M:ResetCardType()
end
function M:ShowHand(cards)
-
self._view_handCardList:RemoveChildren()
local list = self._view_handCardList
@@ -476,8 +484,11 @@ function M:ShowHand(cards)
end
--list:RemoveChildren()
+ local passcard = false
for _, card in pairs(cards) do
- if self.winCard ~= card then
+ if self.winCard == cards and passcard == false then
+ passcard = true
+ else
local obj = list:AddItemFromPool()
obj:GetChild("icon").url = 'ui://Main_Majiang/' .. cardType .. card
end
@@ -489,6 +500,7 @@ function M:ShowHuCard(card)
self._view_getCard:RemoveChildrenToPool()
local btn_card = self._view_getCard:AddItemFromPool()
btn_card:GetChild("icon").url = 'ui://Main_Majiang/' .. self._viewText_cardInfo['Out_Card'] .. card
+ self._ctr_getCard.selectedIndex = 1
end
return M
diff --git a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua
index d159dcdd..58d4415b 100644
--- a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua
+++ b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua
@@ -7,11 +7,12 @@ local PlayerSelfView = {
local M = PlayerSelfView
-function PlayerSelfView.new(view, mainView)
+function PlayerSelfView.new(view, mainView, record, direction)
setmetatable(M, { __index = MJPlayerCardInfoView })
local self = setmetatable({}, { __index = M })
self._view = view
self._mainView = mainView
+ self.direction = direction
self:init()
return self
end
diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml
index 59086f8e..3e8e3a82 100644
--- a/wb_new_ui/assets/Family/Main.xml
+++ b/wb_new_ui/assets/Family/Main.xml
@@ -104,7 +104,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Component/Btn_Card.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Component/Btn_Card.xml
new file mode 100644
index 00000000..87b7b873
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Component/Btn_Card.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Component/com_OutCard_Vertical.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Component/com_OutCard_Vertical.xml
new file mode 100644
index 00000000..549503ce
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Component/com_OutCard_Vertical.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_E.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml
similarity index 89%
rename from wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_E.xml
rename to wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml
index 88f10012..2dc58a3b 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_E.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml
@@ -13,7 +13,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_N.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml
similarity index 84%
rename from wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_N.xml
rename to wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml
index 1aa1ec49..e9147bcb 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_N.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml
@@ -1,10 +1,10 @@
-
+
-
+
@@ -25,15 +25,15 @@
-
+
-
-
-
+
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_S.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml
similarity index 83%
rename from wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_S.xml
rename to wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml
index 2103437a..fa7c4044 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_S.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml
@@ -1,5 +1,5 @@
-
+
@@ -35,32 +35,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_W.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml
similarity index 93%
rename from wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_W.xml
rename to wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml
index 769f5940..cd625791 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_W.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
index 0b2e63f8..2d8be209 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -17,10 +17,10 @@
-
+
-
+
@@ -28,7 +28,7 @@
-
+
@@ -37,7 +37,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
index c601ea21..882e6b11 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
@@ -1,6 +1,6 @@
-
+
@@ -14,13 +14,13 @@
-
+
-
+
-
+
@@ -30,7 +30,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
index 49f85627..c9952a30 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
@@ -1,6 +1,6 @@
-
+
@@ -15,16 +15,16 @@
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index 65f60b1f..918e4a71 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -1197,8 +1197,8 @@
-
-
+
+
@@ -1529,8 +1529,8 @@
-
-
+
+
@@ -1540,6 +1540,8 @@
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
index 3988927a..ef6a639c 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta
index 8ad5b8a4..ce321d26 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta
@@ -124,5 +124,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName:
+ assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_whhc1fo.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_whhc1fo.png.meta
index 04cf068a..d484e531 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_whhc1fo.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_whhc1fo.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName:
+ assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
assetBundleVariant:
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 925b0546..652939d6 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/Modules/FairyGUI/Scripts/UI/FieldTypes.cs b/wb_unity_pro/Assets/Modules/FairyGUI/Scripts/UI/FieldTypes.cs
index 02b1bf66..3ee6701d 100644
--- a/wb_unity_pro/Assets/Modules/FairyGUI/Scripts/UI/FieldTypes.cs
+++ b/wb_unity_pro/Assets/Modules/FairyGUI/Scripts/UI/FieldTypes.cs
@@ -127,7 +127,12 @@
SingleRow,
FlowHorizontal,
FlowVertical,
- Pagination
+ Pagination,
+
+ // 自定义LayoutType,实现倒叙渲染
+ FlowHorizontal_right2left_top2bottom, //水平右到左<<<<,上到下
+ FlowHorizontal_left2right_bottom2top, //水平左到右>>>>,下到上
+ FlowVertical_right2left_bottom2top, //垂直右到左<<<<,下到上
}
public enum ListSelectionMode
diff --git a/wb_unity_pro/Assets/Modules/FairyGUI/Scripts/UI/GList.cs b/wb_unity_pro/Assets/Modules/FairyGUI/Scripts/UI/GList.cs
index ef366b06..a750fa6a 100644
--- a/wb_unity_pro/Assets/Modules/FairyGUI/Scripts/UI/GList.cs
+++ b/wb_unity_pro/Assets/Modules/FairyGUI/Scripts/UI/GList.cs
@@ -2611,6 +2611,102 @@ namespace FairyGUI
ch = Mathf.CeilToInt(maxHeight);
}
}
+ else if (_layout == ListLayoutType.FlowHorizontal_left2right_bottom2top)
+ {
+ curY = viewHeight;
+ for (i = 0; i < cnt; i++)
+ {
+ child = GetChildAt(i);
+ if (foldInvisibleItems && !child.visible)
+ continue;
+
+ if (curX != 0)
+ curX += _columnGap;
+
+ if (_columnCount != 0 && j >= _columnCount
+ || _columnCount == 0 && curX + child.width > viewWidth && maxHeight != 0)
+ {
+ //new line
+ curX = 0;
+ curY -= Mathf.CeilToInt(maxHeight) + _lineGap;
+ maxHeight = 0;
+ j = 0;
+ }
+ child.SetXY(curX, curY - child.height);
+ curX += Mathf.CeilToInt(child.width);
+ if (curX > maxWidth)
+ maxWidth = curX;
+ if (child.height > maxHeight)
+ maxHeight = child.height;
+ j++;
+ }
+ ch = viewHeight;//curY + Mathf.CeilToInt(maxHeight);
+ cw = viewWidth;//Mathf.CeilToInt(maxWidth);
+ }
+ else if (_layout == ListLayoutType.FlowHorizontal_right2left_top2bottom)
+ {
+ curX = viewWidth; //curX = 0;
+
+ for (i = 0; i < cnt; i++)
+ {
+ child = GetChildAt(i);
+ if (foldInvisibleItems && !child.visible)
+ continue;
+
+ if (curX != viewWidth) //if (curX != 0)
+ curX -= _columnGap; //curX += _columnGap;
+ //if (_columnCount != 0 && j >= _columnCount || _columnCount == 0 && curX + child.width > viewWidth && maxHeight != 0)
+ if (_columnCount != 0 && j >= _columnCount || _columnCount == 0 && curX - child.width < 0 && maxHeight != 0)
+ {
+ //new line
+ curX = viewWidth; //curX = 0;
+ curY += Mathf.CeilToInt(maxHeight) + _lineGap;
+ maxHeight = 0;
+ j = 0;
+ }
+ child.SetXY(curX - child.width, curY);
+ curX -= Mathf.CeilToInt(child.width); //curX += Mathf.CeilToInt(child.width);
+ if (viewWidth - curX > maxWidth) //if (curX > maxWidth)
+ maxWidth = viewWidth - curX; //maxWidth = curX;
+ if (child.height > maxHeight)
+ maxHeight = child.height;
+ j++;
+ }
+ ch = viewHeight;//curY + Mathf.CeilToInt(maxHeight);
+ cw = viewWidth;//Mathf.CeilToInt(maxWidth);
+ }
+ else if (_layout == ListLayoutType.FlowVertical_right2left_bottom2top)
+ {
+ curY = viewHeight;
+ curX = viewWidth;
+ for (i = 0; i < cnt; i++)
+ {
+ child = GetChildAt(i);
+ if (foldInvisibleItems && !child.visible)
+ continue;
+
+ if (curY != viewHeight) //if (curY != 0)
+ curY -= _lineGap; //
+
+ if (_lineCount != 0 && j >= _lineCount
+ || _lineCount == 0 && curY - child.height < 0 && maxWidth != 0)
+ {
+ curY = viewHeight; //curY = 0;
+ curX -= Mathf.CeilToInt(maxWidth) + _columnGap; //curX += Mathf.CeilToInt(maxWidth) + _columnGap;
+ maxWidth = 0;
+ j = 0;
+ }
+ child.SetXY(curX - child.width, curY - child.height); //
+ curY -= child.height; //curY += child.height;
+ if (viewHeight - curY > maxHeight) //if (curY > maxHeight)
+ maxHeight = viewHeight - curY;
+ if (child.width > maxWidth)
+ maxWidth = child.width;
+ j++;
+ }
+ cw = viewWidth;//viewWidth - curX + Mathf.CeilToInt(maxWidth);
+ ch = viewHeight;//Mathf.CeilToInt(maxHeight);
+ }
else //pagination
{
int page = 0;
diff --git a/wb_unity_pro/Assets/Scripts/Editor/CustomSettings.cs b/wb_unity_pro/Assets/Scripts/Editor/CustomSettings.cs
index 1631bb30..4c979544 100644
--- a/wb_unity_pro/Assets/Scripts/Editor/CustomSettings.cs
+++ b/wb_unity_pro/Assets/Scripts/Editor/CustomSettings.cs
@@ -230,6 +230,7 @@ public static class CustomSettings
_GT(typeof(FairyGUI.TextField)),
_GT(typeof(EmojiDitc)),
_GT(typeof(EaseType)),
+ _GT(typeof(ListLayoutType)),
};
public static List dynamicList = new List()
diff --git a/wb_unity_pro/Assets/Scripts/GameApplication.cs b/wb_unity_pro/Assets/Scripts/GameApplication.cs
index 349e1e98..d679e2d3 100644
--- a/wb_unity_pro/Assets/Scripts/GameApplication.cs
+++ b/wb_unity_pro/Assets/Scripts/GameApplication.cs
@@ -64,10 +64,11 @@ public class GameApplication : MonoBehaviour
NetManager.TIMEOUT_TIME = 10;
NetManager.debug_print = false;
-
- // UIConfig.depthSupportForPaintingMode = false;
- // Singleton.GetInstance();
-
+
+ UIConfig.depthSupportForPaintingMode = true;
+ // UIConfig.depthSupportForPaintingMode = false;
+ // Singleton.GetInstance();
+
}
@@ -76,7 +77,7 @@ public class GameApplication : MonoBehaviour
{
SDKCallBack.Instance.AuthCallback = __OnWXCallBack;
SDKCallBack.Instance.ShareCallback = _OnSharecallback;
-
+ UIConfig.depthSupportForPaintingMode = true;
}
internal void StartGame()
diff --git a/wb_unity_pro/Assets/Scripts/HotUpdate.cs b/wb_unity_pro/Assets/Scripts/HotUpdate.cs
index bb2bea59..04911ef5 100644
--- a/wb_unity_pro/Assets/Scripts/HotUpdate.cs
+++ b/wb_unity_pro/Assets/Scripts/HotUpdate.cs
@@ -198,9 +198,9 @@ public class Hotupdate {
public void LoadAsset()
{
- Done = true;
- Progress = 1;
- return;
+ //Done = true; 屏蔽更新调试
+ //Progress = 1;
+ //return;
GameApplication.Instance.StartCoroutine(__LoadAsset());
}
diff --git a/wb_unity_pro/Assets/Source/Generate/FairyGUI_ListLayoutTypeWrap.cs b/wb_unity_pro/Assets/Source/Generate/FairyGUI_ListLayoutTypeWrap.cs
new file mode 100644
index 00000000..ae6bb910
--- /dev/null
+++ b/wb_unity_pro/Assets/Source/Generate/FairyGUI_ListLayoutTypeWrap.cs
@@ -0,0 +1,99 @@
+//this source code was auto-generated by tolua#, do not modify it
+using System;
+using LuaInterface;
+
+public class FairyGUI_ListLayoutTypeWrap
+{
+ public static void Register(LuaState L)
+ {
+ L.BeginEnum(typeof(FairyGUI.ListLayoutType));
+ L.RegVar("SingleColumn", get_SingleColumn, null);
+ L.RegVar("SingleRow", get_SingleRow, null);
+ L.RegVar("FlowHorizontal", get_FlowHorizontal, null);
+ L.RegVar("FlowVertical", get_FlowVertical, null);
+ L.RegVar("Pagination", get_Pagination, null);
+ L.RegVar("FlowHorizontal_right2left_top2bottom", get_FlowHorizontal_right2left_top2bottom, null);
+ L.RegVar("FlowHorizontal_left2right_bottom2top", get_FlowHorizontal_left2right_bottom2top, null);
+ L.RegVar("FlowVertical_right2left_bottom2top", get_FlowVertical_right2left_bottom2top, null);
+ L.RegFunction("IntToEnum", IntToEnum);
+ L.EndEnum();
+ TypeTraits.Check = CheckType;
+ StackTraits.Push = Push;
+ }
+
+ static void Push(IntPtr L, FairyGUI.ListLayoutType arg)
+ {
+ ToLua.Push(L, arg);
+ }
+
+ static bool CheckType(IntPtr L, int pos)
+ {
+ return TypeChecker.CheckEnumType(typeof(FairyGUI.ListLayoutType), L, pos);
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_SingleColumn(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.ListLayoutType.SingleColumn);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_SingleRow(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.ListLayoutType.SingleRow);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_FlowHorizontal(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.ListLayoutType.FlowHorizontal);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_FlowVertical(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.ListLayoutType.FlowVertical);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_Pagination(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.ListLayoutType.Pagination);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_FlowHorizontal_right2left_top2bottom(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.ListLayoutType.FlowHorizontal_right2left_top2bottom);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_FlowHorizontal_left2right_bottom2top(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.ListLayoutType.FlowHorizontal_left2right_bottom2top);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_FlowVertical_right2left_bottom2top(IntPtr L)
+ {
+ ToLua.Push(L, FairyGUI.ListLayoutType.FlowVertical_right2left_bottom2top);
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int IntToEnum(IntPtr L)
+ {
+ int arg0 = (int)LuaDLL.lua_tonumber(L, 1);
+ FairyGUI.ListLayoutType o = (FairyGUI.ListLayoutType)arg0;
+ ToLua.Push(L, o);
+ return 1;
+ }
+}
+
diff --git a/wb_unity_pro/Assets/Source/Generate/FairyGUI_ListLayoutTypeWrap.cs.meta b/wb_unity_pro/Assets/Source/Generate/FairyGUI_ListLayoutTypeWrap.cs.meta
new file mode 100644
index 00000000..7a4c03a0
--- /dev/null
+++ b/wb_unity_pro/Assets/Source/Generate/FairyGUI_ListLayoutTypeWrap.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 566c7c95380c94e48b7020e034ac315f
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/wb_unity_pro/Assets/Source/Generate/LuaBinder.cs b/wb_unity_pro/Assets/Source/Generate/LuaBinder.cs
index 8aa2890d..2f60dcb3 100644
--- a/wb_unity_pro/Assets/Source/Generate/LuaBinder.cs
+++ b/wb_unity_pro/Assets/Source/Generate/LuaBinder.cs
@@ -136,6 +136,7 @@ public static class LuaBinder
FairyGUI_ImageWrap.Register(L);
FairyGUI_TextFieldWrap.Register(L);
FairyGUI_EaseTypeWrap.Register(L);
+ FairyGUI_ListLayoutTypeWrap.Register(L);
FairyGUI_GearBaseWrap.Register(L);
FairyGUI_BaseFontWrap.Register(L);
L.RegFunction("GTweenCallback", FairyGUI_GTweenCallback);
diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json
index e718c23b..22e56200 100644
--- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json
+++ b/wb_unity_pro/Assets/StreamingAssets/init1_1.json
@@ -24,34 +24,34 @@
"bundle": "extend/poker2/suoha"
},
{
- "ver": "1.0.30",
+ "ver": "1.0.22",
"name": "南城麻将",
"check": true,
- "version": "1.0.30",
+ "version": "1.0.22",
"game_id": "86",
"bundle": "extend/majiang/nancheng"
},
{
- "ver": "1.0.31",
+ "ver": "1.0.33",
"name": "黎川麻将",
"check": true,
- "version": "1.0.31",
+ "version": "1.0.33",
"game_id": "87",
"bundle": "extend/majiang/lichuan"
},
{
- "ver": "1.0.17",
+ "ver": "1.0.19",
"name": "金溪麻将",
"check": true,
- "version": "1.0.17",
+ "version": "1.0.19",
"game_id": "88",
"bundle": "extend/majiang/jinxi"
},
{
- "ver": "1.0.16",
+ "ver": "1.0.18",
"name": "抚州麻将",
"check": true,
- "version": "1.0.16",
+ "version": "1.0.18",
"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 af385fff..20648be7 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.8",
+ "ver": "1.0.7",
"name": "base_script",
"check": true,
"bundle": "base/base_script",
- "version": "1.0.8"
+ "version": "1.0.7"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "common",
"check": true,
"bundle": "base/common",
- "version": "1.0.8"
+ "version": "1.0.7"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "login",
"check": true,
"bundle": "base/login",
- "version": "1.0.8"
+ "version": "1.0.7"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "lobby",
"check": true,
"bundle": "base/lobby",
- "version": "1.0.8"
+ "version": "1.0.7"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "Family",
"check": true,
"bundle": "base/Family",
- "version": "1.0.8"
+ "version": "1.0.7"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "chat",
"check": true,
"bundle": "base/chat",
- "version": "1.0.8"
+ "version": "1.0.7"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "newgroup",
"check": true,
"bundle": "base/newgroup",
- "version": "1.0.8"
+ "version": "1.0.7"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "rank",
"check": true,
- "version": "1.0.8",
+ "version": "1.0.7",
"bundle": "base/rank"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "main_majiang",
"check": true,
- "version": "1.0.8",
+ "version": "1.0.7",
"bundle": "base/main_majiang"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "main_poker",
"check": true,
- "version": "1.0.8",
+ "version": "1.0.7",
"bundle": "base/main_poker"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "main_zipai",
"check": true,
- "version": "1.0.8",
+ "version": "1.0.7",
"bundle": "base/main_zipai"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "static",
"check": true,
"bundle": "base/static",
- "version": "1.0.8"
+ "version": "1.0.7"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"is_res": true,
"name": "embed",
"check": true,
"bundle": "base/embed",
- "version": "1.0.8"
+ "version": "1.0.7"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "main_pokemajiang",
"check": true,
- "version": "1.0.8",
+ "version": "1.0.7",
"bundle": "base/main_pokemajiang"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.7",
"name": "main_zipaimajiang",
"check": true,
- "version": "1.0.8",
+ "version": "1.0.7",
"bundle": "base/main_zipaimajiang"
}
]
diff --git a/wb_unity_pro/ProjectSettings/TagManager.asset b/wb_unity_pro/ProjectSettings/TagManager.asset
index 2fdb6669..420ff4d7 100644
--- a/wb_unity_pro/ProjectSettings/TagManager.asset
+++ b/wb_unity_pro/ProjectSettings/TagManager.asset
@@ -36,8 +36,8 @@ TagManager:
-
-
-
- -
- -
+ - VUI
+ - Hidden VUI
m_SortingLayers:
- name: Default
uniqueID: 0