lingmeng
/
jx_client_neibu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

房卡同步

master
罗家炜 2025-09-03 18:22:12 +08:00
parent 8fc28196b4
commit 9095bbd8cf
16 changed files with 79 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua
View File

@ -363,7 +363,7 @@ function M:NumberRecordDetailRender()
obj:GetChild('text_gameName').text = info.game_info.name obj:GetChild('text_gameName').text = info.game_info.name
obj:GetChild('text_time').text = os.date('%Y-%m-%d\n%H:%M', info.create_time) obj:GetChild('text_time').text = os.date('%Y-%m-%d\n%H:%M', info.create_time)
obj:GetChild('text_roomID').text = info.room_id obj:GetChild('text_roomID').text = info.room_id
obj:GetChild('text_userDiamond').text = info.info obj:GetChild('text_userDiamond').text = info.valid_diamo
obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc
obj:GetChild('text_playName').text = info.pname obj:GetChild('text_playName').text = info.pname
obj:GetChild('btn_lookRecord').onClick:Set(function() obj:GetChild('btn_lookRecord').onClick:Set(function()
@ -563,7 +563,8 @@ function M:RecursionGetNumberRecord(fgCtr, groupId, uid, index)
if records and #records > 0 then if records and #records > 0 then
for i = 1, #records do for i = 1, #records do
local info = records[i] local info = records[i]
local tempTableChild = self.records[info.game_info.gameType][tonumber(info.is_read) + 1] local tempTableChild = self.records[info.game_info.gameType]
[tonumber(info[string.format("is_read_%s", uid)]) + 1]
info.totalScore = json.decode(info.totalScore) info.totalScore = json.decode(info.totalScore)
local totalScore local totalScore
for i = 1, #info.totalScore do for i = 1, #info.totalScore do

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

@ -615,7 +615,7 @@ function M:RunNiao(list, start_seat)
local card = list[i].card local card = list[i].card
coroutine.wait(0.3) coroutine.wait(0.3)
item:GetTransition("appear"):Play() item:GetTransition("appear"):Play()
item.icon = UIPackage.GetItemURL("Main_Majiang", "201_" .. card) item.icon = UIPackage.GetItemURL("Main_Majiang", "b201_" .. card)
if list[i].score > 0 then item:GetController("bg").selectedIndex = 1 end if list[i].score > 0 then item:GetController("bg").selectedIndex = 1 end
end end
coroutine.start(function() coroutine.start(function()

3
lua_probject/extend_project/extend/majiang/100zhang/EXPlayBackView.lua
View File

@ -17,7 +17,6 @@ function M.new()
return self return self
end end
function M:InitView(url) function M:InitView(url)
local room = self._room local room = self._room
UIPackage.AddPackage("extend/majiang/100zhang/ui/Extend_MJ_100Zhang") UIPackage.AddPackage("extend/majiang/100zhang/ui/Extend_MJ_100Zhang")
@ -125,7 +124,7 @@ function M:ShowStep(index)
list:RemoveChildrenToPool() list:RemoveChildrenToPool()
for i = 1, #niao_list do for i = 1, #niao_list do
local item = list:AddItemFromPool() local item = list:AddItemFromPool()
item.icon = UIPackage.GetItemURL("Main_Majiang", "201_"..niao_list[i].card) item.icon = UIPackage.GetItemURL("Main_Majiang", "b201_" .. niao_list[i].card)
if niao_list[i].score > 0 then if niao_list[i].score > 0 then
item:GetController("bg").selectedIndex = 2 item:GetController("bg").selectedIndex = 2
end end

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

@ -292,10 +292,13 @@ function M:fillResult1(room, peopleNum, total_result)
local bigWin = { seat = -1, score = 0 } local bigWin = { seat = -1, score = 0 }
local bestPao = { seat = -1, times = 0 } local bestPao = { seat = -1, times = 0 }
--循环数据得出分数最大的大赢家，以及点炮次数最多的最佳炮手 --循环数据得出分数最大的大赢家，以及点炮次数最多的最佳炮手
for i = 1, total_result.info_list do for i = 1, #total_result.info_list do
if total_result.info_list[i].total_score > bigWin.score then if total_result.info_list[i].total_score > bigWin.score then
bigWin = { seat = total_result.info_list[i].seat, score = total_result.info_list[i].total_score } bigWin = { seat = total_result.info_list[i].seat, score = total_result.info_list[i].total_score }
end end
if total_result.info_list[i].settle_log.fangpao and total_result.info_list[i].settle_log.fangpao > bestPao.times then
bestPao = { seat = total_result.info_list[i].seat, times = total_result.info_list[i].settle_log.fangpao }
end
end end
for i, v in pairs(DataManager.SelfUser.games) do for i, v in pairs(DataManager.SelfUser.games) do
if v.game_id == room.game_id then if v.game_id == room.game_id then
@ -332,8 +335,17 @@ function M:fillResult1(room, peopleNum, total_result)
totalInfoList.settle_log.ming_kong or 0) totalInfoList.settle_log.ming_kong or 0)
resultInfoComp:GetChild('Text_FangGang').text = string.format("放杠 %d次", resultInfoComp:GetChild('Text_FangGang').text = string.format("放杠 %d次",
totalInfoList.settle_log.fanggang or 0) totalInfoList.settle_log.fanggang or 0)
resultInfoComp:GetController("win").selectedIndex = totalInfoList.total_score >= 0 and 1 or 0 resultInfoComp:GetController("win").selectedIndex = totalInfoList.total_score >= 0 and 1 or 0
if totalInfoList.seat == bigWin.seat then
resultInfoComp:GetController("bigWin").selectedIndex = 1
else
resultInfoComp:GetController("bigWin").selectedIndex = 0
end
if totalInfoList.seat == bestPao.seat then
resultInfoComp:GetController("fangPao").selectedIndex = 1
else
resultInfoComp:GetController("fangPao").selectedIndex = 0
end
end end
end end

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

@ -838,7 +838,7 @@ function M:RunNiao(list, start_seat)
local card = list[i].card local card = list[i].card
coroutine.wait(0.3) coroutine.wait(0.3)
item:GetTransition("appear"):Play() item:GetTransition("appear"):Play()
item.icon = UIPackage.GetItemURL("Main_Majiang", "201_" .. card) item.icon = UIPackage.GetItemURL("Main_Majiang", "b201_" .. card)
if list[i].score > 0 then item:GetController("bg").selectedIndex = 1 end if list[i].score > 0 then item:GetController("bg").selectedIndex = 1 end
end end
coroutine.start(function() coroutine.start(function()
@ -1007,7 +1007,7 @@ function M:FillShowCards(obj, card, num)
if obj.icon then if obj.icon then
obj.icon = 'ui://Main_Majiang/b201_' .. card obj.icon = 'ui://Main_Majiang/b201_' .. card
else else
obj:GetChild("icon").url = 'ui://Main_Majiang/201_' .. card obj:GetChild("icon").url = 'ui://Main_Majiang/b201_' .. card
end end
if obj.title then if obj.title then
obj.title = string.format("%d张", num) obj.title = string.format("%d张", num)

2
lua_probject/extend_project/extend/majiang/lichuan/EXPlayBackView.lua
View File

@ -124,7 +124,7 @@ function M:ShowStep(index)
list:RemoveChildrenToPool() list:RemoveChildrenToPool()
for i = 1, #niao_list do for i = 1, #niao_list do
local item = list:AddItemFromPool() local item = list:AddItemFromPool()
item.icon = UIPackage.GetItemURL("Main_Majiang", "201_" .. niao_list[i].card) item.icon = UIPackage.GetItemURL("Main_Majiang", "b201_" .. niao_list[i].card)
if niao_list[i].score > 0 then if niao_list[i].score > 0 then
item:GetController("bg").selectedIndex = 2 item:GetController("bg").selectedIndex = 2
end end

2
lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
View File

@ -421,7 +421,7 @@ end
function M:ShowJing() function M:ShowJing()
if self._room.jing then if self._room.jing then
self.jing.visible = true self.jing.visible = true
MJPlayerCardInfoView.fillCard2(self, self.jing, "202_", self._room.jing) MJPlayerCardInfoView.fillCard2(self, self.jing, "b202_", self._room.jing)
else else
self.jing.visible = false self.jing.visible = false
end end

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

@ -858,7 +858,7 @@ end
function M:ShowJing() function M:ShowJing()
if self._room.jing then if self._room.jing then
self.jing.visible = true self.jing.visible = true
MJPlayerCardInfoView.fillCard2(self, self.jing, "202_", self._room.jing) MJPlayerCardInfoView.fillCard2(self, self.jing, "b202_", self._room.jing)
else else
self.jing.visible = false self.jing.visible = false
end end

7
lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
View File

@ -501,13 +501,6 @@ function M:ShowHand(cards)
self:fillCard2(obj, cardType, card, 1) self:fillCard2(obj, cardType, card, 1)
end end
end end
if flag_isme then
self._view_getCard:GetChildAt(0):GetController('showhang').selectedIndex = 1
self._view_getCard:GetChildAt(0):GetController('special_jing').selectedIndex = self._view_getCard:GetChildAt(0)
:GetController('jing').selectedIndex
self._view_getCard:GetChildAt(0):GetController('jing').selectedIndex = 0
end
end end
function M:ShowHuCard(card, flag_isme) function M:ShowHuCard(card, flag_isme)

3
wb_new_ui/assets/Family/ChatRoom/Component/item_player.xml
View File

@ -3,12 +3,13 @@
<controller name="cWiner" pages="0,,1," selected="0"> <controller name="cWiner" pages="0,,1," selected="0">
<remark page="1" value="大赢家"/> <remark page="1" value="大赢家"/>
</controller> </controller>
<controller name="cCouler" pages="0,,1," selected="0"/>
<displayList> <displayList>
<image id="n6_j0cy" name="n6" src="j0cy7d4s" fileName="ChatRoom/Image/Rectangle 266.png" xy="-15,0" size="333,168"/> <image id="n6_j0cy" name="n6" src="j0cy7d4s" fileName="ChatRoom/Image/Rectangle 266.png" xy="-15,0" size="333,168"/>
<loader id="n0_ieus" name="loader_icon" xy="30,15" size="96,96" url="ui://27vd145bnlvy7iab" align="center" vAlign="middle" fill="scaleMatchHeight"/> <loader id="n0_ieus" name="loader_icon" xy="30,15" size="96,96" url="ui://27vd145bnlvy7iab" align="center" vAlign="middle" fill="scaleMatchHeight"/>
<text id="n1_ieus" name="tex_name" xy="135,15" size="164,49" font="Alimama FangYuanTi VF" fontSize="36" color="#8e0305" vAlign="middle" leading="-2" autoSize="none" text="用户名称"/> <text id="n1_ieus" name="tex_name" xy="135,15" size="164,49" font="Alimama FangYuanTi VF" fontSize="36" color="#8e0305" vAlign="middle" leading="-2" autoSize="none" text="用户名称"/>
<text id="n2_ieus" name="tex_id" xy="135,57" size="164,38" font="Alimama FangYuanTi VF" fontSize="27" color="#666666" vAlign="middle" leading="-2" autoSize="none" text="999999"/> <text id="n2_ieus" name="tex_id" xy="135,57" size="164,38" font="Alimama FangYuanTi VF" fontSize="27" color="#666666" vAlign="middle" leading="-2" autoSize="none" text="999999"/>
<text id="n3_ieus" name="tex_score" xy="21,106" size="113,64" font="Alimama FangYuanTi VF" fontSize="48" color="#ff0d11" align="center" vAlign="middle" leading="-2" autoSize="none" text="+99"/> <text id="n3_ieus" name="tex_score" xy="21,106" size="113,64" font="Alimama FangYuanTi VF" fontSize="48" color="#00ff00" align="center" vAlign="middle" leading="-2" autoSize="none" text="+99"/>
<image id="n4_ieus" name="n4" src="ieus7d1k" fileName="Main/Image/Rectangle 264.png" xy="0,0" size="6,168"/> <image id="n4_ieus" name="n4" src="ieus7d1k" fileName="Main/Image/Rectangle 264.png" xy="0,0" size="6,168"/>
<image id="n5_ieus" name="n5" src="ieus7d1m" fileName="ChatRoom/Image/dayingjia.png" xy="153,81"> <image id="n5_ieus" name="n5" src="ieus7d1m" fileName="ChatRoom/Image/dayingjia.png" xy="153,81">
<gearDisplay controller="cWiner" pages="1"/> <gearDisplay controller="cWiner" pages="1"/>

8
wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChild.xml
View File

@ -14,16 +14,16 @@
<component id="n0_jrro" name="n0" src="jrro7cxm" fileName="NumberRecord/Component/Multiple_choose.xml" xy="48,42"> <component id="n0_jrro" name="n0" src="jrro7cxm" fileName="NumberRecord/Component/Multiple_choose.xml" xy="48,42">
<Button controller="seleted" page="1"/> <Button controller="seleted" page="1"/>
</component> </component>
<text id="n2_jrro" name="text_gameName" xy="192,47" size="182,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" autoSize="none" text="麻将麻将&#xA;"> <text id="n2_jrro" name="text_gameName" xy="181,47" size="205,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="麻将麻将&#xA;">
<relation target="" sidePair="center-center,middle-middle"/> <relation target="" sidePair="center-center,middle-middle"/>
</text> </text>
<text id="n4_jrro" name="text_time" xy="434,28" size="208,103" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#444444" align="center" autoSize="none" text="2025-05-19 14:23:01"> <text id="n4_jrro" name="text_time" xy="424,28" size="208,103" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#444444" align="center" autoSize="none" text="2025-05-19 14:23:01">
<relation target="" sidePair="center-center,middle-middle"/> <relation target="" sidePair="center-center,middle-middle"/>
</text> </text>
<text id="n6_jrro" name="text_roomID" xy="673,48" size="177,54" font="ui://27vd145bg2mo7ij0" fontSize="40" color="#444444" text="12345678"> <text id="n6_jrro" name="text_roomID" xy="663,48" size="177,54" font="ui://27vd145bg2mo7ij0" fontSize="40" color="#444444" text="12345678">
<relation target="" sidePair="center-center,middle-middle"/> <relation target="" sidePair="center-center,middle-middle"/>
</text> </text>
<text id="n8_jrro" name="text_userDiamond" xy="881,48" size="72,54" font="ui://27vd145bg2mo7ij0" fontSize="40" color="#444444" text="999"> <text id="n8_jrro" name="text_userDiamond" xy="871,48" size="72,54" font="ui://27vd145bg2mo7ij0" fontSize="40" color="#444444" align="center" vAlign="middle" text="999">
<relation target="" sidePair="center-center,middle-middle"/> <relation target="" sidePair="center-center,middle-middle"/>
</text> </text>
<richtext id="n24_jzul" name="text_playName" xy="1871,27" size="283,102" font="ui://27vd145bg2mo7ij0" fontSize="40" color="#444444" align="center" vAlign="middle" autoSize="none" text="好几个备注"> <richtext id="n24_jzul" name="text_playName" xy="1871,27" size="283,102" font="ui://27vd145bg2mo7ij0" fontSize="40" color="#444444" align="center" vAlign="middle" autoSize="none" text="好几个备注">

2
wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChildTitle.xml
View File

@ -18,7 +18,7 @@
<relation target="" sidePair="center-center,middle-middle"/> <relation target="" sidePair="center-center,middle-middle"/>
</text> </text>
<image id="n22_jzul" name="n22" src="jzul7d6e" fileName="NumberRecord/Image/hall_club_BG_landifang.png" xy="868,0" size="96,72"/> <image id="n22_jzul" name="n22" src="jzul7d6e" fileName="NumberRecord/Image/hall_club_BG_landifang.png" xy="868,0" size="96,72"/>
<text id="n8_jrro" name="n8" xy="871,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="房卡"> <text id="n8_jrro" name="n8" xy="865,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="房卡">
<relation target="" sidePair="center-center,middle-middle"/> <relation target="" sidePair="center-center,middle-middle"/>
</text> </text>
<image id="n23_jzul" name="n23" src="jzul7d6e" fileName="NumberRecord/Image/hall_club_BG_landifang.png" xy="971,0" size="886,72"/> <image id="n23_jzul" name="n23" src="jzul7d6e" fileName="NumberRecord/Image/hall_club_BG_landifang.png" xy="971,0" size="886,72"/>

2
wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailResultChild.xml
View File

@ -8,6 +8,6 @@
<gearColor controller="colour" pages="0,1" values="#0000ff,#000000|#ff0000,#000000"/> <gearColor controller="colour" pages="0,1" values="#0000ff,#000000|#ff0000,#000000"/>
<relation target="n0_jrro" sidePair="left-left"/> <relation target="n0_jrro" sidePair="left-left"/>
</text> </text>
<text id="n2_jrro" name="text_name" xy="0,0" size="152,42" font="Alimama FangYuanTi VF" fontSize="24" align="center" vAlign="middle" autoSize="ellipsis" text="超级长长长长长"/> <text id="n2_jrro" name="text_name" xy="0,0" size="152,42" fontSize="24" align="center" vAlign="middle" autoSize="ellipsis" text="超级长长长长长"/>
</displayList> </displayList>
</component> </component>

15
wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_ResultInfo.xml
View File

@ -1,19 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="462,759"> <component size="462,759">
<controller name="win" pages="0,输,1,赢" selected="1"/> <controller name="win" pages="0,输,1,赢" selected="1"/>
<controller name="fangPao" pages="0,,1," selected="0"/> <controller name="fangPao" pages="0,,1," selected="1"/>
<controller name="bigWin" pages="0,,1," selected="0"/>
<displayList> <displayList>
<image id="n0_yry6" name="n0" src="yry6z7" fileName="Main_new_2/Clearing/Image/final_result_bgCell1 1.png" xy="0,0"> <image id="n0_yry6" name="n0" src="yry6z7" fileName="Main_new/Clearing/Image/final_result_bgCell1 1.png" xy="0,0">
<gearDisplay controller="win" pages="0"/> <gearDisplay controller="win" pages="0"/>
</image> </image>
<image id="n1_yry6" name="n1" src="yry6z8" fileName="Main_new_2/Clearing/Image/final_result_bgCell2 1.png" xy="0,0"> <image id="n1_yry6" name="n1" src="yry6z8" fileName="Main_new/Clearing/Image/final_result_bgCell2 1.png" xy="0,0">
<gearDisplay controller="win" pages="1"/> <gearDisplay controller="win" pages="1"/>
</image> </image>
<graph id="n3_yry6" name="bg_head" xy="42,48" size="120,120" type="rect" lineSize="2" lineColor="#ff804b2e" fillColor="#ffe0a94f" corner="12"/> <graph id="n3_yry6" name="bg_head" xy="42,48" size="120,120" type="rect" lineSize="2" lineColor="#ff804b2e" fillColor="#ffe0a94f" corner="12"/>
<image id="n2_yry6" name="n2" src="yry6z9" fileName="Main_new_2/Clearing/Image/final_result_bigWin 1.png" xy="39,-36"> <image id="n2_yry6" name="n2" src="yry6z9" fileName="Main_new/Clearing/Image/final_result_bigWin 1.png" xy="39,-36">
<gearDisplay controller="win" pages="1"/> <gearDisplay controller="bigWin" pages="1"/>
</image> </image>
<component id="n4_yry6" name="Btn_Head" src="yry6zg" fileName="Main_new_2/Clearing/Component/Btn_Head_End.xml" xy="47,53"/> <component id="n4_yry6" name="Btn_Head" src="yry6zg" fileName="Main_new/Clearing/Component/Btn_Head_End.xml" xy="47,53"/>
<text id="n5_yry6" name="Text_Name" xy="174,63" size="249,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#b76734" autoSize="shrink" text="微信用户1111"> <text id="n5_yry6" name="Text_Name" xy="174,63" size="249,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#b76734" autoSize="shrink" text="微信用户1111">
<relation target="" sidePair="left-left,top-top"/> <relation target="" sidePair="left-left,top-top"/>
</text> </text>
@ -41,7 +42,7 @@
<text id="n13_yry6" name="Text_TotalScore" xy="169,615" size="121,103" font="ui://27vd145bh35o7ik0" fontSize="79" color="#f9e782" text="+12"> <text id="n13_yry6" name="Text_TotalScore" xy="169,615" size="121,103" font="ui://27vd145bh35o7ik0" fontSize="79" color="#f9e782" text="+12">
<gearColor controller="win" pages="0" values="#bed9e3,#000000" default="#f9e782,#000000"/> <gearColor controller="win" pages="0" values="#bed9e3,#000000" default="#f9e782,#000000"/>
</text> </text>
<image id="n14_yry6" name="Img_FangPao" src="yry6z6" fileName="Main_new_2/Clearing/Image/allCalculation_img_paoshou 1.png" xy="294,456"> <image id="n14_yry6" name="Img_FangPao" src="yry6z6" fileName="Main_new/Clearing/Image/allCalculation_img_paoshou 1.png" xy="294,456">
<gearDisplay controller="fangPao" pages="1"/> <gearDisplay controller="fangPao" pages="1"/>
</image> </image>
</displayList> </displayList>

BIN
wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
View File

Binary file not shown.

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

Binary file not shown.