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

同步，听牌可能会有点印象正常流程

master
罗家炜 2025-09-30 15:34:35 +08:00
parent 79269e5a09
commit 8bb55d9723
63 changed files with 1132 additions and 1118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua
View File

@ -59,16 +59,15 @@ end
local function AddPlayer(data, self) local function AddPlayer(data, self)
if self.sending then if self.sending then
ViewUtil.ShowBannerOnScreenCenter("正在操作中。。") ViewUtil.ErrorTip(-1, "正在操作中。。")
return return
end end
-- 点击弹出选择成员界面 -- 点击弹出选择成员界面
local view = FamilySelectNumber.New() local view = FamilySelectNumber.New()
view:Show(self.root._group.id, function(number) view:Show(self.root._group.id, function(number)
if Exists(number.uid, data.deskList) then if Exists(number.uid, data.deskList) then
ViewUtil.ShowBannerOnScreenCenter("设置失败,成员已经在关系中") ViewUtil.ErrorTip(-1, "设置失败,成员已经在关系中")
return return
end end
@ -79,7 +78,7 @@ local function AddPlayer(data, self)
fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res) fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res)
self.sending = false self.sending = false
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ShowBannerOnScreenCenter("设置失败") ViewUtil.ErrorTip(-1, "设置失败")
return return
end end
data.deskList[#data.deskList + 1] = { uid = number.uid } data.deskList[#data.deskList + 1] = { uid = number.uid }
@ -92,7 +91,7 @@ local function DelPalyer(data, uid, self)
--print("删除玩家", uid) --print("删除玩家", uid)
if self.sending then if self.sending then
ViewUtil.ShowBannerOnScreenCenter("正在操作中。。") ViewUtil.ErrorTip(-1, "正在操作中。。")
return return
end end
@ -115,7 +114,7 @@ local function DelPalyer(data, uid, self)
fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res) fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res)
self.sending = false self.sending = false
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ShowBannerOnScreenCenter("删除失败") ViewUtil.ErrorTip(-1, "删除失败")
return return
end end
data.deskList = RemoveItem(data.deskList, function(item) data.deskList = RemoveItem(data.deskList, function(item)
@ -129,7 +128,7 @@ end
local function DelDesk(data, self) local function DelDesk(data, self)
if self.sending then if self.sending then
ViewUtil.ShowBannerOnScreenCenter("正在操作中。。") ViewUtil.ErrorTip(-1, "正在操作中。。")
return return
end end
@ -145,7 +144,7 @@ local function ChangeName(deskData, name, self)
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_SetBanTable1(self.root._group.id, deskData.deskId, AllUid(deskData.deskList), name, function(res) fgCtr:FG_SetBanTable1(self.root._group.id, deskData.deskId, AllUid(deskData.deskList), name, function(res)
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ShowBannerOnScreenCenter("删除失败") ViewUtil.ErrorTip(-1, "删除失败")
return return
end end
deskData.deskName = name deskData.deskName = name
@ -323,7 +322,7 @@ function BanDesk:GetBanTableCallback(res)
addBanItem:GetController("cStyle").selectedIndex = 1 addBanItem:GetController("cStyle").selectedIndex = 1
btn_addBanItem.onClick:Set(function() btn_addBanItem.onClick:Set(function()
if self.sending then if self.sending then
ViewUtil.ShowBannerOnScreenCenter("正在操作中。。") ViewUtil.ErrorTip(-1, "正在操作中。。")
return return
end end

4
lua_probject/base_project/Game/View/Family/FamilyInviteFamilyView.lua
View File

@ -19,10 +19,10 @@ function M:init(url)
local view = self._view local view = self._view
view:GetChild('btn_wx').onClick:Add(function() view:GetChild('btn_wx').onClick:Add(function()
ViewUtil.ShowBannerOnScreenCenter("该功能还会开放，敬请期待") ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
end) end)
view:GetChild('btn_moments').onClick:Add(function() view:GetChild('btn_moments').onClick:Add(function()
ViewUtil.ShowBannerOnScreenCenter("该功能还会开放，敬请期待") ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
end) end)
end end

12
lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
View File

@ -51,7 +51,7 @@ local function QuitFamily(self)
local tipsWin = MsgWindow.new(self._view, tips, MsgWindow.MsgMode.OkAndCancel) local tipsWin = MsgWindow.new(self._view, tips, MsgWindow.MsgMode.OkAndCancel)
tipsWin.onOk:Add(function() tipsWin.onOk:Add(function()
if self.networkSending then if self.networkSending then
ViewUtil.ShowBannerOnScreenCenter("操作中，请稍后。。") ViewUtil.ErrorTip(-1, "操作中，请稍后。。")
return return
end end
@ -317,7 +317,7 @@ function FamilyMyFamily:Init()
self.btn_hideNumber.onClick:Set(function() self.btn_hideNumber.onClick:Set(function()
if self.networkSending == true then if self.networkSending == true then
ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后。。") ViewUtil.ErrorTip(-1, "设置中，请稍后。。")
return return
end end
@ -333,13 +333,13 @@ function FamilyMyFamily:Init()
end end
self.family.isShow = 0 self.family.isShow = 0
self:Refalsh() self:Refalsh()
ViewUtil.ShowBannerOnScreenCenter("设置成功") ViewUtil.ErrorTip(-1, "设置成功")
end) end)
end) end)
self.btn_showNumber.onClick:Set(function() self.btn_showNumber.onClick:Set(function()
if self.networkSending == true then if self.networkSending == true then
ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后。。") ViewUtil.ErrorTip(-1, "设置中，请稍后。。")
return return
end end
@ -357,13 +357,13 @@ function FamilyMyFamily:Init()
end end
self.family.isShow = 1 self.family.isShow = 1
self:Refalsh() self:Refalsh()
ViewUtil.ShowBannerOnScreenCenter("设置成功") ViewUtil.ErrorTip(-1, "设置成功")
end) end)
end) end)
self.tips_btn_comfirm.onClick:Set(function() self.tips_btn_comfirm.onClick:Set(function()
if self.networkSending then if self.networkSending then
ViewUtil.ShowBannerOnScreenCenter("操作中，请稍后。。") ViewUtil.ErrorTip(-1, "操作中，请稍后。。")
return return
end end

2
lua_probject/base_project/Game/View/FamilyView.lua
View File

@ -230,7 +230,7 @@ function M:init(url)
obj.text = Utils.TextOmit(group.name, 6, "...") obj.text = Utils.TextOmit(group.name, 6, "...")
obj.onClick:Add(function() obj.onClick:Add(function()
if self._group ~= nil and group.id == self._group.id then if self._group ~= nil and group.id == self._group.id then
--ViewUtil.ShowBannerOnScreenCenter("已在家族中") --ViewUtil.ErrorTip(-1,"已在家族中")
return return
end end

4
lua_probject/base_project/Game/View/LobbyView.lua
View File

@ -57,7 +57,7 @@ function M:InitView(url)
local btn_shop = self._view:GetChild("btn_shop") local btn_shop = self._view:GetChild("btn_shop")
btn_shop.onClick:Add(handler(self, function() btn_shop.onClick:Add(handler(self, function()
local shopView = LobbyShopView.new(function() local shopView = LobbyShopView.new(function()
ViewUtil.ShowBannerOnScreenCenter("该功能还会开放，敬请期待") ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
-- self:ShowPlayerInfo(1, DataManager.SelfUser.diamo, 1) -- self:ShowPlayerInfo(1, DataManager.SelfUser.diamo, 1)
end) end)
shopView:Show() shopView:Show()
@ -159,7 +159,7 @@ function M:InitView(url)
coroutine.start(function() coroutine.start(function()
coroutine.wait(3) coroutine.wait(3)
ViewUtil.CloseModalWait2() ViewUtil.CloseModalWait2()
ViewUtil.ShowBannerOnScreenCenter("微信跳转失败") ViewUtil.ErrorTip(-1, "微信跳转失败")
end) end)
end) end)

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

@ -292,7 +292,7 @@ function M:InitView(url, isHideIpAdds)
self._ctr_more.selectedIndex = 0 self._ctr_more.selectedIndex = 0
end end
if self._room.room_config.config.hpData.BanChat == 1 then if self._room.room_config.config.hpData.BanChat == 1 then
ViewUtil.ShowBannerOnScreenCenter("本房间禁止快捷聊天") ViewUtil.ErrorTip(-1, "本房间禁止快捷聊天")
return return
end end
@ -327,7 +327,7 @@ function M:InitView(url, isHideIpAdds)
self._chat_Talk.onTouchBegin:Set(function(context) self._chat_Talk.onTouchBegin:Set(function(context)
if self._room.room_config.config.hpData.BanChat == 1 then if self._room.room_config.config.hpData.BanChat == 1 then
ViewUtil.ShowBannerOnScreenCenter("本房间禁止快捷聊天") ViewUtil.ErrorTip(-1, "本房间禁止快捷聊天")
return return
end end

26
lua_probject/base_project/Game/View/NewGroup/GroupMngSettingView.lua
View File

@ -4,12 +4,12 @@ local GroupMngSettingView = {}
local M = GroupMngSettingView local M = GroupMngSettingView
function GroupMngSettingView.new(gid) function GroupMngSettingView.new(gid)
setmetatable(M, {__index = BaseWindow}) setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, {__index = M}) local self = setmetatable({}, { __index = M })
self.class = "GroupMngSettingView" self.class = "GroupMngSettingView"
self._close_destroy = true self._close_destroy = true
self.group_id = gid self.group_id = gid
-- self._full = true -- self._full = true
self:init("ui://NewGroup/Win_GroupSetting") self:init("ui://NewGroup/Win_GroupSetting")
self:FillView() self:FillView()
return self return self
@ -57,10 +57,10 @@ function M:FillView()
local option = group.option or 0 local option = group.option or 0
ctr_pt.selectedIndex = bit:_and(option,1) > 0 and 1 or 0 ctr_pt.selectedIndex = bit:_and(option, 1) > 0 and 1 or 0
ctr_wq.selectedIndex = bit:_and(option,2) > 0 and 1 or 0 ctr_wq.selectedIndex = bit:_and(option, 2) > 0 and 1 or 0
ctr_es.selectedIndex = bit:_and(option,4) > 0 and 1 or 0 ctr_es.selectedIndex = bit:_and(option, 4) > 0 and 1 or 0
ctr_ua.selectedIndex = bit:_and(option,8) > 0 and 1 or 0 ctr_ua.selectedIndex = bit:_and(option, 8) > 0 and 1 or 0
self._view:GetChild("btn_ok").onClick:Set(function() self._view:GetChild("btn_ok").onClick:Set(function()
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
@ -83,16 +83,16 @@ function M:FillView()
local option = 0 local option = 0
if ctr_pt.selectedIndex == 1 then if ctr_pt.selectedIndex == 1 then
option = bit:_or(option,1) option = bit:_or(option, 1)
end end
if ctr_wq.selectedIndex == 1 then if ctr_wq.selectedIndex == 1 then
option = bit:_or(option,2) option = bit:_or(option, 2)
end end
if ctr_es.selectedIndex == 1 then if ctr_es.selectedIndex == 1 then
option = bit:_or(option,4) option = bit:_or(option, 4)
end end
if ctr_ua.selectedIndex == 1 then if ctr_ua.selectedIndex == 1 then
option = bit:_or(option,8) option = bit:_or(option, 8)
end end
local showNum = 0 local showNum = 0
@ -106,9 +106,9 @@ function M:FillView()
fgCtr:FG_UpdateGroupInfo(data, function(res) fgCtr:FG_UpdateGroupInfo(data, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode,"设置大联盟失败。") ViewUtil.ErrorTip(res.ReturnCode, "设置大联盟失败。")
else else
ViewUtil.ShowBannerOnScreenCenter("设置成功") ViewUtil.ErrorTip(-1, "设置成功")
group.name = name group.name = name
group.notice = notice group.notice = notice
group.ban = ban group.ban = ban

2
lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua
View File

@ -44,7 +44,7 @@ function M:init(url, member)
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "备注失败") ViewUtil.ErrorTip(res.ReturnCode, "备注失败")
else else
ViewUtil.ShowBannerOnScreenCenter("备注成功") ViewUtil.ErrorTip(-1, "备注成功")
--member.score = score --member.score = score
self:Destroy() self:Destroy()
--self.callback(true) --self.callback(true)

79
lua_probject/base_project/Game/View/NewGroup/MngView/GroupAddMemberInfoView.lua
View File

@ -2,59 +2,56 @@ local GroupAddMemberInfoView = {}
local M = GroupAddMemberInfoView local M = GroupAddMemberInfoView
function GroupAddMemberInfoView.new(group_id,member_id) function GroupAddMemberInfoView.new(group_id, member_id)
setmetatable(M, {__index = BaseView}) setmetatable(M, { __index = BaseView })
local self = setmetatable({}, {__index = M}) local self = setmetatable({}, { __index = M })
self.class = "GroupAddMemberInfoView" self.class = "GroupAddMemberInfoView"
self.group_id = group_id self.group_id = group_id
self.member_id = member_id self.member_id = member_id
self:init("ui://NewGroup/Win_PlayerInfoForAdd") self:init("ui://NewGroup/Win_PlayerInfoForAdd")
return self return self
end end
function M:init(url) function M:init(url)
BaseWindow.init(self,url) BaseWindow.init(self, url)
self.Tx=self._view:GetChild("btn_head") self.Tx = self._view:GetChild("btn_head")
self.Name=self._view:GetChild("tex_name") self.Name = self._view:GetChild("tex_name")
self.Id=self._view:GetChild("tex_id") self.Id = self._view:GetChild("tex_id")
self._view:GetChild("btn_close").onClick:Set( self._view:GetChild("btn_close").onClick:Set(
function () function()
self:Destroy() self:Destroy()
end end
) )
self._view:GetChild("btn_qc").onClick:Set( self._view:GetChild("btn_qc").onClick:Set(
function () function()
self:Destroy() self:Destroy()
end end
) )
self._view:GetChild("btn_qd").onClick:Set( self._view:GetChild("btn_qd").onClick:Set(
function () function()
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_AddMember( fgCtr:FG_AddMember(
self.group_id, self.group_id,
self.member_id, self.member_id,
function (response) function(response)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if (response.ReturnCode == 0) then if (response.ReturnCode == 0) then
ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1) ViewUtil.ErrorTip(-1, '添加成功！', 1)
else else
ViewUtil.ErrorTip(response.ReturnCode, '邀请玩家失败！') ViewUtil.ErrorTip(response.ReturnCode, '邀请玩家失败！')
end
end end
) end
end )
) end
)
end end
function M:SetAddMember(data) function M:SetAddMember(data)
ImageLoad.Load(data.portrait, self.Tx._iconObject) ImageLoad.Load(data.portrait, self.Tx._iconObject)
self.Name.text=data.nick self.Name.text = data.nick
self.Id.text=data.uid self.Id.text = data.uid
self:Show() self:Show()
end end
return M return M

254
lua_probject/base_project/Game/View/NewGroup/MngView/GroupBanSameTableView.lua
View File

@ -5,130 +5,130 @@ local GroupBanSameTableView = {}
local M = GroupBanSameTableView local M = GroupBanSameTableView
function GroupBanSameTableView.new(blur_view, group_id, member_id, data) function GroupBanSameTableView.new(blur_view, group_id, member_id, data)
setmetatable(M, {__index = BaseWindow}) setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, {__index = M}) local self = setmetatable({}, { __index = M })
self.class = "GroupBanSameTableView" self.class = "GroupBanSameTableView"
self._close_destroy = true self._close_destroy = true
self._blur_view = blur_view self._blur_view = blur_view
self.group_id = group_id self.group_id = group_id
self.ori_ban = data.ban_list self.ori_ban = data.ban_list
self.ban_list = membe_deep_clone(data.ban_list) self.ban_list = membe_deep_clone(data.ban_list)
self.member_id = member_id self.member_id = member_id
self:init("ui://NewGroup/Win_BanSameTable") self:init("ui://NewGroup/Win_BanSameTable")
return self return self
end end
function M:init(url) function M:init(url)
BaseWindow.init(self,url) BaseWindow.init(self, url)
-- 搜索结果 -- 搜索结果
self._search_member_data = {} self._search_member_data = {}
self._search_ban_data = {} self._search_ban_data = {}
local group = DataManager.groups:get(self.group_id) local group = DataManager.groups:get(self.group_id)
self.all_members = group.members self.all_members = group.members
self.member_data = {} self.member_data = {}
self:getMemberData(#self.all_members) self:getMemberData(#self.all_members)
self.ctr_search_m = self._view:GetController("search_m") self.ctr_search_m = self._view:GetController("search_m")
self.ctr_search_b = self._view:GetController("search_b") self.ctr_search_b = self._view:GetController("search_b")
self.lst_member = self._view:GetChild("lst_member") self.lst_member = self._view:GetChild("lst_member")
self.lst_member:SetVirtual() self.lst_member:SetVirtual()
self.lst_member.itemRenderer = function(index, obj) self.lst_member.itemRenderer = function(index, obj)
self:OnRenderMemberItem(index, obj) self:OnRenderMemberItem(index, obj)
end end
self.lst_member.scrollPane.onPullUpRelease:Set(function() self.lst_member.scrollPane.onPullUpRelease:Set(function()
self:getMemberData(#self.all_members) self:getMemberData(#self.all_members)
end) end)
self.lst_ban = self._view:GetChild("lst_ban") self.lst_ban = self._view:GetChild("lst_ban")
self.lst_ban:SetVirtual() self.lst_ban:SetVirtual()
self.lst_ban.itemRenderer = function(index, obj) self.lst_ban.itemRenderer = function(index, obj)
self:OnRenderBanItem(index, obj) self:OnRenderBanItem(index, obj)
end end
self:refreshList() self:refreshList()
self._view:GetChild("btn_back").onClick:Set(function() self._view:GetChild("btn_back").onClick:Set(function()
self._search_member_data = {} self._search_member_data = {}
self.ctr_search_m.selectedIndex = 0 self.ctr_search_m.selectedIndex = 0
self:refreshList() self:refreshList()
end) end)
self._view:GetChild("btn_back_ban").onClick:Set(function() self._view:GetChild("btn_back_ban").onClick:Set(function()
self._search_ban_data = {} self._search_ban_data = {}
self.ctr_search_b.selectedIndex = 0 self.ctr_search_b.selectedIndex = 0
self:refreshList() self:refreshList()
end) end)
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
self._view:GetChild("btn_search_member").onClick:Set(function() self._view:GetChild("btn_search_member").onClick:Set(function()
ViewUtil.ShowModalWait(nil) ViewUtil.ShowModalWait(nil)
local qid = tonumber(self._view:GetChild("tex_find_memb").text) local qid = tonumber(self._view:GetChild("tex_find_memb").text)
if not qid then if not qid then
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
ViewUtil.ErrorTip(nil, "输入ID进行搜索") ViewUtil.ErrorTip(nil, "输入ID进行搜索")
return return
end end
fgCtr:FG_FindMember(self.group_id, qid, function(res) fgCtr:FG_FindMember(self.group_id, qid, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if self._is_destroy then if self._is_destroy then
return return
end end
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "找不到成员") ViewUtil.ErrorTip(res.ReturnCode, "找不到成员")
self._search_member_data = {} self._search_member_data = {}
self:refreshList() self:refreshList()
else else
self.ctr_search_m.selectedIndex = 1 self.ctr_search_m.selectedIndex = 1
self._search_member_data[1] = res.Data.members[1] self._search_member_data[1] = res.Data.members[1]
self:refreshList() self:refreshList()
end end
end) end)
end) end)
self._view:GetChild("btn_search_ban").onClick:Set(function() self._view:GetChild("btn_search_ban").onClick:Set(function()
local qid = tonumber(self._view:GetChild("tex_find_ban").text) local qid = tonumber(self._view:GetChild("tex_find_ban").text)
if not qid then if not qid then
ViewUtil.ErrorTip(nil, "输入ID进行搜索") ViewUtil.ErrorTip(nil, "输入ID进行搜索")
return return
end end
for i = 1, #self.ban_list do for i = 1, #self.ban_list do
local data = self.ban_list[i] local data = self.ban_list[i]
if data.uid == qid then if data.uid == qid then
self.ctr_search_b.selectedIndex = 1 self.ctr_search_b.selectedIndex = 1
self._search_ban_data[1] = data self._search_ban_data[1] = data
self:refreshList() self:refreshList()
return return
end end
end end
ViewUtil.ErrorTip(nil, "找不到成员") ViewUtil.ErrorTip(nil, "找不到成员")
self._search_ban_data = {} self._search_ban_data = {}
self:refreshList() self:refreshList()
end) end)
self._view:GetChild("btn_ok").onClick:Set(function() self._view:GetChild("btn_ok").onClick:Set(function()
local set_list = {} local set_list = {}
local del_list = {} local del_list = {}
for i = 1, #self.ban_list do for i = 1, #self.ban_list do
table.insert(set_list, self.ban_list[i].uid) table.insert(set_list, self.ban_list[i].uid)
end end
for i = 1, #self.ori_ban do for i = 1, #self.ori_ban do
local tem = self.ori_ban[i] local tem = self.ori_ban[i]
if not list_check(set_list, tem.uid) then if not list_check(set_list, tem.uid) then
table.insert(del_list, tem.uid) table.insert(del_list, tem.uid)
end end
end end
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
fgCtr:FG_SetBanTable(self.group_id, self.member_id, set_list, del_list, function(res) fgCtr:FG_SetBanTable(self.group_id, self.member_id, set_list, del_list, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode == 0 then if res.ReturnCode == 0 then
self:Destroy() self:Destroy()
ViewUtil.ShowBannerOnScreenCenter("禁止同桌设置成功") ViewUtil.ErrorTip(-1, "禁止同桌设置成功")
else else
ViewUtil.ErrorTip(res.ReturnCode, "禁止同桌设置失败") ViewUtil.ErrorTip(res.ReturnCode, "禁止同桌设置失败")
end end
end) end)
end) end)
end end
local function checkList(list, data) local function checkList(list, data)
@ -172,15 +172,15 @@ function M:getMemberData(index)
-- group:clearMember() -- group:clearMember()
-- end -- end
ViewUtil.ShowModalWait(nil) ViewUtil.ShowModalWait(nil)
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GroupMembers(self.group_id, index, 10, false, 1, function(res) fgCtr:FG_GroupMembers(self.group_id, index, 10, false, 1, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败") ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
else else
list_concat(self.all_members, res.Data.members) list_concat(self.all_members, res.Data.members)
self:refreshList() self:refreshList()
end end
end) end)
end end
@ -211,12 +211,12 @@ function M:FillItem(data, item, act)
btn_head = item:GetChild("btn_head") btn_head = item:GetChild("btn_head")
ImageLoad.Load(data.portrait, btn_head._iconObject) ImageLoad.Load(data.portrait, btn_head._iconObject)
item:GetChild("btn_del").onClick:Set(function() item:GetChild("btn_del").onClick:Set(function()
if self.ctr_search_b.selectedIndex == 1 then if self.ctr_search_b.selectedIndex == 1 then
list_remove(self.ban_list, data) list_remove(self.ban_list, data)
list_remove(self._search_ban_data, data) list_remove(self._search_ban_data, data)
else else
list_remove(self.ban_list, data) list_remove(self.ban_list, data)
end end
self:refreshList() self:refreshList()
end) end)
item:GetChild("btn_set").onClick:Set(function() item:GetChild("btn_set").onClick:Set(function()

2
lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua
View File

@ -494,7 +494,7 @@ function M:FillFagData()
play.maxPlayers = _data.maxPlayers play.maxPlayers = _data.maxPlayers
play.roomNum = self.hpData.tex_times_room / 1000 play.roomNum = self.hpData.tex_times_room / 1000
play.maxRound = res.Data.maxRound play.maxRound = res.Data.maxRound
ViewUtil.ShowBannerOnScreenCenter("添加玩法成功") ViewUtil.ErrorTip(-1, "添加玩法成功")
self.callback(play) self.callback(play)
self:Destroy() self:Destroy()
else else

4
lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
View File

@ -588,7 +588,7 @@ function M:FillFagData()
play.maxPlayers = _data.maxPlayers play.maxPlayers = _data.maxPlayers
play.roomNum = self.hpData.tex_times_room / 1000 play.roomNum = self.hpData.tex_times_room / 1000
play.maxRound = res.Data.maxRound play.maxRound = res.Data.maxRound
ViewUtil.ShowBannerOnScreenCenter("添加玩法成功") ViewUtil.ErrorTip(-1, "添加玩法成功")
self.callback(play) self.callback(play)
self:Destroy() self:Destroy()
else else
@ -1090,7 +1090,7 @@ function M:FillFagData_jiangxi()
play.maxPlayers = _data.maxPlayers play.maxPlayers = _data.maxPlayers
play.roomNum = self.hpData.tex_times_room / 1000 play.roomNum = self.hpData.tex_times_room / 1000
play.maxRound = res.Data.maxRound play.maxRound = res.Data.maxRound
ViewUtil.ShowBannerOnScreenCenter("添加玩法成功") ViewUtil.ErrorTip(-1, "添加玩法成功")
self.callback(play) self.callback(play)
self:Destroy() self:Destroy()
else else

6
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua
View File

@ -125,7 +125,7 @@ function M:init(url)
member.parentId = parent_id member.parentId = parent_id
self._view:GetChild("tex_superior_id").text = parent_id self._view:GetChild("tex_superior_id").text = parent_id
ctr_superior.selectedIndex = 1 ctr_superior.selectedIndex = 1
ViewUtil.ShowBannerOnScreenCenter("调配玩家成功") ViewUtil.ErrorTip(-1, "调配玩家成功")
else else
ViewUtil.ErrorTip(res1.ReturnCode, "调配玩家失败") ViewUtil.ErrorTip(res1.ReturnCode, "调配玩家失败")
end end
@ -183,7 +183,7 @@ function M:init(url)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res1.ReturnCode == 0 then if res1.ReturnCode == 0 then
self.callBack(true) self.callBack(true)
ViewUtil.ShowBannerOnScreenCenter("已成功删除玩家") ViewUtil.ErrorTip(-1, "已成功删除玩家")
self:Destroy() self:Destroy()
else else
ViewUtil.ErrorTip(res1.ReturnCode, "删除成员失败") ViewUtil.ErrorTip(res1.ReturnCode, "删除成员失败")
@ -492,7 +492,7 @@ function M:MovePartner(parent_id, member, obj)
member.partnerLev = res1.Data.partnerLev member.partnerLev = res1.Data.partnerLev
obj:GetChild("tex_superior_id").text = parent_id obj:GetChild("tex_superior_id").text = parent_id
obj:GetController("show_superior").selectedIndex = 1 obj:GetController("show_superior").selectedIndex = 1
ViewUtil.ShowBannerOnScreenCenter("转移成功") ViewUtil.ErrorTip(-1, "转移成功")
else else
ViewUtil.ErrorTip(res1.ReturnCode, "转移失败") ViewUtil.ErrorTip(res1.ReturnCode, "转移失败")
end end

25
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngAddMemberView.lua
View File

@ -8,7 +8,7 @@ function GroupMngAddMemberView.new(gid)
local self = M local self = M
self.class = "GroupMngAddMemberView" self.class = "GroupMngAddMemberView"
self.group_id = gid self.group_id = gid
self:FillView() self:FillView()
return self return self
end end
@ -38,16 +38,16 @@ function M:FillView()
local group = DataManager.groups:get(self.group_id) local group = DataManager.groups:get(self.group_id)
local perm_array = MngPermission.getPermData(group.permission) local perm_array = MngPermission.getPermData(group.permission)
self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupAddMember") self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupAddMember")
self.tex_num = self._view:GetChild("tex_num") self.tex_num = self._view:GetChild("tex_num")
self:ClearNumTex() self:ClearNumTex()
local cnt = self._view.numChildren - 1 local cnt = self._view.numChildren - 1
for i = 0 ,9 do for i = 0, 9 do
local obj = self._view:GetChild("btn_"..i) local obj = self._view:GetChild("btn_" .. i)
obj.onClick:Add(handler(self , self.OnNumButtonAction)) obj.onClick:Add(handler(self, self.OnNumButtonAction))
i = i + 1 i = i + 1
end end
local btn_ok = self._view:GetChild("btn_ok") local btn_ok = self._view:GetChild("btn_ok")
@ -56,19 +56,19 @@ function M:FillView()
return return
end end
if self._texnum_str == "" then return end if self._texnum_str == "" then return end
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_AddMember(self.group_id, tonumber(self._texnum_str), function(response) fgCtr:FG_AddMember(self.group_id, tonumber(self._texnum_str), function(response)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if (response.ReturnCode == 0) then if (response.ReturnCode == 0) then
ViewUtil.ShowBannerOnScreenCenter("添加成功！", 1) ViewUtil.ErrorTip(-1, "添加成功！", 1)
else else
ViewUtil.ErrorTip(response.ReturnCode,"邀请玩家失败！") ViewUtil.ErrorTip(response.ReturnCode, "邀请玩家失败！")
end end
end) end)
end) end)
local btn_del = self._view:GetChild("btn_del") local btn_del = self._view:GetChild("btn_del")
btn_del.onClick:Add(handler(self , self.OnNumButtonAction)) btn_del.onClick:Add(handler(self, self.OnNumButtonAction))
local ctr_mng = self._view:GetController("mng") local ctr_mng = self._view:GetController("mng")
if group.lev < 3 then if group.lev < 3 then
@ -98,7 +98,7 @@ function M:GetJoinsData()
end end
self:FillJoinList(joins) self:FillJoinList(joins)
else else
ViewUtil.ErrorTip(res.ReturnCode,"获取申请列表失败！") ViewUtil.ErrorTip(res.ReturnCode, "获取申请列表失败！")
self:FillJoinList({}) self:FillJoinList({})
end end
end) end)
@ -140,11 +140,11 @@ function M:VerifyPlayerJoin(id, allow)
end end
function M:OnNumButtonAction(context) function M:OnNumButtonAction(context)
local typer = string.sub(context.sender.name ,5) local typer = string.sub(context.sender.name, 5)
if typer == "del" then if typer == "del" then
if (self._currenIndex > 0) then if (self._currenIndex > 0) then
self._currenIndex = self._currenIndex - 1 self._currenIndex = self._currenIndex - 1
self._texnum_str = string.sub(self._texnum_str,0,self._currenIndex) self._texnum_str = string.sub(self._texnum_str, 0, self._currenIndex)
self.tex_num.text = self._texnum_str self.tex_num.text = self._texnum_str
end end
else else
@ -152,7 +152,6 @@ function M:OnNumButtonAction(context)
self._currenIndex = self._currenIndex + 1 self._currenIndex = self._currenIndex + 1
self._texnum_str = self._texnum_str .. typer self._texnum_str = self._texnum_str .. typer
self.tex_num.text = self._texnum_str self.tex_num.text = self._texnum_str
end end
end end
end end

2
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua
View File

@ -153,7 +153,7 @@ function M:FillView()
if (response.ReturnCode and response.ReturnCode == 0) then if (response.ReturnCode and response.ReturnCode == 0) then
GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data) GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data)
self:ClearNumTex() self:ClearNumTex()
--ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1) --ViewUtil.ErrorTip(-1,'添加成功！', 1)
else else
ViewUtil.ErrorTip(123456, '获取玩家失败') ViewUtil.ErrorTip(123456, '获取玩家失败')
end end

4
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua
View File

@ -172,7 +172,7 @@ function M:FillView()
if (response.ReturnCode and response.ReturnCode == 0) then if (response.ReturnCode and response.ReturnCode == 0) then
GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data) GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data)
self:ClearNumTex() self:ClearNumTex()
--ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1) --ViewUtil.ErrorTip(-1,'添加成功！', 1)
else else
ViewUtil.ErrorTip(123456, '获取玩家失败') ViewUtil.ErrorTip(123456, '获取玩家失败')
end end
@ -448,7 +448,7 @@ function M:FillItem(obj, member, refresh)
local btnBxx = obj:GetChild('btn_bxx') local btnBxx = obj:GetChild('btn_bxx')
btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and
not (DataManager.SelfUser.account_id == member.uid) not (DataManager.SelfUser.account_id == member.uid)
--btnBxx.visible = not (DataManager.SelfUser.account_id == member.uid) --btnBxx.visible = not (DataManager.SelfUser.account_id == member.uid)
obj:GetChild('btn_bxx').onClick:Set( obj:GetChild('btn_bxx').onClick:Set(
function() function()

218
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerRewardsView.lua
View File

@ -39,7 +39,7 @@ function M:initData()
local index = self._view:GetController("index").selectedIndex local index = self._view:GetController("index").selectedIndex
if index < 2 then if index < 2 then
self:GetPartnerData(0) self:GetPartnerData(0)
else else
self:GetRewardsStatistic() self:GetRewardsStatistic()
-- self._view:GetController("index").selectedIndex = 0 -- self._view:GetController("index").selectedIndex = 0
@ -65,7 +65,7 @@ function M:InitView()
-- 切换页面时，1,2页需要先清理数据，再加载当前页 -- 切换页面时，1,2页需要先清理数据，再加载当前页
ctr_index.onChanged:Set(function() ctr_index.onChanged:Set(function()
if ctr_index.selectedIndex == 0 then if ctr_index.selectedIndex == 0 then
if self.ctr_search.selectedIndex == 0 then if self.ctr_search.selectedIndex == 0 then
if #self.partner_data ~= 0 then if #self.partner_data ~= 0 then
self.rewards_data = {} self.rewards_data = {}
@ -79,17 +79,17 @@ function M:InitView()
self.lst_rewards.numItems = 0 self.lst_rewards.numItems = 0
self:GetRewardsData() self:GetRewardsData()
end end
elseif ctr_index.selectedIndex == 1 then elseif ctr_index.selectedIndex == 1 then
if self.ctr_search.selectedIndex == 0 then if self.ctr_search.selectedIndex == 0 then
self.rewards_log = {} self.rewards_log = {}
else else
self.search_rewards_log = {} self.search_rewards_log = {}
end end
self.lst_log.numItems = 0 self.lst_log.numItems = 0
self:GetRewardsLog() self:GetRewardsLog()
else else
self:GetRewardsStatistic() self:GetRewardsStatistic()
end end
end) end)
-- 初始化数据 -- 初始化数据
self.partner_data = {} self.partner_data = {}
@ -105,44 +105,44 @@ function M:InitView()
self.rewards_data = {} self.rewards_data = {}
self.rewards_log = {} self.rewards_log = {}
-- 各个列表的初始化 -- 各个列表的初始化
self.lst_partner = self._view:GetChild("lst_partner") self.lst_partner = self._view:GetChild("lst_partner")
self.lst_partner:SetVirtual() self.lst_partner:SetVirtual()
self.lst_partner.itemRenderer = function(index, obj) self.lst_partner.itemRenderer = function(index, obj)
self:OnRenderPartnerItem(index, obj) self:OnRenderPartnerItem(index, obj)
end end
self.lst_partner.scrollPane.onPullUpRelease:Set(function() self.lst_partner.scrollPane.onPullUpRelease:Set(function()
self:GetPartnerData(self.lst_partner.numItems) self:GetPartnerData(self.lst_partner.numItems)
end) end)
self.lst_partner.onClickItem:Set(function() self.lst_partner.onClickItem:Set(function()
self.rewards_data = {} self.rewards_data = {}
self.lst_rewards.numItems = 0 self.lst_rewards.numItems = 0
self:GetRewardsData() self:GetRewardsData()
end) end)
self.lst_partner2 = self._view:GetChild("lst_partner2") self.lst_partner2 = self._view:GetChild("lst_partner2")
self.lst_partner2:SetVirtual() self.lst_partner2:SetVirtual()
self.lst_partner2.itemRenderer = function(index, obj) self.lst_partner2.itemRenderer = function(index, obj)
self:OnRenderPartnerItem2(index, obj) self:OnRenderPartnerItem2(index, obj)
end end
self.lst_partner2.scrollPane.onPullUpRelease:Set(function() self.lst_partner2.scrollPane.onPullUpRelease:Set(function()
self:GetPartnerData(self.lst_partner.numItems) self:GetPartnerData(self.lst_partner.numItems)
end) end)
self.lst_partner2.onClickItem:Set(function() self.lst_partner2.onClickItem:Set(function()
self.rewards_log = {} self.rewards_log = {}
self.lst_log.numItems = 0 self.lst_log.numItems = 0
self:GetRewardsLog() self:GetRewardsLog()
end) end)
self.lst_rewards = self._view:GetChild("lst_rewards") self.lst_rewards = self._view:GetChild("lst_rewards")
self.lst_rewards:SetVirtual() self.lst_rewards:SetVirtual()
self.lst_rewards.itemRenderer = function(index, obj) self.lst_rewards.itemRenderer = function(index, obj)
self:OnRenderRewardsItem(index, obj) self:OnRenderRewardsItem(index, obj)
end end
self.lst_log = self._view:GetChild("lst_rewards_record") self.lst_log = self._view:GetChild("lst_rewards_record")
self.lst_log:SetVirtual() self.lst_log:SetVirtual()
self.lst_log.itemRenderer = function(index, obj) self.lst_log.itemRenderer = function(index, obj)
self:OnRenderLogItem(index, obj) self:OnRenderLogItem(index, obj)
end end
self.lst_log.scrollPane.onPullUpRelease:Set(function() self.lst_log.scrollPane.onPullUpRelease:Set(function()
self:GetRewardsLog(self.lst_log.numItems) self:GetRewardsLog(self.lst_log.numItems)
@ -155,11 +155,11 @@ function M:InitView()
table.insert(values, "0") table.insert(values, "0")
-- if #group.playList > 0 then -- if #group.playList > 0 then
for i = 1, #group.playList do for i = 1, #group.playList do
local play = group.playList[i] local play = group.playList[i]
table.insert(items, play.name) table.insert(items, play.name)
table.insert(values, tostring(play.id)) table.insert(values, tostring(play.id))
end end
-- end -- end
local cb_play = self._view:GetChild("cb_play") local cb_play = self._view:GetChild("cb_play")
cb_play.items = items cb_play.items = items
cb_play.values = values cb_play.values = values
@ -196,8 +196,10 @@ function M:InitView()
self:GetRewardsLog() self:GetRewardsLog()
end) end)
-- 时间组件初始化 -- 时间组件初始化
self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0) self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"),
self.time_panel2 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date3"), self._view:GetChild("btn_date4"), -308, 0) self._view:GetChild("btn_date2"), -308, 0)
self.time_panel2 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date3"),
self._view:GetChild("btn_date4"), -308, 0)
end end
-- 获取合伙人数据 -- 获取合伙人数据
@ -214,8 +216,8 @@ function M:GetPartnerData(index, qid)
if not qid then if not qid then
-- if #members == 0 then return end -- if #members == 0 then return end
for i = 1, #members do for i = 1, #members do
self.partner_data[#self.partner_data + 1] = members[i] self.partner_data[#self.partner_data + 1] = members[i]
self.partner_data2[#self.partner_data2 + 1] = members[i] self.partner_data2[#self.partner_data2 + 1] = members[i]
end end
self.lst_partner.numItems = #self.partner_data self.lst_partner.numItems = #self.partner_data
self.lst_partner2.numItems = #self.partner_data2 self.lst_partner2.numItems = #self.partner_data2
@ -224,9 +226,9 @@ function M:GetPartnerData(index, qid)
self.lst_partner.selectedIndex = 0 self.lst_partner.selectedIndex = 0
self.lst_partner2.selectedIndex = 0 self.lst_partner2.selectedIndex = 0
if tem == 0 and #self.partner_data > 0 then if tem == 0 and #self.partner_data > 0 then
self:GetRewardsData() self:GetRewardsData()
elseif tem == 1 and #self.partner_data2 > 0 then elseif tem == 1 and #self.partner_data2 > 0 then
self:GetRewardsLog() self:GetRewardsLog()
end end
end end
else else
@ -259,8 +261,8 @@ function M:GetRewardsData()
local data local data
if #self.search_partner_data == 0 then if #self.search_partner_data == 0 then
if #self.partner_data == 0 then return end if #self.partner_data == 0 then return end
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
data = self.partner_data[self.lst_partner.selectedIndex + 1] data = self.partner_data[self.lst_partner.selectedIndex + 1]
else else
data = self.search_partner_data[1] data = self.search_partner_data[1]
end end
@ -282,7 +284,7 @@ function M:GetRewardsData()
rdata = self.search_rewards_data rdata = self.search_rewards_data
end end
for i = 1, #rewards do for i = 1, #rewards do
rdata[#rdata + 1] = rewards[i] rdata[#rdata + 1] = rewards[i]
end end
self.lst_rewards.numItems = #rdata self.lst_rewards.numItems = #rdata
end end
@ -299,7 +301,7 @@ function M:GetRewardsLog()
else else
data = self.search_partner_data[1] data = self.search_partner_data[1]
end end
local begin_time, end_time = self.time_panel1:GetDate() local begin_time, end_time = self.time_panel1:GetDate()
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GetRewardsLog(self.group_id, #self.rewards_log, 6, begin_time, end_time, data.uid, function(res) fgCtr:FG_GetRewardsLog(self.group_id, #self.rewards_log, 6, begin_time, end_time, data.uid, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
@ -309,32 +311,32 @@ function M:GetRewardsLog()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取奖励日志失败") ViewUtil.ErrorTip(res.ReturnCode, "获取奖励日志失败")
else else
local logs = res.Data.reward_logs local logs = res.Data.reward_logs
-- if #logs == 0 then return end -- if #logs == 0 then return end
local rdata local rdata
if self.ctr_search.selectedIndex == 0 then if self.ctr_search.selectedIndex == 0 then
rdata = self.rewards_log rdata = self.rewards_log
else else
rdata = self.search_rewards_log rdata = self.search_rewards_log
end end
if #rdata == 0 then if #rdata == 0 then
self._view:GetChild("tex_num1").text = res.Data.total_num / 100 self._view:GetChild("tex_num1").text = res.Data.total_num / 100
self._view:GetChild("tex_num2").text = d2ad(res.Data.total_hp) self._view:GetChild("tex_num2").text = d2ad(res.Data.total_hp)
end end
for i = 1, #logs do for i = 1, #logs do
rdata[#rdata + 1] = logs[i] rdata[#rdata + 1] = logs[i]
end end
self.lst_log.numItems = #rdata self.lst_log.numItems = #rdata
end end
end) end)
end end
-- 获取奖励统计 -- 获取奖励统计
function M:GetRewardsStatistic() function M:GetRewardsStatistic()
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
local data = self.partner_data2[self.lst_partner2.selectedIndex + 1] local data = self.partner_data2[self.lst_partner2.selectedIndex + 1]
local begin_time, end_time = self.time_panel2:GetDate() local begin_time, end_time = self.time_panel2:GetDate()
local pid = tonumber(self._view:GetChild("cb_play").value) local pid = tonumber(self._view:GetChild("cb_play").value)
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GetRewardStatistic(self.group_id, pid, begin_time, end_time, function(res) fgCtr:FG_GetRewardStatistic(self.group_id, pid, begin_time, end_time, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
@ -344,38 +346,38 @@ function M:GetRewardsStatistic()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取奖励日志失败") ViewUtil.ErrorTip(res.ReturnCode, "获取奖励日志失败")
else else
self._view:GetChild("tex_total_round").text = res.Data.round self._view:GetChild("tex_total_round").text = res.Data.round
self._view:GetChild("tex_total_rewards_round").text = res.Data.v_round self._view:GetChild("tex_total_rewards_round").text = res.Data.v_round
self._view:GetChild("tex_total_rewards_fag").text = d2ad(res.Data.hp_cost) self._view:GetChild("tex_total_rewards_fag").text = d2ad(res.Data.hp_cost)
self._view:GetChild("tex_total_rewards").text = d2ad(res.Data.gains) self._view:GetChild("tex_total_rewards").text = d2ad(res.Data.gains)
end end
end) end)
end end
-- 填充合伙人对象 -- 填充合伙人对象
function M:OnRenderPartnerItem(index, obj) function M:OnRenderPartnerItem(index, obj)
local data = self.partner_data[index + 1] local data = self.partner_data[index + 1]
obj:GetChild("tex_name").text = data.nick obj:GetChild("tex_name").text = data.nick
local btn_head = obj:GetChild("btn_head") local btn_head = obj:GetChild("btn_head")
local portrait = data.portrait local portrait = data.portrait
if portrait == "" then if portrait == "" then
btn_head.icon = "ui://Common/Head0" btn_head.icon = "ui://Common/Head0"
else else
ImageLoad.Load(portrait, btn_head._iconObject, self.class) ImageLoad.Load(portrait, btn_head._iconObject, self.class)
end end
end end
-- 填充第2页合伙人对象 -- 填充第2页合伙人对象
function M:OnRenderPartnerItem2(index, obj) function M:OnRenderPartnerItem2(index, obj)
local data = self.partner_data2[index + 1] local data = self.partner_data2[index + 1]
obj:GetChild("tex_name").text = data.nick obj:GetChild("tex_name").text = data.nick
local btn_head = obj:GetChild("btn_head") local btn_head = obj:GetChild("btn_head")
local portrait = data.portrait local portrait = data.portrait
if portrait == "" then if portrait == "" then
btn_head.icon = "ui://Common/Head0" btn_head.icon = "ui://Common/Head0"
else else
ImageLoad.Load(portrait, btn_head._iconObject, self.class) ImageLoad.Load(portrait, btn_head._iconObject, self.class)
end end
end end
-- 显示奖励 -- 显示奖励
@ -387,11 +389,11 @@ local function __showRewardsValue(rtype, cur_value, max_value, mng, value_type)
else else
str = string.format("%s%s", cur_value, tem) str = string.format("%s%s", cur_value, tem)
end end
return str return str
end end
-- 填充奖励设置对象 -- 填充奖励设置对象
function M:OnRenderRewardsItem(index, obj) function M:OnRenderRewardsItem(index, obj)
local data local data
if self.ctr_search.selectedIndex == 0 then if self.ctr_search.selectedIndex == 0 then
data = self.rewards_data[index + 1] data = self.rewards_data[index + 1]
else else
@ -405,43 +407,45 @@ function M:OnRenderRewardsItem(index, obj)
end end
local group = DataManager.groups:get(self.group_id) local group = DataManager.groups:get(self.group_id)
obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3, data.rewardValueType or 1) obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3,
local play_name = group:getPlayName(data.pid) data.rewardValueType or 1)
obj:GetChild("tex_name").text = play_name local play_name = group:getPlayName(data.pid)
obj:GetChild("tex_name").text = play_name
if data.rewardType == 3 or pdata.uid == DataManager.SelfUser.account_id then if data.rewardType == 3 or pdata.uid == DataManager.SelfUser.account_id then
obj:GetController("promote").selectedIndex = 1 obj:GetController("promote").selectedIndex = 1
else else
obj:GetController("promote").selectedIndex = 0 obj:GetController("promote").selectedIndex = 0
end end
local input_type = data.rewardType == 1 and 0 or 3 local input_type = data.rewardType == 1 and 0 or 3
obj:GetChild("btn_set").onClick:Set(function() obj:GetChild("btn_set").onClick:Set(function()
local gfiv = GroupNumberInputView.new(self._root_view,function(num) local gfiv = GroupNumberInputView.new(self._root_view, function(num)
local tem = num local tem = num
if data.rewardType == 2 then if data.rewardType == 2 then
tem = ad2d(tem) tem = ad2d(tem)
end end
if tem > data.max_value then if tem > data.max_value then
ViewUtil.ErrorTip(nil, "输入值超过上限") ViewUtil.ErrorTip(nil, "输入值超过上限")
return return
end end
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
fgCtr:FG_SetRewards(self.group_id, data.pid, pdata.partnerLev, pdata.uid, false, tem, function(res) fgCtr:FG_SetRewards(self.group_id, data.pid, pdata.partnerLev, pdata.uid, false, tem, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败") ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
else else
data.cur_value = tem data.cur_value = tem
obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value, group.lev < 3, data.rewardValueType or 1) obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value,
end group.lev < 3, data.rewardValueType or 1)
end
end) end)
end, input_type) end, input_type)
gfiv:Show() gfiv:Show()
end) end)
obj:GetChild("btn_set_all").onClick:Set(function() obj:GetChild("btn_set_all").onClick:Set(function()
local msg_win = MsgWindow.new(nil, "你是否为名下所有合伙人设定此奖励数值？", MsgWindow.MsgMode.OkAndCancel) local msg_win = MsgWindow.new(nil, "你是否为名下所有合伙人设定此奖励数值？", MsgWindow.MsgMode.OkAndCancel)
msg_win.onOk:Add(function( ... ) msg_win.onOk:Add(function(...)
local pdata local pdata
if self.ctr_search.selectedIndex == 0 then if self.ctr_search.selectedIndex == 0 then
pdata = self.partner_data[self.lst_partner.selectedIndex + 1] pdata = self.partner_data[self.lst_partner.selectedIndex + 1]
@ -450,34 +454,34 @@ function M:OnRenderRewardsItem(index, obj)
end end
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
fgCtr:FG_SetRewards(self.group_id, data.pid, pdata.partnerLev, pdata.uid, true, data.cur_value, function(res) fgCtr:FG_SetRewards(self.group_id, data.pid, pdata.partnerLev, pdata.uid, true, data.cur_value,
ViewUtil.CloseModalWait() function(res)
if res.ReturnCode ~= 0 then ViewUtil.CloseModalWait()
ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败") if res.ReturnCode ~= 0 then
else ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
ViewUtil.ShowBannerOnScreenCenter("设置合伙人奖励成功") else
end ViewUtil.ErrorTip(-1, "设置合伙人奖励成功")
end) end
end)
end) end)
msg_win:Show() msg_win:Show()
end)
end)
end end
-- 填充奖励日志 -- 填充奖励日志
function M:OnRenderLogItem(index, obj) function M:OnRenderLogItem(index, obj)
local data local data
if self.ctr_search.selectedIndex == 0 then if self.ctr_search.selectedIndex == 0 then
data = self.rewards_log[index + 1] data = self.rewards_log[index + 1]
else else
data = self.search_rewards_log[index + 1] data = self.search_rewards_log[index + 1]
end end
obj:GetChild("tex_rewards").text = d2ad(data.hp) obj:GetChild("tex_rewards").text = d2ad(data.hp)
local play_name = DataManager.groups:get(self.group_id):getPlayName(data.pid) local play_name = DataManager.groups:get(self.group_id):getPlayName(data.pid)
obj:GetChild("tex_game").text = play_name obj:GetChild("tex_game").text = play_name
obj:GetChild("tex_num").text = data.round / 100 obj:GetChild("tex_num").text = data.round / 100
obj:GetChild("tex_roomid").text = data.roomid obj:GetChild("tex_roomid").text = data.roomid
obj:GetChild("tex_date").text = os.date("%m月%d日\r%H:%M",data.time) obj:GetChild("tex_date").text = os.date("%m月%d日\r%H:%M", data.time)
end end
return M return M

78
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua
View File

@ -19,8 +19,8 @@ function M:initData()
self.lst_record.numItems = 0 self.lst_record.numItems = 0
self.record_data = {} self.record_data = {}
local now_time = os.date("*t",now) local now_time = os.date("*t", now)
local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0}) local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 })
self.begin_time = today self.begin_time = today
self.end_time = today + 86400 self.end_time = today + 86400
self:GetRecordData(0) self:GetRecordData(0)
@ -63,20 +63,21 @@ function M:InitView()
self:GetRecordData(self.lst_record.numItems) self:GetRecordData(self.lst_record.numItems)
end) end)
self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, nil, true) self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
-308, 0, nil, true)
local ctr_page = self._view:GetController("type") local ctr_page = self._view:GetController("type")
ctr_page.onChanged:Set(function() ctr_page.onChanged:Set(function()
self.record_data = {} self.record_data = {}
self.lst_record.numItems = 0 self.lst_record.numItems = 0
if ctr_page.selectedIndex == 0 then if ctr_page.selectedIndex == 0 then
local now_time = os.date("*t",now) local now_time = os.date("*t", now)
local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0}) local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 })
self.begin_time = today self.begin_time = today
self.end_time = today + 86400 self.end_time = today + 86400
else else
local now_time = os.date("*t",now) local now_time = os.date("*t", now)
local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0}) local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 })
self.begin_time = today - 86400 * ctr_page.selectedIndex self.begin_time = today - 86400 * ctr_page.selectedIndex
self.end_time = today - 86400 * (ctr_page.selectedIndex - 1) self.end_time = today - 86400 * (ctr_page.selectedIndex - 1)
end end
@ -113,7 +114,7 @@ function M:InitView()
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_FindPartnerStat( fgCtr:FG_FindPartnerStat(
self.group_id, self.group_id,
qid,0, 6, time_type,self.begin_time,self.end_time, qid, 0, 6, time_type, self.begin_time, self.end_time,
function(res) function(res)
-- printlog("aaaaaaaaaaaaaaaa22222222222222222222222222222") -- printlog("aaaaaaaaaaaaaaaa22222222222222222222222222222")
-- pt(res) -- pt(res)
@ -131,7 +132,7 @@ function M:InitView()
for j = 1, #res.Data.members do for j = 1, #res.Data.members do
local tem = item_result:AddItemFromPool() local tem = item_result:AddItemFromPool()
self:FillRecordItem(res.Data.members[j],tem) self:FillRecordItem(res.Data.members[j], tem)
end end
end end
end end
@ -147,9 +148,7 @@ function M:InitView()
) )
end end
function M:GetRecordData(index) function M:GetRecordData(index)
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
local time_type = self._view:GetController("type").selectedIndex local time_type = self._view:GetController("type").selectedIndex
@ -158,15 +157,13 @@ function M:GetRecordData(index)
end end
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GetPartnerStat(self.group_id, index, 6, time_type,self.begin_time,self.end_time,function(res) fgCtr:FG_GetPartnerStat(self.group_id, index, 6, time_type, self.begin_time, self.end_time, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode == 0 then if res.ReturnCode == 0 then
local members = res.Data.members local members = res.Data.members
-- printlog("aaaaaaaaaaaaaacccccccccccccccccccccccccccccccc") -- printlog("aaaaaaaaaaaaaacccccccccccccccccccccccccccccccc")
-- pt(members) -- pt(members)
for i = 1, #members do for i = 1, #members do
self.record_data[#self.record_data + 1] = members[i] self.record_data[#self.record_data + 1] = members[i]
end end
@ -187,23 +184,21 @@ local function __showRewardsValue(rtype, cur_value, max_value, mng)
end end
function M:FillRecordItem(data, obj) function M:FillRecordItem(data, obj)
local group = DataManager.groups:get(self.group_id)
local group = DataManager.groups:get(self.group_id) obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) .. "(" .. data.total .. ")"
obj:GetChild("tex_id").text = "ID:" .. data.uid
obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick).."("..data.total..")" local tex_total_score = obj:GetChild("tex_total_score")
obj:GetChild("tex_id").text = "ID:" .. data.uid local ctr_show_total = obj:GetController("show_total")
local tex_total_score = obj:GetChild("tex_total_score")
local ctr_show_total = obj:GetController("show_total")
if data._total_hp then if data._total_hp then
tex_total_score.text = data._total_hp tex_total_score.text = data._total_hp
ctr_show_total.selectedIndex = 1 ctr_show_total.selectedIndex = 1
else else
ctr_show_total.selectedIndex = 0 ctr_show_total.selectedIndex = 0
end end
obj:GetChild("tex_round_valid").text = d2ad(data.reward_hp+data.total_win)--d2ad(data.reward_hp) --data.valid_round / 100 obj:GetChild("tex_round_valid").text = d2ad(data.reward_hp + data.total_win) --d2ad(data.reward_hp) --data.valid_round / 100
obj:GetChild("tex_round_total").text = data.total_round obj:GetChild("tex_round_total").text = data.total_round
obj:GetChild("tex_total").text = d2ad(data.total_win) obj:GetChild("tex_total").text = d2ad(data.total_win)
obj:GetChild("tex_round_youxiao").text = data.valid_round / 100 obj:GetChild("tex_round_youxiao").text = data.valid_round / 100
@ -216,24 +211,23 @@ function M:FillRecordItem(data, obj)
fgCtr:FG_GetTotalHp(self.group_id, data.uid, function(res) fgCtr:FG_GetTotalHp(self.group_id, data.uid, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode == 0 then if res.ReturnCode == 0 then
local hp = d2ad(res.Data.hp)
local hp = d2ad(res.Data.hp) tex_total_score.text = hp
tex_total_score.text = hp data._total_hp = hp
data._total_hp = hp data.total = res.Data.total_member - 1
data.total = res.Data.total_member - 1 obj:GetChild("tex_name").text = data.nick .. "(" .. data.total .. ")"
obj:GetChild("tex_name").text = data.nick.."("..data.total..")" ctr_show_total.selectedIndex = 1
ctr_show_total.selectedIndex = 1
end end
end) end)
end) end)
local btn_award = obj:GetChild("btn_award") local btn_award = obj:GetChild("btn_award")
btn_award.text = d2ad(data.reward_hp)--d2ad(data.reward_hp+data.total_win) btn_award.text = d2ad(data.reward_hp) --d2ad(data.reward_hp+data.total_win)
btn_award.onClick:Set(function() btn_award.onClick:Set(function()
local time_type = self._view:GetController("type").selectedIndex local time_type = self._view:GetController("type").selectedIndex
local gniv = GroupPartnerStatPlay.new(self.group_id, data.uid, data.partnerLev, DataManager.SelfUser.account_id, time_type,self.begin_time,self.end_time) local gniv = GroupPartnerStatPlay.new(self.group_id, data.uid, data.partnerLev, DataManager.SelfUser.account_id,
time_type, self.begin_time, self.end_time)
gniv:Show() gniv:Show()
end) end)
@ -241,20 +235,19 @@ function M:FillRecordItem(data, obj)
btn_detail.onClick:Set(function() btn_detail.onClick:Set(function()
local time_type = self._view:GetController("type").selectedIndex local time_type = self._view:GetController("type").selectedIndex
--printlog("ccccccccccwwwwwwwwwwwwwwwwwwwwwwwwwwww ",self.begin_time," ",self.end_time) --printlog("ccccccccccwwwwwwwwwwwwwwwwwwwwwwwwwwww ",self.begin_time," ",self.end_time)
local gniv = GroupPartnerStatMember.new(self.group_id,data.uid, 0,self.begin_time,self.end_time) local gniv = GroupPartnerStatMember.new(self.group_id, data.uid, 0, self.begin_time, self.end_time)
gniv:Show() gniv:Show()
end) end)
local btnMen = obj:GetChild("btnMen") local btnMen = obj:GetChild("btnMen")
-- btnMen.text = d2ad(data.autoscore) -- btnMen.text = d2ad(data.autoscore)
local menControl = obj:GetController("menkan") local menControl = obj:GetController("menkan")
if group.lev==1 or (group.lev==3 and group.partnerLev>0) then if group.lev == 1 or (group.lev == 3 and group.partnerLev > 0) then
if (DataManager.SelfUser.account_id ~= data.uid) then if (DataManager.SelfUser.account_id ~= data.uid) then
menControl.selectedIndex = 1 menControl.selectedIndex = 1
btnMen.text = d2ad(data.autoscore) btnMen.text = d2ad(data.autoscore)
btnMen.touchable = true btnMen.touchable = true
else else
btnMen.text = d2ad(data.autoscore) btnMen.text = d2ad(data.autoscore)
menControl.selectedIndex = 1 menControl.selectedIndex = 1
@ -265,14 +258,14 @@ function M:FillRecordItem(data, obj)
end end
btnMen.onClick:Set(function() btnMen.onClick:Set(function()
local gfiv = GroupNumberInputView.new(self._root_view,function(num) local gfiv = GroupNumberInputView.new(self._root_view, function(num)
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_SetPartnerThreshold(self.group_id, data.uid, num, function(res) fgCtr:FG_SetPartnerThreshold(self.group_id, data.uid, num, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode,"设置失败") ViewUtil.ErrorTip(res.ReturnCode, "设置失败")
else else
ViewUtil.ShowBannerOnScreenCenter("设置成功") ViewUtil.ErrorTip(-1, "设置成功")
btnMen.text = num btnMen.text = num
data.autoscore = ad2d(num) data.autoscore = ad2d(num)
end end
@ -287,5 +280,4 @@ function M:OnRenderRecordItem(index, obj)
self:FillRecordItem(data, obj) self:FillRecordItem(data, obj)
end end
return M return M

212
lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua
View File

@ -6,8 +6,8 @@ local GroupPartnerRewardsView = {}
local M = GroupPartnerRewardsView local M = GroupPartnerRewardsView
function GroupPartnerRewardsView.new(group_id, partner_id, partner_lev) function GroupPartnerRewardsView.new(group_id, partner_id, partner_lev)
setmetatable(M, {__index = BaseWindow}) setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, {__index = M}) local self = setmetatable({}, { __index = M })
self.class = "GroupPartnerRewardsView" self.class = "GroupPartnerRewardsView"
self._close_destroy = true self._close_destroy = true
self._blur_view = blur_view self._blur_view = blur_view
@ -21,12 +21,12 @@ function GroupPartnerRewardsView.new(group_id, partner_id, partner_lev)
end end
function M:initView(url) function M:initView(url)
BaseWindow.init(self, "ui://NewGroup/Win_PartnerRewards") BaseWindow.init(self, "ui://NewGroup/Win_PartnerRewards")
self.lst_rewards = self._view:GetChild("lst_rewards") self.lst_rewards = self._view:GetChild("lst_rewards")
self.lst_rewards:SetVirtual() self.lst_rewards:SetVirtual()
self.lst_rewards.itemRenderer = function(index, obj) self.lst_rewards.itemRenderer = function(index, obj)
self:OnRenderRewardsItem(index, obj) self:OnRenderRewardsItem(index, obj)
end end
self.fandianControl = self._view:GetController("fandian") self.fandianControl = self._view:GetController("fandian")
self:GetRewardsData() self:GetRewardsData()
@ -46,14 +46,17 @@ function M:GetRewardsData()
local rewards = res.Data.rewards local rewards = res.Data.rewards
self.showxipai = res.Data.showxipai == true and 1 or 0 self.showxipai = res.Data.showxipai == true and 1 or 0
--pt(res) --pt(res)
if rewards and #rewards == 0 then printlog("服务器未设置合伙人奖励===>>>") return end if rewards and #rewards == 0 then
--printlog("获取奖励===>>>",res.Data.rewards) printlog("服务器未设置合伙人奖励===>>>")
--pt(res.Data.rewards) return
end
--printlog("获取奖励===>>>",res.Data.rewards)
--pt(res.Data.rewards)
-- local rdata = self.rewards_data -- local rdata = self.rewards_data
-- for i = 1, #rewards do -- for i = 1, #rewards do
-- rdata[#rdata + 1] = rewards[i] -- rdata[#rdata + 1] = rewards[i]
-- end -- end
for i=1,#rewards do for i = 1, #rewards do
self.rewards_data[i] = rewards[i] self.rewards_data[i] = rewards[i]
end end
self.lst_rewards.numItems = #self.rewards_data self.lst_rewards.numItems = #self.rewards_data
@ -84,123 +87,130 @@ end
-- 填充奖励设置对象 -- 填充奖励设置对象
function M:OnRenderRewardsItem(index, obj) function M:OnRenderRewardsItem(index, obj)
local data = self.rewards_data[index + 1] local data = self.rewards_data[index + 1]
local group = DataManager.groups:get(self.group_id) local group = DataManager.groups:get(self.group_id)
obj:GetController("fandian").selectedIndex = self.showxipai obj:GetController("fandian").selectedIndex = self.showxipai
--printlog("aaaaaaaaaaaaaaaaaaaaa ",__showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1)) --printlog("aaaaaaaaaaaaaaaaaaaaa ",__showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1))
obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1) obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data
obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3, data.rewardValueType or 1) .xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1)
obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, data.anchou_cur_value, data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1) obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3,
local play_name = group:getPlayName(data.pid) data.rewardValueType or 1)
obj:GetChild("tex_name").text = play_name obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, data.anchou_cur_value,
data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1)
local play_name = group:getPlayName(data.pid)
obj:GetChild("tex_name").text = play_name
if data.rewardType == 3 or self.partner_id == DataManager.SelfUser.account_id then if data.rewardType == 3 or self.partner_id == DataManager.SelfUser.account_id then
obj:GetController("promote").selectedIndex = 1 obj:GetController("promote").selectedIndex = 1
else else
obj:GetController("promote").selectedIndex = 0 obj:GetController("promote").selectedIndex = 0
end end
local input_type = data.rewardValueType == 1 and 0 or 3 local input_type = data.rewardValueType == 1 and 0 or 3
obj:GetChild("btn_set").onClick:Set(function() obj:GetChild("btn_set").onClick:Set(function()
local gfiv = GroupNumberInputView.new(self._root_view,function(num) local gfiv = GroupNumberInputView.new(self._root_view, function(num)
local tem = num local tem = num
if data.rewardValueType == 2 then if data.rewardValueType == 2 then
tem = ad2d(tem) tem = ad2d(tem)
end end
if tem > data.max_value then if tem > data.max_value then
ViewUtil.ErrorTip(nil, "输入值超过上限") ViewUtil.ErrorTip(nil, "输入值超过上限")
return return
-- elseif tem < data.cur_value then -- elseif tem < data.cur_value then
-- ViewUtil.ErrorTip(nil, "不能下调奖励") -- ViewUtil.ErrorTip(nil, "不能下调奖励")
-- return -- return
end end
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0,function(res) fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败") ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
else else
data.cur_value = tem data.cur_value = tem
obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value, group.lev < 3, data.rewardValueType or 1) obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value,
end group.lev < 3, data.rewardValueType or 1)
end
end) end)
end, input_type) end, input_type)
gfiv:Show() gfiv:Show()
end) end)
obj:GetChild("btn_set_all").onClick:Set(function() obj:GetChild("btn_set_all").onClick:Set(function()
local msg_win = MsgWindow.new(nil, string.format("是否设定所有玩法奖励为%s%%？", data.cur_value),
MsgWindow.MsgMode.OkAndCancel, nil, true)
local msg_win = MsgWindow.new(nil, string.format("是否设定所有玩法奖励为%s%%？", data.cur_value), MsgWindow.MsgMode.OkAndCancel,nil,true) msg_win.onOk:Add(function(...)
msg_win.onOk:Add(function( ... )
local single = msg_win.btnCheck.selected and 1 or 0 local single = msg_win.btnCheck.selected and 1 or 0
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.cur_value,single ,function(res) fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.cur_value, single,
ViewUtil.CloseModalWait() function(res)
if res.ReturnCode ~= 0 then ViewUtil.CloseModalWait()
ViewUtil.ErrorTip(res.ReturnCode, "设置奖励失败") if res.ReturnCode ~= 0 then
else ViewUtil.ErrorTip(res.ReturnCode, "设置奖励失败")
ViewUtil.ShowBannerOnScreenCenter("设置奖励成功") else
-- for i = 1, #self.rewards_data do ViewUtil.ErrorTip(-1, "设置奖励成功")
-- if self.rewards_data[i].rewardValueType == data.rewardValueType then -- for i = 1, #self.rewards_data do
-- self.rewards_data[i].cur_value = data.cur_value -- if self.rewards_data[i].rewardValueType == data.rewardValueType then
-- end -- self.rewards_data[i].cur_value = data.cur_value
-- end -- end
-- self.lst_rewards.numItems = #self.rewards_data -- end
self:GetRewardsData() -- self.lst_rewards.numItems = #self.rewards_data
end self:GetRewardsData()
end) end
end)
end) end)
msg_win:Show() msg_win:Show()
end)
end)
--xipai_reward --xipai_reward
local input_type1 = data.xipai_rewardValueType == 1 and 0 or 3 local input_type1 = data.xipai_rewardValueType == 1 and 0 or 3
obj:GetChild("btn_set1").onClick:Set(function() obj:GetChild("btn_set1").onClick:Set(function()
local gfiv = GroupNumberInputView.new(self._root_view,function(num) local gfiv = GroupNumberInputView.new(self._root_view, function(num)
local tem = num local tem = num
if data.xipai_rewardValueType == 2 then if data.xipai_rewardValueType == 2 then
tem = ad2d(tem) tem = ad2d(tem)
end end
if tem > data.xipai_max_value then if tem > data.xipai_max_value then
ViewUtil.ErrorTip(nil, "输入值超过上限") ViewUtil.ErrorTip(nil, "输入值超过上限")
return return
-- elseif tem < data.cur_value then -- elseif tem < data.cur_value then
-- ViewUtil.ErrorTip(nil, "不能下调奖励") -- ViewUtil.ErrorTip(nil, "不能下调奖励")
-- return -- return
end end
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0,function(res) fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌奖励失败") ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌奖励失败")
else else
data.xipai_cur_value = tem data.xipai_cur_value = tem
obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, tem, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1) obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, tem, data.xipai_max_value,
end group.lev < 3, data.xipai_rewardValueType or 1)
end
end) end)
end, input_type1) end, input_type1)
gfiv:Show() gfiv:Show()
end) end)
obj:GetChild("btn_set_all1").onClick:Set(function() obj:GetChild("btn_set_all1").onClick:Set(function()
local msg_win = MsgWindow.new(nil, string.format("是否设定所有洗牌奖励为%s%%？", data.xipai_cur_value), MsgWindow.MsgMode.OkAndCancel) local msg_win = MsgWindow.new(nil, string.format("是否设定所有洗牌奖励为%s%%？", data.xipai_cur_value),
msg_win.onOk:Add(function( ... ) MsgWindow.MsgMode.OkAndCancel)
local single = 0--msg_win.btnCheck.selected and 1 or 0 msg_win.onOk:Add(function(...)
local single = 0 --msg_win.btnCheck.selected and 1 or 0
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.xipai_cur_value,single,function(res) fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.xipai_cur_value,
single, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌失败") ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌失败")
else else
ViewUtil.ShowBannerOnScreenCenter("设置洗牌成功") ViewUtil.ErrorTip(-1, "设置洗牌成功")
-- printlog("ccccccccccccccccc11111111111111111111111") -- printlog("ccccccccccccccccc11111111111111111111111")
-- pt(res) -- pt(res)
-- for i = 1, #self.rewards_data do -- for i = 1, #self.rewards_data do
@ -214,55 +224,57 @@ function M:OnRenderRewardsItem(index, obj)
end) end)
end) end)
msg_win:Show() msg_win:Show()
end)
end)
--xipai_reward --xipai_reward
local input_type2 = data.anchou_rewardValueType == 1 and 0 or 3 local input_type2 = data.anchou_rewardValueType == 1 and 0 or 3
obj:GetChild("btn_set2").onClick:Set(function() obj:GetChild("btn_set2").onClick:Set(function()
local gfiv = GroupNumberInputView.new(self._root_view,function(num) local gfiv = GroupNumberInputView.new(self._root_view, function(num)
local tem = num local tem = num
if data.anchou_rewardValueType == 2 then if data.anchou_rewardValueType == 2 then
tem = ad2d(tem) tem = ad2d(tem)
end end
if tem > data.xipai_max_value then if tem > data.xipai_max_value then
ViewUtil.ErrorTip(nil, "输入值超过上限") ViewUtil.ErrorTip(nil, "输入值超过上限")
return return
-- elseif tem < data.cur_value then -- elseif tem < data.cur_value then
-- ViewUtil.ErrorTip(nil, "不能下调奖励") -- ViewUtil.ErrorTip(nil, "不能下调奖励")
-- return -- return
end end
printlog("jefe btn_set2") printlog("jefe btn_set2")
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0,function(res) fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "设置管理奖励失败") ViewUtil.ErrorTip(res.ReturnCode, "设置管理奖励失败")
else else
data.anchou_cur_value = tem data.anchou_cur_value = tem
obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, tem, data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1) obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, tem,
end data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1)
end
end) end)
end, input_type2) end, input_type2)
gfiv:Show() gfiv:Show()
end) end)
obj:GetChild("btn_set_all2").onClick:Set(function() obj:GetChild("btn_set_all2").onClick:Set(function()
local msg_win = MsgWindow.new(nil, string.format("是否设定所有管理奖励为%s%%？", data.anchou_cur_value), MsgWindow.MsgMode.OkAndCancel) local msg_win = MsgWindow.new(nil, string.format("是否设定所有管理奖励为%s%%？", data.anchou_cur_value),
msg_win.onOk:Add(function( ... ) MsgWindow.MsgMode.OkAndCancel)
local single = 0--msg_win.btnCheck.selected and 1 or 0 msg_win.onOk:Add(function(...)
local single = 0 --msg_win.btnCheck.selected and 1 or 0
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.anchou_cur_value,single,function(res) fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.anchou_cur_value,
single, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "设置管理失败") ViewUtil.ErrorTip(res.ReturnCode, "设置管理失败")
else else
ViewUtil.ShowBannerOnScreenCenter("设置管理成功") ViewUtil.ErrorTip(-1, "设置管理成功")
-- printlog("ccccccccccccccccc11111111111111111111111") -- printlog("ccccccccccccccccc11111111111111111111111")
-- pt(res) -- pt(res)
-- for i = 1, #self.rewards_data do -- for i = 1, #self.rewards_data do
@ -276,9 +288,7 @@ function M:OnRenderRewardsItem(index, obj)
end) end)
end) end)
msg_win:Show() msg_win:Show()
end)
end)
end end
return M return M

214
lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetMemberInfoDiaoduView.lua
View File

@ -3,22 +3,22 @@ local GroupSetMemberInfoDiaoduView = {}
local M = GroupSetMemberInfoDiaoduView local M = GroupSetMemberInfoDiaoduView
function GroupSetMemberInfoDiaoduView.new(group_id,member_id,group_black) function GroupSetMemberInfoDiaoduView.new(group_id, member_id, group_black)
setmetatable(M, {__index = BaseWindow}) setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, {__index = M}) local self = setmetatable({}, { __index = M })
self.class = "GroupSetMemberInfoDiaoduView" self.class = "GroupSetMemberInfoDiaoduView"
self.group_id = group_id self.group_id = group_id
self.member_id = member_id self.member_id = member_id
self.currentSelect = 0 self.currentSelect = 0
self.blackList = {{0,0},{25,0},{15,0}} self.blackList = { { 0, 0 }, { 25, 0 }, { 15, 0 } }
self:init("ui://NewGroup/Win_SetAddPlayerHBView") self:init("ui://NewGroup/Win_SetAddPlayerHBView")
return self return self
end end
function M:init(url) function M:init(url)
BaseWindow.init(self,url) BaseWindow.init(self, url)
self.n99 = self._view:GetChild("n99") self.n99 = self._view:GetChild("n99")
self.btnRate = self._view:GetChild("btnRate") self.btnRate = self._view:GetChild("btnRate")
self.n118 = self._view:GetChild("n118") self.n118 = self._view:GetChild("n118")
@ -27,128 +27,128 @@ function M:init(url)
self.btnRate.visible = false self.btnRate.visible = false
self.n118.visible = false self.n118.visible = false
self._view:GetChild("btn_close").onClick:Set( self._view:GetChild("btn_close").onClick:Set(
function () function()
self:Destroy() self:Destroy()
end end
) )
self.txtRate = self._view:GetChild("txtRate") self.txtRate = self._view:GetChild("txtRate")
self.txtRate.visible = false self.txtRate.visible = false
self.txtBlack = self._view:GetChild("txtBlack") self.txtBlack = self._view:GetChild("txtBlack")
self.txtBan = self._view:GetChild("txtBan") self.txtBan = self._view:GetChild("txtBan")
self.currentSelectState=self._view:GetChild("btn_current") self.currentSelectState = self._view:GetChild("btn_current")
self.currentSelectStateText=self._view:GetChild("diaodongtext") self.currentSelectStateText = self._view:GetChild("diaodongtext")
self._view:GetChild("btn_qd1").onClick:Set( self._view:GetChild("btn_qd1").onClick:Set(
function () function()
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_BanMemberHB( fgCtr:FG_BanMemberHB(
self.group_id, self.group_id,
self.member_id, self.member_id,
0, 0,
function (response) function(response)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if (response.ReturnCode == 0) then if (response.ReturnCode == 0) then
self.currentSelectStateText.text="整组调动 "..(response.Data.black+1) self.currentSelectStateText.text = "整组调动 " .. (response.Data.black + 1)
ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1) ViewUtil.ErrorTip(-1, '设置成功！', 1)
else else
ViewUtil.ErrorTip(response.ReturnCode, '设置失败！') ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
end
end end
) end
end )
) end
)
self._view:GetChild("btn_qd2").onClick:Set( self._view:GetChild("btn_qd2").onClick:Set(
function () function()
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_BanMemberHB( fgCtr:FG_BanMemberHB(
self.group_id, self.group_id,
self.member_id, self.member_id,
1, 1,
function (response) function(response)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if (response.ReturnCode == 0) then if (response.ReturnCode == 0) then
self.currentSelectStateText.text="整组调动 "..(response.Data.black+1) self.currentSelectStateText.text = "整组调动 " .. (response.Data.black + 1)
ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1) ViewUtil.ErrorTip(-1, '设置成功！', 1)
else else
ViewUtil.ErrorTip(response.ReturnCode, '设置失败！') ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
end
end end
) end
end )
) end
)
self._view:GetChild("btn_qd3").onClick:Set( self._view:GetChild("btn_qd3").onClick:Set(
function () function()
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_BanMemberHB( fgCtr:FG_BanMemberHB(
self.group_id, self.group_id,
self.member_id, self.member_id,
2, 2,
function (response) function(response)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if (response.ReturnCode == 0) then if (response.ReturnCode == 0) then
self.currentSelectStateText.text="整组调动 "..(response.Data.black+1) self.currentSelectStateText.text = "整组调动 " .. (response.Data.black + 1)
ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1) ViewUtil.ErrorTip(-1, '设置成功！', 1)
else else
ViewUtil.ErrorTip(response.ReturnCode, '设置失败！') ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
end
end end
) end
end )
) end
)
self._view:GetChild("btnRate").onClick:Set( self._view:GetChild("btnRate").onClick:Set(
function () function()
local gniv = local gniv =
GroupNumberInputView.new( GroupNumberInputView.new(
self._root_view, self._root_view,
function(num) function(num)
if num >100 then if num > 100 then
ViewUtil.ShowBannerOnScreenCenter('设置失败,不能超过100', 1) ViewUtil.ErrorTip(-1, '设置失败,不能超过100', 1)
return return
end end
self.txtRate.text = num self.txtRate.text = num
end end
) )
gniv:Show() gniv:Show()
end end
) )
self._view:GetChild("btnBlack").onClick:Set( self._view:GetChild("btnBlack").onClick:Set(
function () function()
local gniv = local gniv =
GroupNumberInputView.new( GroupNumberInputView.new(
self._root_view, self._root_view,
function(num) function(num)
self.txtBlack.text = num self.txtBlack.text = num
end, end,
3 3
) )
gniv:Show() gniv:Show()
end end
) )
self.zm = self._view:GetController('zm') self.zm = self._view:GetController('zm')
self.zhengzu = self._view:GetChild("zhengzu") self.zhengzu = self._view:GetChild("zhengzu")
self.zhengzu.onChanged:Set(function () self.zhengzu.onChanged:Set(function()
local zzValue = tonumber(self.zhengzu.value) local zzValue = tonumber(self.zhengzu.value)
self.zm.selectedIndex = zzValue - 1 self.zm.selectedIndex = zzValue - 1
self.currentSelect = zzValue - 1 self.currentSelect = zzValue - 1
self.txtRate.text = self.blackList[zzValue][1] self.txtRate.text = self.blackList[zzValue][1]
self.txtBlack.text = self.blackList[zzValue][2] self.txtBlack.text = self.blackList[zzValue][2]
self:ChangeOrate() self:ChangeOrate()
end) end)
self._view:GetChild("btn_ok").onClick:Set( self._view:GetChild("btn_ok").onClick:Set(
function () function()
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_BanMemberHB( fgCtr:FG_BanMemberHB(
@ -157,14 +157,14 @@ function M:init(url)
self.currentSelect, self.currentSelect,
tonumber(self.txtRate.text), tonumber(self.txtRate.text),
tonumber(self.txtBlack.text), tonumber(self.txtBlack.text),
function (response) function(response)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if (response.ReturnCode == 0) then if (response.ReturnCode == 0) then
self.currentSelectStateText.text="整组调动 "..(response.Data.ban+1) self.currentSelectStateText.text = "整组调动 " .. (response.Data.ban + 1)
self.blackList = {{0,0},{25,0},{15,0}} self.blackList = { { 0, 0 }, { 25, 0 }, { 15, 0 } }
self.blackList[response.Data.ban+1][1] = response.Data.ban_rate self.blackList[response.Data.ban + 1][1] = response.Data.ban_rate
self.blackList[response.Data.ban+1][2] = response.Data.ban_max_value self.blackList[response.Data.ban + 1][2] = response.Data.ban_max_value
ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1) ViewUtil.ErrorTip(-1, '设置成功！', 1)
else else
ViewUtil.ErrorTip(response.ReturnCode, '设置失败！') ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
end end
@ -174,10 +174,9 @@ function M:init(url)
) )
end end
function M:SetCurrentState(selectID, data)
function M:SetCurrentState(selectID,data) self.blackList = { { 0, 0 }, { 25, 0 }, { 15, 0 } }
self.blackList = {{0,0},{25,0},{15,0}} self.currentSelectStateText.text = "整组调动 " .. selectID
self.currentSelectStateText.text="整组调动 "..selectID
self.currentSelect = selectID - 1 self.currentSelect = selectID - 1
self.blackList[selectID][1] = data.ban_rate self.blackList[selectID][1] = data.ban_rate
self.blackList[selectID][2] = data.ban_max_value self.blackList[selectID][2] = data.ban_max_value
@ -193,9 +192,7 @@ function M:SetCurrentState(selectID,data)
end end
function M:ChangeOrate() function M:ChangeOrate()
if tonumber(self.zhengzu.value) == 2 then if tonumber(self.zhengzu.value) == 2 then
self.n99.visible = true self.n99.visible = true
self.btnRate.visible = true self.btnRate.visible = true
self.n118.visible = true self.n118.visible = true
@ -206,13 +203,10 @@ function M:ChangeOrate()
self.n118.visible = false self.n118.visible = false
self.txtRate.visible = false self.txtRate.visible = false
end end
end end
function M:ChangeZ(num) function M:ChangeZ(num)
self.zhengzu.visibleItemCount = num self.zhengzu.visibleItemCount = num
end end
return M return M

58
lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetPermissionView.lua
View File

@ -6,38 +6,38 @@ local GroupSetPermissionView = {}
local M = GroupSetPermissionView local M = GroupSetPermissionView
function GroupSetPermissionView.new(blur_view, group_id, member) function GroupSetPermissionView.new(blur_view, group_id, member)
setmetatable(M, {__index = BaseWindow}) setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, {__index = M}) local self = setmetatable({}, { __index = M })
self.class = "GroupSetPermissionView" self.class = "GroupSetPermissionView"
self._close_destroy = true self._close_destroy = true
self._blur_view = blur_view self._blur_view = blur_view
self.group_id = group_id self.group_id = group_id
self.member = member self.member = member
self:init("ui://NewGroup/Win_Permission") self:init("ui://NewGroup/Win_Permission")
return self return self
end end
function M:init(url) function M:init(url)
BaseWindow.init(self,url) BaseWindow.init(self, url)
local perm_array = MngPermission.getPermData(self.member.permission) local perm_array = MngPermission.getPermData(self.member.permission)
for i = 1, 5 do for i = 1, 5 do
local btn_perm = self._view:GetChild("btn_" .. i) local btn_perm = self._view:GetChild("btn_" .. i)
btn_perm.selected = perm_array[i] btn_perm.selected = perm_array[i]
end end
local btn_ok = self._view:GetChild("btn_ok") local btn_ok = self._view:GetChild("btn_ok")
btn_ok.onClick:Set(function() btn_ok.onClick:Set(function()
local permission = MngPermission.getPermValue(self:getPermission()) local permission = MngPermission.getPermValue(self:getPermission())
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_SetMngPermission(self.group_id, self.member.uid, permission, function(res) fgCtr:FG_SetMngPermission(self.group_id, self.member.uid, permission, function(res)
if res.ReturnCode == 0 then if res.ReturnCode == 0 then
ViewUtil.ShowBannerOnScreenCenter("设置成功") ViewUtil.ErrorTip(-1, "设置成功")
self.member.permission = permission self.member.permission = permission
self:Destroy() self:Destroy()
else else
ViewUtil.ErrorTip(nil, "设置权限失败") ViewUtil.ErrorTip(nil, "设置权限失败")
end end
end) end)
end) end)
end end
function M:getPermission() function M:getPermission()

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

@ -174,7 +174,8 @@ function M:FillData(player)
self._tex_player_id.text = "ID:" .. player.self_user.account_id self._tex_player_id.text = "ID:" .. player.self_user.account_id
end end
end end
self._ctr_room_owner.selectedIndex = room.owner_id == player.self_user.account_id and 1 or 0 -- self._ctr_room_owner.selectedIndex = room.owner_id == player.self_user.account_id and 1 or 0
self._ctr_room_owner.selectedIndex = player.seat == 1 and 1 or 0
if (DataManager.CurrenRoom.self_player ~= player) then if (DataManager.CurrenRoom.self_player ~= player) then
self._ctr_offline.selectedIndex = player.line_state == 0 and 1 or 0 self._ctr_offline.selectedIndex = player.line_state == 0 and 1 or 0
end end

2
lua_probject/base_project/Game/View/ResultView.lua
View File

@ -262,7 +262,7 @@ function M:__ShareResultStr()
str = str .. p.nick .. sp .. p.id .. '：' .. p.score .. '\r' str = str .. p.nick .. sp .. p.id .. '：' .. p.score .. '\r'
end end
GameApplication.Instance:CopyToClipboard(str) GameApplication.Instance:CopyToClipboard(str)
ViewUtil.ShowBannerOnScreenCenter('已复制战绩') ViewUtil.ErrorTip(-1, '已复制战绩')
end end
function M:SetGSListlineGap(linespacing) function M:SetGSListlineGap(linespacing)

2
lua_probject/base_project/Game/View/ViewUtil.lua
View File

@ -81,7 +81,7 @@ end
local _tip_timer local _tip_timer
local function __ShowTips(msg, time) local function __ShowTips(msg, time)
time = time or 2 time = time or 3
if _defaultTooltipWin then if _defaultTooltipWin then
_tip_timer:Stop() _tip_timer:Stop()
_defaultTooltipWin:Dispose() _defaultTooltipWin:Dispose()

145
lua_probject/extend_project/extend/majiang/fuzhou/CardCheck.lua
View File

@ -1,11 +1,11 @@
-- 检测牌是否存在 -- 检测牌是否存在
local function checkCard(eventCard,cardList,num) local function checkCard(eventCard, cardList, num)
num = num == nil and 1 or num num = num == nil and 1 or num
local result = 0 local result = 0
for i = 1,#cardList do for i = 1, #cardList do
if (cardList[i] == eventCard) then if (cardList[i] == eventCard) then
result = result + 1 result = result + 1
if(result ==num) then if (result == num) then
return true return true
end end
end end
@ -14,24 +14,24 @@ local function checkCard(eventCard,cardList,num)
end end
-- 移除指定数量的牌 -- 移除指定数量的牌
local function removeCard(cardList, card,count) local function removeCard(cardList, card, count)
for i=1,count do for i = 1, count do
list_remove(cardList,card) list_remove(cardList, card)
end end
end end
local function checkCardAndRomve(eventCard,cardList,num) local function checkCardAndRomve(eventCard, cardList, num)
if(checkCard(eventCard,cardList,num)) then if (checkCard(eventCard, cardList, num)) then
removeCard(cardList,eventCard,num) removeCard(cardList, eventCard, num)
return true return true
end end
return false return false
end end
-- 获取列表中牌数量 -- 获取列表中牌数量
local function cardNum(eventCard,cardList) local function cardNum(eventCard, cardList)
local result = 0 local result = 0
for i=1,#cardList do for i = 1, #cardList do
local card = cardList[i] local card = cardList[i]
if (card == eventCard) then if (card == eventCard) then
result = result + 1 result = result + 1
@ -40,7 +40,7 @@ local function cardNum(eventCard,cardList)
return result return result
end end
local zhongid = 0 local zhongid = 0
local M = { local M = {
@ -55,15 +55,15 @@ local M = {
function M:push(cardGroup) function M:push(cardGroup)
self.stack[#self.stack+1] = cardGroup self.stack[#self.stack + 1] = cardGroup
end end
function M:rollBack() function M:rollBack()
local cardGroup = self.stack[#self.stack] local cardGroup = self.stack[#self.stack]
table.remove(self.stack,#self.stack) table.remove(self.stack, #self.stack)
for _,card in ipairs(cardGroup) do for _, card in ipairs(cardGroup) do
if (card == zhongid) then if (card == zhongid) then
self.zhong_count = self.zhong_count +1 self.zhong_count = self.zhong_count + 1
else else
self.cardList[#self.cardList + 1] = card self.cardList[#self.cardList + 1] = card
end end
@ -72,14 +72,14 @@ function M:rollBack()
end end
function M:tryShunzi(card) function M:tryShunzi(card)
if (card < 400 and card % 100 > 7) then if (card < 400 and card % 100 > 7) then
return false return false
end end
if (checkCard(card + 1, self.cardList) and checkCard(card + 2, self.cardList)) then if (checkCard(card + 1, self.cardList) and checkCard(card + 2, self.cardList)) then
removeCard(self.cardList, card, 1) removeCard(self.cardList, card, 1)
removeCard(self.cardList, card + 1, 1) removeCard(self.cardList, card + 1, 1)
removeCard(self.cardList, card + 2, 1) removeCard(self.cardList, card + 2, 1)
local cardGroup = {card,card+1,card+2} local cardGroup = { card, card + 1, card + 2 }
self:push(cardGroup) self:push(cardGroup)
return true return true
end end
@ -88,7 +88,7 @@ end
function M:tryKezi(card) function M:tryKezi(card)
if (checkCardAndRomve(card, self.cardList, 3)) then if (checkCardAndRomve(card, self.cardList, 3)) then
local cardGroup = {card,card,card} local cardGroup = { card, card, card }
self:push(cardGroup) self:push(cardGroup)
return true return true
end end
@ -100,7 +100,7 @@ function M:tryPair(card)
return false return false
end end
if (checkCardAndRomve(card, self.cardList, 2)) then if (checkCardAndRomve(card, self.cardList, 2)) then
local cardGroup = {card,card} local cardGroup = { card, card }
self:push(cardGroup) self:push(cardGroup)
self.pair_count = 1 self.pair_count = 1
return true return true
@ -108,22 +108,21 @@ function M:tryPair(card)
return false return false
end end
function M:tryKezi1Zhong(card) function M:tryKezi1Zhong(card)
if (self.zhong_count >= 1 and checkCardAndRomve(card, self.cardList,2)) then if (self.zhong_count >= 1 and checkCardAndRomve(card, self.cardList, 2)) then
local cardGroup = {card,card,zhongid} local cardGroup = { card, card, zhongid }
self:push(cardGroup) self:push(cardGroup)
self.zhong_count = self.zhong_count -1 self.zhong_count = self.zhong_count - 1
return true return true
end end
return false return false
end end
function M:tryKezi2Zhong(card) function M:tryKezi2Zhong(card)
if (self.zhong_count >= 2 and checkCardAndRomve(card, self.cardList,1)) then if (self.zhong_count >= 2 and checkCardAndRomve(card, self.cardList, 1)) then
local cardGroup = {card,zhongid,zhongid} local cardGroup = { card, zhongid, zhongid }
self:push(cardGroup) self:push(cardGroup)
self.zhong_count = self.zhong_count -2 self.zhong_count = self.zhong_count - 2
return true return true
end end
return false return false
@ -141,8 +140,8 @@ function M:tryShunzi1Zhong(card)
if (checkCard(card + 1, self.cardList)) then if (checkCard(card + 1, self.cardList)) then
removeCard(self.cardList, card, 1) removeCard(self.cardList, card, 1)
removeCard(self.cardList, card + 1, 1) removeCard(self.cardList, card + 1, 1)
self.zhong_count = self.zhong_count -1 self.zhong_count = self.zhong_count - 1
local cardGroup = {card,card+1,zhongid} local cardGroup = { card, card + 1, zhongid }
self:push(cardGroup) self:push(cardGroup)
return true return true
end end
@ -150,8 +149,8 @@ function M:tryShunzi1Zhong(card)
if (checkCard(card + 2, self.cardList) and ((card + 1) % 100 ~= 0)) then if (checkCard(card + 2, self.cardList) and ((card + 1) % 100 ~= 0)) then
removeCard(self.cardList, card, 1) removeCard(self.cardList, card, 1)
removeCard(self.cardList, card + 2, 1) removeCard(self.cardList, card + 2, 1)
self.zhong_count = self.zhong_count -1 self.zhong_count = self.zhong_count - 1
local cardGroup = {card,zhongid,card+2} local cardGroup = { card, zhongid, card + 2 }
self:push(cardGroup) self:push(cardGroup)
return true return true
end end
@ -166,9 +165,9 @@ function M:tryPair1Zhong(card)
return false return false
end end
removeCard(self.cardList, card, 1) removeCard(self.cardList, card, 1)
local cardGroup = {card,zhongid} local cardGroup = { card, zhongid }
self:push(cardGroup) self:push(cardGroup)
self.zhong_count = self.zhong_count -1 self.zhong_count = self.zhong_count - 1
self.pair_count = 1 self.pair_count = 1
return true return true
end end
@ -180,9 +179,9 @@ function M:tryPair2Zhong()
if (self.zhong_count < 2) then if (self.zhong_count < 2) then
return false return false
end end
local cardGroup = {zhongid,zhongid} local cardGroup = { zhongid, zhongid }
self:push(cardGroup) self:push(cardGroup)
self.zhong_count = self.zhong_count -2 self.zhong_count = self.zhong_count - 2
self.pair_count = 1 self.pair_count = 1
return true return true
end end
@ -233,7 +232,6 @@ function M:tryWin()
end end
if (self:tryKezi2Zhong(activeCard)) then if (self:tryKezi2Zhong(activeCard)) then
if (self:tryWin()) then if (self:tryWin()) then
return true return true
end end
@ -271,16 +269,16 @@ function M:checkQidui()
end end
function M:isQdPari(cardList) function M:isQdPari(cardList)
if(self.qidui_pari_count == 7) then if (self.qidui_pari_count == 7) then
return true return true
end end
if (#cardList== 0) then if (#cardList == 0) then
return true return true
end end
local card = cardList[1] local card = cardList[1]
if (cardNum(card, cardList) >= 2) then if (cardNum(card, cardList) >= 2) then
removeCard(cardList, card, 2) removeCard(cardList, card, 2)
self.qidui_pari_count = self.qidui_pari_count +1 self.qidui_pari_count = self.qidui_pari_count + 1
if (self:isQdPari(cardList)) then if (self:isQdPari(cardList)) then
return true return true
end end
@ -289,7 +287,7 @@ function M:isQdPari(cardList)
if (self.hongzhong_count > 0) then if (self.hongzhong_count > 0) then
removeCard(cardList, card, 1) removeCard(cardList, card, 1)
self.hongzhong_count = self.hongzhong_count - 1 self.hongzhong_count = self.hongzhong_count - 1
self.qidui_pari_count = self.qidui_pari_count +1 self.qidui_pari_count = self.qidui_pari_count + 1
if (self:isQdPari(cardList)) then if (self:isQdPari(cardList)) then
return true return true
end end
@ -297,13 +295,13 @@ function M:isQdPari(cardList)
return false return false
end end
local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi) local function init(self, cardInhand, addCard, isZhong, qidui, eightLaizi)
self.stack = {} self.stack = {}
self.pair_count = 0 self.pair_count = 0
self.cardList = membe_clone(cardInhand) self.cardList = membe_clone(cardInhand)
self.qidui = qidui self.qidui = qidui
self.eight_laizi = eightLaizi self.eight_laizi = eightLaizi
self.cardList[#self.cardList+1] = addCard self.cardList[#self.cardList + 1] = addCard
if (isZhong) then if (isZhong) then
self.zhong_count = cardNum(zhongid, self.cardList) self.zhong_count = cardNum(zhongid, self.cardList)
removeCard(self.cardList, zhongid, self.zhong_count) removeCard(self.cardList, zhongid, self.zhong_count)
@ -315,64 +313,59 @@ local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi)
end end
local specialCardList = { 401, 402, 403, 404, 405, 406, 407 } local specialCardList = { 401, 402, 403, 404, 405, 406, 407 }
function M.tingPai(cardInhand, isZhong, qidui, eightLaizi) function M.tingPai(cardInhand, data)
-- printlog("isZhong", isZhong) data = data or {}
-- printlog("qidui", qidui)
-- printlog("eightLaizi", eightLaizi)
-- pt(cardInhand)
local self = setmetatable({}, { __index = M }) local self = setmetatable({}, { __index = M })
local tingList = {} local tingList = {}
if not cardInhand or #cardInhand == 0 then if not cardInhand or #cardInhand == 0 then
return tingList return tingList
end end
for k=100,300,100 do for k = 100, 300, 100 do
for i=1,9 do for i = 1, 9 do
local tem = k + i local tem = k + i
local result = init(self,cardInhand,tem,isZhong,qidui,eightLaizi) local result = init(self, cardInhand, tem, data._flag_haveLaizi, data._hu_qidui, data._data_laizi)
--printlog("返回结果为===>>>",result) --printlog("返回结果为===>>>",result)
if(result) then if (result) then
tingList[#tingList + 1] = tem tingList[#tingList + 1] = tem
end end
end end
end end
for j=1,#specialCardList do for j = 1, #specialCardList do
local tem = specialCardList[j] local tem = specialCardList[j]
local result = init(self,cardInhand,tem,isZhong,qidui,eightLaizi) local result = init(self, cardInhand, tem, data._flag_haveLaizi, data._hu_qidui, data._data_laizi)
if(result) then if (result) then
tingList[#tingList + 1] = tem tingList[#tingList + 1] = tem
end end
end end
return tingList return tingList
end end
function M.MuiltiplteCaculateTingPai(cardInhand,isZhong,qidui,eightLaizi) function M.MuiltiplteCaculateTingPai(cardInhand, isZhong, qidui, eightLaizi)
if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo>0 then if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo > 0 then
zhongid=DataManager.CurrenRoom.laiziInfo[1] zhongid = DataManager.CurrenRoom.laiziInfo[1]
local tempTingList2={} local tempTingList2 = {}
local tempTingList1=M.tingPai(cardInhand,isZhong,qidui,eightLaizi) local tempTingList1 = M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
if DataManager.CurrenRoom.laiziInfo[2] then if DataManager.CurrenRoom.laiziInfo[2] then
zhongid=DataManager.CurrenRoom.laiziInfo[2] zhongid = DataManager.CurrenRoom.laiziInfo[2]
tempTingList2=M.tingPai(cardInhand,isZhong,qidui,eightLaizi) tempTingList2 = M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
zhongid=DataManager.CurrenRoom.laiziInfo[1] zhongid = DataManager.CurrenRoom.laiziInfo[1]
end end
local currentTingList={} local currentTingList = {}
if #tempTingList1>0 and #tempTingList2>0 then if #tempTingList1 > 0 and #tempTingList2 > 0 then
currentTingList=CombineDictionaryAndRemoveSomeItem(tempTingList1,tempTingList2) currentTingList = CombineDictionaryAndRemoveSomeItem(tempTingList1, tempTingList2)
elseif #tempTingList1>0 then elseif #tempTingList1 > 0 then
currentTingList=tempTingList1 currentTingList = tempTingList1
elseif #tempTingList2>0 then elseif #tempTingList2 > 0 then
currentTingList=tempTingList2 currentTingList = tempTingList2
end end
return currentTingList return currentTingList
else else
zhongid=0 zhongid = 0
return M.tingPai(cardInhand,isZhong,qidui,eightLaizi) return M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
end end
end end
return M return M

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

@ -67,7 +67,31 @@ function M:InitView(url)
self.showNextCtr = self._view:GetController('showNext') self.showNextCtr = self._view:GetController('showNext')
self.showNextList = self._view:GetChild('list_showNext') self.showNextList = self._view:GetChild('list_showNext')
self._view:GetChild('btn_showNext').onClick:Set(function() self._view:GetChild('btn_showNext').onClick:Set(function()
self:reqResidueCard() coroutine.start(function()
local time = 0
ViewUtil:ShowModalWait2(0.01)
while not self._flag_getRemindCard do
if time > 20 then
break
end
coroutine.wait(0.05)
end
ViewUtil.CloseModalWait2()
if self._flag_getRemindCard then
self.showNextCtr.selectedIndex = 1
self.showNextList:SetVirtual()
self.showNextList.itemRenderer = function(index, obj)
local card = self.cardSet[index + 1]
self:FillShowCards(obj, card, self.cardMap[card])
obj.data = { card = card }
end
self.showNextList.numItems = #self.cardSet
time = time + 1
else
self:reqResidueCard()
end
end)
end) end)
self._view:GetChild('btn_closeShow').onClick:Set(function() self._view:GetChild('btn_closeShow').onClick:Set(function()
self.showNextCtr.selectedIndex = 0 self.showNextCtr.selectedIndex = 0
@ -169,13 +193,10 @@ function M:UpdatePlayerInfoView()
end end
function M:NewMJPlayerCardInfoView(view, index) function M:NewMJPlayerCardInfoView(view, index)
return MJMainView.NewMJPlayerCardInfoView(self, view, index)
--[[
if index == 1 then if index == 1 then
return MJPlayerSelfCardInfoView.new(view, self) return MJPlayerSelfCardInfoView.new(view, self, nil, "S")
end end
return MJPlayerCardInfoView.new(view, self) return MJMainView.NewMJPlayerCardInfoView(self, view, index)
]]
end end
function M:EventInit() function M:EventInit()
@ -217,6 +238,7 @@ function M:EventInit()
--self._viewText_testName.text = 0 --self._viewText_testName.text = 0
self:UpdateRound() self:UpdateRound()
self:RemoveCursor() self:RemoveCursor()
self:reqResidueCard()
self._state.selectedIndex = 1 self._state.selectedIndex = 1
self:ShowJing() self:ShowJing()
if self._niao_View then if self._niao_View then
@ -266,7 +288,8 @@ function M:EventInit()
info:UpdateHandCard() info:UpdateHandCard()
local outcard = UIPackage.CreateObjectFromURL(_gcm_outcard_url) local outcard = UIPackage.CreateObjectFromURL(_gcm_outcard_url)
info:UpdateOutCardList(outcard, card, self._cursor) info:UpdateOutCardList(outcard, card, self._cursor)
self._player_card_info[1]._ctr_tip.selectedIndex = 0
self._player_card_info[1]._ctr_showGuoHu.selectedIndex = 0
self:PlayMJSound("chupai.mp3") self:PlayMJSound("chupai.mp3")
self:PlaySound("FuZhou_MJ", p.self_user.sex, tostring(card)) self:PlaySound("FuZhou_MJ", p.self_user.sex, tostring(card))
if seat == _room.self_player.seat then if seat == _room.self_player.seat then
@ -275,6 +298,7 @@ function M:EventInit()
end) end)
_gamectr:AddEventListener(TX_GameEvent.GetCard, function(...) _gamectr:AddEventListener(TX_GameEvent.GetCard, function(...)
self:__CloseTip() self:__CloseTip()
self:reqResidueCard()
local arg = { ... } local arg = { ... }
local seat = arg[1] local seat = arg[1]
local card = arg[2] local card = arg[2]
@ -542,26 +566,19 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...) _gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...)
local arg = { ... } local arg = { ... }
local residueCard = arg[1] local residueCard = arg[1]
local cardMap = {} self.cardMap = {}
local cardSet = {} self.cardSet = {}
self.showNextCtr.selectedIndex = 1
for i = 1, #residueCard do for i = 1, #residueCard do
local cardNum = residueCard[i] local cardNum = residueCard[i]
if not cardMap[cardNum] then if not self.cardMap[cardNum] then
cardMap[cardNum] = 1 self.cardMap[cardNum] = 1
table.insert(cardSet, cardNum) table.insert(self.cardSet, cardNum)
else else
cardMap[cardNum] = cardMap[cardNum] + 1 self.cardMap[cardNum] = self.cardMap[cardNum] + 1
end end
end end
table.sort(cardSet) table.sort(self.cardSet)
self.showNextList:SetVirtual() self._flag_getRemindCard = true
self.showNextList.itemRenderer = function(index, obj)
local card = cardSet[index + 1]
self:FillShowCards(obj, card, cardMap[card])
obj.data = { card = card }
end
self.showNextList.numItems = #cardSet
end) end)
--替换mianview的事件 --替换mianview的事件
@ -593,12 +610,10 @@ function M:OutCard(card)
info:UpdateHandCard() info:UpdateHandCard()
info:UpdateOutCardList(nil, card, self._cursor) info:UpdateOutCardList(nil, card, self._cursor)
info._ctr_tip.selectedIndex = 0
info._ctr_showGuoHu.selectedIndex = 0
self:markOutCards(false, card) self:markOutCards(false, card)
self:PlaySound("FuZhou_MJ", self._room.self_player.self_user.sex, tostring(card)) self:PlaySound("FuZhou_MJ", self._room.self_player.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3") self:PlayMJSound("chupai.mp3")
-- self:ShowHuTip() self:ShowHuTip()
end) end)
else else
printlog("鬼牌不能出===>>>" .. card) printlog("鬼牌不能出===>>>" .. card)
@ -962,6 +977,7 @@ end
-----------------------展示牌---------------------------- -----------------------展示牌----------------------------
function M:reqResidueCard() function M:reqResidueCard()
self._flag_getRemindCard = false
local _gamectr = ControllerManager.GetController(GameController) local _gamectr = ControllerManager.GetController(GameController)
_gamectr:ReqResidueCard() _gamectr:ReqResidueCard()
end end

29
lua_probject/extend_project/extend/majiang/fuzhou/MJPlayerSelfCardInfoView.lua
View File

@ -4,32 +4,29 @@ local CardCheck = import(".CardCheck")
local M = {} local M = {}
-- --
function M.new(view, mainView) function M.new(view, mainView, record, direction)
setmetatable(MJPlayerSelfCardInfoView, { __index = MJPlayerCardInfoView }) setmetatable(MJPlayerSelfCardInfoView, { __index = MJPlayerCardInfoView })
setmetatable(M, { __index = MJPlayerSelfCardInfoView }) setmetatable(M, { __index = MJPlayerSelfCardInfoView })
local self = setmetatable({}, { __index = M }) local self = setmetatable({}, { __index = M })
self.class = "PlayerSelfCardInfoView" self.class = "PlayerSelfCardInfoView"
self._view = view self._view = view
self._mainView = mainView self._mainView = mainView
self.direction = direction
self:init() self:init()
return self return self
end end
-- function M:ShowHuTip(card_list) function M:init()
-- printlog("ShowHuTip") getmetatable(M).__index.init(self)
-- local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true, DataManager.CurrenRoom.room_config.Qidui, end
-- DataManager.CurrenRoom.room_config.Laizi)
-- if #tingList > 0 then function M:ShowHuTip(card_list)
-- if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo > 0 then self._mainView._hu_tip:FillData(self:GetTingList(card_list))
-- for i = 1, #DataManager.CurrenRoom.laiziInfo do end
-- if IsHasDictionary(DataManager.CurrenRoom.laiziInfo[i], tingList) == false then
-- table.insert(tingList, DataManager.CurrenRoom.laiziInfo[i]) function M:GetTingList(card_list)
-- end return CardCheck.MuiltiplteCaculateTingPai(card_list, { _hu_qidui = true })
-- end end
-- end
-- end
-- self._mainView._hu_tip:FillData(tingList)
-- end
function M:UpdateHandCard(getcard, mp) function M:UpdateHandCard(getcard, mp)
MJPlayerSelfCardInfoView.UpdateHandCard(self, getcard, mp) MJPlayerSelfCardInfoView.UpdateHandCard(self, getcard, mp)

3
lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua
View File

@ -20,9 +20,6 @@ end
function M:FillData(player) function M:FillData(player)
PlayerInfoView.FillData(self, player) PlayerInfoView.FillData(self, player)
if player.seat == 1 then
self._view:GetController('room_owner').selectedIndex = 1
end
-- if player.cur_hp ~= nil then -- if player.cur_hp ~= nil then
-- self:UpdateScore(d2ad(player.cur_hp)) -- self:UpdateScore(d2ad(player.cur_hp))
-- else -- else

4
lua_probject/extend_project/extend/poker/runfast/ExtendConfig.lua
View File

@ -80,7 +80,6 @@ function M:FillRoomData(s2croom)
local reload = s2croom["reload"] local reload = s2croom["reload"]
local _tableInfo = s2croom["tableInfo"] local _tableInfo = s2croom["tableInfo"]
room.xipaiScore = _tableInfo["xipai_score"] room.xipaiScore = _tableInfo["xipai_score"]
local _config = _tableInfo["config"] local _config = _tableInfo["config"]
@ -133,7 +132,8 @@ function M:FillRoomData(s2croom)
room.game_status = 0 room.game_status = 0
if reload then if reload then
local reloadInfo = s2croom["reloadInfo"] local reloadInfo = s2croom["reloadInfo"]
local bank_seat = reloadInfo["banker_seat"]
room.banker_seat = bank_seat
local playing = reloadInfo["playing"] local playing = reloadInfo["playing"]
room.curren_turn_seat = reloadInfo["active_seat"] room.curren_turn_seat = reloadInfo["active_seat"]

2
lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua
View File

@ -178,6 +178,7 @@ function M:OnInitCard(evt_data)
local cardlist = evt_data["cards"] local cardlist = evt_data["cards"]
local round = evt_data["round"] local round = evt_data["round"]
local bank_seat = evt_data["bank_seat"]
self._cacheEvent:Enqueue( self._cacheEvent:Enqueue(
function() function()
for _, player in ipairs(self._room.player_list) do for _, player in ipairs(self._room.player_list) do
@ -186,6 +187,7 @@ function M:OnInitCard(evt_data)
end end
self._room.curren_round = round self._room.curren_round = round
self._room.banker_seat = bank_seat
DispatchEvent(self._dispatcher, RunFast_GameEvent.OnInitCard, round, cardlist) DispatchEvent(self._dispatcher, RunFast_GameEvent.OnInitCard, round, cardlist)
end end
) )

21
lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua
View File

@ -509,6 +509,7 @@ function M:EventInit()
head_info._view:GetChild("shengyu").text = p.hand_count head_info._view:GetChild("shengyu").text = p.hand_count
end end
p:Clear() p:Clear()
head_info:MarkBank(p.seat == _room.banker_seat)
head_info:FillData(p) head_info:FillData(p)
local card_info = self._player_card_info[self:GetPos(p.seat)] local card_info = self._player_card_info[self:GetPos(p.seat)]
card_info:Clear() card_info:Clear()
@ -543,15 +544,15 @@ function M:EventInit()
self.ctr_time.selectedIndex = index self.ctr_time.selectedIndex = index
-- for i=1,#self._player_info do -- for i = 1, #self._player_info do
-- if index==i then -- if index == i then
-- -- body -- -- body
-- local head_info = self._player_info[index] -- local head_info = self._player_info[index]
-- head_info:MarkBank(true) -- head_info:MarkBank(true)
-- else -- else
-- local head_info = self._player_info[i] -- local head_info = self._player_info[i]
-- head_info:MarkBank(false) -- head_info:MarkBank(false)
-- end -- end
-- end -- end
-- if index == 1 then -- if index == 1 then
@ -1115,6 +1116,7 @@ function M:ReConnectForStart()
head_info:UpdateLineState(player.line_state) head_info:UpdateLineState(player.line_state)
head_info:UpdatePiao(player.piao) head_info:UpdatePiao(player.piao)
head_info:SetBaoDan(player.hand_count == 1) head_info:SetBaoDan(player.hand_count == 1)
head_info:MarkBank(player.seat == self._room.banker_seat)
if head_info._view:GetChild("shengyu") ~= nil and head_info._view:GetController("shengyu") ~= nil then if head_info._view:GetChild("shengyu") ~= nil and head_info._view:GetController("shengyu") ~= nil then
-- body -- body
@ -1193,6 +1195,7 @@ function M:ReconnectForClearing()
head_info:UpdateLineState(player.line_state) head_info:UpdateLineState(player.line_state)
--head_info._view:GetController("Oener").selectedIndex=0 --head_info._view:GetController("Oener").selectedIndex=0
head_info:UpdatePiao(player.piao) head_info:UpdatePiao(player.piao)
head_info:MarkBank(player.seat == self._room.banker_seat)
if head_info._view:GetChild("shengyu") ~= nil and head_info._view:GetController("shengyu") ~= nil then if head_info._view:GetChild("shengyu") ~= nil and head_info._view:GetController("shengyu") ~= nil then
-- body -- body

16
lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua
View File

@ -398,24 +398,24 @@ function M:PlayEffect(type, callback)
obj.visible = true obj.visible = true
if type == 2 then if type == 2 then
obj:GetTransition('t0'):Play(1, 0, function() obj:GetTransition('t0'):Play(1, 0, function()
obj:GetChild('n11'):TweenMoveX(width * 1.03, 0.5):OnComplete(function() obj:GetChild('n11'):TweenMoveX(width * 1.03, 0.3):OnComplete(function()
obj:Dispose() obj:Dispose()
callback() callback()
end) end)
obj:GetChild('n12'):TweenMoveX(width * 1.03 - 121, 0.5) obj:GetChild('n12'):TweenMoveX(width * 1.03 - 121, 0.3)
obj:GetChild('n11'):TweenFade(0, 0.5) obj:GetChild('n11'):TweenFade(0, 0.3)
obj:GetChild('n12'):TweenFade(0, 0.5) obj:GetChild('n12'):TweenFade(0, 0.3)
end) end)
elseif type == 5 or type == 8 or type == 12 then elseif type == 5 or type == 8 or type == 12 then
obj:GetTransition('t0'):Play(1, 0, function() obj:GetTransition('t0'):Play(1, 0, function()
obj:GetChild('n13'):TweenMoveX(width * 0.7, 0.5):OnComplete(function() obj:GetChild('n13'):TweenMoveX(width * 0.7, 0.4):OnComplete(function()
obj:Dispose() obj:Dispose()
callback() callback()
end) end)
obj:GetChild('n14'):TweenMoveX(width * 0.7 - 120, 0.5) obj:GetChild('n14'):TweenMoveX(width * 0.7 - 120, 0.4)
obj:GetChild('n13'):TweenFade(1, 0.2):OnComplete(function() obj:GetChild('n13'):TweenFade(1, 0.2):OnComplete(function()
obj:GetChild('n13'):TweenFade(0, 0.3) obj:GetChild('n13'):TweenFade(0, 0.4)
obj:GetChild('n14'):TweenFade(0, 0.3) obj:GetChild('n14'):TweenFade(0, 0.4)
end) end)
end) end)
else else

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

@ -6,24 +6,25 @@ local HuTipView = {
local M = HuTipView local M = HuTipView
function M.new(main_view) function M.new(main_view)
local self = {} local self = {}
self.class = "HuTipView" self.class = "HuTipView"
setmetatable(self,{__index = HuTipView}) setmetatable(self, { __index = HuTipView })
self._main_view = main_view self._main_view = main_view
self:init() self:init()
return self return self
end end
local function SetObjEnabled(obj, enabled) local function SetObjEnabled(obj, enabled)
obj.visible = enabled obj.visible = enabled
obj.touchable = enabled obj.touchable = false
end end
function M:OnTouchBegin(context) function M:OnTouchBegin(context)
self._view_start_pos = Vector2(self._view.x, self._view.y) self._view_start_pos = Vector2(self._view.x, self._view.y)
self._touch_start_pos = self._main_view._view:GlobalToLocal(Vector2(context.inputEvent.x, context.inputEvent.y)) self._touch_start_pos = self._main_view._view:GlobalToLocal(Vector2(context.inputEvent.x, context.inputEvent.y))
end end
function M:OnTouchMove(context) function M:OnTouchMove(context)
local xy = self._main_view._view:GlobalToLocal(Vector2.New(context.inputEvent.x,context.inputEvent.y)) local xy = self._main_view._view:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
local dist = Vector2(xy.x - self._touch_start_pos.x, xy.y - self._touch_start_pos.y) local dist = Vector2(xy.x - self._touch_start_pos.x, xy.y - self._touch_start_pos.y)
local posx = self._view_start_pos.x + dist.x local posx = self._view_start_pos.x + dist.x
local posy = self._view_start_pos.y + dist.y local posy = self._view_start_pos.y + dist.y
@ -36,15 +37,12 @@ end
function M:init() function M:init()
self._view = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Hu_tip") self._view = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Hu_tip")
self._main_view._view:AddChild(self._view) self._main_view._view:AddChild(self._view)
local width = self._view.width
local m_width = self._main_view._view.width
local m_height = self._main_view._view.height
-- 初始位置 -- 初始位置
self._view.x = 0 self._view:Center()
self._view.y = 0.675 * m_height self._view.y = GRoot.inst.height * 0.723
SetObjEnabled(self._view, false) SetObjEnabled(self._view, false)
self._view.onTouchBegin:Add(handler(self, self.OnTouchBegin)) -- self._view.onTouchBegin:Add(handler(self, self.OnTouchBegin))
self._view.onTouchMove:Add(handler(self, self.OnTouchMove)) -- self._view.onTouchMove:Add(handler(self, self.OnTouchMove))
end end
-- function M:FillData(cards) -- function M:FillData(cards)
@ -72,39 +70,13 @@ end
function M:FillData(cards, posX) function M:FillData(cards, posX)
-- local btn_showtip = self._main_view._view:GetChild("btn_showtip") -- local btn_showtip = self._main_view._view:GetChild("btn_showtip")
local lst_card = self._view:GetChild("lst_card") local lst_card = self._view:GetChild("lst_card")
lst_card:RemoveChildrenToPool() lst_card:SetVirtual()
local num = #cards local num = #cards
if num > 0 then if num > 0 then
local o_width = 192 if num == lst_card.numItems then
local i_width = 93 lst_card:RefreshVirtualList()
local column_gap = 43
lst_card.columnGap = column_gap
if num > 1 then
self._view.width = o_width + (num - 1) * i_width
else else
self._view.width = o_width lst_card.numItems = num
end
local count = 0
for i = 1, num do
local item = lst_card:AddItemFromPool()
local card = cards[i]
item:GetChild("icon").icon = "ui://Main_Majiang/" .. self:GetPrefix() .. "201_" .. card
local left_num = self._main_view:CountCardLeftNum(card)
local tex_num = item:GetChild("tex_num")
tex_num.text = left_num .. "张"
tex_num.visible = true
count = count + left_num
end
self._view:GetChild("tex_num").text = count
if posX then
if posX + self._view.width > 1300 then
posX = 1300 - self._view.width
end
self._view.x = posX
SetObjEnabled(self._view, true)
else
-- self._view.x = self._main_view._view.width * 0.2 - self._view.width * 0.5
SetObjEnabled(self._view, true)
end end
else else
SetObjEnabled(self._view, false) SetObjEnabled(self._view, false)
@ -112,7 +84,7 @@ function M:FillData(cards, posX)
end end
function M:GetPrefix() function M:GetPrefix()
return get_majiang_prefix(DataManager.CurrenRoom.game_id) return get_majiang_prefix(DataManager.CurrenRoom.game_id)
end end
return M return M

29
lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua
View File

@ -45,21 +45,15 @@ function M:init()
-- end -- end
end end
function M:ShowHuTip(card_list) function M:RemoverCardListByIndexGetCardList(index)
printlog("ShowHuTip") local card_list = DataManager.CurrenRoom.self_player.card_list
local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true, DataManager.CurrenRoom.room_config.Qidui, local tempCardList = {}
DataManager.CurrenRoom.room_config.Laizi) for i = 0, (#card_list) - 1 do
pt(tingList) if i ~= index then
if #tingList > 0 then table.insert(tempCardList, card_list[i + 1])
if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo > 0 then
for i = 1, #DataManager.CurrenRoom.laiziInfo do
if IsHasDictionary(DataManager.CurrenRoom.laiziInfo[i], tingList) == false then
table.insert(tingList, DataManager.CurrenRoom.laiziInfo[i])
end
end
end end
end end
self._mainView._hu_tip:FillData(tingList) return tempCardList
end end
function M:UpdateHandCard(getcard, mp) function M:UpdateHandCard(getcard, mp)
@ -91,9 +85,12 @@ function M:UpdateHandCard(getcard, mp)
btn_card = self._view_handCardList:AddItemFromPool() btn_card = self._view_handCardList:AddItemFromPool()
btn_card.width = (GRoot.inst.width * 0.88 - self._view_handCardList.columnGap * 12) / 13 btn_card.width = (GRoot.inst.width * 0.88 - self._view_handCardList.columnGap * 12) / 13
end end
-- btn_card.sound = "ui://Main_Majiang/click"
self:FillHandCard(i, btn_card, tem_card, true) self:FillHandCard(i, btn_card, tem_card, true)
-- btn_card.onClick:Set(handler(self, self.__OnClickHandCard)) local tingList = {}
if getcard then
tingList = self:GetTingList(self:RemoverCardListByIndexGetCardList(i))
end
btn_card:GetController('ting').selectedIndex = (tingList and #tingList > 0) and 1 or 0
end end
if getcard then if getcard then
@ -271,7 +268,7 @@ function M:__OnClickHandCard(context)
self._flag_seletedGet = 0 self._flag_seletedGet = 0
local button = context.data local button = context.data
local _room = DataManager.CurrenRoom local _room = DataManager.CurrenRoom
self:ShowHuTip(self:RemoverCardListByIndexGetCardList(self._view_handCardList.selectedIndex))
if _room.curren_outcard_seat == _room.self_player.seat then if _room.curren_outcard_seat == _room.self_player.seat then
if self._mainView.clickMode == "single" or Utils.IsDoubleClick(context) or self._click_index == self._view_handCardList.selectedIndex then if self._mainView.clickMode == "single" or Utils.IsDoubleClick(context) or self._click_index == self._view_handCardList.selectedIndex then
local card = button.data local card = button.data

18
wb_new_ui/assets/Common/ToolsTip.xml
View File

@ -1,16 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="149,88" extention="Label"> <component size="149,88" extention="Label">
<displayList> <displayList>
<graph id="n0" name="n0" xy="0,0" size="149,88" group="n2" type="rect" lineSize="0" lineColor="#ffffcc00" fillColor="#80000000"> <graph id="n0" name="n0" xy="0,0" pivot="0.5,0.5" size="149,88" group="n2" type="rect" lineSize="0" lineColor="#ffffcc00" fillColor="#80000000">
<relation target="n1" sidePair="width-width"/> <relation target="n1" sidePair="width-width"/>
<relation target="" sidePair="center-center,middle-middle"/>
</graph> </graph>
<text id="n1" name="title" xy="26,7" size="97,74" group="n2" font="Arial" fontSize="56" color="#ffffff" align="center" vAlign="middle" text="333"/> <text id="n1" name="title" xy="26,7" pivot="0.5,0.5" size="97,74" group="n2" font="Arial" fontSize="56" color="#ffffff" align="center" vAlign="middle" text="333">
<relation target="" sidePair="center-center,middle-middle"/>
</text>
<group id="n2" name="n2" xy="0,0" size="149,88" advanced="true"/> <group id="n2" name="n2" xy="0,0" size="149,88" advanced="true"/>
</displayList> </displayList>
<relation target="n1" sidePair="width-width"/> <relation target="n1" sidePair="width-width"/>
<transition name="t0" autoPlay="true"> <transition name="t0" autoPlay="true" frameRate="30">
<item time="0" type="XY" target="n2" tween="true" startValue="0,-87" endValue="0,0" duration="6" ease="Quart.Out"/> <item time="0" type="Scale" target="n0" tween="true" startValue="0,0" endValue="1,1" duration="7" ease="Linear"/>
<item time="46" type="XY" target="n2" tween="true" startValue="0,0" endValue="0,-85" duration="14" ease="Quart.In"/> <item time="0" type="Scale" target="n1" tween="true" startValue="0,0" endValue="1,1" duration="7" ease="Linear"/>
<item time="50" type="Alpha" target="n1" tween="true" startValue="1" endValue="0" duration="10"/> <item time="0" type="Visible" target="n0" value="true"/>
<item time="0" type="Visible" target="n1" value="true"/>
<item time="96" type="Visible" target="n0" value="false"/>
<item time="96" type="Visible" target="n1" value="false"/>
</transition> </transition>
</component> </component>

23
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_1.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="144,144" opaque="false" initName="gcm_info"> <component size="144,144" opaque="false" initName="gcm_info">
<controller name="room_owner" pages="0,,1," selected="0"/> <controller name="room_owner" homePageType="specific" homePage="1" pages="0,,1," selected="1"/>
<controller name="bank" pages="0,,1," selected="0"/> <controller name="bank" homePageType="specific" homePage="1" pages="0,,1," selected="1"/>
<controller name="read" pages="0,,1," selected="0"/> <controller name="read" pages="0,,1," selected="0"/>
<controller name="offline" pages="0,,1," selected="0"/> <controller name="offline" pages="0,,1," selected="0"/>
<controller name="mask_voice" pages="0,,1," selected="0"/> <controller name="mask_voice" pages="0,,1," selected="0"/>
@ -11,7 +11,7 @@
<controller name="text_color" pages="0,,1," selected="0"/> <controller name="text_color" pages="0,,1," selected="0"/>
<controller name="cScore" pages="0,,1," selected="0"/> <controller name="cScore" pages="0,,1," selected="0"/>
<controller name="baodan" pages="0,,1," selected="0"/> <controller name="baodan" pages="0,,1," selected="0"/>
<controller name="piaoWin" pages="0,,1," selected="1"/> <controller name="piaoWin" pages="0,,1," selected="0"/>
<displayList> <displayList>
<image id="n8" name="ready" src="jdf3hz" fileName="component/Result/yzb.png" xy="-1,-113" visible="false"> <image id="n8" name="ready" src="jdf3hz" fileName="component/Result/yzb.png" xy="-1,-113" visible="false">
<gearDisplay controller="read" pages="1"/> <gearDisplay controller="read" pages="1"/>
@ -22,14 +22,7 @@
<image id="n40_d2rw" name="n40" src="prgzal" fileName="component/head/tuoguan.png" xy="187,7"> <image id="n40_d2rw" name="n40" src="prgzal" fileName="component/head/tuoguan.png" xy="187,7">
<gearDisplay controller="tuoguan" pages="1"/> <gearDisplay controller="tuoguan" pages="1"/>
</image> </image>
<image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="0,-7">
<gearDisplay controller="bank" pages="1"/>
</image>
<text id="n48_nkur" name="tuoguanTips" xy="-46,-39" size="237,48" visible="false" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S"/> <text id="n48_nkur" name="tuoguanTips" xy="-46,-39" size="237,48" visible="false" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S"/>
<image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="0,91" size="98,53">
<gearDisplay controller="room_owner" pages="1"/>
<relation target="" sidePair="left-left%,bottom-bottom%"/>
</image>
<component id="n5" name="btn_head" src="ckvbcin" fileName="Main_New/Component/btn_head.xml" xy="0,0" size="144,144" group="n49_ckvb" aspect="true"> <component id="n5" name="btn_head" src="ckvbcin" fileName="Main_New/Component/btn_head.xml" xy="0,0" size="144,144" group="n49_ckvb" aspect="true">
<relation target="" sidePair="width-width,height-height,center-center,middle-middle"/> <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
</component> </component>
@ -37,6 +30,14 @@
<text id="n45_kx91" name="text_jifen" xy="59,188" size="48,59" scale="1.3,1" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="01"> <text id="n45_kx91" name="text_jifen" xy="59,188" size="48,59" scale="1.3,1" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="01">
<relation target="n59_n9qr" sidePair="middle-middle,left-right"/> <relation target="n59_n9qr" sidePair="middle-middle,left-right"/>
</text> </text>
<image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="2,89" size="98,53">
<gearDisplay controller="room_owner" pages="1"/>
<relation target="" sidePair="width-width%,height-height%,left-left,bottom-bottom"/>
</image>
<image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="99,-8" size="73,68">
<gearDisplay controller="bank" pages="1"/>
<relation target="" sidePair="width-width%,height-height%,left-left,top-top"/>
</image>
<text id="n51_ckvb" name="name" xy="2,138" size="180,59" font="Arial" fontSize="44" color="#ffe26d" align="center" vAlign="middle" letterSpacing="6" autoClearText="true" text="你好~凌"> <text id="n51_ckvb" name="name" xy="2,138" size="180,59" font="Arial" fontSize="44" color="#ffe26d" align="center" vAlign="middle" letterSpacing="6" autoClearText="true" text="你好~凌">
<relation target="" sidePair="left-left,top-bottom%"/> <relation target="" sidePair="left-left,top-bottom%"/>
</text> </text>
@ -102,7 +103,7 @@
<item time="18" type="Rotation" target="n63_n9qr" tween="true" startValue="20" endValue="0" duration="6" ease="Linear"/> <item time="18" type="Rotation" target="n63_n9qr" tween="true" startValue="20" endValue="0" duration="6" ease="Linear"/>
</transition> </transition>
<transition name="piaoScore"> <transition name="piaoScore">
<item time="0" type="Scale" target="n64_diqo" tween="true" startValue="0,1" endValue="0,0" duration="0" ease="Linear"/> <item time="0" type="Scale" target="n64_diqo" value="0,1"/>
<item time="0" type="Scale" target="n64_diqo" tween="true" startValue="0,0" endValue="1,1" duration="18" ease="Linear"/> <item time="0" type="Scale" target="n64_diqo" tween="true" startValue="0,0" endValue="1,1" duration="18" ease="Linear"/>
<item time="0" type="Scale" target="n65_diqo" tween="true" startValue="0,0" endValue="1.1,1.1" duration="18" ease="Linear"/> <item time="0" type="Scale" target="n65_diqo" tween="true" startValue="0,0" endValue="1.1,1.1" duration="18" ease="Linear"/>
<item time="0" type="Visible" target="n64_diqo" value="true"/> <item time="0" type="Visible" target="n64_diqo" value="true"/>

12
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="144,144" opaque="false" initName="gcm_info"> <component size="144,144" opaque="false" initName="gcm_info">
<controller name="room_owner" pages="0,,1," selected="1"/> <controller name="room_owner" pages="0,,1," selected="1"/>
<controller name="bank" pages="0,,1," selected="0"/> <controller name="bank" pages="0,,1," selected="1"/>
<controller name="read" pages="0,,1," selected="0"/> <controller name="read" pages="0,,1," selected="0"/>
<controller name="offline" pages="0,,1," selected="0"/> <controller name="offline" pages="0,,1," selected="0"/>
<controller name="mask_voice" pages="0,,1," selected="0"/> <controller name="mask_voice" pages="0,,1," selected="0"/>
@ -21,9 +21,6 @@
<image id="n40_d2rw" name="n40" src="prgzal" fileName="component/head/tuoguan.png" xy="187,7"> <image id="n40_d2rw" name="n40" src="prgzal" fileName="component/head/tuoguan.png" xy="187,7">
<gearDisplay controller="tuoguan" pages="1"/> <gearDisplay controller="tuoguan" pages="1"/>
</image> </image>
<image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="0,-7">
<gearDisplay controller="bank" pages="1"/>
</image>
<text id="n48_nkur" name="tuoguanTips" xy="-136,142" size="237,48" visible="false" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S"> <text id="n48_nkur" name="tuoguanTips" xy="-136,142" size="237,48" visible="false" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S">
<relation target="n51_ckvb" sidePair="right-left"/> <relation target="n51_ckvb" sidePair="right-left"/>
</text> </text>
@ -34,8 +31,13 @@
<text id="n45_kx91" name="text_jifen" xy="-129,76" size="48,59" scale="1.3,1" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="01"> <text id="n45_kx91" name="text_jifen" xy="-129,76" size="48,59" scale="1.3,1" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="01">
<relation target="n59_n9qr" sidePair="middle-middle,right-left"/> <relation target="n59_n9qr" sidePair="middle-middle,right-left"/>
</text> </text>
<image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="0,76" visible="false"> <image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="2,89" size="98,53">
<gearDisplay controller="room_owner" pages="1"/> <gearDisplay controller="room_owner" pages="1"/>
<relation target="" sidePair="width-width%,height-height%,left-left,bottom-bottom"/>
</image>
<image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="99,-8" size="73,68">
<gearDisplay controller="bank" pages="1"/>
<relation target="" sidePair="width-width%,height-height%,left-left,top-top"/>
</image> </image>
<text id="n51_ckvb" name="name" xy="-248,5" size="240,59" font="Arial" fontSize="44" color="#ffe26d" align="center" vAlign="middle" letterSpacing="4" autoClearText="true" text="奥利奥生..."> <text id="n51_ckvb" name="name" xy="-248,5" size="240,59" font="Arial" fontSize="44" color="#ffe26d" align="center" vAlign="middle" letterSpacing="4" autoClearText="true" text="奥利奥生...">
<relation target="" sidePair="right-left,bottom-top"/> <relation target="" sidePair="right-left,bottom-top"/>

22
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="144,144" opaque="false" initName="gcm_info"> <component size="144,144" opaque="false" initName="gcm_info">
<controller name="room_owner" pages="0,,1," selected="0"/> <controller name="room_owner" pages="0,,1," selected="1"/>
<controller name="bank" pages="0,,1," selected="0"/> <controller name="bank" pages="0,,1," selected="1"/>
<controller name="read" pages="0,,1," selected="0"/> <controller name="read" pages="0,,1," selected="0"/>
<controller name="offline" pages="0,,1," selected="0"/> <controller name="offline" pages="0,,1," selected="0"/>
<controller name="mask_voice" pages="0,,1," selected="0"/> <controller name="mask_voice" pages="0,,1," selected="0"/>
@ -21,9 +21,6 @@
<image id="n40_d2rw" name="n40" src="prgzal" fileName="component/head/tuoguan.png" xy="187,7"> <image id="n40_d2rw" name="n40" src="prgzal" fileName="component/head/tuoguan.png" xy="187,7">
<gearDisplay controller="tuoguan" pages="1"/> <gearDisplay controller="tuoguan" pages="1"/>
</image> </image>
<image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="0,-7">
<gearDisplay controller="bank" pages="1"/>
</image>
<text id="n48_nkur" name="tuoguanTips" xy="264,142" size="237,48" visible="false" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S"> <text id="n48_nkur" name="tuoguanTips" xy="264,142" size="237,48" visible="false" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S">
<relation target="n51_ckvb" sidePair="right-left"/> <relation target="n51_ckvb" sidePair="right-left"/>
</text> </text>
@ -31,9 +28,17 @@
<relation target="" sidePair="width-width,height-height,center-center,middle-middle"/> <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
</component> </component>
<group id="n49_ckvb" name="head" xy="0,0" size="144,144"/> <group id="n49_ckvb" name="head" xy="0,0" size="144,144"/>
<image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="2,89" size="98,53">
<gearDisplay controller="room_owner" pages="1"/>
<relation target="" sidePair="width-width%,height-height%,left-left,bottom-bottom"/>
</image>
<text id="n45_kx91" name="text_jifen" xy="214,76" size="48,59" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="01"> <text id="n45_kx91" name="text_jifen" xy="214,76" size="48,59" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="01">
<relation target="n59_n9qr" sidePair="middle-middle,left-right"/> <relation target="n59_n9qr" sidePair="middle-middle,left-right"/>
</text> </text>
<image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="99,-8" size="73,68">
<gearDisplay controller="bank" pages="1"/>
<relation target="" sidePair="width-width%,height-height%,left-left,top-top"/>
</image>
<text id="n51_ckvb" name="name" xy="152,5" size="240,59" font="Arial" fontSize="44" color="#ffe26d" align="center" vAlign="middle" letterSpacing="4" autoClearText="true" text="奥利奥生..."> <text id="n51_ckvb" name="name" xy="152,5" size="240,59" font="Arial" fontSize="44" color="#ffe26d" align="center" vAlign="middle" letterSpacing="4" autoClearText="true" text="奥利奥生...">
<relation target="" sidePair="left-right,bottom-top"/> <relation target="" sidePair="left-right,bottom-top"/>
</text> </text>
@ -41,19 +46,16 @@
<component id="n34_u4l2" name="zhuang" src="prgzac" fileName="component/head/touxiang.xml" xy="-371,-254" group="n33_e7qn" visible="false"> <component id="n34_u4l2" name="zhuang" src="prgzac" fileName="component/head/touxiang.xml" xy="-371,-254" group="n33_e7qn" visible="false">
<gearDisplay controller="bank" pages="1"/> <gearDisplay controller="bank" pages="1"/>
</component> </component>
<image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="-239,-225" group="n33_e7qn" visible="false">
<gearDisplay controller="room_owner" pages="1"/>
</image>
<component id="n36_h4ge" name="n36" xy="-333,-216" size="100,100" group="n33_e7qn" touchable="false"> <component id="n36_h4ge" name="n36" xy="-333,-216" size="100,100" group="n33_e7qn" touchable="false">
<gearDisplay controller="dismiss_room" pages="1"/> <gearDisplay controller="dismiss_room" pages="1"/>
</component> </component>
<group id="n33_e7qn" name="n33" xy="-371,-254" size="157,155" group="n52_ckvb"/> <group id="n33_e7qn" name="n33" xy="-371,-254" size="155,155" group="n52_ckvb"/>
<text id="n41_i3h6" name="piao" xy="-338,-248" size="92,29" group="n52_ckvb" fontSize="20" color="#ffd100" align="center" vAlign="middle" autoSize="none" text=""/> <text id="n41_i3h6" name="piao" xy="-338,-248" size="92,29" group="n52_ckvb" fontSize="20" color="#ffd100" align="center" vAlign="middle" autoSize="none" text=""/>
<component id="n29_e54q" name="info" src="jdf3hy" fileName="component/head/HeadNameBG.xml" xy="-360,-121" group="n52_ckvb"/> <component id="n29_e54q" name="info" src="jdf3hy" fileName="component/head/HeadNameBG.xml" xy="-360,-121" group="n52_ckvb"/>
<image id="n44_kx91" name="n44" src="jdf3hx" fileName="component/head/jfk.png" xy="-352,-71" size="132,35" group="n47_kx91"/> <image id="n44_kx91" name="n44" src="jdf3hx" fileName="component/head/jfk.png" xy="-352,-71" size="132,35" group="n47_kx91"/>
<text id="n46_kx91" name="n46" xy="-346,-69" size="48,32" group="n47_kx91" fontSize="22" color="#512e06" vAlign="middle" text="战绩"/> <text id="n46_kx91" name="n46" xy="-346,-69" size="48,32" group="n47_kx91" fontSize="22" color="#512e06" vAlign="middle" text="战绩"/>
<group id="n47_kx91" name="zhanji" xy="-352,-71" size="132,35" group="n52_ckvb" advanced="true"/> <group id="n47_kx91" name="zhanji" xy="-352,-71" size="132,35" group="n52_ckvb" advanced="true"/>
<group id="n52_ckvb" name="n52" xy="-371,-254" size="157,218" visible="false" advanced="true"/> <group id="n52_ckvb" name="n52" xy="-371,-254" size="155,218" visible="false" advanced="true"/>
<graph id="n32_kba2" name="offLine" xy="0,0" size="144,144" group="n53_ckvb" aspect="true" touchable="false" type="rect" lineSize="0" fillColor="#b3000000"> <graph id="n32_kba2" name="offLine" xy="0,0" size="144,144" group="n53_ckvb" aspect="true" touchable="false" type="rect" lineSize="0" fillColor="#b3000000">
<gearDisplay controller="offline" pages="1"/> <gearDisplay controller="offline" pages="1"/>
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>

30
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_feiji.xml
View File

@ -1,23 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="300,97" pivot="0.5,0.5" anchor="true"> <component size="400,97" pivot="0.5,0.5" anchor="true">
<displayList> <displayList>
<image id="n14_diqo" name="n14" src="diqocp7" fileName="Main_New/texiao/feiji/huoyan.png" xy="-274,6" size="154,48"/> <image id="n14_diqo" name="n14" src="diqocp7" fileName="Main_New/texiao/feiji/huoyan.png" xy="-274,6" size="154,48"/>
<image id="n13_diqo" name="n13" src="diqocoh" fileName="Main_New/texiao/zi_feiji.png" xy="-63,-2"/> <image id="n13_diqo" name="n13" src="diqocoh" fileName="Main_New/texiao/zi_feiji.png" xy="-63,-2"/>
</displayList> </displayList>
<transition name="t0"> <transition name="t0" frameRate="30">
<item time="0" type="Alpha" target="n13_diqo" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/> <item time="0" type="Alpha" target="n13_diqo" tween="true" startValue="0.3" endValue="1" duration="6" ease="Linear"/>
<item time="0" type="Alpha" target="n14_diqo" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/> <item time="0" type="Alpha" target="n14_diqo" tween="true" startValue="0.3" endValue="1" duration="7" ease="Linear"/>
<item time="0" type="Size" target="n14_diqo" value="191,80"/> <item time="0" type="Size" target="n14_diqo" value="98,80"/>
<item time="0" type="XY" target="n13_diqo" tween="true" startValue="-63,-2" endValue="10,-2" duration="6" ease="Linear"/> <item time="0" type="XY" target="n13_diqo" tween="true" startValue="-63,-2" endValue="50,-2" duration="6" ease="Linear"/>
<item time="0" type="XY" target="n14_diqo" value="-134,6"/> <item time="0" type="XY" target="n14_diqo" value="-41,6"/>
<item time="6" type="Size" target="n14_diqo" tween="true" startValue="191,80" endValue="324,80" duration="3" ease="Linear"/> <item time="6" type="Size" target="n14_diqo" tween="true" startValue="142,80" endValue="313.667,80" duration="2" ease="Linear"/>
<item time="6" type="XY" target="n14_diqo" tween="true" startValue="-134,6" endValue="-254,6" duration="3" ease="Linear"/> <item time="6" type="XY" target="n14_diqo" tween="true" startValue="-45,6" endValue="-135.667,6" duration="2" ease="Linear"/>
<item time="9" type="Size" target="n14_diqo" tween="true" startValue="324,80" endValue="180,80" duration="6" ease="Linear"/> <item time="7" type="XY" target="n13_diqo" tween="true" startValue="90,-2" endValue="190,-3" duration="17" ease="Linear"/>
<item time="9" type="XY" target="n13_diqo" tween="true" startValue="10,-2" endValue="120,-2" duration="6" ease="Linear"/> <item time="8" type="Size" target="n14_diqo" tween="true" startValue="313.667,80" endValue="140,80" duration="16" ease="Linear"/>
<item time="9" type="XY" target="n14_diqo" tween="true" startValue="-254,6" endValue="0,6" duration="6" ease="Linear"/> <item time="8" type="XY" target="n14_diqo" tween="true" startValue="-135.667,6" endValue="99.996,5" duration="16" ease="Linear"/>
<item time="15" type="Alpha" target="n13_diqo" value="1"/> <item time="14" type="Alpha" target="n13_diqo" value="1"/>
<item time="15" type="Alpha" target="n14_diqo" value="1"/> <item time="16" type="Alpha" target="n14_diqo" value="1"/>
<item time="15" type="XY" target="n13_diqo" value="120,-2"/>
<item time="15" type="XY" target="n14_diqo" value="0,6"/>
</transition> </transition>
</component> </component>

54
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_liandui.xml
View File

@ -6,30 +6,62 @@
<component id="n5_diqo" name="n5" src="diqocpw" fileName="Main_New/texiao/xingxing.xml" xy="203,-18"/> <component id="n5_diqo" name="n5" src="diqocpw" fileName="Main_New/texiao/xingxing.xml" xy="203,-18"/>
<component id="n6_diqo" name="n6" src="diqocpw" fileName="Main_New/texiao/xingxing.xml" xy="0,1"/> <component id="n6_diqo" name="n6" src="diqocpw" fileName="Main_New/texiao/xingxing.xml" xy="0,1"/>
<component id="n7_diqo" name="n7" src="diqocpw" fileName="Main_New/texiao/xingxing.xml" xy="111,56"/> <component id="n7_diqo" name="n7" src="diqocpw" fileName="Main_New/texiao/xingxing.xml" xy="111,56"/>
<image id="n8_mhse" name="n8" src="diqocp6" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui01.png" xy="54,-3" alpha="0"/>
<image id="n9_mhse" name="n9" src="diqocp5" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui02.png" xy="54,-3" alpha="0"/>
<image id="n10_mhse" name="n10" src="diqocp4" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui03.png" xy="53,-4" alpha="0"/>
<image id="n11_mhse" name="n11" src="diqocp3" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui04.png" xy="55,-3" alpha="0"/>
<image id="n12_mhse" name="n12" src="diqocp2" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui05.png" xy="54,-3" alpha="0"/>
<image id="n13_mhse" name="n13" src="diqocp9" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui06.png" xy="55,-2" alpha="0"/>
<image id="n14_mhse" name="n14" src="diqocp1" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui07.png" xy="54,-3" alpha="0"/>
<image id="n15_mhse" name="n15" src="diqocoz" fileName="Main_New/texiao/saoguang_zi/saoguang_liandui08.png" xy="54,-4" alpha="0"/>
</displayList> </displayList>
<transition name="t0"> <transition name="t0" frameRate="30">
<item time="0" type="Alpha" target="n0_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/> <item time="0" type="Alpha" target="n0_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
<item time="0" type="Alpha" target="n1_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/> <item time="0" type="Alpha" target="n1_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
<item time="0" type="Scale" target="n0_diqo" value="1,1"/> <item time="0" type="Scale" target="n0_diqo" value="1,1"/>
<item time="0" type="Scale" target="n1_diqo" value="1,1"/> <item time="0" type="Scale" target="n1_diqo" value="1,1"/>
<item time="0" type="Visible" target="n10_mhse" value="false"/>
<item time="0" type="Visible" target="n11_mhse" value="false"/>
<item time="0" type="Visible" target="n12_mhse" value="false"/>
<item time="0" type="Visible" target="n13_mhse" value="false"/>
<item time="0" type="Visible" target="n14_mhse" value="false"/>
<item time="0" type="Visible" target="n15_mhse" value="false"/>
<item time="0" type="Visible" target="n5_diqo" value="false"/> <item time="0" type="Visible" target="n5_diqo" value="false"/>
<item time="0" type="Visible" target="n6_diqo" value="false"/> <item time="0" type="Visible" target="n6_diqo" value="false"/>
<item time="0" type="Visible" target="n7_diqo" value="false"/> <item time="0" type="Visible" target="n7_diqo" value="false"/>
<item time="0" type="XY" target="n0_diqo" tween="true" startValue="0,-" endValue="55,0" duration="6" ease="Linear"/> <item time="0" type="Visible" target="n8_mhse" value="false"/>
<item time="0" type="XY" target="n1_diqo" tween="true" startValue="203,-" endValue="138,-" duration="6" ease="Linear"/> <item time="0" type="Visible" target="n9_mhse" value="false"/>
<item time="6" type="Scale" target="n0_diqo" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/> <item time="0" type="XY" target="n0_diqo" tween="true" startValue="0,-" endValue="58,0" duration="4" ease="Linear"/>
<item time="6" type="Scale" target="n1_diqo" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/> <item time="0" type="XY" target="n1_diqo" tween="true" startValue="203,-" endValue="144,-" duration="4" ease="Linear"/>
<item time="4" type="Scale" target="n0_diqo" tween="true" startValue="1,1" endValue="1.2,1.2" duration="2" ease="Linear"/>
<item time="4" type="Scale" target="n1_diqo" tween="true" startValue="1,1" endValue="1.2,1.2" duration="2" ease="Linear"/>
<item time="4" type="XY" target="n0_diqo" tween="true" startValue="58,0" endValue="44,-" duration="2" ease="Linear"/>
<item time="4" type="XY" target="n1_diqo" tween="true" startValue="144,-" endValue="145,-" duration="2" ease="Linear"/>
<item time="6" type="Scale" target="n0_diqo" tween="true" startValue="1.2,1.2" endValue="1,1" duration="3" ease="Linear"/>
<item time="6" type="Scale" target="n1_diqo" tween="true" startValue="1.2,1.2" endValue="1,1" duration="3" ease="Linear"/>
<item time="6" type="Transition" target="n5_diqo" value="t0"/> <item time="6" type="Transition" target="n5_diqo" value="t0"/>
<item time="6" type="Visible" target="n5_diqo" value="true"/> <item time="6" type="Visible" target="n5_diqo" value="true"/>
<item time="6" type="XY" target="n0_diqo" tween="true" startValue="55,0" endValue="45,-" duration="4" ease="Linear"/> <item time="6" type="XY" target="n0_diqo" tween="true" startValue="44,-" endValue="55,0" duration="3" ease="Linear"/>
<item time="6" type="XY" target="n1_diqo" tween="true" startValue="138,-" endValue="144,-" duration="4" ease="Linear"/> <item time="6" type="XY" target="n1_diqo" tween="true" startValue="145,-" endValue="138,-" duration="3" ease="Linear"/>
<item time="10" type="Scale" target="n0_diqo" tween="true" startValue="1.2,1.2" endValue="1,1" duration="3" ease="Linear"/> <item time="10" type="Visible" target="n8_mhse" value="true"/>
<item time="10" type="Scale" target="n1_diqo" tween="true" startValue="1.2,1.2" endValue="1,1" duration="3" ease="Linear"/> <item time="11" type="Visible" target="n8_mhse" value="false"/>
<item time="10" type="XY" target="n0_diqo" tween="true" startValue="45,-" endValue="55,0" duration="3" ease="Linear"/> <item time="12" type="Visible" target="n9_mhse" value="true"/>
<item time="10" type="XY" target="n1_diqo" tween="true" startValue="144,-" endValue="138,-" duration="3" ease="Linear"/>
<item time="13" type="Transition" target="n6_diqo" value="t0"/> <item time="13" type="Transition" target="n6_diqo" value="t0"/>
<item time="13" type="Visible" target="n6_diqo" value="true"/> <item time="13" type="Visible" target="n6_diqo" value="true"/>
<item time="14" type="Visible" target="n10_mhse" value="true"/>
<item time="14" type="Visible" target="n9_mhse" value="false"/>
<item time="15" type="Visible" target="n10_mhse" value="false"/>
<item time="15" type="Visible" target="n11_mhse" value="true"/>
<item time="18" type="Transition" target="n7_diqo" value="t0"/> <item time="18" type="Transition" target="n7_diqo" value="t0"/>
<item time="18" type="Visible" target="n7_diqo" value="true"/> <item time="18" type="Visible" target="n7_diqo" value="true"/>
<item time="20" type="Visible" target="n11_mhse" value="false"/>
<item time="20" type="Visible" target="n12_mhse" value="true"/>
<item time="21" type="Visible" target="n12_mhse" value="false"/>
<item time="21" type="Visible" target="n13_mhse" value="true"/>
<item time="22" type="Visible" target="n13_mhse" value="false"/>
<item time="22" type="Visible" target="n14_mhse" value="true"/>
<item time="23" type="Visible" target="n14_mhse" value="false"/>
<item time="23" type="Visible" target="n15_mhse" value="true"/>
<item time="24" type="Visible" target="n15_mhse" value="false"/>
</transition> </transition>
</component> </component>

34
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_sandaidan.xml
View File

@ -1,25 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="300,97" pivot="0.5,0.5" anchor="true"> <component size="300,97" pivot="0.5,0.5" anchor="true">
<displayList> <displayList>
<image id="n8_diqo" name="n8" src="diqocod" fileName="Main_New/texiao/zi_sandaier01.png" xy="64,4"/>
<image id="n9_diqo" name="n9" src="diqococ" fileName="Main_New/texiao/zi_sandaier02.png" xy="103,-6"/> <image id="n9_diqo" name="n9" src="diqococ" fileName="Main_New/texiao/zi_sandaier02.png" xy="103,-6"/>
<image id="n8_diqo" name="n8" src="diqocod" fileName="Main_New/texiao/zi_sandaier01.png" xy="64,4"/>
<image id="n10_diqo" name="n10" src="diqocoa" fileName="Main_New/texiao/zi_sandaiyi01.png" xy="143,7"/> <image id="n10_diqo" name="n10" src="diqocoa" fileName="Main_New/texiao/zi_sandaiyi01.png" xy="143,7"/>
</displayList> </displayList>
<transition name="t0"> <transition name="t0" frameRate="30">
<item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/> <item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0.3" endValue="1" duration="3" ease="Linear"/>
<item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/> <item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0.3" endValue="1" duration="3" ease="Linear"/>
<item time="0" type="Alpha" target="n9_diqo" value="0"/> <item time="0" type="Alpha" target="n9_diqo" value="0"/>
<item time="0" type="XY" target="n10_diqo" tween="true" startValue="143,78,0.477,0.804" endValue="143,24" duration="6" ease="Linear"/> <item time="0" type="XY" target="n10_diqo" tween="true" startValue="154,78" endValue="153,7" duration="3" ease="Linear"/>
<item time="0" type="XY" target="n8_diqo" tween="true" startValue="64,58" endValue="64,4" duration="6" ease="Linear"/> <item time="0" type="XY" target="n8_diqo" tween="true" startValue="53.9,58.006,0.18,0.598" endValue="53.9,3.977,0.18,0.041" duration="3" ease="Linear"/>
<item time="6" type="Alpha" target="n9_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/> <item time="3" type="Alpha" target="n9_diqo" value="0.3"/>
<item time="6" type="XY" target="n10_diqo" tween="true" startValue="143,24" endValue="212,24" duration="6" ease="Linear"/> <item time="3" type="XY" target="n9_diqo" value="111,-73"/>
<item time="6" type="XY" target="n8_diqo" tween="true" startValue="64,4" endValue="6,4" duration="6" ease="Linear"/> <item time="5" type="Alpha" target="n9_diqo" value="1"/>
<item time="6" type="XY" target="n9_diqo" tween="true" startValue="103,-85" endValue="103,34" duration="6" ease="Linear"/> <item time="5" type="XY" target="n10_diqo" value="186,24"/>
<item time="12" type="XY" target="n10_diqo" tween="true" startValue="212,24" endValue="190,24" duration="3" ease="Linear"/> <item time="5" type="XY" target="n8_diqo" value="26,4"/>
<item time="12" type="XY" target="n8_diqo" tween="true" startValue="6,4" endValue="27,4" duration="3" ease="Linear"/> <item time="5" type="XY" target="n9_diqo" value="102,-10"/>
<item time="12" type="XY" target="n9_diqo" tween="true" startValue="103,34" endValue="103,-6" duration="3" ease="Linear"/> <item time="7" type="XY" target="n10_diqo" tween="true" startValue="189,24" endValue="186,24" duration="2" ease="Linear"/>
<item time="21" type="Alpha" target="n10_diqo" value="1"/> <item time="7" type="XY" target="n8_diqo" tween="true" startValue="21,4" endValue="26,4" duration="2" ease="Linear"/>
<item time="21" type="Alpha" target="n8_diqo" value="1"/> <item time="7" type="XY" target="n9_diqo" tween="true" startValue="99,10" endValue="102,-10" duration="2" ease="Linear"/>
<item time="21" type="Alpha" target="n9_diqo" value="1"/> <item time="27" type="Alpha" target="n10_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
<item time="27" type="Alpha" target="n8_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
<item time="27" type="Alpha" target="n9_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
</transition> </transition>
</component> </component>

34
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_sandaidui.xml
View File

@ -1,25 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="300,97" pivot="0.5,0.5" anchor="true"> <component size="300,97" pivot="0.5,0.5" anchor="true">
<displayList> <displayList>
<image id="n8_diqo" name="n8" src="diqocod" fileName="Main_New/texiao/zi_sandaier01.png" xy="64,4"/>
<image id="n9_diqo" name="n9" src="diqococ" fileName="Main_New/texiao/zi_sandaier02.png" xy="103,-6"/> <image id="n9_diqo" name="n9" src="diqococ" fileName="Main_New/texiao/zi_sandaier02.png" xy="103,-6"/>
<image id="n8_diqo" name="n8" src="diqocod" fileName="Main_New/texiao/zi_sandaier01.png" xy="64,4"/>
<image id="n10_diqo" name="n10" src="diqocob" fileName="Main_New/texiao/zi_sandaier03.png" xy="143,7"/> <image id="n10_diqo" name="n10" src="diqocob" fileName="Main_New/texiao/zi_sandaier03.png" xy="143,7"/>
</displayList> </displayList>
<transition name="t0"> <transition name="t0" frameRate="30">
<item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/> <item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0.3" endValue="1" duration="3" ease="Linear"/>
<item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/> <item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0.3" endValue="1" duration="3" ease="Linear"/>
<item time="0" type="Alpha" target="n9_diqo" value="0"/> <item time="0" type="Alpha" target="n9_diqo" value="0"/>
<item time="0" type="XY" target="n10_diqo" tween="true" startValue="143,58" endValue="143,7" duration="6" ease="Linear"/> <item time="0" type="XY" target="n10_diqo" tween="true" startValue="154,58" endValue="153,7" duration="3" ease="Linear"/>
<item time="0" type="XY" target="n8_diqo" tween="true" startValue="64,58,0.213,0.598" endValue="64,4,0.213,0.041" duration="6" ease="Linear"/> <item time="0" type="XY" target="n8_diqo" tween="true" startValue="53.9,58.006,0.18,0.598" endValue="53.9,3.977,0.18,0.041" duration="3" ease="Linear"/>
<item time="6" type="Alpha" target="n9_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/> <item time="3" type="Alpha" target="n9_diqo" value="0.3"/>
<item time="6" type="XY" target="n10_diqo" tween="true" startValue="143,7" endValue="212,7" duration="6" ease="Linear"/> <item time="3" type="XY" target="n9_diqo" value="111,-73"/>
<item time="6" type="XY" target="n8_diqo" tween="true" startValue="64,4,0.213,0.041" endValue="6,4" duration="6" ease="Linear"/> <item time="5" type="Alpha" target="n9_diqo" value="1"/>
<item time="6" type="XY" target="n9_diqo" tween="true" startValue="103,-85" endValue="103,34" duration="6" ease="Linear"/> <item time="5" type="XY" target="n10_diqo" value="179,7"/>
<item time="12" type="XY" target="n10_diqo" tween="true" startValue="212,7" endValue="180,7" duration="3" ease="Linear"/> <item time="5" type="XY" target="n8_diqo" value="26,4"/>
<item time="12" type="XY" target="n8_diqo" tween="true" startValue="6,4" endValue="27,4" duration="3" ease="Linear"/> <item time="5" type="XY" target="n9_diqo" value="102,-10"/>
<item time="12" type="XY" target="n9_diqo" tween="true" startValue="103,34" endValue="103,-6" duration="3" ease="Linear"/> <item time="7" type="XY" target="n10_diqo" tween="true" startValue="184,7" endValue="179,7" duration="2" ease="Linear"/>
<item time="21" type="Alpha" target="n10_diqo" value="1"/> <item time="7" type="XY" target="n8_diqo" tween="true" startValue="21,4" endValue="26,4" duration="2" ease="Linear"/>
<item time="21" type="Alpha" target="n8_diqo" value="1"/> <item time="7" type="XY" target="n9_diqo" tween="true" startValue="99,10" endValue="102,-10" duration="2" ease="Linear"/>
<item time="21" type="Alpha" target="n9_diqo" value="1"/> <item time="27" type="Alpha" target="n10_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
<item time="27" type="Alpha" target="n8_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
<item time="27" type="Alpha" target="n9_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
</transition> </transition>
</component> </component>

20
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_shunzi.xml
View File

@ -6,17 +6,17 @@
<relation target="" sidePair="left-left%"/> <relation target="" sidePair="left-left%"/>
</image> </image>
</displayList> </displayList>
<transition name="t0"> <transition name="t0" frameRate="30">
<item time="0" type="Alpha" target="n11_diqo" tween="true" startValue="0" endValue="1" duration="6"/> <item time="0" type="Alpha" target="n11_diqo" value="0.6"/>
<item time="0" type="Alpha" target="n12_diqo" value="0"/> <item time="0" type="Alpha" target="n12_diqo" value="0"/>
<item time="0" type="XY" target="n11_diqo" tween="true" startValue="-130.5,4.5" endValue="-0.5,4.5" duration="6" ease="Linear"/> <item time="0" type="XY" target="n11_diqo" value="0,4"/>
<item time="6" type="Alpha" target="n12_diqo" value="1"/> <item time="5" type="Alpha" target="n11_diqo" value="1"/>
<item time="5" type="XY" target="n11_diqo" tween="true" startValue="-1,4" endValue="173,4.5" duration="19" ease="Linear"/>
<item time="6" type="Alpha" target="n12_diqo" tween="true" startValue="0.6" endValue="1" duration="18" ease="Linear"/>
<item time="6" type="Size" target="n12_diqo" tween="true" startValue="113,93" endValue="268,93" duration="9" ease="Linear"/> <item time="6" type="Size" target="n12_diqo" tween="true" startValue="113,93" endValue="268,93" duration="9" ease="Linear"/>
<item time="6" type="XY" target="n11_diqo" tween="true" startValue="-0.5,4.5" endValue="123.5,4.5" duration="9" ease="Linear"/> <item time="6" type="XY" target="n12_diqo" tween="true" startValue="0.5,6.5" endValue="0.5,6.5" duration="9" ease="Linear"/>
<item time="6" type="XY" target="n12_diqo" value="0.5,6.5"/> <item time="14" type="Alpha" target="n11_diqo" value="1"/>
<item time="15" type="Alpha" target="n11_diqo" value="1"/> <item time="15" type="Size" target="n12_diqo" tween="true" startValue="268,93" endValue="163,93" duration="9" ease="Linear"/>
<item time="15" type="Alpha" target="n12_diqo" value="1"/> <item time="15" type="XY" target="n12_diqo" tween="true" startValue="0.5,6.5" endValue="143.5,6.5" duration="9" ease="Linear"/>
<item time="15" type="XY" target="n11_diqo" value="123.5,4.5"/>
<item time="15" type="XY" target="n12_diqo" value="0.5,6.5"/>
</transition> </transition>
</component> </component>

34
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_sidaisab.xml
View File

@ -1,25 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="300,97" pivot="0.5,0.5" anchor="true"> <component size="300,97" pivot="0.5,0.5" anchor="true">
<displayList> <displayList>
<image id="n8_diqo" name="n8" src="11k4tcqf" fileName="Main_New/texiao/图层 5.png" xy="64,4"/>
<image id="n9_diqo" name="n9" src="11k4tcqg" fileName="Main_New/texiao/图层 6.png" xy="103,-6"/> <image id="n9_diqo" name="n9" src="11k4tcqg" fileName="Main_New/texiao/图层 6.png" xy="103,-6"/>
<image id="n8_diqo" name="n8" src="11k4tcqf" fileName="Main_New/texiao/图层 5.png" xy="64,4"/>
<image id="n10_diqo" name="n10" src="11k4tcqh" fileName="Main_New/texiao/组 1 拷贝.png" xy="143,7"/> <image id="n10_diqo" name="n10" src="11k4tcqh" fileName="Main_New/texiao/组 1 拷贝.png" xy="143,7"/>
</displayList> </displayList>
<transition name="t0"> <transition name="t0" frameRate="30">
<item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/> <item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0.3" endValue="1" duration="3" ease="Linear"/>
<item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/> <item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0.3" endValue="1" duration="3" ease="Linear"/>
<item time="0" type="Alpha" target="n9_diqo" value="0"/> <item time="0" type="Alpha" target="n9_diqo" value="0"/>
<item time="0" type="XY" target="n10_diqo" tween="true" startValue="143,58,0.477,0.598" endValue="143,4" duration="6" ease="Linear"/> <item time="0" type="XY" target="n10_diqo" tween="true" startValue="154,58" endValue="153,7" duration="3" ease="Linear"/>
<item time="0" type="XY" target="n8_diqo" tween="true" startValue="64,58" endValue="64,4" duration="6" ease="Linear"/> <item time="0" type="XY" target="n8_diqo" tween="true" startValue="53.9,58.006,0.18,0.598" endValue="53.9,3.977,0.18,0.041" duration="3" ease="Linear"/>
<item time="6" type="Alpha" target="n9_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/> <item time="3" type="Alpha" target="n9_diqo" value="0.3"/>
<item time="6" type="XY" target="n10_diqo" tween="true" startValue="143,4" endValue="212,4" duration="6" ease="Linear"/> <item time="3" type="XY" target="n9_diqo" value="111,-73"/>
<item time="6" type="XY" target="n8_diqo" tween="true" startValue="64,4" endValue="6,4" duration="6" ease="Linear"/> <item time="5" type="Alpha" target="n9_diqo" value="1"/>
<item time="6" type="XY" target="n9_diqo" tween="true" startValue="103,-85" endValue="103,34" duration="6" ease="Linear"/> <item time="5" type="XY" target="n10_diqo" value="175,8"/>
<item time="12" type="XY" target="n10_diqo" tween="true" startValue="212,4" endValue="177,4" duration="3" ease="Linear"/> <item time="5" type="XY" target="n8_diqo" value="26,4"/>
<item time="12" type="XY" target="n8_diqo" tween="true" startValue="6,4" endValue="27,4" duration="3" ease="Linear"/> <item time="5" type="XY" target="n9_diqo" value="105,-1"/>
<item time="12" type="XY" target="n9_diqo" tween="true" startValue="103,34" endValue="105,1" duration="3" ease="Linear"/> <item time="7" type="XY" target="n10_diqo" tween="true" startValue="175,7" endValue="173,11" duration="2" ease="Linear"/>
<item time="21" type="Alpha" target="n10_diqo" value="1"/> <item time="7" type="XY" target="n8_diqo" tween="true" startValue="21,4" endValue="26,4" duration="2" ease="Linear"/>
<item time="21" type="Alpha" target="n8_diqo" value="1"/> <item time="7" type="XY" target="n9_diqo" tween="true" startValue="99,10" endValue="104,3" duration="2" ease="Linear"/>
<item time="21" type="Alpha" target="n9_diqo" value="1"/> <item time="27" type="Alpha" target="n10_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
<item time="27" type="Alpha" target="n8_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
<item time="27" type="Alpha" target="n9_diqo" tween="true" startValue="1" endValue="0" duration="5" ease="Linear"/>
</transition> </transition>
</component> </component>

79
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_zhadan.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="366,97" pivot="0.5,0.5" anchor="true"> <component size="366,97" pivot="0.5,0.5" anchor="true">
<displayList> <displayList>
<image id="n13_11k4t" name="n13" src="diqocop" fileName="Main_New/texiao/zhadanqiu.png" xy="133,-141" pivot="0.5,0.5" rotation="-36"/> <image id="n13_11k4t" name="n13" src="diqocop" fileName="Main_New/texiao/zhadanqiu.png" xy="133,-91" pivot="0.5,0.5" alpha="0.6" rotation="-36"/>
<image id="n15_11k4t" name="n15" src="diqocnx" fileName="Main_New/texiao/zhadan/huoyan-zhadan01.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/> <image id="n15_11k4t" name="n15" src="diqocnx" fileName="Main_New/texiao/zhadan/huoyan-zhadan01.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
<image id="n16_11k4t" name="n16" src="diqocnv" fileName="Main_New/texiao/zhadan/huoyan-zhadan02.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/> <image id="n16_11k4t" name="n16" src="diqocnv" fileName="Main_New/texiao/zhadan/huoyan-zhadan02.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
<image id="n17_11k4t" name="n17" src="diqocnu" fileName="Main_New/texiao/zhadan/huoyan-zhadan03.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/> <image id="n17_11k4t" name="n17" src="diqocnu" fileName="Main_New/texiao/zhadan/huoyan-zhadan03.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
@ -10,20 +10,16 @@
<image id="n20_11k4t" name="n20" src="diqocnr" fileName="Main_New/texiao/zhadan/huoyan-zhadan06.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/> <image id="n20_11k4t" name="n20" src="diqocnr" fileName="Main_New/texiao/zhadan/huoyan-zhadan06.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
<image id="n21_11k4t" name="n21" src="diqocnq" fileName="Main_New/texiao/zhadan/huoyan-zhadan07.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/> <image id="n21_11k4t" name="n21" src="diqocnq" fileName="Main_New/texiao/zhadan/huoyan-zhadan07.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
<image id="n22_11k4t" name="n22" src="diqocnp" fileName="Main_New/texiao/zhadan/huoyan-zhadan08.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/> <image id="n22_11k4t" name="n22" src="diqocnp" fileName="Main_New/texiao/zhadan/huoyan-zhadan08.png" xy="133,-82" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
<image id="n23_11k4t" name="n23" src="diqocnw" fileName="Main_New/texiao/zhadan/zhongxinguang01.png" xy="68,-66" pivot="0.5,0.5" visible="false"/> <image id="n23_11k4t" name="n23" src="diqocnw" fileName="Main_New/texiao/zhadan/zhongxinguang01.png" xy="68,-66" pivot="0.5,0.5" scale="0.7,0.6" visible="false"/>
<image id="n24_11k4t" name="n24" src="diqoco7" fileName="Main_New/texiao/zhadan/zhongxinguang02.png" xy="68,-66" pivot="0.5,0.5" visible="false"/> <image id="n24_11k4t" name="n24" src="diqoco7" fileName="Main_New/texiao/zhadan/zhongxinguang02.png" xy="68,-66" pivot="0.5,0.5" skew="0.9,0.7" visible="false"/>
<image id="n25_11k4t" name="n25" src="diqocog" fileName="Main_New/texiao/zhadan/zhongxinguang03.png" xy="68,-66" pivot="0.5,0.5" visible="false"/> <image id="n25_11k4t" name="n25" src="diqocog" fileName="Main_New/texiao/zhadan/zhongxinguang03.png" xy="68,-66" pivot="0.5,0.5" scale="1.4,1.2" visible="false"/>
<image id="n26_11k4t" name="n26" src="diqoco8" fileName="Main_New/texiao/zhadan/zhongxinguang04.png" xy="68,-66" pivot="0.5,0.5" visible="false"/> <image id="n26_11k4t" name="n26" src="diqoco8" fileName="Main_New/texiao/zhadan/zhongxinguang04.png" xy="68,-66" pivot="0.5,0.5" scale="1.6,1.4" visible="false" alpha="0.75"/>
<image id="n14_11k4t" name="n14" src="diqocpv" fileName="Main_New/texiao/zi_zhadan.png" xy="87,0" pivot="0.5,0.5"/> <image id="n14_11k4t" name="n14" src="diqocpv" fileName="Main_New/texiao/zi_zhadan.png" xy="87,0" pivot="0.5,0.5"/>
</displayList> </displayList>
<transition name="t0"> <transition name="t0" frameRate="30">
<item time="0" type="Alpha" target="n13_11k4t" tween="true" startValue="0.3" endValue="1" duration="4" ease="Linear"/>
<item time="0" type="Alpha" target="n14_11k4t" value="0"/> <item time="0" type="Alpha" target="n14_11k4t" value="0"/>
<item time="0" type="Alpha" target="n26_11k4t" value="1"/>
<item time="0" type="Scale" target="n14_11k4t" value="1,1"/> <item time="0" type="Scale" target="n14_11k4t" value="1,1"/>
<item time="0" type="Scale" target="n23_11k4t" value="1,1"/> <item time="0" type="Visible" target="n13_11k4t" value="true"/>
<item time="0" type="Scale" target="n25_11k4t" value="1,1"/>
<item time="0" type="Scale" target="n26_11k4t" value="1,1"/>
<item time="0" type="Visible" target="n15_11k4t" value="false"/> <item time="0" type="Visible" target="n15_11k4t" value="false"/>
<item time="0" type="Visible" target="n16_11k4t" value="false"/> <item time="0" type="Visible" target="n16_11k4t" value="false"/>
<item time="0" type="Visible" target="n17_11k4t" value="false"/> <item time="0" type="Visible" target="n17_11k4t" value="false"/>
@ -36,37 +32,34 @@
<item time="0" type="Visible" target="n24_11k4t" value="false"/> <item time="0" type="Visible" target="n24_11k4t" value="false"/>
<item time="0" type="Visible" target="n25_11k4t" value="false"/> <item time="0" type="Visible" target="n25_11k4t" value="false"/>
<item time="0" type="Visible" target="n26_11k4t" value="false"/> <item time="0" type="Visible" target="n26_11k4t" value="false"/>
<item time="0" type="XY" target="n13_11k4t" tween="true" startValue="133,-141.5" endValue="133,-21" duration="4" ease="Linear"/> <item time="2" type="Alpha" target="n14_11k4t" value="1"/>
<item time="5" type="Alpha" target="n13_11k4t" value="0"/> <item time="2" type="Scale" target="n14_11k4t" tween="true" startValue="0.3,0.3" endValue="1,1" duration="5" ease="Back.Out"/>
<item time="5" type="Alpha" target="n14_11k4t" value="1"/> <item time="2" type="Visible" target="n13_11k4t" value="false"/>
<item time="5" type="Scale" target="n14_11k4t" tween="true" startValue="0.3,0.3" endValue="1,1" duration="3" ease="Linear"/> <item time="2" type="Visible" target="n23_11k4t" value="true"/>
<item time="5" type="Scale" target="n23_11k4t" tween="true" startValue="0.8,0.8" endValue="1,1" duration="1" ease="Linear"/> <item time="4" type="Visible" target="n23_11k4t" value="false"/>
<item time="5" type="Visible" target="n23_11k4t" value="true"/> <item time="4" type="Visible" target="n24_11k4t" value="true"/>
<item time="7" type="Visible" target="n23_11k4t" value="false"/> <item time="6" type="Visible" target="n24_11k4t" value="false"/>
<item time="7" type="Visible" target="n24_11k4t" value="true"/> <item time="6" type="Visible" target="n25_11k4t" value="true"/>
<item time="8" type="Scale" target="n25_11k4t" value="1.2,1.2"/> <item time="7" type="Scale" target="n14_11k4t" value="1,1"/>
<item time="8" type="Visible" target="n24_11k4t" value="false"/> <item time="8" type="Visible" target="n25_11k4t" value="false"/>
<item time="8" type="Visible" target="n25_11k4t" value="true"/> <item time="8" type="Visible" target="n26_11k4t" value="true"/>
<item time="9" type="Alpha" target="n26_11k4t" tween="true" startValue="1" endValue="0.3" duration="1" ease="Linear"/> <item time="10" type="Visible" target="n15_11k4t" value="true"/>
<item time="9" type="Scale" target="n26_11k4t" value="1.5,1.5"/> <item time="10" type="Visible" target="n26_11k4t" value="false"/>
<item time="9" type="Visible" target="n25_11k4t" value="false"/> <item time="11" type="Visible" target="n15_11k4t" value="false"/>
<item time="9" type="Visible" target="n26_11k4t" value="true"/> <item time="11" type="Visible" target="n16_11k4t" value="true"/>
<item time="10" type="Alpha" target="n26_11k4t" tween="true" startValue="0.3" endValue="0" duration="1" ease="Linear"/> <item time="14" type="Visible" target="n16_11k4t" value="false"/>
<item time="11" type="Visible" target="n15_11k4t" value="true"/> <item time="14" type="Visible" target="n17_11k4t" value="true"/>
<item time="12" type="Visible" target="n15_11k4t" value="false"/> <item time="16" type="Visible" target="n17_11k4t" value="false"/>
<item time="12" type="Visible" target="n16_11k4t" value="true"/> <item time="16" type="Visible" target="n18_11k4t" value="true"/>
<item time="13" type="Visible" target="n16_11k4t" value="false"/> <item time="18" type="Visible" target="n18_11k4t" value="false"/>
<item time="13" type="Visible" target="n17_11k4t" value="true"/> <item time="18" type="Visible" target="n19_11k4t" value="true"/>
<item time="14" type="Visible" target="n17_11k4t" value="false"/> <item time="20" type="Visible" target="n19_11k4t" value="false"/>
<item time="14" type="Visible" target="n18_11k4t" value="true"/> <item time="20" type="Visible" target="n20_11k4t" value="true"/>
<item time="15" type="Visible" target="n18_11k4t" value="false"/> <item time="22" type="Visible" target="n20_11k4t" value="false"/>
<item time="15" type="Visible" target="n19_11k4t" value="true"/> <item time="22" type="Visible" target="n21_11k4t" value="true"/>
<item time="16" type="Visible" target="n19_11k4t" value="false"/> <item time="24" type="Alpha" target="n14_11k4t" tween="true" startValue="0.6" endValue="0" duration="7" ease="Linear"/>
<item time="16" type="Visible" target="n20_11k4t" value="true"/> <item time="24" type="Visible" target="n21_11k4t" value="false"/>
<item time="17" type="Visible" target="n20_11k4t" value="false"/> <item time="24" type="Visible" target="n22_11k4t" value="true"/>
<item time="17" type="Visible" target="n21_11k4t" value="true"/> <item time="26" type="Visible" target="n22_11k4t" value="false"/>
<item time="18" type="Visible" target="n21_11k4t" value="false"/>
<item time="18" type="Visible" target="n22_11k4t" value="true"/>
<item time="19" type="Visible" target="n22_11k4t" value="false"/>
</transition> </transition>
</component> </component>

2
wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" designImageAlpha="100" designImageLayer="1"> <component size="2532,1170" designImageAlpha="100" designImageLayer="1">
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="1"/> <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="0"/>
<controller name="sdk" pages="0,,1," selected="0"/> <controller name="sdk" pages="0,,1," selected="0"/>
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/> <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
<controller name="time" pages="0,,1,,2,,3," selected="0"/> <controller name="time" pages="0,,1,,2,,3," selected="0"/>

BIN
wb_new_ui/assets/Extend_Poker_RunFastNew/component/image/images/庄.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

6
wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
View File

@ -667,8 +667,6 @@
<component id="diqocpw" name="xingxing.xml" path="/Main_New/texiao/"/> <component id="diqocpw" name="xingxing.xml" path="/Main_New/texiao/"/>
<component id="diqocpx" name="te_liandui.xml" path="/Main_New/texiao/" exported="true"/> <component id="diqocpx" name="te_liandui.xml" path="/Main_New/texiao/" exported="true"/>
<movieclip id="diqocpy" name="clip_liandui.jta" path="/Main_New/texiao/saoguang_zi/"/> <movieclip id="diqocpy" name="clip_liandui.jta" path="/Main_New/texiao/saoguang_zi/"/>
<component id="diqocpz" name="te_sandaidui.xml" path="/Main_New/texiao/" exported="true"/>
<component id="diqocq0" name="te_sandaidan.xml" path="/Main_New/texiao/" exported="true"/>
<component id="diqocq1" name="te_shunzi.xml" path="/Main_New/texiao/" exported="true"/> <component id="diqocq1" name="te_shunzi.xml" path="/Main_New/texiao/" exported="true"/>
<component id="diqocq2" name="te_feiji.xml" path="/Main_New/texiao/" exported="true"/> <component id="diqocq2" name="te_feiji.xml" path="/Main_New/texiao/" exported="true"/>
<component id="11k4tcq4" name="te_zhadan.xml" path="/Main_New/texiao/" exported="true"/> <component id="11k4tcq4" name="te_zhadan.xml" path="/Main_New/texiao/" exported="true"/>
@ -679,7 +677,9 @@
<image id="11k4tcqf" name="图层 5.png" path="/Main_New/texiao/"/> <image id="11k4tcqf" name="图层 5.png" path="/Main_New/texiao/"/>
<image id="11k4tcqg" name="图层 6.png" path="/Main_New/texiao/"/> <image id="11k4tcqg" name="图层 6.png" path="/Main_New/texiao/"/>
<image id="11k4tcqh" name="组 1 拷贝.png" path="/Main_New/texiao/"/> <image id="11k4tcqh" name="组 1 拷贝.png" path="/Main_New/texiao/"/>
<component id="11k4tcqi" name="te_sidaisab.xml" path="/Main_New/texiao/" exported="true"/> <component id="mhsetcqk" name="te_sandaidui.xml" path="/Main_New/texiao/" exported="true"/>
<component id="mhsetcql" name="te_sidaisab.xml" path="/Main_New/texiao/" exported="true"/>
<component id="mhsetcqm" name="te_sandaidan.xml" path="/Main_New/texiao/" exported="true"/>
</resources> </resources>
<publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/> <publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
</packageDescription> </packageDescription>

BIN
wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/ting_corner_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

4
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml
View File

@ -6,6 +6,7 @@
<controller name="out" pages="0,,1," selected="0"/> <controller name="out" pages="0,,1," selected="0"/>
<controller name="showhang" pages="0,,1," selected="0"/> <controller name="showhang" pages="0,,1," selected="0"/>
<controller name="special_jing" pages="0,,1," selected="0"/> <controller name="special_jing" pages="0,,1," selected="0"/>
<controller name="ting" pages="0,,1," selected="0"/>
<displayList> <displayList>
<loader id="n3_hp0b" name="icon" xy="0,0" size="175,191" group="n13_jzul" aspect="true" url="ui://Main_Majiang/b202_203" fill="scaleFree"> <loader id="n3_hp0b" name="icon" xy="0,0" size="175,191" group="n13_jzul" aspect="true" url="ui://Main_Majiang/b202_203" fill="scaleFree">
<gearXY controller="button" pages="0,1" values="0,0|0,-35"/> <gearXY controller="button" pages="0,1" values="0,0|0,-35"/>
@ -32,6 +33,9 @@
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
<relation target="n3_hp0b" sidePair="top-top"/> <relation target="n3_hp0b" sidePair="top-top"/>
</image> </image>
<image id="n15_mhse" name="n15" src="mhset1kp" fileName="Main_new/Main/Image/ting_corner_icon.png" xy="71,12" size="101,145">
<gearDisplay controller="ting" pages="1"/>
</image>
</displayList> </displayList>
<Button mode="Check" sound="ui://v0j9abjyr8cy1k6" volume="0"/> <Button mode="Check" sound="ui://v0j9abjyr8cy1k6" volume="0"/>
</component> </component>

6
wb_new_ui/assets/Main_Majiang/component/hu_tip/Btn_Card_Hu.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="52,73" extention="Button"> <component size="112,190" extention="Button">
<displayList> <displayList>
<loader id="n1_pikf" name="icon" xy="-1,0" size="92,133" scale="0.55,0.55" url="ui://lxhyy2sd6cpqth"/> <loader id="n1_pikf" name="icon" xy="0,65" size="112,115" url="ui://lxhyy2sd6cpqth"/>
<text id="n2_nje6" name="tex_num" xy="52,52" size="29,19" visible="false" fontSize="15" color="#ffffff" align="center" vAlign="middle" text="3张"/> <text id="n2_nje6" name="title" xy="17,25" pivot="0.5,0.5" size="76,39" scale="1.3,1" font="Arial" fontSize="28" align="center" vAlign="middle" text="剩4张"/>
</displayList> </displayList>
<Button/> <Button/>
</component> </component>

BIN
wb_new_ui/assets/Main_Majiang/component/hu_tip/GPS_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 211 KiB

18
wb_new_ui/assets/Main_Majiang/component/hu_tip/Hu_tip.xml
View File

@ -1,20 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="152,85" extention="Button"> <component size="185,190" pivot="0.5,1" extention="Button">
<displayList> <displayList>
<graph id="n0_g4z1" name="n0" xy="0,0" size="152,85" alpha="0.7" type="rect" lineSize="0" fillColor="#ff000000" corner="10"> <image id="n7_mhse" name="n7" src="mhset1kn" fileName="component/hu_tip/GPS_bg.png" xy="0,0" size="185,190">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</graph> </image>
<image id="n1_g4z1" name="n1" src="gq7mek" fileName="component/hu_tip/common_table_tab_hu.png" xy="-1,0"/> <image id="n8_mhse" name="n8" src="mhset1ko" fileName="component/hu_tip/gamexzmj_37.png" xy="27,41" size="130,108"/>
<list id="n3_g4z1" name="lst_card" xy="153,1" size="200,82" layout="row" colGap="3" defaultItem="ui://v0j9abjygq7mej" autoItemSize="false" vAlign="middle" autoClearItems="true"> <list id="n3_g4z1" name="lst_card" xy="170,0" size="0,190" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="36" defaultItem="ui://v0j9abjygq7mej" autoItemSize="false" vAlign="middle" autoClearItems="true">
<item/>
<item/>
<item/>
<item/>
<item/> <item/>
</list> </list>
<graph id="n4_g4z1" name="n4" xy="79,9" size="2,66" type="rect" lineSize="0"/>
<text id="n5_g4z1" name="tex_num" xy="14,13" size="64,44" fontSize="40" color="#cccccc" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="15"/>
<text id="n6_g4z1" name="tex_num" xy="21,48" size="50,41" fontSize="24" color="#cccccc" align="center" vAlign="middle" autoSize="none" text="张"/>
</displayList> </displayList>
<Button/> <Button/>
<relation target="n3_g4z1" sidePair="width-width"/>
</component> </component>

BIN
wb_new_ui/assets/Main_Majiang/component/hu_tip/gamexzmj_37.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
wb_new_ui/assets/Main_Majiang/images/z01.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

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

@ -1277,6 +1277,9 @@
<image id="xx1c1ki" name="outMask.png" path="/Main_new/Main/Image/"/> <image id="xx1c1ki" name="outMask.png" path="/Main_new/Main/Image/"/>
<component id="11k4t1kj" name="Btn_MaCard.xml" path="/Main_new/Main_new_4/Component/" exported="true"/> <component id="11k4t1kj" name="Btn_MaCard.xml" path="/Main_new/Main_new_4/Component/" exported="true"/>
<image id="11k4t1kk" name="xzmj_15.png" path="/Main_new/Main/Image/"/> <image id="11k4t1kk" name="xzmj_15.png" path="/Main_new/Main/Image/"/>
<image id="mhset1kn" name="GPS_bg.png" path="/component/hu_tip/"/>
<image id="mhset1ko" name="gamexzmj_37.png" path="/component/hu_tip/"/>
<image id="mhset1kp" name="ting_corner_icon.png" path="/Main_new/Main/Image/"/>
</resources> </resources>
<publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/> <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
</packageDescription> </packageDescription>

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

Binary file not shown.

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 MiB

After

Width:  |  Height:  |  Size: 4.6 MiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 MiB

After

Width:  |  Height:  |  Size: 3.8 MiB

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

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 MiB

After

Width:  |  Height:  |  Size: 2.0 MiB

BIN
wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 MiB

After

Width:  |  Height:  |  Size: 1.8 MiB

BIN
wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
View File

Binary file not shown.