diff --git a/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua b/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua
index 2f7f98b3..5afbecbb 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua
@@ -50,7 +50,7 @@ end
local function Exists(id, deskList)
for _, player in pairs(deskList) do
- if id == player.uid then
+ if id == player.uid then
return true
end
end
@@ -59,16 +59,15 @@ end
local function AddPlayer(data, self)
if self.sending then
- ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
+ ViewUtil.ErrorTip(-1, "正在操作中。。")
return
end
-- 点击弹出选择成员界面
local view = FamilySelectNumber.New()
view:Show(self.root._group.id, function(number)
-
if Exists(number.uid, data.deskList) then
- ViewUtil.ShowBannerOnScreenCenter("设置失败,成员已经在关系中")
+ ViewUtil.ErrorTip(-1, "设置失败,成员已经在关系中")
return
end
@@ -79,7 +78,7 @@ local function AddPlayer(data, self)
fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res)
self.sending = false
if res.ReturnCode ~= 0 then
- ViewUtil.ShowBannerOnScreenCenter("设置失败")
+ ViewUtil.ErrorTip(-1, "设置失败")
return
end
data.deskList[#data.deskList + 1] = { uid = number.uid }
@@ -92,7 +91,7 @@ local function DelPalyer(data, uid, self)
--print("删除玩家", uid)
if self.sending then
- ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
+ ViewUtil.ErrorTip(-1, "正在操作中。。")
return
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)
self.sending = false
if res.ReturnCode ~= 0 then
- ViewUtil.ShowBannerOnScreenCenter("删除失败")
+ ViewUtil.ErrorTip(-1, "删除失败")
return
end
data.deskList = RemoveItem(data.deskList, function(item)
@@ -129,7 +128,7 @@ end
local function DelDesk(data, self)
if self.sending then
- ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
+ ViewUtil.ErrorTip(-1, "正在操作中。。")
return
end
@@ -145,7 +144,7 @@ local function ChangeName(deskData, name, self)
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_SetBanTable1(self.root._group.id, deskData.deskId, AllUid(deskData.deskList), name, function(res)
if res.ReturnCode ~= 0 then
- ViewUtil.ShowBannerOnScreenCenter("删除失败")
+ ViewUtil.ErrorTip(-1, "删除失败")
return
end
deskData.deskName = name
@@ -323,7 +322,7 @@ function BanDesk:GetBanTableCallback(res)
addBanItem:GetController("cStyle").selectedIndex = 1
btn_addBanItem.onClick:Set(function()
if self.sending then
- ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
+ ViewUtil.ErrorTip(-1, "正在操作中。。")
return
end
diff --git a/lua_probject/base_project/Game/View/Family/FamilyInviteFamilyView.lua b/lua_probject/base_project/Game/View/Family/FamilyInviteFamilyView.lua
index 0590fc6c..9c18f491 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyInviteFamilyView.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyInviteFamilyView.lua
@@ -19,10 +19,10 @@ function M:init(url)
local view = self._view
view:GetChild('btn_wx').onClick:Add(function()
- ViewUtil.ShowBannerOnScreenCenter("该功能还会开放，敬请期待")
+ ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
end)
view:GetChild('btn_moments').onClick:Add(function()
- ViewUtil.ShowBannerOnScreenCenter("该功能还会开放，敬请期待")
+ ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
end)
end
diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
index 0dfaac13..c0636a67 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
@@ -51,7 +51,7 @@ local function QuitFamily(self)
local tipsWin = MsgWindow.new(self._view, tips, MsgWindow.MsgMode.OkAndCancel)
tipsWin.onOk:Add(function()
if self.networkSending then
- ViewUtil.ShowBannerOnScreenCenter("操作中，请稍后。。")
+ ViewUtil.ErrorTip(-1, "操作中，请稍后。。")
return
end
@@ -317,7 +317,7 @@ function FamilyMyFamily:Init()
self.btn_hideNumber.onClick:Set(function()
if self.networkSending == true then
- ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后。。")
+ ViewUtil.ErrorTip(-1, "设置中，请稍后。。")
return
end
@@ -333,13 +333,13 @@ function FamilyMyFamily:Init()
end
self.family.isShow = 0
self:Refalsh()
- ViewUtil.ShowBannerOnScreenCenter("设置成功")
+ ViewUtil.ErrorTip(-1, "设置成功")
end)
end)
self.btn_showNumber.onClick:Set(function()
if self.networkSending == true then
- ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后。。")
+ ViewUtil.ErrorTip(-1, "设置中，请稍后。。")
return
end
@@ -357,13 +357,13 @@ function FamilyMyFamily:Init()
end
self.family.isShow = 1
self:Refalsh()
- ViewUtil.ShowBannerOnScreenCenter("设置成功")
+ ViewUtil.ErrorTip(-1, "设置成功")
end)
end)
self.tips_btn_comfirm.onClick:Set(function()
if self.networkSending then
- ViewUtil.ShowBannerOnScreenCenter("操作中，请稍后。。")
+ ViewUtil.ErrorTip(-1, "操作中，请稍后。。")
return
end
diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index bfc34dc3..f66e05d3 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/lua_probject/base_project/Game/View/FamilyView.lua
@@ -230,7 +230,7 @@ function M:init(url)
obj.text = Utils.TextOmit(group.name, 6, "...")
obj.onClick:Add(function()
if self._group ~= nil and group.id == self._group.id then
- --ViewUtil.ShowBannerOnScreenCenter("已在家族中")
+ --ViewUtil.ErrorTip(-1,"已在家族中")
return
end
diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua
index 78e9f53c..08c926f8 100644
--- a/lua_probject/base_project/Game/View/LobbyView.lua
+++ b/lua_probject/base_project/Game/View/LobbyView.lua
@@ -57,7 +57,7 @@ function M:InitView(url)
local btn_shop = self._view:GetChild("btn_shop")
btn_shop.onClick:Add(handler(self, function()
local shopView = LobbyShopView.new(function()
- ViewUtil.ShowBannerOnScreenCenter("该功能还会开放，敬请期待")
+ ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
-- self:ShowPlayerInfo(1, DataManager.SelfUser.diamo, 1)
end)
shopView:Show()
@@ -159,7 +159,7 @@ function M:InitView(url)
coroutine.start(function()
coroutine.wait(3)
ViewUtil.CloseModalWait2()
- ViewUtil.ShowBannerOnScreenCenter("微信跳转失败")
+ ViewUtil.ErrorTip(-1, "微信跳转失败")
end)
end)
diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua
index 7b693834..6bea07e6 100644
--- a/lua_probject/base_project/Game/View/MainView.lua
+++ b/lua_probject/base_project/Game/View/MainView.lua
@@ -292,7 +292,7 @@ function M:InitView(url, isHideIpAdds)
self._ctr_more.selectedIndex = 0
end
if self._room.room_config.config.hpData.BanChat == 1 then
- ViewUtil.ShowBannerOnScreenCenter("本房间禁止快捷聊天")
+ ViewUtil.ErrorTip(-1, "本房间禁止快捷聊天")
return
end
@@ -327,7 +327,7 @@ function M:InitView(url, isHideIpAdds)
self._chat_Talk.onTouchBegin:Set(function(context)
if self._room.room_config.config.hpData.BanChat == 1 then
- ViewUtil.ShowBannerOnScreenCenter("本房间禁止快捷聊天")
+ ViewUtil.ErrorTip(-1, "本房间禁止快捷聊天")
return
end
diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupMngSettingView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupMngSettingView.lua
index d51a36df..1bb7dc5f 100644
--- a/lua_probject/base_project/Game/View/NewGroup/GroupMngSettingView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/GroupMngSettingView.lua
@@ -4,19 +4,19 @@ local GroupMngSettingView = {}
local M = GroupMngSettingView
function GroupMngSettingView.new(gid)
- setmetatable(M, {__index = BaseWindow})
- local self = setmetatable({}, {__index = M})
+ setmetatable(M, { __index = BaseWindow })
+ local self = setmetatable({}, { __index = M })
self.class = "GroupMngSettingView"
self._close_destroy = true
self.group_id = gid
- -- self._full = true
+ -- self._full = true
self:init("ui://NewGroup/Win_GroupSetting")
self:FillView()
return self
end
function M:initData()
-
+
end
function M:FillView()
@@ -57,10 +57,10 @@ function M:FillView()
local option = group.option 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_es.selectedIndex = bit:_and(option,4) > 0 and 1 or 0
- ctr_ua.selectedIndex = bit:_and(option,8) > 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_es.selectedIndex = bit:_and(option, 4) > 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()
ViewUtil.ShowModalWait()
@@ -82,18 +82,18 @@ function M:FillView()
local ua = ctr_ua.selectedIndex
local option = 0
- if ctr_pt.selectedIndex == 1 then
- option = bit:_or(option,1)
+ if ctr_pt.selectedIndex == 1 then
+ option = bit:_or(option, 1)
end
- if ctr_wq.selectedIndex == 1 then
- option = bit:_or(option,2)
+ if ctr_wq.selectedIndex == 1 then
+ option = bit:_or(option, 2)
end
- if ctr_es.selectedIndex == 1 then
- option = bit:_or(option,4)
+ if ctr_es.selectedIndex == 1 then
+ option = bit:_or(option, 4)
+ end
+ if ctr_ua.selectedIndex == 1 then
+ option = bit:_or(option, 8)
end
- if ctr_ua.selectedIndex == 1 then
- option = bit:_or(option,8)
- end
local showNum = 0
if ctl_show_num.selectedIndex == 1 then
@@ -101,14 +101,14 @@ function M:FillView()
if strShowNum ~= nil and strShowNum ~= "" then
showNum = tonumber(self._view:GetChild("txt_show_num").text)
end
- end
+ end
fgCtr:FG_UpdateGroupInfo(data, function(res)
ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then
- ViewUtil.ErrorTip(res.ReturnCode,"设置大联盟失败。")
+ ViewUtil.ErrorTip(res.ReturnCode, "设置大联盟失败。")
else
- ViewUtil.ShowBannerOnScreenCenter("设置成功")
+ ViewUtil.ErrorTip(-1, "设置成功")
group.name = name
group.notice = notice
group.ban = ban
@@ -123,4 +123,4 @@ function M:FillView()
end)
end
-return M
\ No newline at end of file
+return M
diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua
index 3c0c0a12..a3e6754f 100644
--- a/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua
@@ -44,7 +44,7 @@ function M:init(url, member)
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "备注失败")
else
- ViewUtil.ShowBannerOnScreenCenter("备注成功")
+ ViewUtil.ErrorTip(-1, "备注成功")
--member.score = score
self:Destroy()
--self.callback(true)
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupAddMemberInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupAddMemberInfoView.lua
index c4358ccd..825cfd65 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupAddMemberInfoView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupAddMemberInfoView.lua
@@ -2,59 +2,56 @@ local GroupAddMemberInfoView = {}
local M = GroupAddMemberInfoView
-function GroupAddMemberInfoView.new(group_id,member_id)
- setmetatable(M, {__index = BaseView})
- local self = setmetatable({}, {__index = M})
- self.class = "GroupAddMemberInfoView"
- self.group_id = group_id
- self.member_id = member_id
- self:init("ui://NewGroup/Win_PlayerInfoForAdd")
- return self
+function GroupAddMemberInfoView.new(group_id, member_id)
+ setmetatable(M, { __index = BaseView })
+ local self = setmetatable({}, { __index = M })
+ self.class = "GroupAddMemberInfoView"
+ self.group_id = group_id
+ self.member_id = member_id
+ self:init("ui://NewGroup/Win_PlayerInfoForAdd")
+ return self
end
function M:init(url)
- BaseWindow.init(self,url)
- self.Tx=self._view:GetChild("btn_head")
- self.Name=self._view:GetChild("tex_name")
- self.Id=self._view:GetChild("tex_id")
+ BaseWindow.init(self, url)
+ self.Tx = self._view:GetChild("btn_head")
+ self.Name = self._view:GetChild("tex_name")
+ self.Id = self._view:GetChild("tex_id")
self._view:GetChild("btn_close").onClick:Set(
- function ()
- self:Destroy()
- end
- )
+ function()
+ self:Destroy()
+ end
+ )
self._view:GetChild("btn_qc").onClick:Set(
- function ()
- self:Destroy()
- end
- )
+ function()
+ self:Destroy()
+ end
+ )
self._view:GetChild("btn_qd").onClick:Set(
- function ()
- ViewUtil.ShowModalWait()
- local fgCtr = ControllerManager.GetController(NewGroupController)
- fgCtr:FG_AddMember(
- self.group_id,
- self.member_id,
- function (response)
- ViewUtil.CloseModalWait()
- if (response.ReturnCode == 0) then
- ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1)
- else
- ViewUtil.ErrorTip(response.ReturnCode, '邀请玩家失败！')
- end
+ function()
+ ViewUtil.ShowModalWait()
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ fgCtr:FG_AddMember(
+ self.group_id,
+ self.member_id,
+ function(response)
+ ViewUtil.CloseModalWait()
+ if (response.ReturnCode == 0) then
+ ViewUtil.ErrorTip(-1, '添加成功！', 1)
+ else
+ ViewUtil.ErrorTip(response.ReturnCode, '邀请玩家失败！')
end
- )
- end
- )
-
+ end
+ )
+ end
+ )
end
-
function M:SetAddMember(data)
ImageLoad.Load(data.portrait, self.Tx._iconObject)
- self.Name.text=data.nick
- self.Id.text=data.uid
+ self.Name.text = data.nick
+ self.Id.text = data.uid
self:Show()
end
-
-return M
\ No newline at end of file
+return M
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupBanSameTableView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupBanSameTableView.lua
index 9c4b78f8..d8b6ba25 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupBanSameTableView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupBanSameTableView.lua
@@ -5,130 +5,130 @@ local GroupBanSameTableView = {}
local M = GroupBanSameTableView
function GroupBanSameTableView.new(blur_view, group_id, member_id, data)
- setmetatable(M, {__index = BaseWindow})
- local self = setmetatable({}, {__index = M})
- self.class = "GroupBanSameTableView"
- self._close_destroy = true
- self._blur_view = blur_view
- self.group_id = group_id
- self.ori_ban = data.ban_list
- self.ban_list = membe_deep_clone(data.ban_list)
- self.member_id = member_id
- self:init("ui://NewGroup/Win_BanSameTable")
- return self
+ setmetatable(M, { __index = BaseWindow })
+ local self = setmetatable({}, { __index = M })
+ self.class = "GroupBanSameTableView"
+ self._close_destroy = true
+ self._blur_view = blur_view
+ self.group_id = group_id
+ self.ori_ban = data.ban_list
+ self.ban_list = membe_deep_clone(data.ban_list)
+ self.member_id = member_id
+ self:init("ui://NewGroup/Win_BanSameTable")
+ return self
end
function M:init(url)
- BaseWindow.init(self,url)
- -- 搜索结果
- self._search_member_data = {}
- self._search_ban_data = {}
+ BaseWindow.init(self, url)
+ -- 搜索结果
+ self._search_member_data = {}
+ self._search_ban_data = {}
- local group = DataManager.groups:get(self.group_id)
- self.all_members = group.members
- self.member_data = {}
- self:getMemberData(#self.all_members)
+ local group = DataManager.groups:get(self.group_id)
+ self.all_members = group.members
+ self.member_data = {}
+ self:getMemberData(#self.all_members)
- self.ctr_search_m = self._view:GetController("search_m")
- self.ctr_search_b = self._view:GetController("search_b")
+ self.ctr_search_m = self._view:GetController("search_m")
+ self.ctr_search_b = self._view:GetController("search_b")
- self.lst_member = self._view:GetChild("lst_member")
- self.lst_member:SetVirtual()
- self.lst_member.itemRenderer = function(index, obj)
- self:OnRenderMemberItem(index, obj)
- end
- self.lst_member.scrollPane.onPullUpRelease:Set(function()
- self:getMemberData(#self.all_members)
- end)
+ self.lst_member = self._view:GetChild("lst_member")
+ self.lst_member:SetVirtual()
+ self.lst_member.itemRenderer = function(index, obj)
+ self:OnRenderMemberItem(index, obj)
+ end
+ self.lst_member.scrollPane.onPullUpRelease:Set(function()
+ self:getMemberData(#self.all_members)
+ end)
- self.lst_ban = self._view:GetChild("lst_ban")
- self.lst_ban:SetVirtual()
- self.lst_ban.itemRenderer = function(index, obj)
- self:OnRenderBanItem(index, obj)
- end
- self:refreshList()
+ self.lst_ban = self._view:GetChild("lst_ban")
+ self.lst_ban:SetVirtual()
+ self.lst_ban.itemRenderer = function(index, obj)
+ self:OnRenderBanItem(index, obj)
+ end
+ self:refreshList()
- self._view:GetChild("btn_back").onClick:Set(function()
- self._search_member_data = {}
- self.ctr_search_m.selectedIndex = 0
- self:refreshList()
- end)
+ self._view:GetChild("btn_back").onClick:Set(function()
+ self._search_member_data = {}
+ self.ctr_search_m.selectedIndex = 0
+ self:refreshList()
+ end)
- self._view:GetChild("btn_back_ban").onClick:Set(function()
- self._search_ban_data = {}
- self.ctr_search_b.selectedIndex = 0
- self:refreshList()
- end)
+ self._view:GetChild("btn_back_ban").onClick:Set(function()
+ self._search_ban_data = {}
+ self.ctr_search_b.selectedIndex = 0
+ self:refreshList()
+ end)
- local fgCtr = ControllerManager.GetController(NewGroupController)
- self._view:GetChild("btn_search_member").onClick:Set(function()
- ViewUtil.ShowModalWait(nil)
- local qid = tonumber(self._view:GetChild("tex_find_memb").text)
- if not qid then
- ViewUtil.CloseModalWait()
- ViewUtil.ErrorTip(nil, "输入ID进行搜索")
- return
- end
- fgCtr:FG_FindMember(self.group_id, qid, function(res)
- ViewUtil.CloseModalWait()
- if self._is_destroy then
- return
- end
- if res.ReturnCode ~= 0 then
- ViewUtil.ErrorTip(res.ReturnCode, "找不到成员")
- self._search_member_data = {}
- self:refreshList()
- else
- self.ctr_search_m.selectedIndex = 1
- self._search_member_data[1] = res.Data.members[1]
- self:refreshList()
- end
- end)
- end)
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ self._view:GetChild("btn_search_member").onClick:Set(function()
+ ViewUtil.ShowModalWait(nil)
+ local qid = tonumber(self._view:GetChild("tex_find_memb").text)
+ if not qid then
+ ViewUtil.CloseModalWait()
+ ViewUtil.ErrorTip(nil, "输入ID进行搜索")
+ return
+ end
+ fgCtr:FG_FindMember(self.group_id, qid, function(res)
+ ViewUtil.CloseModalWait()
+ if self._is_destroy then
+ return
+ end
+ if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode, "找不到成员")
+ self._search_member_data = {}
+ self:refreshList()
+ else
+ self.ctr_search_m.selectedIndex = 1
+ self._search_member_data[1] = res.Data.members[1]
+ self:refreshList()
+ end
+ end)
+ end)
- self._view:GetChild("btn_search_ban").onClick:Set(function()
- local qid = tonumber(self._view:GetChild("tex_find_ban").text)
- if not qid then
- ViewUtil.ErrorTip(nil, "输入ID进行搜索")
- return
- end
- for i = 1, #self.ban_list do
- local data = self.ban_list[i]
- if data.uid == qid then
- self.ctr_search_b.selectedIndex = 1
- self._search_ban_data[1] = data
- self:refreshList()
- return
- end
- end
- ViewUtil.ErrorTip(nil, "找不到成员")
- self._search_ban_data = {}
- self:refreshList()
- end)
+ self._view:GetChild("btn_search_ban").onClick:Set(function()
+ local qid = tonumber(self._view:GetChild("tex_find_ban").text)
+ if not qid then
+ ViewUtil.ErrorTip(nil, "输入ID进行搜索")
+ return
+ end
+ for i = 1, #self.ban_list do
+ local data = self.ban_list[i]
+ if data.uid == qid then
+ self.ctr_search_b.selectedIndex = 1
+ self._search_ban_data[1] = data
+ self:refreshList()
+ return
+ end
+ end
+ ViewUtil.ErrorTip(nil, "找不到成员")
+ self._search_ban_data = {}
+ self:refreshList()
+ end)
- self._view:GetChild("btn_ok").onClick:Set(function()
- local set_list = {}
- local del_list = {}
- for i = 1, #self.ban_list do
- table.insert(set_list, self.ban_list[i].uid)
- end
- for i = 1, #self.ori_ban do
- local tem = self.ori_ban[i]
- if not list_check(set_list, tem.uid) then
- table.insert(del_list, tem.uid)
- end
- end
- ViewUtil.ShowModalWait()
- fgCtr:FG_SetBanTable(self.group_id, self.member_id, set_list, del_list, function(res)
- ViewUtil.CloseModalWait()
- if res.ReturnCode == 0 then
- self:Destroy()
- ViewUtil.ShowBannerOnScreenCenter("禁止同桌设置成功")
- else
- ViewUtil.ErrorTip(res.ReturnCode, "禁止同桌设置失败")
- end
- end)
- end)
+ self._view:GetChild("btn_ok").onClick:Set(function()
+ local set_list = {}
+ local del_list = {}
+ for i = 1, #self.ban_list do
+ table.insert(set_list, self.ban_list[i].uid)
+ end
+ for i = 1, #self.ori_ban do
+ local tem = self.ori_ban[i]
+ if not list_check(set_list, tem.uid) then
+ table.insert(del_list, tem.uid)
+ end
+ end
+ ViewUtil.ShowModalWait()
+ fgCtr:FG_SetBanTable(self.group_id, self.member_id, set_list, del_list, function(res)
+ ViewUtil.CloseModalWait()
+ if res.ReturnCode == 0 then
+ self:Destroy()
+ ViewUtil.ErrorTip(-1, "禁止同桌设置成功")
+ else
+ ViewUtil.ErrorTip(res.ReturnCode, "禁止同桌设置失败")
+ end
+ end)
+ end)
end
local function checkList(list, data)
@@ -172,15 +172,15 @@ function M:getMemberData(index)
-- group:clearMember()
-- end
ViewUtil.ShowModalWait(nil)
- local fgCtr = ControllerManager.GetController(NewGroupController)
- fgCtr:FG_GroupMembers(self.group_id, index, 10, false, 1, function(res)
- ViewUtil.CloseModalWait()
- if res.ReturnCode ~= 0 then
- ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
- else
- list_concat(self.all_members, res.Data.members)
- self:refreshList()
- end
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ fgCtr:FG_GroupMembers(self.group_id, index, 10, false, 1, function(res)
+ ViewUtil.CloseModalWait()
+ if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
+ else
+ list_concat(self.all_members, res.Data.members)
+ self:refreshList()
+ end
end)
end
@@ -211,12 +211,12 @@ function M:FillItem(data, item, act)
btn_head = item:GetChild("btn_head")
ImageLoad.Load(data.portrait, btn_head._iconObject)
item:GetChild("btn_del").onClick:Set(function()
- if self.ctr_search_b.selectedIndex == 1 then
- list_remove(self.ban_list, data)
- list_remove(self._search_ban_data, data)
- else
- list_remove(self.ban_list, data)
- end
+ if self.ctr_search_b.selectedIndex == 1 then
+ list_remove(self.ban_list, data)
+ list_remove(self._search_ban_data, data)
+ else
+ list_remove(self.ban_list, data)
+ end
self:refreshList()
end)
item:GetChild("btn_set").onClick:Set(function()
@@ -229,4 +229,4 @@ function M:FillItem(data, item, act)
end)
end
-return M
\ No newline at end of file
+return M
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua
index e2b16c88..bcbf5046 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua
@@ -494,7 +494,7 @@ function M:FillFagData()
play.maxPlayers = _data.maxPlayers
play.roomNum = self.hpData.tex_times_room / 1000
play.maxRound = res.Data.maxRound
- ViewUtil.ShowBannerOnScreenCenter("添加玩法成功")
+ ViewUtil.ErrorTip(-1, "添加玩法成功")
self.callback(play)
self:Destroy()
else
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
index 271fb8f7..84b52565 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
@@ -588,7 +588,7 @@ function M:FillFagData()
play.maxPlayers = _data.maxPlayers
play.roomNum = self.hpData.tex_times_room / 1000
play.maxRound = res.Data.maxRound
- ViewUtil.ShowBannerOnScreenCenter("添加玩法成功")
+ ViewUtil.ErrorTip(-1, "添加玩法成功")
self.callback(play)
self:Destroy()
else
@@ -1090,7 +1090,7 @@ function M:FillFagData_jiangxi()
play.maxPlayers = _data.maxPlayers
play.roomNum = self.hpData.tex_times_room / 1000
play.maxRound = res.Data.maxRound
- ViewUtil.ShowBannerOnScreenCenter("添加玩法成功")
+ ViewUtil.ErrorTip(-1, "添加玩法成功")
self.callback(play)
self:Destroy()
else
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua
index ac98501d..3dd80a68 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua
@@ -125,7 +125,7 @@ function M:init(url)
member.parentId = parent_id
self._view:GetChild("tex_superior_id").text = parent_id
ctr_superior.selectedIndex = 1
- ViewUtil.ShowBannerOnScreenCenter("调配玩家成功")
+ ViewUtil.ErrorTip(-1, "调配玩家成功")
else
ViewUtil.ErrorTip(res1.ReturnCode, "调配玩家失败")
end
@@ -183,7 +183,7 @@ function M:init(url)
ViewUtil.CloseModalWait()
if res1.ReturnCode == 0 then
self.callBack(true)
- ViewUtil.ShowBannerOnScreenCenter("已成功删除玩家")
+ ViewUtil.ErrorTip(-1, "已成功删除玩家")
self:Destroy()
else
ViewUtil.ErrorTip(res1.ReturnCode, "删除成员失败")
@@ -492,7 +492,7 @@ function M:MovePartner(parent_id, member, obj)
member.partnerLev = res1.Data.partnerLev
obj:GetChild("tex_superior_id").text = parent_id
obj:GetController("show_superior").selectedIndex = 1
- ViewUtil.ShowBannerOnScreenCenter("转移成功")
+ ViewUtil.ErrorTip(-1, "转移成功")
else
ViewUtil.ErrorTip(res1.ReturnCode, "转移失败")
end
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngAddMemberView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngAddMemberView.lua
index 121001ce..e62e2e51 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngAddMemberView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngAddMemberView.lua
@@ -8,7 +8,7 @@ function GroupMngAddMemberView.new(gid)
local self = M
self.class = "GroupMngAddMemberView"
self.group_id = gid
- self:FillView()
+ self:FillView()
return self
end
@@ -38,37 +38,37 @@ function M:FillView()
local group = DataManager.groups:get(self.group_id)
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:ClearNumTex()
-
+
local cnt = self._view.numChildren - 1
-
- for i = 0 ,9 do
- local obj = self._view:GetChild("btn_"..i)
- obj.onClick:Add(handler(self , self.OnNumButtonAction))
+
+ for i = 0, 9 do
+ local obj = self._view:GetChild("btn_" .. i)
+ obj.onClick:Add(handler(self, self.OnNumButtonAction))
i = i + 1
end
local btn_ok = self._view:GetChild("btn_ok")
btn_ok.onClick:Set(function()
- if not CheckPermission(group.lev, perm_array[2]) then
+ if not CheckPermission(group.lev, perm_array[2]) then
return
end
if self._texnum_str == "" then return end
- ViewUtil.ShowModalWait()
+ ViewUtil.ShowModalWait()
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_AddMember(self.group_id, tonumber(self._texnum_str), function(response)
ViewUtil.CloseModalWait()
if (response.ReturnCode == 0) then
- ViewUtil.ShowBannerOnScreenCenter("添加成功！", 1)
+ ViewUtil.ErrorTip(-1, "添加成功！", 1)
else
- ViewUtil.ErrorTip(response.ReturnCode,"邀请玩家失败！")
+ ViewUtil.ErrorTip(response.ReturnCode, "邀请玩家失败！")
end
end)
end)
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")
if group.lev < 3 then
@@ -78,7 +78,7 @@ function M:FillView()
ctr_page.onChanged:Set(function()
if ctr_page.selectedIndex == 1 then
self:GetJoinsData()
- end
+ end
end)
end
@@ -98,7 +98,7 @@ function M:GetJoinsData()
end
self:FillJoinList(joins)
else
- ViewUtil.ErrorTip(res.ReturnCode,"获取申请列表失败！")
+ ViewUtil.ErrorTip(res.ReturnCode, "获取申请列表失败！")
self:FillJoinList({})
end
end)
@@ -140,11 +140,11 @@ function M:VerifyPlayerJoin(id, allow)
end
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 (self._currenIndex > 0) then
+ if (self._currenIndex > 0) then
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
end
else
@@ -152,7 +152,6 @@ function M:OnNumButtonAction(context)
self._currenIndex = self._currenIndex + 1
self._texnum_str = self._texnum_str .. typer
self.tex_num.text = self._texnum_str
-
end
end
end
@@ -163,4 +162,4 @@ function M:ClearNumTex()
self.tex_num.text = self._texnum_str
end
-return M
\ No newline at end of file
+return M
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua
index b289fdc3..38e80f1c 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua
@@ -153,7 +153,7 @@ function M:FillView()
if (response.ReturnCode and response.ReturnCode == 0) then
GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data)
self:ClearNumTex()
- --ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1)
+ --ViewUtil.ErrorTip(-1,'添加成功！', 1)
else
ViewUtil.ErrorTip(123456, '获取玩家失败')
end
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua
index 7317b859..09f99d4a 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua
@@ -172,7 +172,7 @@ function M:FillView()
if (response.ReturnCode and response.ReturnCode == 0) then
GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data)
self:ClearNumTex()
- --ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1)
+ --ViewUtil.ErrorTip(-1,'添加成功！', 1)
else
ViewUtil.ErrorTip(123456, '获取玩家失败')
end
@@ -448,7 +448,7 @@ function M:FillItem(obj, member, refresh)
local btnBxx = obj:GetChild('btn_bxx')
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)
obj:GetChild('btn_bxx').onClick:Set(
function()
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerRewardsView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerRewardsView.lua
index 70477170..f63de9c0 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerRewardsView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerRewardsView.lua
@@ -39,7 +39,7 @@ function M:initData()
local index = self._view:GetController("index").selectedIndex
if index < 2 then
- self:GetPartnerData(0)
+ self:GetPartnerData(0)
else
self:GetRewardsStatistic()
-- self._view:GetController("index").selectedIndex = 0
@@ -65,7 +65,7 @@ function M:InitView()
-- 切换页面时，1,2页需要先清理数据，再加载当前页
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.partner_data ~= 0 then
self.rewards_data = {}
@@ -79,17 +79,17 @@ function M:InitView()
self.lst_rewards.numItems = 0
self:GetRewardsData()
end
- elseif ctr_index.selectedIndex == 1 then
+ elseif ctr_index.selectedIndex == 1 then
if self.ctr_search.selectedIndex == 0 then
self.rewards_log = {}
else
self.search_rewards_log = {}
end
self.lst_log.numItems = 0
- self:GetRewardsLog()
- else
- self:GetRewardsStatistic()
- end
+ self:GetRewardsLog()
+ else
+ self:GetRewardsStatistic()
+ end
end)
-- 初始化数据
self.partner_data = {}
@@ -105,45 +105,45 @@ function M:InitView()
self.rewards_data = {}
self.rewards_log = {}
-- 各个列表的初始化
- self.lst_partner = self._view:GetChild("lst_partner")
- self.lst_partner:SetVirtual()
+ self.lst_partner = self._view:GetChild("lst_partner")
+ self.lst_partner:SetVirtual()
self.lst_partner.itemRenderer = function(index, obj)
- self:OnRenderPartnerItem(index, obj)
- end
+ self:OnRenderPartnerItem(index, obj)
+ end
self.lst_partner.scrollPane.onPullUpRelease:Set(function()
self:GetPartnerData(self.lst_partner.numItems)
end)
self.lst_partner.onClickItem:Set(function()
- self.rewards_data = {}
- self.lst_rewards.numItems = 0
- self:GetRewardsData()
+ self.rewards_data = {}
+ self.lst_rewards.numItems = 0
+ self:GetRewardsData()
end)
- self.lst_partner2 = self._view:GetChild("lst_partner2")
- self.lst_partner2:SetVirtual()
+ self.lst_partner2 = self._view:GetChild("lst_partner2")
+ self.lst_partner2:SetVirtual()
self.lst_partner2.itemRenderer = function(index, obj)
- self:OnRenderPartnerItem2(index, obj)
- end
+ self:OnRenderPartnerItem2(index, obj)
+ end
self.lst_partner2.scrollPane.onPullUpRelease:Set(function()
self:GetPartnerData(self.lst_partner.numItems)
end)
self.lst_partner2.onClickItem:Set(function()
- self.rewards_log = {}
- self.lst_log.numItems = 0
- self:GetRewardsLog()
+ self.rewards_log = {}
+ self.lst_log.numItems = 0
+ self:GetRewardsLog()
end)
self.lst_rewards = self._view:GetChild("lst_rewards")
self.lst_rewards:SetVirtual()
self.lst_rewards.itemRenderer = function(index, obj)
- self:OnRenderRewardsItem(index, obj)
+ self:OnRenderRewardsItem(index, obj)
end
self.lst_log = self._view:GetChild("lst_rewards_record")
self.lst_log:SetVirtual()
self.lst_log.itemRenderer = function(index, obj)
- self:OnRenderLogItem(index, obj)
- end
+ self:OnRenderLogItem(index, obj)
+ end
self.lst_log.scrollPane.onPullUpRelease:Set(function()
self:GetRewardsLog(self.lst_log.numItems)
end)
@@ -155,11 +155,11 @@ function M:InitView()
table.insert(values, "0")
-- if #group.playList > 0 then
for i = 1, #group.playList do
- local play = group.playList[i]
- table.insert(items, play.name)
- table.insert(values, tostring(play.id))
- end
- -- end
+ local play = group.playList[i]
+ table.insert(items, play.name)
+ table.insert(values, tostring(play.id))
+ end
+ -- end
local cb_play = self._view:GetChild("cb_play")
cb_play.items = items
cb_play.values = values
@@ -196,8 +196,10 @@ function M:InitView()
self:GetRewardsLog()
end)
-- 时间组件初始化
- self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), 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)
+ self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"),
+ 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
-- 获取合伙人数据
@@ -207,15 +209,15 @@ function M:GetPartnerData(index, qid)
if self._is_destroy then
return
end
- if res.ReturnCode ~= 0 then
+ if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人信息失败")
else
local members = res.Data.members
if not qid then
-- if #members == 0 then return end
for i = 1, #members do
- self.partner_data[#self.partner_data + 1] = members[i]
- self.partner_data2[#self.partner_data2 + 1] = members[i]
+ self.partner_data[#self.partner_data + 1] = members[i]
+ self.partner_data2[#self.partner_data2 + 1] = members[i]
end
self.lst_partner.numItems = #self.partner_data
self.lst_partner2.numItems = #self.partner_data2
@@ -224,9 +226,9 @@ function M:GetPartnerData(index, qid)
self.lst_partner.selectedIndex = 0
self.lst_partner2.selectedIndex = 0
if tem == 0 and #self.partner_data > 0 then
- self:GetRewardsData()
- elseif tem == 1 and #self.partner_data2 > 0 then
- self:GetRewardsLog()
+ self:GetRewardsData()
+ elseif tem == 1 and #self.partner_data2 > 0 then
+ self:GetRewardsLog()
end
end
else
@@ -259,8 +261,8 @@ function M:GetRewardsData()
local data
if #self.search_partner_data == 0 then
if #self.partner_data == 0 then return end
- ViewUtil.ShowModalWait()
- data = self.partner_data[self.lst_partner.selectedIndex + 1]
+ ViewUtil.ShowModalWait()
+ data = self.partner_data[self.lst_partner.selectedIndex + 1]
else
data = self.search_partner_data[1]
end
@@ -270,7 +272,7 @@ function M:GetRewardsData()
if self._is_destroy then
return
end
- if res.ReturnCode ~= 0 then
+ if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人奖励失败")
else
local rewards = res.Data.rewards
@@ -282,7 +284,7 @@ function M:GetRewardsData()
rdata = self.search_rewards_data
end
for i = 1, #rewards do
- rdata[#rdata + 1] = rewards[i]
+ rdata[#rdata + 1] = rewards[i]
end
self.lst_rewards.numItems = #rdata
end
@@ -294,88 +296,88 @@ function M:GetRewardsLog()
local data
if #self.search_partner_data == 0 then
if #self.partner_data2 == 0 then return end
- ViewUtil.ShowModalWait()
+ ViewUtil.ShowModalWait()
data = self.partner_data2[self.lst_partner2.selectedIndex + 1]
else
data = self.search_partner_data[1]
end
- local begin_time, end_time = self.time_panel1:GetDate()
+ local begin_time, end_time = self.time_panel1:GetDate()
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GetRewardsLog(self.group_id, #self.rewards_log, 6, begin_time, end_time, data.uid, function(res)
ViewUtil.CloseModalWait()
if self._is_destroy then
return
end
- if res.ReturnCode ~= 0 then
+ if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取奖励日志失败")
else
- local logs = res.Data.reward_logs
- -- if #logs == 0 then return end
+ local logs = res.Data.reward_logs
+ -- if #logs == 0 then return end
local rdata
if self.ctr_search.selectedIndex == 0 then
rdata = self.rewards_log
else
rdata = self.search_rewards_log
end
- if #rdata == 0 then
- self._view:GetChild("tex_num1").text = res.Data.total_num / 100
- self._view:GetChild("tex_num2").text = d2ad(res.Data.total_hp)
- end
- for i = 1, #logs do
- rdata[#rdata + 1] = logs[i]
- end
- self.lst_log.numItems = #rdata
+ if #rdata == 0 then
+ self._view:GetChild("tex_num1").text = res.Data.total_num / 100
+ self._view:GetChild("tex_num2").text = d2ad(res.Data.total_hp)
+ end
+ for i = 1, #logs do
+ rdata[#rdata + 1] = logs[i]
+ end
+ self.lst_log.numItems = #rdata
end
end)
end
-- 获取奖励统计
-function M:GetRewardsStatistic()
- ViewUtil.ShowModalWait()
- local data = self.partner_data2[self.lst_partner2.selectedIndex + 1]
- local begin_time, end_time = self.time_panel2:GetDate()
- local pid = tonumber(self._view:GetChild("cb_play").value)
+function M:GetRewardsStatistic()
+ ViewUtil.ShowModalWait()
+ local data = self.partner_data2[self.lst_partner2.selectedIndex + 1]
+ local begin_time, end_time = self.time_panel2:GetDate()
+ local pid = tonumber(self._view:GetChild("cb_play").value)
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GetRewardStatistic(self.group_id, pid, begin_time, end_time, function(res)
ViewUtil.CloseModalWait()
if self._is_destroy then
return
end
- if res.ReturnCode ~= 0 then
+ if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取奖励日志失败")
else
- 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_fag").text = d2ad(res.Data.hp_cost)
- self._view:GetChild("tex_total_rewards").text = d2ad(res.Data.gains)
+ 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_fag").text = d2ad(res.Data.hp_cost)
+ self._view:GetChild("tex_total_rewards").text = d2ad(res.Data.gains)
end
end)
end
-- 填充合伙人对象
function M:OnRenderPartnerItem(index, obj)
- local data = self.partner_data[index + 1]
- obj:GetChild("tex_name").text = data.nick
- local btn_head = obj:GetChild("btn_head")
- local portrait = data.portrait
- if portrait == "" then
- btn_head.icon = "ui://Common/Head0"
- else
- ImageLoad.Load(portrait, btn_head._iconObject, self.class)
- end
+ local data = self.partner_data[index + 1]
+ obj:GetChild("tex_name").text = data.nick
+ local btn_head = obj:GetChild("btn_head")
+ local portrait = data.portrait
+ if portrait == "" then
+ btn_head.icon = "ui://Common/Head0"
+ else
+ ImageLoad.Load(portrait, btn_head._iconObject, self.class)
+ end
end
-- 填充第2页合伙人对象
function M:OnRenderPartnerItem2(index, obj)
- local data = self.partner_data2[index + 1]
- obj:GetChild("tex_name").text = data.nick
- local btn_head = obj:GetChild("btn_head")
- local portrait = data.portrait
- if portrait == "" then
- btn_head.icon = "ui://Common/Head0"
- else
- ImageLoad.Load(portrait, btn_head._iconObject, self.class)
- end
+ local data = self.partner_data2[index + 1]
+ obj:GetChild("tex_name").text = data.nick
+ local btn_head = obj:GetChild("btn_head")
+ local portrait = data.portrait
+ if portrait == "" then
+ btn_head.icon = "ui://Common/Head0"
+ else
+ ImageLoad.Load(portrait, btn_head._iconObject, self.class)
+ end
end
-- 显示奖励
@@ -387,11 +389,11 @@ local function __showRewardsValue(rtype, cur_value, max_value, mng, value_type)
else
str = string.format("%s%s", cur_value, tem)
end
- return str
+ return str
end
-- 填充奖励设置对象
function M:OnRenderRewardsItem(index, obj)
- local data
+ local data
if self.ctr_search.selectedIndex == 0 then
data = self.rewards_data[index + 1]
else
@@ -402,46 +404,48 @@ function M:OnRenderRewardsItem(index, obj)
pdata = self.partner_data[self.lst_partner.selectedIndex + 1]
else
pdata = self.search_partner_data[1]
- end
+ end
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)
- local play_name = group:getPlayName(data.pid)
- obj:GetChild("tex_name").text = play_name
+ obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3,
+ data.rewardValueType or 1)
+ 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
obj:GetController("promote").selectedIndex = 1
else
obj:GetController("promote").selectedIndex = 0
end
- local input_type = data.rewardType == 1 and 0 or 3
- obj:GetChild("btn_set").onClick:Set(function()
- local gfiv = GroupNumberInputView.new(self._root_view,function(num)
+ local input_type = data.rewardType == 1 and 0 or 3
+ obj:GetChild("btn_set").onClick:Set(function()
+ local gfiv = GroupNumberInputView.new(self._root_view, function(num)
local tem = num
if data.rewardType == 2 then
- tem = ad2d(tem)
+ tem = ad2d(tem)
end
if tem > data.max_value then
- ViewUtil.ErrorTip(nil, "输入值超过上限")
- return
+ ViewUtil.ErrorTip(nil, "输入值超过上限")
+ return
end
local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait()
- fgCtr:FG_SetRewards(self.group_id, data.pid, pdata.partnerLev, pdata.uid, false, tem, function(res)
- ViewUtil.CloseModalWait()
- if res.ReturnCode ~= 0 then
- ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
- else
- data.cur_value = tem
- obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value, group.lev < 3, data.rewardValueType or 1)
- end
+ fgCtr:FG_SetRewards(self.group_id, data.pid, pdata.partnerLev, pdata.uid, false, tem, function(res)
+ ViewUtil.CloseModalWait()
+ if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
+ else
+ data.cur_value = tem
+ obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value,
+ group.lev < 3, data.rewardValueType or 1)
+ end
end)
end, input_type)
gfiv:Show()
- end)
- obj:GetChild("btn_set_all").onClick:Set(function()
+ end)
+ obj:GetChild("btn_set_all").onClick:Set(function()
local msg_win = MsgWindow.new(nil, "你是否为名下所有合伙人设定此奖励数值？", MsgWindow.MsgMode.OkAndCancel)
- msg_win.onOk:Add(function( ... )
+ msg_win.onOk:Add(function(...)
local pdata
if self.ctr_search.selectedIndex == 0 then
pdata = self.partner_data[self.lst_partner.selectedIndex + 1]
@@ -450,34 +454,34 @@ function M:OnRenderRewardsItem(index, obj)
end
local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait()
- fgCtr:FG_SetRewards(self.group_id, data.pid, pdata.partnerLev, pdata.uid, true, data.cur_value, function(res)
- ViewUtil.CloseModalWait()
- if res.ReturnCode ~= 0 then
- ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
- else
- ViewUtil.ShowBannerOnScreenCenter("设置合伙人奖励成功")
- end
- end)
+ fgCtr:FG_SetRewards(self.group_id, data.pid, pdata.partnerLev, pdata.uid, true, data.cur_value,
+ function(res)
+ ViewUtil.CloseModalWait()
+ if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
+ else
+ ViewUtil.ErrorTip(-1, "设置合伙人奖励成功")
+ end
+ end)
end)
- msg_win:Show()
-
- end)
+ msg_win:Show()
+ end)
end
-- 填充奖励日志
function M:OnRenderLogItem(index, obj)
- local data
+ local data
if self.ctr_search.selectedIndex == 0 then
data = self.rewards_log[index + 1]
else
data = self.search_rewards_log[index + 1]
end
- obj:GetChild("tex_rewards").text = d2ad(data.hp)
- local play_name = DataManager.groups:get(self.group_id):getPlayName(data.pid)
- obj:GetChild("tex_game").text = play_name
- obj:GetChild("tex_num").text = data.round / 100
- obj:GetChild("tex_roomid").text = data.roomid
- obj:GetChild("tex_date").text = os.date("%m月%d日\r%H:%M",data.time)
+ obj:GetChild("tex_rewards").text = d2ad(data.hp)
+ local play_name = DataManager.groups:get(self.group_id):getPlayName(data.pid)
+ obj:GetChild("tex_game").text = play_name
+ obj:GetChild("tex_num").text = data.round / 100
+ obj:GetChild("tex_roomid").text = data.roomid
+ obj:GetChild("tex_date").text = os.date("%m月%d日\r%H:%M", data.time)
end
-return M
\ No newline at end of file
+return M
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua
index 58bcf70c..493d3973 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua
@@ -19,8 +19,8 @@ function M:initData()
self.lst_record.numItems = 0
self.record_data = {}
- 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 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 })
self.begin_time = today
self.end_time = today + 86400
self:GetRecordData(0)
@@ -32,7 +32,7 @@ end
-- fgCtr:FG_GetMembersCount(self.group_id,function(res)
-- ViewUtil.CloseModalWait()
-
+
-- if res.ReturnCode == 0 then
-- self._view:GetChild('tex_memb_num').text = res.Data.member_num
-- self._view:GetChild('tex_total_hp').text = d2ad(res.Data.hp_num1+res.Data.otherHp)
@@ -55,28 +55,29 @@ function M:InitView()
-- end
self.lst_record = self._view:GetChild("lst_record")
- self.lst_record:SetVirtual()
+ self.lst_record:SetVirtual()
self.lst_record.itemRenderer = function(index, obj)
self:OnRenderRecordItem(index, obj)
end
self.lst_record.scrollPane.onPullUpRelease:Set(function()
self:GetRecordData(self.lst_record.numItems)
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")
ctr_page.onChanged:Set(function()
self.record_data = {}
self.lst_record.numItems = 0
if ctr_page.selectedIndex == 0 then
- 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 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 })
self.begin_time = today
self.end_time = today + 86400
else
- 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 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 })
self.begin_time = today - 86400 * ctr_page.selectedIndex
self.end_time = today - 86400 * (ctr_page.selectedIndex - 1)
end
@@ -113,7 +114,7 @@ function M:InitView()
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_FindPartnerStat(
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)
-- printlog("aaaaaaaaaaaaaaaa22222222222222222222222222222")
-- pt(res)
@@ -131,14 +132,14 @@ function M:InitView()
for j = 1, #res.Data.members do
local tem = item_result:AddItemFromPool()
- self:FillRecordItem(res.Data.members[j],tem)
+ self:FillRecordItem(res.Data.members[j], tem)
end
end
- end
+ end
)
end
)
-
+
local btn_back = self._view:GetChild('btn_back')
btn_back.onClick:Set(
function()
@@ -147,9 +148,7 @@ function M:InitView()
)
end
-
function M:GetRecordData(index)
-
ViewUtil.ShowModalWait()
local time_type = self._view:GetController("type").selectedIndex
@@ -158,15 +157,13 @@ function M:GetRecordData(index)
end
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()
if res.ReturnCode == 0 then
-
local members = res.Data.members
-- printlog("aaaaaaaaaaaaaacccccccccccccccccccccccccccccccc")
- -- pt(members)
+ -- pt(members)
for i = 1, #members do
self.record_data[#self.record_data + 1] = members[i]
end
@@ -187,23 +184,21 @@ local function __showRewardsValue(rtype, cur_value, max_value, mng)
end
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..")"
- obj:GetChild("tex_id").text = "ID:" .. data.uid
-
- local tex_total_score = obj:GetChild("tex_total_score")
- local ctr_show_total = obj:GetController("show_total")
- if data._total_hp then
-
+ local tex_total_score = obj:GetChild("tex_total_score")
+ local ctr_show_total = obj:GetController("show_total")
+ if data._total_hp then
tex_total_score.text = data._total_hp
- ctr_show_total.selectedIndex = 1
- else
- ctr_show_total.selectedIndex = 0
+ ctr_show_total.selectedIndex = 1
+ else
+ ctr_show_total.selectedIndex = 0
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_total").text = d2ad(data.total_win)
obj:GetChild("tex_round_youxiao").text = data.valid_round / 100
@@ -216,65 +211,63 @@ function M:FillRecordItem(data, obj)
fgCtr:FG_GetTotalHp(self.group_id, data.uid, function(res)
ViewUtil.CloseModalWait()
if res.ReturnCode == 0 then
-
- local hp = d2ad(res.Data.hp)
- tex_total_score.text = hp
- data._total_hp = hp
- data.total = res.Data.total_member - 1
- obj:GetChild("tex_name").text = data.nick.."("..data.total..")"
- ctr_show_total.selectedIndex = 1
+ local hp = d2ad(res.Data.hp)
+ tex_total_score.text = hp
+ data._total_hp = hp
+ data.total = res.Data.total_member - 1
+ obj:GetChild("tex_name").text = data.nick .. "(" .. data.total .. ")"
+ ctr_show_total.selectedIndex = 1
end
end)
end)
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()
-
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)
- gniv:Show()
+ 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()
end)
local btn_detail = obj:GetChild("btn_detail")
btn_detail.onClick:Set(function()
local time_type = self._view:GetController("type").selectedIndex
--printlog("ccccccccccwwwwwwwwwwwwwwwwwwwwwwwwwwww ",self.begin_time," ",self.end_time)
- local gniv = GroupPartnerStatMember.new(self.group_id,data.uid, 0,self.begin_time,self.end_time)
- gniv:Show()
+ local gniv = GroupPartnerStatMember.new(self.group_id, data.uid, 0, self.begin_time, self.end_time)
+ gniv:Show()
end)
local btnMen = obj:GetChild("btnMen")
- -- btnMen.text = d2ad(data.autoscore)
+ -- btnMen.text = d2ad(data.autoscore)
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
menControl.selectedIndex = 1
btnMen.text = d2ad(data.autoscore)
btnMen.touchable = true
-
else
btnMen.text = d2ad(data.autoscore)
menControl.selectedIndex = 1
btnMen.touchable = false
end
- else
+ else
menControl.selectedIndex = 0
end
-
+
btnMen.onClick:Set(function()
- local gfiv = GroupNumberInputView.new(self._root_view,function(num)
- local fgCtr = ControllerManager.GetController(NewGroupController)
- fgCtr:FG_SetPartnerThreshold(self.group_id, data.uid, num, function(res)
+ local gfiv = GroupNumberInputView.new(self._root_view, function(num)
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ fgCtr:FG_SetPartnerThreshold(self.group_id, data.uid, num, function(res)
ViewUtil.CloseModalWait()
- if res.ReturnCode ~= 0 then
- ViewUtil.ErrorTip(res.ReturnCode,"设置失败")
+ if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode, "设置失败")
else
- ViewUtil.ShowBannerOnScreenCenter("设置成功")
- btnMen.text = num
- data.autoscore = ad2d(num)
+ ViewUtil.ErrorTip(-1, "设置成功")
+ btnMen.text = num
+ data.autoscore = ad2d(num)
end
end)
end, 0)
@@ -284,8 +277,7 @@ end
function M:OnRenderRecordItem(index, obj)
local data = self.record_data[index + 1]
- self:FillRecordItem(data, obj)
+ self:FillRecordItem(data, obj)
end
-
-return M
\ No newline at end of file
+return M
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua
index 54013f53..056ed73e 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua
@@ -6,8 +6,8 @@ local GroupPartnerRewardsView = {}
local M = GroupPartnerRewardsView
function GroupPartnerRewardsView.new(group_id, partner_id, partner_lev)
- setmetatable(M, {__index = BaseWindow})
- local self = setmetatable({}, {__index = M})
+ setmetatable(M, { __index = BaseWindow })
+ local self = setmetatable({}, { __index = M })
self.class = "GroupPartnerRewardsView"
self._close_destroy = true
self._blur_view = blur_view
@@ -21,12 +21,12 @@ function GroupPartnerRewardsView.new(group_id, partner_id, partner_lev)
end
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:SetVirtual()
self.lst_rewards.itemRenderer = function(index, obj)
- self:OnRenderRewardsItem(index, obj)
+ self:OnRenderRewardsItem(index, obj)
end
self.fandianControl = self._view:GetController("fandian")
self:GetRewardsData()
@@ -40,20 +40,23 @@ function M:GetRewardsData()
if self._is_destroy then
return
end
- if res.ReturnCode ~= 0 then
+ if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人奖励失败")
else
local rewards = res.Data.rewards
self.showxipai = res.Data.showxipai == true and 1 or 0
--pt(res)
- if rewards and #rewards == 0 then printlog("服务器未设置合伙人奖励===>>>") return end
- --printlog("获取奖励===>>>",res.Data.rewards)
- --pt(res.Data.rewards)
+ if rewards and #rewards == 0 then
+ printlog("服务器未设置合伙人奖励===>>>")
+ return
+ end
+ --printlog("获取奖励===>>>",res.Data.rewards)
+ --pt(res.Data.rewards)
-- local rdata = self.rewards_data
-- for i = 1, #rewards do
-- rdata[#rdata + 1] = rewards[i]
-- end
- for i=1,#rewards do
+ for i = 1, #rewards do
self.rewards_data[i] = rewards[i]
end
self.lst_rewards.numItems = #self.rewards_data
@@ -84,123 +87,130 @@ end
-- 填充奖励设置对象
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)
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))
- 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_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3, data.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)
- local play_name = group:getPlayName(data.pid)
- obj:GetChild("tex_name").text = play_name
+ 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_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3,
+ data.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)
+ 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
obj:GetController("promote").selectedIndex = 1
else
obj:GetController("promote").selectedIndex = 0
end
- local input_type = data.rewardValueType == 1 and 0 or 3
- obj:GetChild("btn_set").onClick:Set(function()
- local gfiv = GroupNumberInputView.new(self._root_view,function(num)
+ local input_type = data.rewardValueType == 1 and 0 or 3
+ obj:GetChild("btn_set").onClick:Set(function()
+ local gfiv = GroupNumberInputView.new(self._root_view, function(num)
local tem = num
if data.rewardValueType == 2 then
- tem = ad2d(tem)
+ tem = ad2d(tem)
end
if tem > data.max_value then
- ViewUtil.ErrorTip(nil, "输入值超过上限")
- return
- -- elseif tem < data.cur_value then
- -- ViewUtil.ErrorTip(nil, "不能下调奖励")
- -- return
+ ViewUtil.ErrorTip(nil, "输入值超过上限")
+ return
+ -- elseif tem < data.cur_value then
+ -- ViewUtil.ErrorTip(nil, "不能下调奖励")
+ -- return
end
local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait()
- fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0,function(res)
- ViewUtil.CloseModalWait()
- if res.ReturnCode ~= 0 then
- ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
- else
- data.cur_value = tem
- obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value, group.lev < 3, data.rewardValueType or 1)
- end
+ fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res)
+ ViewUtil.CloseModalWait()
+ if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
+ else
+ data.cur_value = tem
+ obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value,
+ group.lev < 3, data.rewardValueType or 1)
+ end
end)
end, input_type)
gfiv:Show()
- end)
- 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)
-
- msg_win.onOk:Add(function( ... )
+ end)
+ 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)
+
+ msg_win.onOk:Add(function(...)
local single = msg_win.btnCheck.selected and 1 or 0
local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait()
- fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.cur_value,single ,function(res)
- ViewUtil.CloseModalWait()
- if res.ReturnCode ~= 0 then
- ViewUtil.ErrorTip(res.ReturnCode, "设置奖励失败")
- else
- ViewUtil.ShowBannerOnScreenCenter("设置奖励成功")
- -- for i = 1, #self.rewards_data do
- -- if self.rewards_data[i].rewardValueType == data.rewardValueType then
- -- self.rewards_data[i].cur_value = data.cur_value
- -- end
- -- end
- -- self.lst_rewards.numItems = #self.rewards_data
- self:GetRewardsData()
- end
- end)
+ fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.cur_value, single,
+ function(res)
+ ViewUtil.CloseModalWait()
+ if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode, "设置奖励失败")
+ else
+ ViewUtil.ErrorTip(-1, "设置奖励成功")
+ -- for i = 1, #self.rewards_data do
+ -- if self.rewards_data[i].rewardValueType == data.rewardValueType then
+ -- self.rewards_data[i].cur_value = data.cur_value
+ -- end
+ -- end
+ -- self.lst_rewards.numItems = #self.rewards_data
+ self:GetRewardsData()
+ end
+ end)
end)
- msg_win:Show()
-
- end)
+ msg_win:Show()
+ end)
--xipai_reward
local input_type1 = data.xipai_rewardValueType == 1 and 0 or 3
- obj:GetChild("btn_set1").onClick:Set(function()
- local gfiv = GroupNumberInputView.new(self._root_view,function(num)
+ obj:GetChild("btn_set1").onClick:Set(function()
+ local gfiv = GroupNumberInputView.new(self._root_view, function(num)
local tem = num
if data.xipai_rewardValueType == 2 then
- tem = ad2d(tem)
+ tem = ad2d(tem)
end
-
+
if tem > data.xipai_max_value then
- ViewUtil.ErrorTip(nil, "输入值超过上限")
- return
- -- elseif tem < data.cur_value then
- -- ViewUtil.ErrorTip(nil, "不能下调奖励")
- -- return
+ ViewUtil.ErrorTip(nil, "输入值超过上限")
+ return
+ -- elseif tem < data.cur_value then
+ -- ViewUtil.ErrorTip(nil, "不能下调奖励")
+ -- return
end
local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait()
- fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0,function(res)
- ViewUtil.CloseModalWait()
- if res.ReturnCode ~= 0 then
- ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌奖励失败")
- else
- 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)
- end
+ fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res)
+ ViewUtil.CloseModalWait()
+ if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌奖励失败")
+ else
+ 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)
+ end
end)
end, input_type1)
gfiv:Show()
- end)
+ end)
+
+ obj:GetChild("btn_set_all1").onClick:Set(function()
+ local msg_win = MsgWindow.new(nil, string.format("是否设定所有洗牌奖励为%s%%？", data.xipai_cur_value),
+ MsgWindow.MsgMode.OkAndCancel)
+ msg_win.onOk:Add(function(...)
+ local single = 0 --msg_win.btnCheck.selected and 1 or 0
- obj:GetChild("btn_set_all1").onClick:Set(function()
- local msg_win = MsgWindow.new(nil, string.format("是否设定所有洗牌奖励为%s%%？", data.xipai_cur_value), MsgWindow.MsgMode.OkAndCancel)
- msg_win.onOk:Add(function( ... )
- local single = 0--msg_win.btnCheck.selected and 1 or 0
-
local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait()
- fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.xipai_cur_value,single,function(res)
- ViewUtil.CloseModalWait()
- if res.ReturnCode ~= 0 then
+ fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.xipai_cur_value,
+ single, function(res)
+ ViewUtil.CloseModalWait()
+ if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌失败")
else
- ViewUtil.ShowBannerOnScreenCenter("设置洗牌成功")
+ ViewUtil.ErrorTip(-1, "设置洗牌成功")
-- printlog("ccccccccccccccccc11111111111111111111111")
-- pt(res)
-- for i = 1, #self.rewards_data do
@@ -210,59 +220,61 @@ function M:OnRenderRewardsItem(index, obj)
-- end
-- self.lst_rewards.numItems = #self.rewards_data
self:GetRewardsData()
- end
+ end
end)
end)
- msg_win:Show()
-
- end)
+ msg_win:Show()
+ end)
--xipai_reward
local input_type2 = data.anchou_rewardValueType == 1 and 0 or 3
- obj:GetChild("btn_set2").onClick:Set(function()
- local gfiv = GroupNumberInputView.new(self._root_view,function(num)
+ obj:GetChild("btn_set2").onClick:Set(function()
+ local gfiv = GroupNumberInputView.new(self._root_view, function(num)
local tem = num
if data.anchou_rewardValueType == 2 then
- tem = ad2d(tem)
+ tem = ad2d(tem)
end
-
+
if tem > data.xipai_max_value then
- ViewUtil.ErrorTip(nil, "输入值超过上限")
- return
- -- elseif tem < data.cur_value then
- -- ViewUtil.ErrorTip(nil, "不能下调奖励")
- -- return
+ ViewUtil.ErrorTip(nil, "输入值超过上限")
+ return
+ -- elseif tem < data.cur_value then
+ -- ViewUtil.ErrorTip(nil, "不能下调奖励")
+ -- return
end
printlog("jefe btn_set2")
local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait()
- fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0,function(res)
- ViewUtil.CloseModalWait()
- if res.ReturnCode ~= 0 then
- ViewUtil.ErrorTip(res.ReturnCode, "设置管理奖励失败")
- else
- 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)
- end
+ fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res)
+ ViewUtil.CloseModalWait()
+ if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode, "设置管理奖励失败")
+ else
+ 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)
+ end
end)
end, input_type2)
gfiv:Show()
- end)
+ end)
+
+ obj:GetChild("btn_set_all2").onClick:Set(function()
+ local msg_win = MsgWindow.new(nil, string.format("是否设定所有管理奖励为%s%%？", data.anchou_cur_value),
+ MsgWindow.MsgMode.OkAndCancel)
+ msg_win.onOk:Add(function(...)
+ local single = 0 --msg_win.btnCheck.selected and 1 or 0
- obj:GetChild("btn_set_all2").onClick:Set(function()
- local msg_win = MsgWindow.new(nil, string.format("是否设定所有管理奖励为%s%%？", data.anchou_cur_value), MsgWindow.MsgMode.OkAndCancel)
- msg_win.onOk:Add(function( ... )
- local single = 0--msg_win.btnCheck.selected and 1 or 0
-
local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait()
- fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.anchou_cur_value,single,function(res)
- ViewUtil.CloseModalWait()
- if res.ReturnCode ~= 0 then
+ fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.anchou_cur_value,
+ single, function(res)
+ ViewUtil.CloseModalWait()
+ if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "设置管理失败")
else
- ViewUtil.ShowBannerOnScreenCenter("设置管理成功")
+ ViewUtil.ErrorTip(-1, "设置管理成功")
-- printlog("ccccccccccccccccc11111111111111111111111")
-- pt(res)
-- for i = 1, #self.rewards_data do
@@ -272,13 +284,11 @@ function M:OnRenderRewardsItem(index, obj)
-- end
-- self.lst_rewards.numItems = #self.rewards_data
self:GetRewardsData()
- end
+ end
end)
end)
- msg_win:Show()
-
- end)
-
+ msg_win:Show()
+ end)
end
-return M
\ No newline at end of file
+return M
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetMemberInfoDiaoduView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetMemberInfoDiaoduView.lua
index 72c2f6ab..b844106b 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetMemberInfoDiaoduView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetMemberInfoDiaoduView.lua
@@ -3,152 +3,152 @@ local GroupSetMemberInfoDiaoduView = {}
local M = GroupSetMemberInfoDiaoduView
-function GroupSetMemberInfoDiaoduView.new(group_id,member_id,group_black)
- setmetatable(M, {__index = BaseWindow})
- local self = setmetatable({}, {__index = M})
- self.class = "GroupSetMemberInfoDiaoduView"
- self.group_id = group_id
- self.member_id = member_id
+function GroupSetMemberInfoDiaoduView.new(group_id, member_id, group_black)
+ setmetatable(M, { __index = BaseWindow })
+ local self = setmetatable({}, { __index = M })
+ self.class = "GroupSetMemberInfoDiaoduView"
+ self.group_id = group_id
+ self.member_id = member_id
self.currentSelect = 0
- self.blackList = {{0,0},{25,0},{15,0}}
- self:init("ui://NewGroup/Win_SetAddPlayerHBView")
- return self
+ self.blackList = { { 0, 0 }, { 25, 0 }, { 15, 0 } }
+ self:init("ui://NewGroup/Win_SetAddPlayerHBView")
+ return self
end
function M:init(url)
- BaseWindow.init(self,url)
-
- self.n99 = self._view:GetChild("n99")
-
+ BaseWindow.init(self, url)
+
+ self.n99 = self._view:GetChild("n99")
+
self.btnRate = self._view:GetChild("btnRate")
self.n118 = self._view:GetChild("n118")
self.n99.visible = false
-
+
self.btnRate.visible = false
self.n118.visible = false
self._view:GetChild("btn_close").onClick:Set(
- function ()
- self:Destroy()
- end
- )
-
+ function()
+ self:Destroy()
+ end
+ )
+
self.txtRate = self._view:GetChild("txtRate")
self.txtRate.visible = false
self.txtBlack = self._view:GetChild("txtBlack")
self.txtBan = self._view:GetChild("txtBan")
- self.currentSelectState=self._view:GetChild("btn_current")
- self.currentSelectStateText=self._view:GetChild("diaodongtext")
-
+ self.currentSelectState = self._view:GetChild("btn_current")
+ self.currentSelectStateText = self._view:GetChild("diaodongtext")
+
self._view:GetChild("btn_qd1").onClick:Set(
- function ()
- ViewUtil.ShowModalWait()
- local fgCtr = ControllerManager.GetController(NewGroupController)
- fgCtr:FG_BanMemberHB(
- self.group_id,
- self.member_id,
- 0,
- function (response)
- ViewUtil.CloseModalWait()
- if (response.ReturnCode == 0) then
- self.currentSelectStateText.text="整组调动 "..(response.Data.black+1)
- ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1)
- else
- ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
- end
+ function()
+ ViewUtil.ShowModalWait()
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ fgCtr:FG_BanMemberHB(
+ self.group_id,
+ self.member_id,
+ 0,
+ function(response)
+ ViewUtil.CloseModalWait()
+ if (response.ReturnCode == 0) then
+ self.currentSelectStateText.text = "整组调动 " .. (response.Data.black + 1)
+ ViewUtil.ErrorTip(-1, '设置成功！', 1)
+ else
+ ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
end
- )
- end
- )
-
-
- self._view:GetChild("btn_qd2").onClick:Set(
- function ()
- ViewUtil.ShowModalWait()
- local fgCtr = ControllerManager.GetController(NewGroupController)
- fgCtr:FG_BanMemberHB(
- self.group_id,
- self.member_id,
- 1,
- function (response)
- ViewUtil.CloseModalWait()
- if (response.ReturnCode == 0) then
- self.currentSelectStateText.text="整组调动 "..(response.Data.black+1)
- ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1)
- else
- ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
- end
- end
- )
- end
- )
-
- self._view:GetChild("btn_qd3").onClick:Set(
- function ()
- ViewUtil.ShowModalWait()
- local fgCtr = ControllerManager.GetController(NewGroupController)
- fgCtr:FG_BanMemberHB(
- self.group_id,
- self.member_id,
- 2,
- function (response)
- ViewUtil.CloseModalWait()
- if (response.ReturnCode == 0) then
- self.currentSelectStateText.text="整组调动 "..(response.Data.black+1)
- ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1)
- else
- ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
- end
- end
- )
- end
- )
-
- self._view:GetChild("btnRate").onClick:Set(
- function ()
- local gniv =
- GroupNumberInputView.new(
- self._root_view,
- function(num)
- if num >100 then
- ViewUtil.ShowBannerOnScreenCenter('设置失败,不能超过100', 1)
- return
end
- self.txtRate.text = num
- end
- )
- gniv:Show()
+ )
+ end
+ )
+
+
+ self._view:GetChild("btn_qd2").onClick:Set(
+ function()
+ ViewUtil.ShowModalWait()
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ fgCtr:FG_BanMemberHB(
+ self.group_id,
+ self.member_id,
+ 1,
+ function(response)
+ ViewUtil.CloseModalWait()
+ if (response.ReturnCode == 0) then
+ self.currentSelectStateText.text = "整组调动 " .. (response.Data.black + 1)
+ ViewUtil.ErrorTip(-1, '设置成功！', 1)
+ else
+ ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
+ end
+ end
+ )
+ end
+ )
+
+ self._view:GetChild("btn_qd3").onClick:Set(
+ function()
+ ViewUtil.ShowModalWait()
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ fgCtr:FG_BanMemberHB(
+ self.group_id,
+ self.member_id,
+ 2,
+ function(response)
+ ViewUtil.CloseModalWait()
+ if (response.ReturnCode == 0) then
+ self.currentSelectStateText.text = "整组调动 " .. (response.Data.black + 1)
+ ViewUtil.ErrorTip(-1, '设置成功！', 1)
+ else
+ ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
+ end
+ end
+ )
+ end
+ )
+
+ self._view:GetChild("btnRate").onClick:Set(
+ function()
+ local gniv =
+ GroupNumberInputView.new(
+ self._root_view,
+ function(num)
+ if num > 100 then
+ ViewUtil.ErrorTip(-1, '设置失败,不能超过100', 1)
+ return
+ end
+ self.txtRate.text = num
+ end
+ )
+ gniv:Show()
end
)
self._view:GetChild("btnBlack").onClick:Set(
- function ()
+ function()
local gniv =
- GroupNumberInputView.new(
- self._root_view,
- function(num)
- self.txtBlack.text = num
- end,
- 3
+ GroupNumberInputView.new(
+ self._root_view,
+ function(num)
+ self.txtBlack.text = num
+ end,
+ 3
- )
- gniv:Show()
+ )
+ gniv:Show()
end
)
self.zm = self._view:GetController('zm')
self.zhengzu = self._view:GetChild("zhengzu")
-
-
- self.zhengzu.onChanged:Set(function ()
+
+
+ self.zhengzu.onChanged:Set(function()
local zzValue = tonumber(self.zhengzu.value)
self.zm.selectedIndex = zzValue - 1
self.currentSelect = zzValue - 1
self.txtRate.text = self.blackList[zzValue][1]
self.txtBlack.text = self.blackList[zzValue][2]
self:ChangeOrate()
- end)
-
+ end)
+
self._view:GetChild("btn_ok").onClick:Set(
- function ()
+ function()
ViewUtil.ShowModalWait()
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_BanMemberHB(
@@ -157,14 +157,14 @@ function M:init(url)
self.currentSelect,
tonumber(self.txtRate.text),
tonumber(self.txtBlack.text),
- function (response)
+ function(response)
ViewUtil.CloseModalWait()
if (response.ReturnCode == 0) then
- self.currentSelectStateText.text="整组调动 "..(response.Data.ban+1)
- 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][2] = response.Data.ban_max_value
- ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1)
+ self.currentSelectStateText.text = "整组调动 " .. (response.Data.ban + 1)
+ 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][2] = response.Data.ban_max_value
+ ViewUtil.ErrorTip(-1, '设置成功！', 1)
else
ViewUtil.ErrorTip(response.ReturnCode, '设置失败！')
end
@@ -174,14 +174,13 @@ function M:init(url)
)
end
-
-function M:SetCurrentState(selectID,data)
- self.blackList = {{0,0},{25,0},{15,0}}
- self.currentSelectStateText.text="整组调动 "..selectID
+function M:SetCurrentState(selectID, data)
+ self.blackList = { { 0, 0 }, { 25, 0 }, { 15, 0 } }
+ self.currentSelectStateText.text = "整组调动 " .. selectID
self.currentSelect = selectID - 1
self.blackList[selectID][1] = data.ban_rate
self.blackList[selectID][2] = data.ban_max_value
-
+
self.txtRate.text = data.ban_rate
self.txtBlack.text = data.ban_max_value
self.txtBan.text = data.ban_value
@@ -193,26 +192,21 @@ function M:SetCurrentState(selectID,data)
end
function M:ChangeOrate()
-
if tonumber(self.zhengzu.value) == 2 then
-
- self.n99.visible = true
+ self.n99.visible = true
self.btnRate.visible = true
self.n118.visible = true
self.txtRate.visible = true
else
- self.n99.visible = false
+ self.n99.visible = false
self.btnRate.visible = false
self.n118.visible = false
self.txtRate.visible = false
end
-
-
end
function M:ChangeZ(num)
self.zhengzu.visibleItemCount = num
end
-
-return M
\ No newline at end of file
+return M
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetPermissionView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetPermissionView.lua
index 1e67b4e9..13ec447d 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetPermissionView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetPermissionView.lua
@@ -6,38 +6,38 @@ local GroupSetPermissionView = {}
local M = GroupSetPermissionView
function GroupSetPermissionView.new(blur_view, group_id, member)
- setmetatable(M, {__index = BaseWindow})
- local self = setmetatable({}, {__index = M})
- self.class = "GroupSetPermissionView"
- self._close_destroy = true
- self._blur_view = blur_view
- self.group_id = group_id
- self.member = member
- self:init("ui://NewGroup/Win_Permission")
- return self
+ setmetatable(M, { __index = BaseWindow })
+ local self = setmetatable({}, { __index = M })
+ self.class = "GroupSetPermissionView"
+ self._close_destroy = true
+ self._blur_view = blur_view
+ self.group_id = group_id
+ self.member = member
+ self:init("ui://NewGroup/Win_Permission")
+ return self
end
function M:init(url)
- BaseWindow.init(self,url)
- local perm_array = MngPermission.getPermData(self.member.permission)
- for i = 1, 5 do
- local btn_perm = self._view:GetChild("btn_" .. i)
- btn_perm.selected = perm_array[i]
- end
- local btn_ok = self._view:GetChild("btn_ok")
- btn_ok.onClick:Set(function()
- local permission = MngPermission.getPermValue(self:getPermission())
- local fgCtr = ControllerManager.GetController(NewGroupController)
- fgCtr:FG_SetMngPermission(self.group_id, self.member.uid, permission, function(res)
- if res.ReturnCode == 0 then
- ViewUtil.ShowBannerOnScreenCenter("设置成功")
- self.member.permission = permission
- self:Destroy()
- else
- ViewUtil.ErrorTip(nil, "设置权限失败")
- end
- end)
- end)
+ BaseWindow.init(self, url)
+ local perm_array = MngPermission.getPermData(self.member.permission)
+ for i = 1, 5 do
+ local btn_perm = self._view:GetChild("btn_" .. i)
+ btn_perm.selected = perm_array[i]
+ end
+ local btn_ok = self._view:GetChild("btn_ok")
+ btn_ok.onClick:Set(function()
+ local permission = MngPermission.getPermValue(self:getPermission())
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ fgCtr:FG_SetMngPermission(self.group_id, self.member.uid, permission, function(res)
+ if res.ReturnCode == 0 then
+ ViewUtil.ErrorTip(-1, "设置成功")
+ self.member.permission = permission
+ self:Destroy()
+ else
+ ViewUtil.ErrorTip(nil, "设置权限失败")
+ end
+ end)
+ end)
end
function M:getPermission()
@@ -49,4 +49,4 @@ function M:getPermission()
return perm_array
end
-return M
\ No newline at end of file
+return M
diff --git a/lua_probject/base_project/Game/View/PlayerInfoView2.lua b/lua_probject/base_project/Game/View/PlayerInfoView2.lua
index b13b59e2..a773d3d2 100644
--- a/lua_probject/base_project/Game/View/PlayerInfoView2.lua
+++ b/lua_probject/base_project/Game/View/PlayerInfoView2.lua
@@ -174,7 +174,8 @@ function M:FillData(player)
self._tex_player_id.text = "ID:" .. player.self_user.account_id
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
self._ctr_offline.selectedIndex = player.line_state == 0 and 1 or 0
end
diff --git a/lua_probject/base_project/Game/View/ResultView.lua b/lua_probject/base_project/Game/View/ResultView.lua
index a063ec99..e6b7acb0 100644
--- a/lua_probject/base_project/Game/View/ResultView.lua
+++ b/lua_probject/base_project/Game/View/ResultView.lua
@@ -262,7 +262,7 @@ function M:__ShareResultStr()
str = str .. p.nick .. sp .. p.id .. '：' .. p.score .. '\r'
end
GameApplication.Instance:CopyToClipboard(str)
- ViewUtil.ShowBannerOnScreenCenter('已复制战绩')
+ ViewUtil.ErrorTip(-1, '已复制战绩')
end
function M:SetGSListlineGap(linespacing)
diff --git a/lua_probject/base_project/Game/View/ViewUtil.lua b/lua_probject/base_project/Game/View/ViewUtil.lua
index 1f844024..39b12113 100644
--- a/lua_probject/base_project/Game/View/ViewUtil.lua
+++ b/lua_probject/base_project/Game/View/ViewUtil.lua
@@ -81,7 +81,7 @@ end
local _tip_timer
local function __ShowTips(msg, time)
- time = time or 2
+ time = time or 3
if _defaultTooltipWin then
_tip_timer:Stop()
_defaultTooltipWin:Dispose()
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/CardCheck.lua b/lua_probject/extend_project/extend/majiang/fuzhou/CardCheck.lua
index b8724844..14ae7109 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/CardCheck.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/CardCheck.lua
@@ -1,11 +1,11 @@
-- 检测牌是否存在
-local function checkCard(eventCard,cardList,num)
+local function checkCard(eventCard, cardList, num)
num = num == nil and 1 or num
local result = 0
- for i = 1,#cardList do
+ for i = 1, #cardList do
if (cardList[i] == eventCard) then
result = result + 1
- if(result ==num) then
+ if (result == num) then
return true
end
end
@@ -14,24 +14,24 @@ local function checkCard(eventCard,cardList,num)
end
-- 移除指定数量的牌
-local function removeCard(cardList, card,count)
- for i=1,count do
- list_remove(cardList,card)
+local function removeCard(cardList, card, count)
+ for i = 1, count do
+ list_remove(cardList, card)
end
end
-local function checkCardAndRomve(eventCard,cardList,num)
- if(checkCard(eventCard,cardList,num)) then
- removeCard(cardList,eventCard,num)
+local function checkCardAndRomve(eventCard, cardList, num)
+ if (checkCard(eventCard, cardList, num)) then
+ removeCard(cardList, eventCard, num)
return true
end
return false
end
-- 获取列表中牌数量
-local function cardNum(eventCard,cardList)
+local function cardNum(eventCard, cardList)
local result = 0
- for i=1,#cardList do
+ for i = 1, #cardList do
local card = cardList[i]
if (card == eventCard) then
result = result + 1
@@ -40,7 +40,7 @@ local function cardNum(eventCard,cardList)
return result
end
-local zhongid = 0
+local zhongid = 0
local M = {
@@ -54,16 +54,16 @@ local M = {
}
-function M:push(cardGroup)
- self.stack[#self.stack+1] = cardGroup
+function M:push(cardGroup)
+ self.stack[#self.stack + 1] = cardGroup
end
function M:rollBack()
local cardGroup = self.stack[#self.stack]
- table.remove(self.stack,#self.stack)
- for _,card in ipairs(cardGroup) do
+ table.remove(self.stack, #self.stack)
+ for _, card in ipairs(cardGroup) do
if (card == zhongid) then
- self.zhong_count = self.zhong_count +1
+ self.zhong_count = self.zhong_count + 1
else
self.cardList[#self.cardList + 1] = card
end
@@ -71,36 +71,36 @@ function M:rollBack()
table.sort(self.cardList)
end
-function M:tryShunzi(card)
- if (card < 400 and card % 100 > 7) then
+function M:tryShunzi(card)
+ if (card < 400 and card % 100 > 7) then
return false
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, 1)
removeCard(self.cardList, card + 2, 1)
- local cardGroup = {card,card+1,card+2}
+ local cardGroup = { card, card + 1, card + 2 }
self:push(cardGroup)
return true
end
return false
end
-function M:tryKezi(card)
+function M:tryKezi(card)
if (checkCardAndRomve(card, self.cardList, 3)) then
- local cardGroup = {card,card,card}
+ local cardGroup = { card, card, card }
self:push(cardGroup)
return true
end
return false
end
-function M:tryPair(card)
+function M:tryPair(card)
if (self.pair_count > 0) then
return false
end
if (checkCardAndRomve(card, self.cardList, 2)) then
- local cardGroup = {card,card}
+ local cardGroup = { card, card }
self:push(cardGroup)
self.pair_count = 1
return true
@@ -108,28 +108,27 @@ function M:tryPair(card)
return false
end
-
-function M:tryKezi1Zhong(card)
- if (self.zhong_count >= 1 and checkCardAndRomve(card, self.cardList,2)) then
- local cardGroup = {card,card,zhongid}
+function M:tryKezi1Zhong(card)
+ if (self.zhong_count >= 1 and checkCardAndRomve(card, self.cardList, 2)) then
+ local cardGroup = { card, card, zhongid }
self:push(cardGroup)
- self.zhong_count = self.zhong_count -1
- return true
- end
- return false
-end
-
-function M:tryKezi2Zhong(card)
- if (self.zhong_count >= 2 and checkCardAndRomve(card, self.cardList,1)) then
- local cardGroup = {card,zhongid,zhongid}
- self:push(cardGroup)
- self.zhong_count = self.zhong_count -2
+ self.zhong_count = self.zhong_count - 1
return true
end
return false
end
-function M:tryShunzi1Zhong(card)
+function M:tryKezi2Zhong(card)
+ if (self.zhong_count >= 2 and checkCardAndRomve(card, self.cardList, 1)) then
+ local cardGroup = { card, zhongid, zhongid }
+ self:push(cardGroup)
+ self.zhong_count = self.zhong_count - 2
+ return true
+ end
+ return false
+end
+
+function M:tryShunzi1Zhong(card)
if (card % 100 > 8) then
return false
end
@@ -141,8 +140,8 @@ function M:tryShunzi1Zhong(card)
if (checkCard(card + 1, self.cardList)) then
removeCard(self.cardList, card, 1)
removeCard(self.cardList, card + 1, 1)
- self.zhong_count = self.zhong_count -1
- local cardGroup = {card,card+1,zhongid}
+ self.zhong_count = self.zhong_count - 1
+ local cardGroup = { card, card + 1, zhongid }
self:push(cardGroup)
return true
end
@@ -150,15 +149,15 @@ function M:tryShunzi1Zhong(card)
if (checkCard(card + 2, self.cardList) and ((card + 1) % 100 ~= 0)) then
removeCard(self.cardList, card, 1)
removeCard(self.cardList, card + 2, 1)
- self.zhong_count = self.zhong_count -1
- local cardGroup = {card,zhongid,card+2}
+ self.zhong_count = self.zhong_count - 1
+ local cardGroup = { card, zhongid, card + 2 }
self:push(cardGroup)
return true
end
return false
end
-function M:tryPair1Zhong(card)
+function M:tryPair1Zhong(card)
if (self.pair_count > 0) then
return false
end
@@ -166,28 +165,28 @@ function M:tryPair1Zhong(card)
return false
end
removeCard(self.cardList, card, 1)
- local cardGroup = {card,zhongid}
+ local cardGroup = { card, zhongid }
self:push(cardGroup)
- self.zhong_count = self.zhong_count -1
+ self.zhong_count = self.zhong_count - 1
self.pair_count = 1
return true
end
-function M:tryPair2Zhong()
+function M:tryPair2Zhong()
if (self.pair_count > 0) then
return false
end
if (self.zhong_count < 2) then
return false
end
- local cardGroup = {zhongid,zhongid}
+ local cardGroup = { zhongid, zhongid }
self:push(cardGroup)
- self.zhong_count = self.zhong_count -2
+ self.zhong_count = self.zhong_count - 2
self.pair_count = 1
return true
end
-function M:tryWin()
+function M:tryWin()
if (self.zhong_count == 4 and not self.eight_laizi) or (self.zhong_count == 8 and self.eight_laizi) then
return true
end
@@ -233,7 +232,6 @@ function M:tryWin()
end
if (self:tryKezi2Zhong(activeCard)) then
-
if (self:tryWin()) then
return true
end
@@ -257,7 +255,7 @@ function M:tryWin()
return false
end
-function M:checkQidui()
+function M:checkQidui()
if (not self.qidui) then
return false
end
@@ -270,17 +268,17 @@ function M:checkQidui()
return self:isQdPari(cardList)
end
-function M:isQdPari(cardList)
- if(self.qidui_pari_count == 7) then
+function M:isQdPari(cardList)
+ if (self.qidui_pari_count == 7) then
return true
end
- if (#cardList== 0) then
+ if (#cardList == 0) then
return true
end
local card = cardList[1]
if (cardNum(card, cardList) >= 2) then
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
return true
end
@@ -289,7 +287,7 @@ function M:isQdPari(cardList)
if (self.hongzhong_count > 0) then
removeCard(cardList, card, 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
return true
end
@@ -297,13 +295,13 @@ function M:isQdPari(cardList)
return false
end
-local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi)
+local function init(self, cardInhand, addCard, isZhong, qidui, eightLaizi)
self.stack = {}
self.pair_count = 0
self.cardList = membe_clone(cardInhand)
self.qidui = qidui
self.eight_laizi = eightLaizi
- self.cardList[#self.cardList+1] = addCard
+ self.cardList[#self.cardList + 1] = addCard
if (isZhong) then
self.zhong_count = cardNum(zhongid, self.cardList)
removeCard(self.cardList, zhongid, self.zhong_count)
@@ -315,64 +313,59 @@ local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi)
end
local specialCardList = { 401, 402, 403, 404, 405, 406, 407 }
-function M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
- -- printlog("isZhong", isZhong)
- -- printlog("qidui", qidui)
- -- printlog("eightLaizi", eightLaizi)
- -- pt(cardInhand)
+function M.tingPai(cardInhand, data)
+ data = data or {}
local self = setmetatable({}, { __index = M })
local tingList = {}
if not cardInhand or #cardInhand == 0 then
return tingList
end
- for k=100,300,100 do
- for i=1,9 do
+ for k = 100, 300, 100 do
+ for i = 1, 9 do
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)
- if(result) then
- tingList[#tingList + 1] = tem
+ if (result) then
+ tingList[#tingList + 1] = tem
end
end
end
-
- for j=1,#specialCardList do
+
+ for j = 1, #specialCardList do
local tem = specialCardList[j]
- local result = init(self,cardInhand,tem,isZhong,qidui,eightLaizi)
- if(result) then
- tingList[#tingList + 1] = tem
+ local result = init(self, cardInhand, tem, data._flag_haveLaizi, data._hu_qidui, data._data_laizi)
+ if (result) then
+ tingList[#tingList + 1] = tem
end
end
-
+
return tingList
end
-function M.MuiltiplteCaculateTingPai(cardInhand,isZhong,qidui,eightLaizi)
- if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo>0 then
- zhongid=DataManager.CurrenRoom.laiziInfo[1]
- local tempTingList2={}
- local tempTingList1=M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
+function M.MuiltiplteCaculateTingPai(cardInhand, isZhong, qidui, eightLaizi)
+ if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo > 0 then
+ zhongid = DataManager.CurrenRoom.laiziInfo[1]
+ local tempTingList2 = {}
+ local tempTingList1 = M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
if DataManager.CurrenRoom.laiziInfo[2] then
- zhongid=DataManager.CurrenRoom.laiziInfo[2]
- tempTingList2=M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
- zhongid=DataManager.CurrenRoom.laiziInfo[1]
+ zhongid = DataManager.CurrenRoom.laiziInfo[2]
+ tempTingList2 = M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
+ zhongid = DataManager.CurrenRoom.laiziInfo[1]
end
- local currentTingList={}
- if #tempTingList1>0 and #tempTingList2>0 then
- currentTingList=CombineDictionaryAndRemoveSomeItem(tempTingList1,tempTingList2)
- elseif #tempTingList1>0 then
- currentTingList=tempTingList1
- elseif #tempTingList2>0 then
- currentTingList=tempTingList2
+ local currentTingList = {}
+ if #tempTingList1 > 0 and #tempTingList2 > 0 then
+ currentTingList = CombineDictionaryAndRemoveSomeItem(tempTingList1, tempTingList2)
+ elseif #tempTingList1 > 0 then
+ currentTingList = tempTingList1
+ elseif #tempTingList2 > 0 then
+ currentTingList = tempTingList2
end
-
+
return currentTingList
-
else
- zhongid=0
- return M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
+ zhongid = 0
+ return M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
end
-
end
-return M
\ No newline at end of file
+return M
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
index 85247040..14ccc715 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
@@ -67,7 +67,31 @@ function M:InitView(url)
self.showNextCtr = self._view:GetController('showNext')
self.showNextList = self._view:GetChild('list_showNext')
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)
self._view:GetChild('btn_closeShow').onClick:Set(function()
self.showNextCtr.selectedIndex = 0
@@ -169,13 +193,10 @@ function M:UpdatePlayerInfoView()
end
function M:NewMJPlayerCardInfoView(view, index)
- return MJMainView.NewMJPlayerCardInfoView(self, view, index)
- --[[
if index == 1 then
- return MJPlayerSelfCardInfoView.new(view, self)
+ return MJPlayerSelfCardInfoView.new(view, self, nil, "S")
end
- return MJPlayerCardInfoView.new(view, self)
- ]]
+ return MJMainView.NewMJPlayerCardInfoView(self, view, index)
end
function M:EventInit()
@@ -217,6 +238,7 @@ function M:EventInit()
--self._viewText_testName.text = 0
self:UpdateRound()
self:RemoveCursor()
+ self:reqResidueCard()
self._state.selectedIndex = 1
self:ShowJing()
if self._niao_View then
@@ -266,7 +288,8 @@ function M:EventInit()
info:UpdateHandCard()
local outcard = UIPackage.CreateObjectFromURL(_gcm_outcard_url)
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:PlaySound("FuZhou_MJ", p.self_user.sex, tostring(card))
if seat == _room.self_player.seat then
@@ -275,6 +298,7 @@ function M:EventInit()
end)
_gamectr:AddEventListener(TX_GameEvent.GetCard, function(...)
self:__CloseTip()
+ self:reqResidueCard()
local arg = { ... }
local seat = arg[1]
local card = arg[2]
@@ -542,26 +566,19 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...)
local arg = { ... }
local residueCard = arg[1]
- local cardMap = {}
- local cardSet = {}
- self.showNextCtr.selectedIndex = 1
+ self.cardMap = {}
+ self.cardSet = {}
for i = 1, #residueCard do
local cardNum = residueCard[i]
- if not cardMap[cardNum] then
- cardMap[cardNum] = 1
- table.insert(cardSet, cardNum)
+ if not self.cardMap[cardNum] then
+ self.cardMap[cardNum] = 1
+ table.insert(self.cardSet, cardNum)
else
- cardMap[cardNum] = cardMap[cardNum] + 1
+ self.cardMap[cardNum] = self.cardMap[cardNum] + 1
end
end
- table.sort(cardSet)
- self.showNextList:SetVirtual()
- 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
+ table.sort(self.cardSet)
+ self._flag_getRemindCard = true
end)
--替换mianview的事件
@@ -593,12 +610,10 @@ function M:OutCard(card)
info:UpdateHandCard()
info:UpdateOutCardList(nil, card, self._cursor)
- info._ctr_tip.selectedIndex = 0
- info._ctr_showGuoHu.selectedIndex = 0
self:markOutCards(false, card)
self:PlaySound("FuZhou_MJ", self._room.self_player.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3")
- -- self:ShowHuTip()
+ self:ShowHuTip()
end)
else
printlog("鬼牌不能出===>>>" .. card)
@@ -962,6 +977,7 @@ end
-----------------------展示牌----------------------------
function M:reqResidueCard()
+ self._flag_getRemindCard = false
local _gamectr = ControllerManager.GetController(GameController)
_gamectr:ReqResidueCard()
end
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/MJPlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/MJPlayerSelfCardInfoView.lua
index 4fa39205..afffccb1 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/MJPlayerSelfCardInfoView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/MJPlayerSelfCardInfoView.lua
@@ -4,32 +4,29 @@ local CardCheck = import(".CardCheck")
local M = {}
--
-function M.new(view, mainView)
+function M.new(view, mainView, record, direction)
setmetatable(MJPlayerSelfCardInfoView, { __index = MJPlayerCardInfoView })
setmetatable(M, { __index = MJPlayerSelfCardInfoView })
local self = setmetatable({}, { __index = M })
self.class = "PlayerSelfCardInfoView"
self._view = view
self._mainView = mainView
+ self.direction = direction
self:init()
return self
end
--- function M:ShowHuTip(card_list)
--- printlog("ShowHuTip")
--- local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true, DataManager.CurrenRoom.room_config.Qidui,
--- DataManager.CurrenRoom.room_config.Laizi)
--- if #tingList > 0 then
--- 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
--- self._mainView._hu_tip:FillData(tingList)
--- end
+function M:init()
+ getmetatable(M).__index.init(self)
+end
+
+function M:ShowHuTip(card_list)
+ self._mainView._hu_tip:FillData(self:GetTingList(card_list))
+end
+
+function M:GetTingList(card_list)
+ return CardCheck.MuiltiplteCaculateTingPai(card_list, { _hu_qidui = true })
+end
function M:UpdateHandCard(getcard, mp)
MJPlayerSelfCardInfoView.UpdateHandCard(self, getcard, mp)
diff --git a/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua
index 630d3f3f..851bc5ce 100644
--- a/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua
+++ b/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua
@@ -20,9 +20,6 @@ end
function M:FillData(player)
PlayerInfoView.FillData(self, player)
- if player.seat == 1 then
- self._view:GetController('room_owner').selectedIndex = 1
- end
-- if player.cur_hp ~= nil then
-- self:UpdateScore(d2ad(player.cur_hp))
-- else
diff --git a/lua_probject/extend_project/extend/poker/runfast/ExtendConfig.lua b/lua_probject/extend_project/extend/poker/runfast/ExtendConfig.lua
index cbcd46a7..f3389505 100644
--- a/lua_probject/extend_project/extend/poker/runfast/ExtendConfig.lua
+++ b/lua_probject/extend_project/extend/poker/runfast/ExtendConfig.lua
@@ -80,7 +80,6 @@ function M:FillRoomData(s2croom)
local reload = s2croom["reload"]
local _tableInfo = s2croom["tableInfo"]
-
room.xipaiScore = _tableInfo["xipai_score"]
local _config = _tableInfo["config"]
@@ -133,7 +132,8 @@ function M:FillRoomData(s2croom)
room.game_status = 0
if reload then
local reloadInfo = s2croom["reloadInfo"]
-
+ local bank_seat = reloadInfo["banker_seat"]
+ room.banker_seat = bank_seat
local playing = reloadInfo["playing"]
room.curren_turn_seat = reloadInfo["active_seat"]
diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua
index fe8e90eb..decd59c8 100644
--- a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua
+++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua
@@ -178,6 +178,7 @@ function M:OnInitCard(evt_data)
local cardlist = evt_data["cards"]
local round = evt_data["round"]
+ local bank_seat = evt_data["bank_seat"]
self._cacheEvent:Enqueue(
function()
for _, player in ipairs(self._room.player_list) do
@@ -186,6 +187,7 @@ function M:OnInitCard(evt_data)
end
self._room.curren_round = round
+ self._room.banker_seat = bank_seat
DispatchEvent(self._dispatcher, RunFast_GameEvent.OnInitCard, round, cardlist)
end
)
diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua
index eb3c2288..8b5cc69d 100644
--- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua
+++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua
@@ -509,6 +509,7 @@ function M:EventInit()
head_info._view:GetChild("shengyu").text = p.hand_count
end
p:Clear()
+ head_info:MarkBank(p.seat == _room.banker_seat)
head_info:FillData(p)
local card_info = self._player_card_info[self:GetPos(p.seat)]
card_info:Clear()
@@ -543,15 +544,15 @@ function M:EventInit()
self.ctr_time.selectedIndex = index
- -- for i=1,#self._player_info do
- -- if index==i then
- -- -- body
- -- local head_info = self._player_info[index]
- -- head_info:MarkBank(true)
- -- else
- -- local head_info = self._player_info[i]
- -- head_info:MarkBank(false)
- -- end
+ -- for i = 1, #self._player_info do
+ -- if index == i then
+ -- -- body
+ -- local head_info = self._player_info[index]
+ -- head_info:MarkBank(true)
+ -- else
+ -- local head_info = self._player_info[i]
+ -- head_info:MarkBank(false)
+ -- end
-- end
-- if index == 1 then
@@ -1115,6 +1116,7 @@ function M:ReConnectForStart()
head_info:UpdateLineState(player.line_state)
head_info:UpdatePiao(player.piao)
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
-- body
@@ -1193,6 +1195,7 @@ function M:ReconnectForClearing()
head_info:UpdateLineState(player.line_state)
--head_info._view:GetController("Oener").selectedIndex=0
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
-- body
diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua
index ee7c2eb6..59278605 100644
--- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua
+++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua
@@ -398,24 +398,24 @@ function M:PlayEffect(type, callback)
obj.visible = true
if type == 2 then
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()
callback()
end)
- obj:GetChild('n12'):TweenMoveX(width * 1.03 - 121, 0.5)
- obj:GetChild('n11'):TweenFade(0, 0.5)
- obj:GetChild('n12'):TweenFade(0, 0.5)
+ obj:GetChild('n12'):TweenMoveX(width * 1.03 - 121, 0.3)
+ obj:GetChild('n11'):TweenFade(0, 0.3)
+ obj:GetChild('n12'):TweenFade(0, 0.3)
end)
elseif type == 5 or type == 8 or type == 12 then
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()
callback()
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(0, 0.3)
- obj:GetChild('n14'):TweenFade(0, 0.3)
+ obj:GetChild('n13'):TweenFade(0, 0.4)
+ obj:GetChild('n14'):TweenFade(0, 0.4)
end)
end)
else
diff --git a/lua_probject/main_project/main/majiang/HuTipView.lua b/lua_probject/main_project/main/majiang/HuTipView.lua
index 5ae92292..b61a17f0 100644
--- a/lua_probject/main_project/main/majiang/HuTipView.lua
+++ b/lua_probject/main_project/main/majiang/HuTipView.lua
@@ -6,24 +6,25 @@ local HuTipView = {
local M = HuTipView
function M.new(main_view)
- local self = {}
- self.class = "HuTipView"
- setmetatable(self,{__index = HuTipView})
- self._main_view = main_view
- self:init()
- return self
+ local self = {}
+ self.class = "HuTipView"
+ setmetatable(self, { __index = HuTipView })
+ self._main_view = main_view
+ self:init()
+ return self
end
local function SetObjEnabled(obj, enabled)
obj.visible = enabled
- obj.touchable = enabled
+ obj.touchable = false
end
function M:OnTouchBegin(context)
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))
end
+
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 posx = self._view_start_pos.x + dist.x
local posy = self._view_start_pos.y + dist.y
@@ -36,15 +37,12 @@ end
function M:init()
self._view = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Hu_tip")
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.y = 0.675 * m_height
+ self._view:Center()
+ self._view.y = GRoot.inst.height * 0.723
SetObjEnabled(self._view, false)
- self._view.onTouchBegin:Add(handler(self, self.OnTouchBegin))
- self._view.onTouchMove:Add(handler(self, self.OnTouchMove))
+ -- self._view.onTouchBegin:Add(handler(self, self.OnTouchBegin))
+ -- self._view.onTouchMove:Add(handler(self, self.OnTouchMove))
end
-- function M:FillData(cards)
@@ -69,42 +67,16 @@ end
-- end
-- end
-function M:FillData(cards, posX)
+function M:FillData(cards, posX)
-- local btn_showtip = self._main_view._view:GetChild("btn_showtip")
local lst_card = self._view:GetChild("lst_card")
- lst_card:RemoveChildrenToPool()
+ lst_card:SetVirtual()
local num = #cards
if num > 0 then
- local o_width = 192
- local i_width = 93
- local column_gap = 43
- lst_card.columnGap = column_gap
- if num > 1 then
- self._view.width = o_width + (num - 1) * i_width
+ if num == lst_card.numItems then
+ lst_card:RefreshVirtualList()
else
- self._view.width = o_width
- 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)
+ lst_card.numItems = num
end
else
SetObjEnabled(self._view, false)
@@ -112,7 +84,7 @@ function M:FillData(cards, posX)
end
function M:GetPrefix()
- return get_majiang_prefix(DataManager.CurrenRoom.game_id)
+ return get_majiang_prefix(DataManager.CurrenRoom.game_id)
end
-return M
\ No newline at end of file
+return M
diff --git a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua
index 83d3c129..9c73b696 100644
--- a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua
+++ b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua
@@ -45,21 +45,15 @@ function M:init()
-- end
end
-function M:ShowHuTip(card_list)
- printlog("ShowHuTip")
- local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true, DataManager.CurrenRoom.room_config.Qidui,
- DataManager.CurrenRoom.room_config.Laizi)
- pt(tingList)
- if #tingList > 0 then
- 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
+function M:RemoverCardListByIndexGetCardList(index)
+ local card_list = DataManager.CurrenRoom.self_player.card_list
+ local tempCardList = {}
+ for i = 0, (#card_list) - 1 do
+ if i ~= index then
+ table.insert(tempCardList, card_list[i + 1])
end
end
- self._mainView._hu_tip:FillData(tingList)
+ return tempCardList
end
function M:UpdateHandCard(getcard, mp)
@@ -91,9 +85,12 @@ function M:UpdateHandCard(getcard, mp)
btn_card = self._view_handCardList:AddItemFromPool()
btn_card.width = (GRoot.inst.width * 0.88 - self._view_handCardList.columnGap * 12) / 13
end
- -- btn_card.sound = "ui://Main_Majiang/click"
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
if getcard then
@@ -271,7 +268,7 @@ function M:__OnClickHandCard(context)
self._flag_seletedGet = 0
local button = context.data
local _room = DataManager.CurrenRoom
-
+ self:ShowHuTip(self:RemoverCardListByIndexGetCardList(self._view_handCardList.selectedIndex))
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
local card = button.data
diff --git a/wb_new_ui/assets/Common/ToolsTip.xml b/wb_new_ui/assets/Common/ToolsTip.xml
index 39b37f90..fc86f06f 100644
--- a/wb_new_ui/assets/Common/ToolsTip.xml
+++ b/wb_new_ui/assets/Common/ToolsTip.xml
@@ -1,16 +1,22 @@
-
+
+
-
+
+
+
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/hu_tip/gamexzmj_37.png b/wb_new_ui/assets/Main_Majiang/component/hu_tip/gamexzmj_37.png
new file mode 100644
index 00000000..cf8f7298
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/component/hu_tip/gamexzmj_37.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/z01.png b/wb_new_ui/assets/Main_Majiang/images/z01.png
index d2acf732..1d66766b 100644
Binary files a/wb_new_ui/assets/Main_Majiang/images/z01.png and b/wb_new_ui/assets/Main_Majiang/images/z01.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index 3b05751c..515df596 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -1277,6 +1277,9 @@
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
index 90de332f..4579782c 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
index 7cf9af66..0b16186b 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png
index cdfe75eb..20ae222f 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index 26cb7ce7..d064372c 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
index 51a91f86..2e86c2d0 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png
index 897ae692..0618597c 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
index 75f22952..71325944 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes differ