diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua
index b4e31de1..3ab1d402 100644
--- a/lua_probject/base_project/Game/Controller/NewGroupController.lua
+++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua
@@ -242,10 +242,14 @@ function M:FG_GroupMembers12(group_id, limit, num, type, online, callback)
if res.ReturnCode == 0 then
local group = DataManager.groups:get(group_id)
local members = res.Data.members
- for i = 1, #members do
- local m = members[i]
- group:addMember(m)
+
+ if #members>0 then
+ for i = 1, #members do
+ local m = members[i]
+ group:addMember(m)
+ end
end
+
end
callback(res)
end)
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua
index f5e81015..0ff14db3 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua
@@ -220,7 +220,7 @@ function M:GetMemberData(index)
if index == 0 then
group:clearMember()
end
-
+
ViewUtil.ShowModalWait(nil, "亲友圈成员较多，请稍后")
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GroupMembers12(
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua
index 20e79fa9..279dc908 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua
@@ -225,7 +225,7 @@ function M:GetMemberData(index)
if index == 0 then
group:clearMember()
end
-
+
ViewUtil.ShowModalWait(nil)
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GroupMembers12(
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua
index ddf18cb2..4255deaf 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua
@@ -241,7 +241,7 @@ function M:GetMemberData(index)
if i == #allmembers then
allFlag = true
end
- pt(member)
+
if member.lev < 3 or member.partnerLev ~= 0 then
table.insert(self.member_data, member)
sendRequest = sendRequest + 1
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua
index 82311be9..d8041546 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua
@@ -457,6 +457,7 @@ function M:OnRenderRecordItemNew(obj, mainRecord, root_id)
if not root_id and not mainRecord.partnerLev then
ViewUtil.ShowModalWait("正在获取成员中")
self:RecursionGetNumberRecordForLev1(0, mainRecord.uid, {})
+ ViewUtil.CloseModalWait()
else
self:RecursionGetNumberRecord(mainRecord.uid, root_id or mainRecord.uid, 0)
end
@@ -538,6 +539,7 @@ function M:RecursionGetNumberRecordForLev1(index, id, tempTable)
if self.begin_time ~= nil and self.end_time ~= nil then
time_type = 0
end
+
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GroupMembers12(
self.group_id,
@@ -550,9 +552,18 @@ function M:RecursionGetNumberRecordForLev1(index, id, tempTable)
ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败')
else
local numbers = res.Data.members
+
if #numbers == 0 then
- local one = table.remove(tempTable)
- self:RecursionGetNumberRecordByLev1(tempTable, one.uid, id)
+
+ local one = {}
+ if #tempTable>0 then
+ one = table.remove(tempTable)
+ end
+ if one~=nil then
+ self:RecursionGetNumberRecordByLev1(tempTable, one.uid, id)
+ else
+ ViewUtil.ShowModalWait("没有下级成员")
+ end
else
for i = 1, #numbers do
if numbers[i].lev ~= 1 and numbers[i].partnerLev == 0 then
@@ -564,6 +575,7 @@ function M:RecursionGetNumberRecordForLev1(index, id, tempTable)
end
end
)
+
end
function M:RecursionGetNumberRecordByLev1(tempTable, id, root_id)
@@ -571,7 +583,7 @@ function M:RecursionGetNumberRecordByLev1(tempTable, id, root_id)
if self.begin_time ~= nil and self.end_time ~= nil then
time_type = 0
end
-
+ ViewUtil.ShowModalWait(nil)
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GetDirectMemberStat(self.group_id, id, root_id, 0, 1,
time_type,
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua
index 83fb86bc..d8e62828 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua
@@ -255,7 +255,6 @@ function M:GetMemberData(index)
if index == 0 then
group:clearMember()
end
-
ViewUtil.ShowModalWait(nil, "亲友圈成员较多，请稍后")
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GroupMembers12(
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
index 936195d8..ee755bab 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
@@ -262,7 +262,7 @@ function M:EventInit()
info:MarkBank(p.seat == _room.banker_seat)
info:Ready(false)
- info._view:GetController('huxi').selectedIndex = 1
+ --info._view:GetController('huxi').selectedIndex = 1
info._view:GetChild('huxi').text = p.hu_xi
info._view:GetController('zhanji').selectedIndex = 1
info._view:GetChild('tex_jifen').text = p.total_score --d2ad(p.total_hp)
@@ -418,6 +418,8 @@ function M:EventInit()
local card = arg[2]
local seat = p.seat
local info = self._player_card_info[self:GetPos(seat)]
+
+
self:PlaySound(p.self_user.sex, 'F_' .. card)
if seat == self._room.self_player.seat then
_room.curren_outcard_seat = -1
@@ -425,12 +427,14 @@ function M:EventInit()
info:UpdateIsOnClick(true)
info:SendChangeCard()
info:ChuPaiTiShi()
+
end
local list = _room.player_list
for i = 1, #list do
local p = list[i]
local info = self._player_info[self:GetPos(p.seat)]
info._view:GetController('time').selectedIndex = 0
+ self._player_info[self:GetPos(p.seat)]._view:GetController("huxi").selectedIndex = 1
end
info:UpdateOutCardList(card, true, false, self:GetPos(seat))
if self._leftcard == 1 then
@@ -1034,7 +1038,7 @@ function M:OnFangziAction(...)
effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'ti')
-- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "ti")
end
- printlog("jefe self RB_FZType 5=======")
+
effect.touchable = false
effect.x, effect.y = -250, -200
effect:GetTransition('t0'):Play()
@@ -1045,7 +1049,7 @@ function M:OnFangziAction(...)
effect:Dispose()
end
)
- printlog("jefe self RB_FZType 6=======")
+
end
if (player == self._room.self_player) then
coroutine.start(
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua
index 9f5f4b27..7adc67ed 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua
@@ -11,6 +11,7 @@ local Record_Event = {
Evt_ThrowCard = 'ThrowCard',
Evt_AddCard = 'AddCard',
Evt_ChangePaiXing = 'ChangePaiXing',
+ Evt_TipAction = "Tips",
Evt_Win = 'Win',
Evt_result = 'result'
}
@@ -95,6 +96,7 @@ function M:InitView(url)
self._cmdmap[Record_Event.Evt_Action] = self.CmdAction
self._cmdmap[Record_Event.Evt_ThrowCard] = self.CmdThrowCard
self._cmdmap[Record_Event.Evt_AddCard] = self.CmdAddCard
+ self._cmdmap[Record_Event.Evt_TipAction] = self.CmdTipAction
self._cmdmap[Record_Event.Evt_Win] = self.CmdWin
self._cmdmap[Record_Event.Evt_ChangePaiXing] = self.CmdChangePaiXing
self._cmdmap[Record_Event.Evt_result] = self.onResult
@@ -150,11 +152,26 @@ function M:ShowStep(index)
local step = self._step[index + 1]
self:UpdateStep(index + 1)
self:UpdateLeftCard(step.left_card)
+ if self._chipeng_tip then
+ self._chipeng_tip:Dispose()
+ self._chipeng_tip = nil
+ end
+ if self._lit_fanzi then
+ self._lit_fanzi=nil
+ end
+
+ local _chipeng_tip = UIPackage.CreateObject('Main_RunBeard', 'Gcm_action_tips')
+ self._chipeng_tip = _chipeng_tip
+ self._lit_fanzi = _chipeng_tip:GetChild('lit_fanzi')
+ self._lit_fanzi:RemoveChildrenToPool()
+
+
for i = 1, #step.player_card_data do
local p = self._room:GetPlayerBySeat(i)
local info = self._player_card_info[self:GetPos(i)]
p.card_list = step.player_card_data[i].card_list
p.outcard_list = step.player_card_data[i].outcard_list
+ -- p.tip_list = step.player_card_data[i].tip_list
p.fz_list = step.player_card_data[i].fz_list
p.hu_xi = step.player_card_data[i].hu_xi
p.hand_left_count = #p.card_list
@@ -204,11 +221,7 @@ function M:ShowStep(index)
info:InitHandCard(false)
end
-
-
-
- --if p.seat == self._room.self_player.seat then
- --[[if step.cmd == Record_Event.Evt_ChangePaiXing then
+ if step.cmd == Record_Event.Evt_ChangePaiXing then
local _card_list = {}
for i = 1, #step.card_list do
local data = {}
@@ -223,7 +236,7 @@ function M:ShowStep(index)
else
info:UpdateHandCards(step.card_list)
end
- end--]]
+ end
--end
if step.cmd == Record_Event.Evt_OutCard or step.cmd == Record_Event.Evt_GetCard then
@@ -242,7 +255,39 @@ function M:ShowStep(index)
if p.outcard_list ~= nil then
info:UpdateQiPai(p.outcard_list)
end
+
+
+ if step.cmd == Record_Event.Evt_TipAction then
+ if step.player_card_data[i].tip_list[index]~=nil then
+ for key, value in pairs(step.player_card_data[i].tip_list[index]) do
+ local td = value
+ local url = 'ui://Main_RunBeard/Btn_fztip'
+ local btn_t = self._lit_fanzi:AddItemFromPool(url)
+ btn_t.icon = 'ui://Main_RunBeard/newop_' ..td
+ end
+
+ local url1 = 'ui://Main_RunBeard/Btn_fztip'
+ local btn_t1 = self._lit_fanzi:AddItemFromPool(url1)
+ btn_t1.icon = 'ui://Main_RunBeard/newop'
+
+ self._view:AddChild(_chipeng_tip)
+ _chipeng_tip:Center()
+ self._chipeng_tip.x = self._chipeng_tip.x + 200
+ self._chipeng_tip.y = self._chipeng_tip.y - 50
+
+ end
+
+
+
+
+ end
+
+
end
+
+
+
+
-- print("step.cmd ",step.cmdm,Record_Event.Evt_Win)
if step.cmd == Record_Event.Evt_result then
local _room = DataManager.CurrenRoom
@@ -319,6 +364,7 @@ function M:GenerateAllStepData(data)
u.seat = p.seat
u.card_list = p.hand_card
u.hand_left_count = #u.card_list
+ u.tip_list = {}
u.fz_list = {}
u.outcard_list = {}
u.hu_xi = 0
@@ -488,6 +534,21 @@ function M:CmdWin(cmd, index)
data.win = cmd.seat
end
+function M:CmdTipAction(cmd,index)
+ local data = self:CopyLastStep(index)
+ data.cmd = cmd.cmd
+ data.seat = cmd.seat
+ local u = data.player_card_data[cmd.seat]
+ data.tip_list = cmd.data.tip_list
+ local tips = {}
+ if #cmd.data.tip_list>0 then
+ for i = 1, #cmd.data.tip_list do
+ tips[cmd.data.tip_list[i].type] = cmd.data.tip_list[i].type
+ end
+ end
+ u.tip_list[index] = tips
+end
+
function M:UpdateLeftCard(num)
self._tex_LeftCard.text = '剩余 ' .. num .. ' 张牌'
end
@@ -503,11 +564,13 @@ function M:CopyLastStep(index)
step.player_card_data = {}
local card_data = step.player_card_data
for i = 1, #last_step.player_card_data do
+ -- pt(last_step.player_card_data[i])
card_data[i] = {}
card_data[i].card_list = self:deepcopy(last_step.player_card_data[i].card_list)
card_data[i].outcard_list = self:deepcopy(last_step.player_card_data[i].outcard_list)
card_data[i].fz_list = self:deepcopy(last_step.player_card_data[i].fz_list)
card_data[i].hand_left_count = #card_data[i].card_list
+ card_data[i].tip_list = self:deepcopy(last_step.player_card_data[i].tip_list)
card_data[i].hu_xi = self:deepcopy(last_step.player_card_data[i].hu_xi)
end
--pt(card_data)
@@ -535,7 +598,6 @@ function M:deepcopy(object)
end
function M:NextRecordPlay()
- printlog("NextRecordPlay")
local result = PlayBackView.NextRecordPlay(self)
if not result then
return
@@ -547,7 +609,6 @@ function M:NextRecordPlay()
end
function M:LastRecordPlay()
- printlog("LastRecordPlay")
local result = PlayBackView.LastRecordPlay(self)
if not result then
return
@@ -652,10 +713,6 @@ function M:OnUpdate()
end
end
-function M:ShowBackResult(datas)
- self._view:GetController("state").selectedIndex = 4
-
-end
function M:Destroy()
UpdateBeat:Remove(self.OnUpdate, self)
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua
index 965f9728..212c3347 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua
@@ -858,7 +858,7 @@ function M:FillItemData(room, data, item)
local cards = card_list:AddItemFromPool()
cards:GetChild('card_type').text = '提'
cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi
- cards:GetController('c1').selectedIndex = 1
+ cards:GetController('c1').selectedIndex = 2
for j = 1, 4 do
cards:GetChild('card_' .. j).icon =
self:getCardItem('ui://Main_RunBeard/202_', info_list[i].opCardList[k].card1)
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua
index cc5c8a02..89175611 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua
@@ -211,7 +211,7 @@ function M:UpdateHandCards( list )
end
for i=1,#list do
local card_code = list[i].card_item
- local btn_card =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipai")
+ local btn_card =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipais")
btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/202_",card_code)
local card_view = NewCardView(btn_card,card_code,list[i].index_X,list[i].index_Y)
--存牌堆
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index c34010d4..0858f5ea 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -36,6 +36,8 @@
"ui://ppu1wv76j4mf9e",
"ui://ppu1wv76j4mf9k",
"ui://v6yvqp7wf55qwa",
+ "ui://v6yvqp7wf55qw7",
+ "ui://v6yvqp7wf55qw5",
"ui://v6yvqp7waen81bs",
"ui://v6yvqp7waen81b0",
"ui://v6yvqp7waen81bf",
@@ -68,7 +70,7 @@
"test.device": "720p Phone",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://ppu1wv76j4mf9k",
+ "doc.activeDoc": "ui://v6yvqp7wf55qw7",
"libview.twoColumn": false,
"libview.expandedNodes": [
"s63l0suw",
@@ -81,8 +83,12 @@
"/component/Main/",
"ppu1wv76",
"/component/clearing/",
- "m7iejg46",
- "/"
+ "v6yvqp7w",
+ "/",
+ "v6yvqp7w",
+ "/component/",
+ "v6yvqp7w",
+ "/component/Main/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
index 1d7235ec..6de3d0d2 100644
--- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
+++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
@@ -98,7 +98,7 @@
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
index f5160263..04a6f122 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
@@ -1,6 +1,6 @@
-
+
@@ -27,7 +27,7 @@
-
+
@@ -71,9 +71,9 @@
-
+
-
+