10.18
罗家炜
parent
dd5edc8a73
commit
13dd31b708
|
|
@ -23,7 +23,8 @@ GroupMgrEvent = {
|
|||
OnFamilyRoomReflash = "OnFamilyRoomReflash",
|
||||
OnFamilyMemberOut = "OnFamilyMemberOut",
|
||||
OnRefNumberBan = "OnRefNumberBan",
|
||||
OnRefShowStartRoom = "OnRefShowStartRoom"
|
||||
OnRefShowStartRoom = "OnRefShowStartRoom",
|
||||
OnRefNotice = "OnRefNotice"
|
||||
}
|
||||
|
||||
GroupMgrController = {
|
||||
|
|
@ -70,6 +71,7 @@ function GroupMgrController.new()
|
|||
self._eventmap[Protocol.WEB_FG_MEMBER_GAME_STATE] = self.OnMemberGameState
|
||||
self._eventmap[Protocol.FGMGR_EVT_Ref_NumberBan] = self.OnRefNumberBan
|
||||
self._eventmap[Protocol.FGMGR_EVT_SHOWSTART] = self.OnRefShowStartRoom
|
||||
self._eventmap[Protocol.FWEb_EVT_UPDATENOTICE] = self.OnRefNotice
|
||||
|
||||
-- self:connect(callback)
|
||||
return self
|
||||
|
|
@ -166,6 +168,7 @@ function M:connect(host, groupId, callback)
|
|||
group.isvip = res.Data.isvip
|
||||
group.isWatch = res.Data.isWatch
|
||||
group.messageCount = res.Data.messageCount
|
||||
group.isShow = res.Data.isShow
|
||||
group.joinsData = {}
|
||||
else
|
||||
self.code = SocketCode.ExceptionOnConnect
|
||||
|
|
@ -672,6 +675,12 @@ function M:OnRefShowStartRoom(evt_data)
|
|||
DispatchEvent(self._dispatcher, GroupMgrEvent.OnRefShowStartRoom, evt_data)
|
||||
end
|
||||
|
||||
function M:OnRefNotice(evt_data)
|
||||
local group = DataManager.groups:get(evt_data.groupId)
|
||||
group.notice = evt_data.notice
|
||||
DispatchEvent(self._dispatcher, GroupMgrEvent.OnRefNotice, evt_data)
|
||||
end
|
||||
|
||||
function M:PopEvent()
|
||||
local _cacheEvent = self._cacheEvent
|
||||
if (_cacheEvent:Count() > 0) then
|
||||
|
|
|
|||
|
|
@ -449,6 +449,8 @@ Protocol = {
|
|||
FGMGR_SET_SHOWSTART = "13012",
|
||||
--显示/隐藏一开始房间接收事件
|
||||
FGMGR_EVT_SHOWSTART = "13013",
|
||||
--推送亲友圈公告修改
|
||||
FWEb_EVT_UPDATENOTICE = "13014",
|
||||
|
||||
--end::::::::::::::牌友圈协议::::::::::::::::::::
|
||||
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ end
|
|||
|
||||
function M:RoundListRenderer(index, obj)
|
||||
local rankTable = self.roundRanks
|
||||
obj:GetChild('text_rank').text = index
|
||||
obj:GetChild('text_rank').text = index + 1
|
||||
obj:GetChild('text_id').text = rankTable[index + 1].rankTable
|
||||
obj:GetChild('text_name').text = rankTable[index + 1].nick
|
||||
obj:GetChild('text_other').text = rankTable[index + 1].round
|
||||
|
|
@ -109,7 +109,7 @@ end
|
|||
|
||||
function M:WinListRenderer(index, obj)
|
||||
local rankTable = self.winRanks
|
||||
obj:GetChild('text_rank').text = index
|
||||
obj:GetChild('text_rank').text = index + 1
|
||||
obj:GetChild('text_id').text = rankTable[index + 1].rankTable
|
||||
obj:GetChild('text_name').text = rankTable[index + 1].nick
|
||||
obj:GetChild('text_other').text = rankTable[index + 1].win
|
||||
|
|
@ -118,7 +118,7 @@ end
|
|||
|
||||
function M:ScoreListRenderer(index, obj)
|
||||
local rankTable = self.scoreRanks
|
||||
obj:GetChild('text_rank').text = index
|
||||
obj:GetChild('text_rank').text = index + 1
|
||||
obj:GetChild('text_id').text = rankTable[index + 1].rankTable
|
||||
obj:GetChild('text_name').text = rankTable[index + 1].nick
|
||||
obj:GetChild('text_other').text = rankTable[index + 1].score
|
||||
|
|
|
|||
|
|
@ -189,8 +189,12 @@ local function list_BanedPlayersRenderer(index, obj, data, self, fatherIndex)
|
|||
local btn_delPlayer = obj:GetChild("btn_delPlayer")
|
||||
btn_delPlayer.onClick:Set(function()
|
||||
-- 删除玩家按钮
|
||||
self.changedIndex = fatherIndex
|
||||
DelPalyer(data, player.uid, self)
|
||||
local _curren_msg = MsgWindow.new(self._root_view, '是否确认删除该成员?', MsgWindow.MsgMode.OkAndCancel)
|
||||
_curren_msg.onOk:Add(function()
|
||||
self.changedIndex = fatherIndex
|
||||
DelPalyer(data, player.uid, self)
|
||||
end)
|
||||
_curren_msg:Show()
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
@ -215,7 +219,11 @@ local function list_banItemRenderer(index, obj, self)
|
|||
|
||||
btn_del.onClick:Set(function()
|
||||
-- 删除整个桌子
|
||||
DelDesk(data, self)
|
||||
local _curren_msg = MsgWindow.new(self._root_view, '是否确认删除该分组关系?', MsgWindow.MsgMode.OkAndCancel)
|
||||
_curren_msg.onOk:Add(function()
|
||||
DelDesk(data, self)
|
||||
end)
|
||||
_curren_msg:Show()
|
||||
end)
|
||||
|
||||
list_BanedPlayers.itemRenderer = function(i, o)
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ function M:AddListener()
|
|||
mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyRoomReflash, handler(self, self._evtOnFamilyRoomReflash))
|
||||
mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyMemberOut, handler(self, self._evtOnFamilyMemberOut))
|
||||
mgr_ctr:AddEventListener(GroupMgrEvent.OnRefShowStartRoom, handler(self, self._evtOnRefShowStartRoom))
|
||||
mgr_ctr:AddEventListener(GroupMgrEvent.OnRefNotice, handler(self, self._evtOnRefNotice))
|
||||
print("家族添加监听")
|
||||
end
|
||||
|
||||
|
|
@ -59,7 +60,9 @@ function M:RemoveAll()
|
|||
mgr_ctr:RemoveEventListener(GroupMgrEvent.OnMemberState, handler(self, self._evtOnMemberState))
|
||||
mgr_ctr:RemoveEventListener(GroupMgrEvent.OnFamilyRoomReflash, handler(self, self._evtOnFamilyRoomReflash))
|
||||
mgr_ctr:RemoveEventListener(GroupMgrEvent.OnFamilyMemberOut, handler(self, self._evtOnFamilyMemberOut))
|
||||
mgr_ctr:RemoveEventListener(GroupMgrEvent.OnRefShowStartRoom, handler(self, self._evtOnRefShowStartRoom))
|
||||
mgr_ctr:RemoveEventListener(GroupMgrEvent.OnRefNotice, handler(self, self._evtOnRefShowStartRoom))
|
||||
mgr_ctr:RemoveEventListener(GroupMgrEvent.OnRefNotice, handler(self, self._evtOnRefNotice))
|
||||
|
||||
|
||||
print("家族去除监听")
|
||||
end
|
||||
|
|
@ -409,4 +412,20 @@ function M:_evtOnRefShowStartRoom(...)
|
|||
self:UpdateFamilyRoom(nil, self._group.id)
|
||||
end
|
||||
|
||||
function M:_evtOnRefNotice(...)
|
||||
local arg = { ... }
|
||||
|
||||
local evt_data = arg[1]
|
||||
|
||||
local view = ViewManager.GetCurrenView()
|
||||
if view.class ~= "FamilyMainView" then
|
||||
return
|
||||
end
|
||||
printlog("lingmeng _evtOnRefShowStartRoom", self._group.id, evt_data.groupId)
|
||||
if self._group.id == nil or evt_data.groupId ~= self._group.id then
|
||||
return
|
||||
end
|
||||
self:RefNotice(self._group.id)
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -140,6 +140,8 @@ function FamilyMyFamily:Close()
|
|||
end
|
||||
|
||||
function FamilyMyFamily:Refalsh()
|
||||
local group = DataManager.groups.groupMap[self.groupId]
|
||||
|
||||
self.family = DataManager.groups.groupMap[self.groupId]
|
||||
|
||||
self.tex_fName.text = Utils.TextOmit(self.family.name, 6, "...")
|
||||
|
|
@ -156,7 +158,10 @@ function FamilyMyFamily:Refalsh()
|
|||
self.showNumber = self.family.isShow
|
||||
if self.showNumber == 0 then
|
||||
self.cDisplayNumber.selectedIndex = 1
|
||||
self.tex_fNumber.text = "*"
|
||||
if group.lev == 3 then
|
||||
self.tex_fNumber.text = "*"
|
||||
self.cDisplayNumber.selectedIndex = 0
|
||||
end
|
||||
elseif self.showNumber == 1 then
|
||||
self.cDisplayNumber.selectedIndex = 0
|
||||
end
|
||||
|
|
|
|||
|
|
@ -99,14 +99,17 @@ function FamilyMyfamilyList:Init()
|
|||
local tex_familyName = obj:GetChild("tex_familyName")
|
||||
local tex_familyNumber = obj:GetChild("tex_familyNumber")
|
||||
local btn_familyManage = obj:GetChild("btn_familyManage")
|
||||
local btn_familyManage2 = obj:GetChild("btn_familyManage2")
|
||||
local btn_record = obj:GetChild("btn_record")
|
||||
local btn_rank = obj:GetChild("btn_rank")
|
||||
local loader_icon = obj:GetChild("loader_icon")
|
||||
local ctr_groupLev = obj:GetController("groupLev")
|
||||
|
||||
tex_familyId.text = group.id
|
||||
tex_familyName.emojies = EmojiDitc.EmojiesDitc
|
||||
tex_familyName.text = Utils.TextOmit(group.name, 6, "...")
|
||||
tex_familyNumber.text = group.total_member_num
|
||||
tex_familyNumber.text = group.isShow == 1 and group.total_member_num or "***"
|
||||
ctr_groupLev.selectedIndex = group.lev < 3 and 1 or 0
|
||||
ImageLoad.Load(group.o_portrait, loader_icon)
|
||||
|
||||
btn_familyManage.onClick:Set(function()
|
||||
|
|
@ -116,6 +119,13 @@ function FamilyMyfamilyList:Init()
|
|||
view:Show(group.id)
|
||||
end)
|
||||
|
||||
btn_familyManage2.onClick:Set(function()
|
||||
--self:Close()
|
||||
--self.FamilyView:OpenMyFamily(group.id)
|
||||
local view = FamilyMyFamily.New()
|
||||
view:Show(group.id)
|
||||
end)
|
||||
|
||||
btn_record.onClick:Set(function()
|
||||
self:Close()
|
||||
self.FamilyView:FamilyRecord()
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ function M.TryShow(data, callback)
|
|||
local group = data.group
|
||||
local noticeTime = Utils.LoadLocalFile(string.format("Family_%s_notice_time", group.id)) or 0
|
||||
local noticeText = Utils.LoadLocalFile(string.format("Family_%s_notice_text", group.id)) or ""
|
||||
if tonumber(os.date("%Y%m%d", tonumber(noticeTime))) - tonumber(os.date("%Y%m%d", os.time())) < -1 and group.notice and #group.notice > 0 and noticeText ~= group.notice then
|
||||
if tonumber(os.date("%Y%m%d", tonumber(noticeTime))) - tonumber(os.date("%Y%m%d", os.time())) <= -1 or (group.notice and #group.notice > 0 and noticeText ~= group.notice) then
|
||||
Utils.SaveLocalFile(string.format("Family_%s_notice_time", group.id), os.time())
|
||||
Utils.SaveLocalFile(string.format("Family_%s_notice_text", group.id), group.notice)
|
||||
local my = M.New(data, callback)
|
||||
|
|
|
|||
|
|
@ -240,17 +240,24 @@ function FamilyNumberRecord.New(root, page)
|
|||
return
|
||||
end
|
||||
local newReadType = 3 - self.readStatusNum
|
||||
fgCtr:FG_SetGroupRecordReadStatus(group_id, GetPlatform(), self.military.list, newReadType - 1, self._tagId,
|
||||
function(res)
|
||||
pt(res)
|
||||
if res.ReturnCode ~= 0 then
|
||||
ViewUtil.ErrorTip(res.ReturnCode, "修改战绩阅读状态失败")
|
||||
else
|
||||
self.ctr_numberRecord.selectedIndex = 1
|
||||
self:OnClickNumberRank(group_id, self.rankNumber.uid, self.rankNumber.round)
|
||||
self.military = { size = 0, list = {} }
|
||||
end
|
||||
end)
|
||||
local _curren_msg = MsgWindow.new(self._root_view, newReadType == 1 and "确定要将选中的对局设置为未读" or "确定要将选中的对局设置为已读",
|
||||
MsgWindow.MsgMode.OkAndCancel)
|
||||
_curren_msg.onOk:Add(function()
|
||||
fgCtr:FG_SetGroupRecordReadStatus(group_id, GetPlatform(), self.military.list, newReadType - 1, self._tagId,
|
||||
function(res)
|
||||
pt(res)
|
||||
if res.ReturnCode ~= 0 then
|
||||
ViewUtil.ErrorTip(res.ReturnCode, "修改战绩阅读状态失败")
|
||||
else
|
||||
self.ctr_numberRecord.selectedIndex = 1
|
||||
self:OnClickNumberRank(group_id, self.rankNumber.uid, self.rankNumber.round)
|
||||
self.military = { size = 0, list = {} }
|
||||
self:OnClickSortType()
|
||||
ViewUtil.ErrorTip(-1, "设置成功")
|
||||
end
|
||||
end)
|
||||
end)
|
||||
_curren_msg:Show()
|
||||
end)
|
||||
self._view:GetChild('btn_allChooseReverse').onClick:Set(function()
|
||||
self._flag_allChooseReverse = self.records[self.gameTypeNum][self.readStatusNum].childNum
|
||||
|
|
@ -404,6 +411,7 @@ function M:NumberRecordDetailRender()
|
|||
obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc
|
||||
obj:GetChild('text_playName').text = info.pname
|
||||
obj:GetChild('btn_lookRecord').onClick:Set(function()
|
||||
-- self._view:GetChild('box_mumberTime').selectedIndex = self._view:GetController('day').selectedIndex
|
||||
self._viewList_recordDetail:RemoveChildrenToPool()
|
||||
for i = 1, tonumber(info.round) do
|
||||
local obj = self._viewList_recordDetail:AddItemFromPool()
|
||||
|
|
@ -439,7 +447,7 @@ function M:NumberRecordDetailRender()
|
|||
resultDetailList.itemRenderer = function(index, obj)
|
||||
local resultInfo = info.totalScore[index + 1]
|
||||
ImageLoad.Load(resultInfo.portrait, obj:GetChild('btn_head')._iconObject)
|
||||
obj:GetChild('text_name').text = resultInfo.nick
|
||||
obj:GetChild('text_name').text = ViewUtil.stringEllipsis(resultInfo.nick)
|
||||
obj:GetChild('text_score').text = string.format("%s%s", resultInfo.score >= 0 and "+" or "", resultInfo
|
||||
.score)
|
||||
obj:GetController('colour').selectedIndex = resultInfo.score >= 0 and 1 or 0
|
||||
|
|
|
|||
|
|
@ -252,6 +252,22 @@ function M:init(url)
|
|||
end
|
||||
end)
|
||||
end)
|
||||
|
||||
local list_familyNumber = self._view:GetChild('list_familyNumber')
|
||||
if list_familyNumber then
|
||||
list_familyNumber.scrollPane.onScroll:Set(function()
|
||||
self._flag_falshMenberTime = true
|
||||
self._data_falshMenberTime = 7
|
||||
end)
|
||||
end
|
||||
|
||||
local list_room = self._view:GetChild('list_room')
|
||||
if list_room then
|
||||
list_room.scrollPane.onScroll:Set(function()
|
||||
self._flag_falshRoomTime = true
|
||||
self._data_falshRoomTime = 20
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
||||
function M:Reflash()
|
||||
|
|
@ -280,7 +296,7 @@ function M:Reflash()
|
|||
end
|
||||
local btn = self.list_family:GetChildAt(chooseIndex - 1)
|
||||
btn.onClick:Call()
|
||||
FamilyNotice.TryShow({ group = DataManager.groups.groupList[chooseIndex] })
|
||||
self:RefNotice(DataManager.groups.groupList[chooseIndex].id)
|
||||
else
|
||||
self:JoinFamily(true)
|
||||
self.btn_chatRoom.visible = false
|
||||
|
|
@ -492,16 +508,18 @@ end
|
|||
|
||||
function M:ReflashMember()
|
||||
self.members = SortMembers(self._group.members)
|
||||
|
||||
local list_familyNumber = self._view:GetChild('list_familyNumber')
|
||||
if list_familyNumber.itemRenderer == nil then
|
||||
return
|
||||
end
|
||||
|
||||
if list_familyNumber.numItems == #self._group.members then
|
||||
list_familyNumber:RefreshVirtualList()
|
||||
if self._group.isShow == 1 or self._group.lev < 3 then
|
||||
if list_familyNumber.numItems == #self._group.members then
|
||||
list_familyNumber:RefreshVirtualList()
|
||||
else
|
||||
list_familyNumber.numItems = #self._group.members
|
||||
end
|
||||
else
|
||||
list_familyNumber.numItems = #self._group.members
|
||||
list_familyNumber.numItems = 0
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -535,7 +553,11 @@ function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type)
|
|||
ImageLoad.Load(player.portrait, loader_icon)
|
||||
end
|
||||
--list_familyNumber.numItems = #self._group.members
|
||||
list_familyNumber.numItems = #self.members
|
||||
if self._group.isShow == 1 or self._group.lev < 3 then
|
||||
list_familyNumber.numItems = #self.members
|
||||
else
|
||||
list_familyNumber.numItems = 0
|
||||
end
|
||||
self:ChangeOther()
|
||||
return 1
|
||||
end
|
||||
|
|
@ -891,6 +913,7 @@ end
|
|||
function M:OnUpdate()
|
||||
local fgCtr = ControllerManager.GetController(NewGroupController)
|
||||
local newTime = os.time()
|
||||
local deltaTime = Time.deltaTime
|
||||
-- --12001事件
|
||||
local func = self._mgr_ctr:PopEvent()
|
||||
if (func ~= nil) then
|
||||
|
|
@ -945,7 +968,28 @@ function M:OnUpdate()
|
|||
self.lastTime = newTime
|
||||
if self._view:GetChild('list_familyNumber').itemRenderer then
|
||||
self.members = SortMembers(self._group.members) --local members = self._group.members
|
||||
self._view:GetChild('list_familyNumber').numItems = #self.members
|
||||
if self._group.isShow == 1 or self._group.lev < 3 then
|
||||
self._view:GetChild('list_familyNumber').numItems = #self.members
|
||||
else
|
||||
self._view:GetChild('list_familyNumber').numItems = 0
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if self._flag_falshMenberTime then
|
||||
if self._data_falshMenberTime > 0 then
|
||||
self._data_falshMenberTime = self._data_falshMenberTime - deltaTime
|
||||
else
|
||||
self._flag_falshMenberTime = false
|
||||
self._view:GetChild('list_familyNumber').scrollPane:SetPosY(0, true)
|
||||
end
|
||||
end
|
||||
if self._flag_falshRoomTime then
|
||||
if self._data_falshRoomTime > 0 then
|
||||
self._data_falshRoomTime = self._data_falshRoomTime - deltaTime
|
||||
else
|
||||
self._flag_falshRoomTime = false
|
||||
self._view:GetChild('list_room').scrollPane:SetPosY(0, true)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1175,6 +1219,11 @@ function M:ReflashChatRoomRedPoint()
|
|||
tex_redPoint.text = tex
|
||||
end
|
||||
|
||||
function M:RefNotice(groupId)
|
||||
local group = DataManager.groups:get(groupId)
|
||||
FamilyNotice.TryShow({ group = group })
|
||||
end
|
||||
|
||||
function M:Show()
|
||||
ViewUtil.PlaySoundBg()
|
||||
Broadcast.AddListener(BroadcastEvent.OnJoinsChange, ReflashJoinsRedPoint, self)
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ function M:RecordDetailRenderer(index, obj, data)
|
|||
local score = data.totalScore[index + 1].score
|
||||
obj:GetController('colour').selectedIndex = score >= 0 and 1 or 0
|
||||
obj:GetChild('text_score').text = string.format("%s%d", score >= 0 and "+" or "", score)
|
||||
obj:GetChild('text_name').text = data.totalScore[index + 1].nick
|
||||
obj:GetChild('text_name').text = ViewUtil.stringEllipsis(data.totalScore[index + 1].nick, 5)
|
||||
end
|
||||
|
||||
function M:PlayerNameRenderer(index, obj)
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ Table_Error_code_Map = {
|
|||
[999] = { id = 999, note = "未知错误" },
|
||||
[17] = { id = 17, note = "奖券不足" },
|
||||
[53] = { id = 53, note = "与桌上玩家IP相同，进入房间失败" },
|
||||
[54] = { id = 54, note = "与桌上玩家距离过近，进入房间失败" },
|
||||
[54] = { id = 54, note = "加入房间失败，距离太近，无法进入房间" },
|
||||
[55] = { id = 55, note = "GPS服务未开启，请开启GPS服务！" },
|
||||
[56] = { id = 56, note = "不是亲友圈" },
|
||||
[57] = { id = 57, note = "亲友圈不能退出" },
|
||||
|
|
@ -50,7 +50,7 @@ Table_Error_code_Map = {
|
|||
[61] = { id = 61, note = "手机号码已绑定玩家" },
|
||||
[80] = { id = 80, note = "房间已删除" },
|
||||
[81] = { id = 81, note = "是亲友圈房间" },
|
||||
[83] = { id = 83, note = "分数已被限制，请联系管理员" },
|
||||
[83] = { id = 83, note = "创建亲友圈房间失败，已达到积分限制，请联系亲友圈管理员" },
|
||||
[1000] = { id = 1000, note = "已申请加入" },
|
||||
[1001] = { id = 1001, note = "成员已存在" },
|
||||
[1002] = { id = 1002, note = "成员不存在" },
|
||||
|
|
|
|||
|
|
@ -67,31 +67,18 @@ 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()
|
||||
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)
|
||||
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
|
||||
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)
|
||||
self.showNextList.numItems = #self.cardSet
|
||||
else
|
||||
self:reqResidueCard()
|
||||
end
|
||||
end)
|
||||
self._view:GetChild('btn_closeShow').onClick:Set(function()
|
||||
self.showNextCtr.selectedIndex = 0
|
||||
|
|
|
|||
|
|
@ -66,31 +66,18 @@ 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()
|
||||
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)
|
||||
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
|
||||
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)
|
||||
self.showNextList.numItems = #self.cardSet
|
||||
else
|
||||
self:reqResidueCard()
|
||||
end
|
||||
end)
|
||||
self._view:GetChild('btn_closeShow').onClick:Set(function()
|
||||
self.showNextCtr.selectedIndex = 0
|
||||
|
|
|
|||
|
|
@ -67,31 +67,18 @@ 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()
|
||||
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)
|
||||
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
|
||||
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)
|
||||
self.showNextList.numItems = #self.cardSet
|
||||
else
|
||||
self:reqResidueCard()
|
||||
end
|
||||
end)
|
||||
self._view:GetChild('btn_closeShow').onClick:Set(function()
|
||||
self.showNextCtr.selectedIndex = 0
|
||||
|
|
|
|||
|
|
@ -65,31 +65,18 @@ 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()
|
||||
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)
|
||||
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
|
||||
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)
|
||||
self.showNextList.numItems = #self.cardSet
|
||||
else
|
||||
self:reqResidueCard()
|
||||
end
|
||||
end)
|
||||
self._view:GetChild('btn_closeShow').onClick:Set(function()
|
||||
self.showNextCtr.selectedIndex = 0
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ local CardCheck = {
|
|||
threelack = false,
|
||||
fourDaiThree = false,
|
||||
fristCard = true,
|
||||
haveRuleCard = false,
|
||||
tipCardList = {},
|
||||
touchCardSet = {},
|
||||
touchCardMao = {}
|
||||
|
|
@ -40,6 +41,7 @@ function M:InitFlag()
|
|||
self.planelack = config.planelack == 1
|
||||
self.threelack = config.threelack == 1
|
||||
self.fourDaiThree = config.fourDaiThree
|
||||
self.rule = config.rule
|
||||
self._flag_fristCard = true
|
||||
print("==============================lingmengcheckinitFlag")
|
||||
pt(config)
|
||||
|
|
@ -124,14 +126,19 @@ function M:InitLastCard(cardList, mustPutMaxCard)
|
|||
end
|
||||
end
|
||||
|
||||
function M:initCards(cardList, flag, flag_allCards)
|
||||
function M:initCards(cardList, data)
|
||||
print("lingmenginitCards")
|
||||
pt(cardList)
|
||||
local temp_long = 0
|
||||
data = data or {}
|
||||
self:Clear()
|
||||
self._flag_allCards = flag_allCards or false
|
||||
if flag then
|
||||
self._flag_allCards = data.flag_allCards or false
|
||||
self._flag_ruleCard = data.flag_ruleCard or false
|
||||
if data.flag then
|
||||
for i = 1, #cardList do
|
||||
if cardList[i].card_code_number == 34 then
|
||||
self.haveRuleCard = true
|
||||
end
|
||||
local number = math.floor(cardList[i][1].card_code_number / 10)
|
||||
if self.cardList[number] then
|
||||
self.cardList[number] = self.cardList[number] + 1
|
||||
|
|
@ -151,6 +158,9 @@ function M:initCards(cardList, flag, flag_allCards)
|
|||
end
|
||||
else
|
||||
for i = 1, #cardList do
|
||||
if cardList[i].card_code_number == 34 then
|
||||
self.haveRuleCard = true
|
||||
end
|
||||
local number = math.floor(cardList[i].card_code_number / 10)
|
||||
if self.cardList[number] then
|
||||
self.cardList[number] = self.cardList[number] + 1
|
||||
|
|
@ -185,6 +195,9 @@ function M:CheckCards()
|
|||
if self.cardNum == 0 then
|
||||
return
|
||||
end
|
||||
if self.rule == 1 and self._flag_ruleCard and DataManager.CurrenRoom.curren_round == 1 and not self.haveRuleCard then
|
||||
return
|
||||
end
|
||||
|
||||
print("lingmeng self.lastMinCard", self.lastMinCard)
|
||||
|
||||
|
|
@ -764,6 +777,7 @@ function M:Clear()
|
|||
self.cardSize = 0
|
||||
self.long = false
|
||||
self._flag_checkLst = false
|
||||
self.haveRuleCard = false
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -481,13 +481,16 @@ function M:EventInit()
|
|||
local card = arg[1]
|
||||
self.ctr_state.selectedIndex = 1
|
||||
-- self.ctr_card_eff.selectedIndex = 1
|
||||
-- self:PlayCardEff(card)
|
||||
-- if self._room.room_config.people_num == 3 then
|
||||
-- self:PlayCardEff(403)
|
||||
-- end
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnInitCard, function(...)
|
||||
local arg = { ... }
|
||||
local round = arg[1]
|
||||
local cardlist = arg[2]
|
||||
self._popEvent = false
|
||||
|
||||
if self.destory_win ~= nil then
|
||||
coroutine.stop(self.destory_win)
|
||||
|
|
@ -556,6 +559,15 @@ function M:EventInit()
|
|||
--card_info:UpdateRemainCard(#cardlist,true)
|
||||
end
|
||||
end
|
||||
|
||||
if self._room.room_config.people_num == 3 and round == 1 then
|
||||
local effect = self._view:GetTransition(string.format('to_%s', self:GetPos(self._room.banker_seat)))
|
||||
effect:Play(1, 0, function()
|
||||
self._popEvent = true
|
||||
end)
|
||||
else
|
||||
self._popEvent = true
|
||||
end
|
||||
end)
|
||||
|
||||
|
||||
|
|
@ -1025,7 +1037,7 @@ function M:EventInit()
|
|||
if player.seat ~= win_seat then
|
||||
card_info.ctr_outpoker.selectedIndex = 0
|
||||
end
|
||||
if win_seat == self._room.self_player.seat and player.seat ~= self._room.self_player.seat then
|
||||
if player.seat ~= self._room.self_player.seat then
|
||||
local oneTime = 7 / 60
|
||||
|
||||
-- card_info:UpdateHandPoker(player.cards, false, true)
|
||||
|
|
|
|||
|
|
@ -91,7 +91,6 @@ function M:InitView(url)
|
|||
self._cmdmap[RunFast_Record_Event.Evt_Pass] = self.CmdPass
|
||||
self._cmdmap[RunFast_Record_Event.Evt_NewRound] = self.CmdNewRound
|
||||
self._cmdmap[RunFast_Record_Event.Evt_result] = self.Cmdresult
|
||||
self._cmdmap[RunFast_Record_Event.Evt_Result] = self.CmdResult
|
||||
end
|
||||
|
||||
function M:NewPlayerPokerInfoView(view, index)
|
||||
|
|
@ -197,6 +196,7 @@ function M:ShowStep(index)
|
|||
end
|
||||
if step.cmd == RunFast_Record_Event.Evt_result then
|
||||
local result = step.result
|
||||
|
||||
for i = 1, #result do
|
||||
local card_info = self._player_card_info[self:GetPos(result[i].seat)]
|
||||
|
||||
|
|
|
|||
|
|
@ -216,6 +216,7 @@ function M:InitPoker(pokerList, isPlayAni, open)
|
|||
self.cor_init_poker = nil
|
||||
self.card_list = {}
|
||||
self._ctr_canSendCard.selectedIndex = 0
|
||||
self._flag_ruleCard = false
|
||||
self._view_handCard:RemoveChildren(0, -1, true)
|
||||
if isPlayAni == true then
|
||||
self.cor_init_poker =
|
||||
|
|
@ -228,6 +229,9 @@ function M:InitPoker(pokerList, isPlayAni, open)
|
|||
table.sort(pokerList)
|
||||
table.sort(self.card_list, tableSortNumber)
|
||||
for i = #pokerList, 1, -1 do
|
||||
if pokerList[i] == 403 then
|
||||
self._flag_ruleCard = true
|
||||
end
|
||||
local card_number_code = self:ChangeOneCodeByFrom(pokerList[i])
|
||||
local card_flower_code = pokerList[i]
|
||||
-- local btn_card = self:CreatPoker(card_number_code, cs, open)
|
||||
|
|
@ -283,6 +287,9 @@ function M:InitPoker(pokerList, isPlayAni, open)
|
|||
)
|
||||
else
|
||||
for i = #pokerList, 1, -1 do
|
||||
if pokerList[i] == 403 then
|
||||
self._flag_ruleCard = true
|
||||
end
|
||||
local card_number_code = self:ChangeOneCodeByFrom(pokerList[i])
|
||||
local card_flower_code = pokerList[i]
|
||||
local btn_card = self._view_handCard:AddItemFromPool()
|
||||
|
|
@ -483,7 +490,14 @@ function M:TouchMoveEnd(context)
|
|||
if #send_card > 0 then
|
||||
table.sort(send_card, tableSortNumber)
|
||||
send_card = #xuan_card > 0 and xuan_card or send_card
|
||||
self._cardCheck:initCards(send_card, #xuan_card > 0, #send_card == self._view_handCard.numItems)
|
||||
self._cardCheck:initCards(send_card,
|
||||
{
|
||||
flag = #xuan_card > 0,
|
||||
flag_allCards = #send_card == self._view_handCard.numItems,
|
||||
flag_ruleCard = self
|
||||
._flag_ruleCard
|
||||
})
|
||||
|
||||
self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0
|
||||
else
|
||||
self._ctr_canSendCard.selectedIndex = 0
|
||||
|
|
@ -840,7 +854,7 @@ function M:UpdateHandCardsColor()
|
|||
end
|
||||
if #send_card > 0 then
|
||||
table.sort(send_card, tableSortNumber)
|
||||
self._cardCheck:initCards(send_card, false, #send_card == self._view_handCard.numItems)
|
||||
self._cardCheck:initCards(send_card, { flag = false, flag_allCards = #send_card == self._view_handCard.numItems })
|
||||
self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0
|
||||
else
|
||||
self._ctr_canSendCard.selectedIndex = 0
|
||||
|
|
@ -1447,6 +1461,7 @@ function M:Clear()
|
|||
self.card_list = {}
|
||||
self.out_card_list = {}
|
||||
self._view_handCard:RemoveChildren(0, -1, true)
|
||||
self._flag_ruleCard = false
|
||||
-- self.mask_liangpai:RemoveChildren(0,-1,true)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ end
|
|||
|
||||
function M:FillPlayerHead(view, playerInfo, bigWin)
|
||||
ImageLoad.Load(playerInfo.self_user.head_url, view:GetChild('btn_head')._iconObject)
|
||||
view:GetChild('text_name').text = playerInfo.self_user.nick_name
|
||||
view:GetChild('text_name').text = ViewUtil.stringEllipsis(playerInfo.self_user.nick_name)
|
||||
view:GetChild('text|_ID').text = playerInfo.self_user.account_id
|
||||
view:GetController('bigWin').selectedIndex = bigWin and 1 or 0
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="144,144" opaque="false" initName="gcm_info">
|
||||
<controller name="room_owner" pages="0,,1," selected="1"/>
|
||||
<controller name="bank" pages="0,,1," selected="1"/>
|
||||
<controller name="room_owner" pages="0,,1," selected="0"/>
|
||||
<controller name="bank" pages="0,,1," selected="0"/>
|
||||
<controller name="read" pages="0,,1," selected="0"/>
|
||||
<controller name="offline" pages="0,,1," selected="0"/>
|
||||
<controller name="mask_voice" pages="0,,1," selected="0"/>
|
||||
|
|
@ -101,6 +101,7 @@
|
|||
<gearDisplay controller="piaoWin" pages="0"/>
|
||||
<relation target="" sidePair="center-center"/>
|
||||
</text>
|
||||
<component id="n66_f11o" name="comp_hudon" src="bm7dtcrf" fileName="Main_new/Main/Component/comp_hudon.xml" xy="-28,-15" touchable="false"/>
|
||||
</displayList>
|
||||
<transition name="t0" autoPlay="true" autoPlayRepeat="-1" frameRate="60">
|
||||
<item time="0" type="Rotation" target="n63_n9qr" tween="true" startValue="0" endValue="-20" duration="15" ease="Linear"/>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="1760,157" opaque="false" initName="player_card_info">
|
||||
<controller name="output" homePageType="specific" homePage="1" pages="0,,1,,2," selected="0"/>
|
||||
<controller name="output" homePageType="specific" homePage="0" pages="0,,1,,2," selected="0"/>
|
||||
<controller name="one_card" pages="0,,1," selected="0"/>
|
||||
<controller name="resultOut" pages="0,,1," selected="0"/>
|
||||
<controller name="resultOut" homePageType="specific" homePage="0" pages="0,,1," selected="1"/>
|
||||
<controller name="time_clock" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
<list id="n53_q9cc" name="hand_card_list" xy="-697,-634" size="445,78" visible="false" layout="row" selectionMode="none" overflow="scroll" lineGap="-15" colGap="-25" defaultItem="ui://9n9stu2eprgz8e" align="right"/>
|
||||
|
|
@ -21,9 +21,23 @@
|
|||
<gearDisplay controller="output" pages="1"/>
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
<list id="n62_ckvb" name="n62" xy="570,-1020" size="200,300" overflow="scroll"/>
|
||||
<list id="n63_ckvb" name="list_resultOut" xy="498,-26" pivot="0.5,0.5" size="1014,210" layout="flow_hz" lineGap="-90" colGap="-101" defaultItem="ui://9n9stu2eckvbcjn" align="right" autoClearItems="true">
|
||||
<list id="n63_ckvb" name="list_resultOut" xy="548,-26" pivot="0.5,0.5" size="1014,210" layout="flow_hz" lineGap="-90" colGap="-101" defaultItem="ui://9n9stu2eckvbcjn" align="right" autoClearItems="true">
|
||||
<gearDisplay controller="resultOut" pages="1"/>
|
||||
<item/>
|
||||
<item/>
|
||||
|
|
@ -61,6 +75,7 @@
|
|||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
</displayList>
|
||||
<transition name="score">
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="1760,157" opaque="false" initName="player_card_info">
|
||||
<controller name="output" homePageType="specific" homePage="1" pages="0,,1,,2," selected="0"/>
|
||||
<controller name="one_card" pages="0,,1," selected="1"/>
|
||||
<controller name="resultOut" pages="0,,1," selected="1"/>
|
||||
<controller name="time_clock" pages="0,,1," selected="1"/>
|
||||
<controller name="output" homePageType="specific" homePage="0" pages="0,,1,,2," selected="0"/>
|
||||
<controller name="one_card" pages="0,,1," selected="0"/>
|
||||
<controller name="resultOut" homePageType="specific" homePage="0" pages="0,,1," selected="1"/>
|
||||
<controller name="time_clock" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
<list id="n53_q9cc" name="hand_card_list" xy="-697,-634" size="445,78" visible="false" layout="row" selectionMode="none" overflow="scroll" lineGap="-15" colGap="-25" defaultItem="ui://9n9stu2eprgz8e" align="right"/>
|
||||
<component id="n59_8yp0" name="out_card_com" src="prgz89" fileName="component/poker/hand_poker_con.xml" xy="-640,-632" size="390,179" visible="false"/>
|
||||
|
|
@ -26,9 +26,18 @@
|
|||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
<list id="n62_ckvb" name="n62" xy="570,-1020" size="200,300" overflow="scroll"/>
|
||||
<list id="n63_ckvb" name="list_resultOut" xy="158,-26" pivot="0.5,0.5" size="1014,210" layout="flow_hz" lineGap="-90" colGap="-101" defaultItem="ui://9n9stu2eckvbcjn" align="center" vAlign="middle">
|
||||
<list id="n63_ckvb" name="list_resultOut" xy="-62,-26" pivot="0.5,0.5" size="1014,210" layout="flow_hz" lineGap="-90" colGap="-101" defaultItem="ui://9n9stu2eckvbcjn" align="center" vAlign="middle">
|
||||
<gearDisplay controller="resultOut" pages="1"/>
|
||||
<item/>
|
||||
<item/>
|
||||
|
|
@ -38,6 +47,14 @@
|
|||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
<component id="n64_n9qr" name="Comp_Clock" src="ckvbcis" fileName="Main_New/Component/Comp_Clock.xml" xy="-138,-6" size="174,143">
|
||||
<gearDisplay controller="time_clock" pages="1"/>
|
||||
|
|
@ -58,7 +75,6 @@
|
|||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
</displayList>
|
||||
<transition name="score">
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="2532,1170" designImageAlpha="100" designImageLayer="1">
|
||||
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="4"/>
|
||||
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="1"/>
|
||||
<controller name="sdk" pages="0,,1," selected="0"/>
|
||||
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
|
||||
<controller name="time" pages="0,,1,,2,,3," selected="1"/>
|
||||
<controller name="time" pages="0,,1,,2,,3," selected="0"/>
|
||||
<controller name="card_eff" pages="0,,1," selected="0"/>
|
||||
<controller name="zidongtishi" pages="0,,1," selected="0"/>
|
||||
<controller name="voice" pages="0,,1," selected="0"/>
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
<gearDisplay controller="state" pages="0,1,2"/>
|
||||
<relation target="" sidePair="center-center"/>
|
||||
</group>
|
||||
<component id="n67_qfrg" name="time" src="prgzer" fileName="component/Clock.xml" xy="-296,2199" scale="1.5,1.5" visible="false" touchable="false">
|
||||
<component id="n67_qfrg" name="time" src="prgzer" fileName="component/Clock.xml" xy="625,198" scale="1.5,1.5" visible="false" touchable="false">
|
||||
<gearDisplay controller="time" pages="1,2,3"/>
|
||||
<gearXY controller="time" pages="1,2" values="-296,2199|2797,1976" default="625,198"/>
|
||||
</component>
|
||||
|
|
@ -88,9 +88,9 @@
|
|||
<group id="n86_q50p" name="n86" xy="124,1734" size="1334,815" advanced="true">
|
||||
<relation target="" sidePair="center-center"/>
|
||||
</group>
|
||||
<component id="n75_jmab" name="poker_eff" src="prgz9k" fileName="component/effect/poker/poker_eff.xml" xy="618,10" touchable="false">
|
||||
<component id="n75_jmab" name="poker_eff" src="prgz9k" fileName="component/effect/poker/poker_eff.xml" xy="1197,469" touchable="false">
|
||||
<gearDisplay controller="card_eff" pages="1"/>
|
||||
<gearXY controller="card_eff" pages="0,1" values="618,10|618,10"/>
|
||||
<gearXY controller="card_eff" pages="0,1" values="1197,469|618,10"/>
|
||||
<gearLook controller="card_eff" default="1,0,0,0"/>
|
||||
</component>
|
||||
<image id="n90_j7ij" name="n90" src="prgzdv" fileName="component/poker/card.png" xy="227,2039" size="169,233" group="n93_eclw" scale="0.6,0.6">
|
||||
|
|
@ -144,15 +144,15 @@
|
|||
<gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
|
||||
<relation target="" sidePair="bottom-bottom"/>
|
||||
</component>
|
||||
<component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="447,178" group="n122_ckvb" touchable="false">
|
||||
<component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="664,177" group="n122_ckvb" scale="0.9,0.9" touchable="false">
|
||||
<gearDisplay controller="state" pages="1,3,4"/>
|
||||
<relation target="n18" sidePair="right-left,middle-middle"/>
|
||||
</component>
|
||||
<component id="n157_11k4t" name="player_card_info_3" src="11k4tcq7" fileName="Main_New/Player_card_info_3.xml" xy="325,178" group="n122_ckvb" touchable="false">
|
||||
<component id="n157_11k4t" name="player_card_info_3" src="11k4tcq7" fileName="Main_New/Player_card_info_3.xml" xy="292,178" group="n122_ckvb" scale="0.9,0.9" touchable="false">
|
||||
<gearDisplay controller="state" pages="1,3,4"/>
|
||||
<relation target="n18" sidePair="right-left,middle-middle"/>
|
||||
</component>
|
||||
<group id="n122_ckvb" name="playCardInfo" xy="126,178" size="2280,991"/>
|
||||
<group id="n122_ckvb" name="playCardInfo" xy="126,177" size="2298,992"/>
|
||||
<component id="n152_n9qr" name="btn_inviteFamily" src="n9qrcly" fileName="Main_new/Main/Component/btn_normol.xml" xy="2404,264" size="129,243">
|
||||
<gearDisplay controller="state" pages="0"/>
|
||||
<relation target="" sidePair="right-right"/>
|
||||
|
|
@ -185,10 +185,11 @@
|
|||
<gearDisplay controller="Inclear" pages="1"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,center-center,top-middle%"/>
|
||||
</component>
|
||||
<component id="n140_ckvb" name="Comp_Clock" src="ckvbcis" fileName="Main_New/Component/Comp_Clock.xml" xy="729,667" visible="false">
|
||||
<component id="n140_ckvb" name="Comp_Clock" src="ckvbcis" fileName="Main_New/Component/Comp_Clock.xml" xy="388,492" visible="false">
|
||||
<gearDisplay controller="time" pages="1,2,3"/>
|
||||
<gearXY controller="time" pages="1,2" values="729,667|2133,159" default="388,492"/>
|
||||
</component>
|
||||
<component id="n166_f11o" name="n166" src="prgz9k" fileName="component/effect/poker/poker_eff.xml" xy="1201,489" visible="false"/>
|
||||
<component id="n130_ckvb" name="btn_pangGuang" src="ckvbcjf" fileName="Main_New/Component/Btn_Spectator.xml" xy="597,23" size="90,76" group="n131_ckvb">
|
||||
<relation target="" sidePair="right-center%,top-top"/>
|
||||
</component>
|
||||
|
|
@ -274,4 +275,27 @@
|
|||
<item time="0" type="XY" target="n75_jmab" tween="true" startValue="618,0" endValue="150,250" duration="18"/>
|
||||
<item time="18" type="Alpha" target="n75_jmab" tween="true" startValue="1" endValue="0" duration="6"/>
|
||||
</transition>
|
||||
<transition name="to_1">
|
||||
<item time="0" type="Rotation" target="n166_f11o" value="0"/>
|
||||
<item time="0" type="Visible" target="n166_f11o" value="true"/>
|
||||
<item time="0" type="XY" target="n166_f11o" value="1201,489"/>
|
||||
<item time="6" type="XY" target="n166_f11o" tween="true" startValue="1201,489" endValue="1201,909" duration="18" ease="Linear"/>
|
||||
<item time="24" type="Visible" target="n166_f11o" value="false"/>
|
||||
</transition>
|
||||
<transition name="to_2">
|
||||
<item time="0" type="Rotation" target="n166_f11o" value="0"/>
|
||||
<item time="0" type="Visible" target="n166_f11o" value="true"/>
|
||||
<item time="0" type="XY" target="n166_f11o" value="1201,489"/>
|
||||
<item time="6" type="Rotation" target="n166_f11o" value="-90"/>
|
||||
<item time="6" type="XY" target="n166_f11o" tween="true" startValue="1201,669" endValue="2276,213" duration="18" ease="Linear"/>
|
||||
<item time="24" type="Visible" target="n166_f11o" value="false"/>
|
||||
</transition>
|
||||
<transition name="to_3">
|
||||
<item time="0" type="Rotation" target="n166_f11o" value="0"/>
|
||||
<item time="0" type="Visible" target="n166_f11o" value="true"/>
|
||||
<item time="0" type="XY" target="n166_f11o" value="1201,489"/>
|
||||
<item time="6" type="Rotation" target="n166_f11o" value="90"/>
|
||||
<item time="6" type="XY" target="n166_f11o" tween="true" startValue="1401,489" endValue="251,77" duration="18" ease="Linear"/>
|
||||
<item time="24" type="Visible" target="n166_f11o" value="false"/>
|
||||
</transition>
|
||||
</component>
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="129,191" extention="Button">
|
||||
<displayList>
|
||||
<component id="n5_jmab" name="poker" src="rqeb3o" xy="0,0" pivot="0.5,0.5" pkg="823o5jy4"/>
|
||||
<image id="n6_jmab" name="di" src="epn6ac" pkg="lx6k641g" xy="0,0" pivot="0.5,0.5"/>
|
||||
<component id="n7_f11o" name="n7" src="ckvbcjp" fileName="Main_New/Component/Btn_SelfCard.xml" xy="-74,-68">
|
||||
<Button icon="ui://Main_Poker/403"/>
|
||||
</component>
|
||||
</displayList>
|
||||
<Button mode="Check"/>
|
||||
</component>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="129,191" extention="Button">
|
||||
<displayList>
|
||||
<component id="n5_jmab" name="poker" src="rqeb3o" xy="0,0" pivot="0.5,0.5" pkg="823o5jy4"/>
|
||||
<image id="n6_jmab" name="di" src="epn6ac" pkg="lx6k641g" xy="0,0" pivot="0.5,0.5"/>
|
||||
</displayList>
|
||||
<Button mode="Check"/>
|
||||
</component>
|
||||
|
|
@ -706,6 +706,7 @@
|
|||
<component id="bgcftcrg" name="comp_checkCardOne.xml" path="/Main_New/Component/"/>
|
||||
<image id="bgcftcrh" name="checkthiscard.png" path="/Main_New/Component/"/>
|
||||
<component id="bgcftcri" name="comp_checkCard.xml" path="/Main_New/Component/"/>
|
||||
<component id="f11otcrj" name="poker_eff_three.xml" path="/component/effect/poker/" exported="true"/>
|
||||
</resources>
|
||||
<publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
|
||||
</packageDescription>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 165 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB |
|
|
@ -1,10 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="1178,798">
|
||||
<displayList>
|
||||
<image id="n0_bgcf" name="n0" src="bgcft7d7d" fileName="FamilyNotice/Image/bg.png" xy="12,31" size="1155,766"/>
|
||||
<image id="n1_bgcf" name="n1" src="bgcft7d7e" fileName="FamilyNotice/Image/title_top.png" xy="0,0" size="1178,128"/>
|
||||
<component id="n2_bgcf" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1090,-29" size="122,130" aspect="true"/>
|
||||
<text id="n3_bgcf" name="title" xy="32,5" size="1049,101" font="Alibaba PuHuiTi 3.0" fontSize="68" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" shadowColor="#000000" shadowOffset="1,1" text="公告"/>
|
||||
<image id="n7_bgcf" name="n7" src="bgcft7d7g" fileName="FamilyNotice/Image/bg_familyNotice.png" xy="0,0" size="1178,798"/>
|
||||
<image id="n8_bgcf" name="n8" src="bgcft7d7i" fileName="FamilyNotice/Image/title_familyNotice.png" xy="495,15" size="186,66"/>
|
||||
<component id="n2_bgcf" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1090,-29" size="122,130" aspect="true">
|
||||
<Button icon="ui://htcn7v3rbgcft7d7h"/>
|
||||
</component>
|
||||
<text id="n6_bgcf" name="text_familyName" xy="68,122" size="1049,101" font="Arial" fontSize="46" color="#61270f" align="center" vAlign="middle" autoSize="none" text="公告"/>
|
||||
<component id="n5_bgcf" name="label_detial" src="bgcft7d7f" fileName="FamilyNotice/Component/label_tipText.xml" xy="72,225" size="1034,550"/>
|
||||
</displayList>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="310,120" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
|
||||
<controller name="cRedPoint" pages="0,,1," selected="0">
|
||||
<controller name="cRedPoint" pages="0,,1," selected="1">
|
||||
<remark page="1" value="开启红点"/>
|
||||
</controller>
|
||||
<displayList>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="310,120" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
|
||||
<controller name="cRedPoint" pages="0,,1," selected="0">
|
||||
<remark page="1" value="开启红点"/>
|
||||
</controller>
|
||||
<displayList>
|
||||
<image id="n3_f11o" name="n3" src="f11ot7d7j" fileName="MyFamily/Image/chakan.png" xy="-2,0" size="310,120"/>
|
||||
<image id="n1_icft" name="n1" src="icft7d63" fileName="Main/Image/Group 687.png" xy="255,-18">
|
||||
<gearDisplay controller="cRedPoint" pages="1"/>
|
||||
</image>
|
||||
<text id="n2_icft" name="tex_redPoint" xy="255,-18" size="58,58" font="ui://27vd145bh35o7ilb" fontSize="43" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" text="20">
|
||||
<gearDisplay controller="cRedPoint" pages="1"/>
|
||||
</text>
|
||||
</displayList>
|
||||
<Button downEffect="dark" downEffectValue="0.9"/>
|
||||
</component>
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="1980,234">
|
||||
<controller name="groupLev" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
<image id="n0_yk1o" name="n0" src="yk1o7d3r" fileName="MyFamily/Image/Rectangle 259.png" xy="0,0" size="1980,249">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
|
|
@ -15,9 +16,18 @@
|
|||
<group id="n10_q3uh" name="n10" xy="30,24" size="837,186" advanced="true">
|
||||
<relation target="" sidePair="left-left"/>
|
||||
</group>
|
||||
<component id="n3_yk1o" name="btn_rank" src="yk1o7d3x" fileName="MyFamily/Component/btn_familyRank.xml" xy="912,57" group="n11_q3uh"/>
|
||||
<component id="n4_yk1o" name="btn_record" src="yk1o7d3y" fileName="MyFamily/Component/btn_familyRecord.xml" xy="1299,57" group="n11_q3uh"/>
|
||||
<component id="n5_yk1o" name="btn_familyManage" src="yk1o7d3z" fileName="MyFamily/Component/btn_familyManage.xml" xy="1623,57" group="n11_q3uh"/>
|
||||
<component id="n3_yk1o" name="btn_rank" src="yk1o7d3x" fileName="MyFamily/Component/btn_familyRank.xml" xy="912,57" group="n11_q3uh">
|
||||
<gearDisplay controller="groupLev" pages="1"/>
|
||||
</component>
|
||||
<component id="n4_yk1o" name="btn_record" src="yk1o7d3y" fileName="MyFamily/Component/btn_familyRecord.xml" xy="1299,57" group="n11_q3uh">
|
||||
<gearDisplay controller="groupLev" pages="1"/>
|
||||
</component>
|
||||
<component id="n5_yk1o" name="btn_familyManage" src="yk1o7d3z" fileName="MyFamily/Component/btn_familyManage.xml" xy="1623,57" group="n11_q3uh">
|
||||
<gearDisplay controller="groupLev" pages="1"/>
|
||||
</component>
|
||||
<component id="n12_f11o" name="btn_familyManage2" src="f11ot7d7k" fileName="MyFamily/Component/btn_familyManage2.xml" xy="1623,57" group="n11_q3uh">
|
||||
<gearDisplay controller="groupLev" pages="0"/>
|
||||
</component>
|
||||
<group id="n11_q3uh" name="n11" xy="912,57" size="1021,120" advanced="true">
|
||||
<relation target="" sidePair="right-right"/>
|
||||
</group>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
|
|
@ -23,7 +23,7 @@
|
|||
<relation target="" sidePair="center-center"/>
|
||||
</richtext>
|
||||
<component id="n5_lgoh" name="box_mumberTime" src="ghku7d4d" fileName="Record/Component/combBox_time.xml" xy="124,174" size="439,73" group="n11_lgoh">
|
||||
<ComboBox visibleItemCount="10"/>
|
||||
<ComboBox visibleItemCount="10" selectionController="day"/>
|
||||
</component>
|
||||
<text id="n6_lgoh" name="text_numberRecordTime" xy="113,255" size="440,56" group="n11_lgoh" font="ui://27vd145bh35o7im7" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="2025-03-21 14:30:23"/>
|
||||
<component id="n7_lgoh" name="btn_numberRecordHead" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="1162,221" size="144,144" group="n11_lgoh"/>
|
||||
|
|
|
|||
|
|
@ -430,9 +430,12 @@
|
|||
<image id="bgcft7d7a" name="jiesanqinyouquan.png" path="/MyFamily/Image/"/>
|
||||
<component id="bgcft7d7b" name="btn_jiesanFamily.xml" path="/MyFamily/Component/"/>
|
||||
<component id="bgcft7d7c" name="com_FamilyNotice.xml" path="/FamilyNotice/" exported="true"/>
|
||||
<image id="bgcft7d7d" name="bg.png" path="/FamilyNotice/Image/" scale="9grid" scale9grid="14,135,28,270"/>
|
||||
<image id="bgcft7d7e" name="title_top.png" path="/FamilyNotice/Image/" scale="9grid" scale9grid="160,22,320,44"/>
|
||||
<component id="bgcft7d7f" name="label_tipText.xml" path="/FamilyNotice/Component/"/>
|
||||
<image id="bgcft7d7g" name="bg_familyNotice.png" path="/FamilyNotice/Image/"/>
|
||||
<image id="bgcft7d7h" name="btn_close_familyNotice.png" path="/FamilyNotice/Image/"/>
|
||||
<image id="bgcft7d7i" name="title_familyNotice.png" path="/FamilyNotice/Image/"/>
|
||||
<image id="f11ot7d7j" name="chakan.png" path="/MyFamily/Image/"/>
|
||||
<component id="f11ot7d7k" name="btn_familyManage2.xml" path="/MyFamily/Component/"/>
|
||||
</resources>
|
||||
<publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
|
||||
</packageDescription>
|
||||
|
|
@ -55,16 +55,17 @@
|
|||
<relation target="" sidePair="right-right%,top-top%"/>
|
||||
</component>
|
||||
<group id="n111_ker3" name="menu_top" xy="2149,6" size="358,96"/>
|
||||
<component id="n176_isi5" name="btn_customerService" src="isi57cny" fileName="component/Main/Component/right/btn_customerService.xml" xy="2336,422" group="n123_g8kk">
|
||||
<component id="n176_isi5" name="btn_customerService" src="isi57cny" fileName="component/Main/Component/right/btn_customerService.xml" xy="2340,422" group="n123_g8kk">
|
||||
<relation target="" sidePair="right-right%,top-top%"/>
|
||||
</component>
|
||||
<component id="n177_isi5" name="btn_invite" src="isi57cnx" fileName="component/Main/Component/right/btn_invite.xml" xy="2336,257" group="n123_g8kk">
|
||||
<relation target="" sidePair="right-right%,top-top%"/>
|
||||
</component>
|
||||
<component id="n204_bgcf" name="btn_giftDiamond" src="66fw7d75" fileName="component/Record/Component/btn_normol.xml" xy="2336,584" size="160,139" group="n123_g8kk" visible="false">
|
||||
<relation target="" sidePair="right-right%,top-top%"/>
|
||||
<Button icon="ui://2d9xdj6zbgcf7jg5"/>
|
||||
</component>
|
||||
<group id="n123_g8kk" name="menu_right" xy="2336,257" size="161,466"/>
|
||||
<group id="n123_g8kk" name="menu_right" xy="2336,257" size="164,466"/>
|
||||
<component id="n178_isi5" name="btn_more" src="isi57co9" fileName="component/Main/Component/left/btn_more.xml" xy="-4,482" group="n125_g8kk">
|
||||
<relation target="" sidePair="middle-middle,left-left"/>
|
||||
</component>
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 4.6 MiB After Width: | Height: | Size: 1.4 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.0 MiB After Width: | Height: | Size: 3.8 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 484 KiB After Width: | Height: | Size: 1.6 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 716 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 274 KiB After Width: | Height: | Size: 849 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 274 KiB |
|
|
@ -0,0 +1,92 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 54624e6dd78c82149bc3c78aa45e0f4f
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: -1
|
||||
wrapV: -1
|
||||
wrapW: -1
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
applyGammaDecoding: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,41 +1,41 @@
|
|||
[
|
||||
{
|
||||
"ver": "1.0.42",
|
||||
"ver": "1.0.43",
|
||||
"name": "跑得快",
|
||||
"check": true,
|
||||
"version": "1.0.42",
|
||||
"version": "1.0.43",
|
||||
"game_id": "66",
|
||||
"bundle": "extend/poker/runfast"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.60",
|
||||
"ver": "1.0.61",
|
||||
"name": "南城麻将",
|
||||
"check": true,
|
||||
"version": "1.0.60",
|
||||
"version": "1.0.61",
|
||||
"game_id": "86",
|
||||
"bundle": "extend/majiang/nancheng"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.63",
|
||||
"ver": "1.0.64",
|
||||
"name": "黎川麻将",
|
||||
"check": true,
|
||||
"version": "1.0.63",
|
||||
"version": "1.0.64",
|
||||
"game_id": "87",
|
||||
"bundle": "extend/majiang/lichuan"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.47",
|
||||
"ver": "1.0.48",
|
||||
"name": "金溪麻将",
|
||||
"check": true,
|
||||
"version": "1.0.47",
|
||||
"version": "1.0.48",
|
||||
"game_id": "88",
|
||||
"bundle": "extend/majiang/jinxi"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.46",
|
||||
"ver": "1.0.47",
|
||||
"name": "抚州麻将",
|
||||
"check": true,
|
||||
"version": "1.0.46",
|
||||
"version": "1.0.47",
|
||||
"game_id": "89",
|
||||
"bundle": "extend/majiang/fuzhou"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,109 +1,109 @@
|
|||
[
|
||||
{
|
||||
"lua_path": "/tolua_project,/base_project,/main_project",
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "base_script",
|
||||
"check": true,
|
||||
"bundle": "base/base_script",
|
||||
"version": "1.0.9"
|
||||
"version": "1.0.11"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "common",
|
||||
"check": true,
|
||||
"bundle": "base/common",
|
||||
"version": "1.0.9"
|
||||
"version": "1.0.11"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "login",
|
||||
"check": true,
|
||||
"bundle": "base/login",
|
||||
"version": "1.0.9"
|
||||
"version": "1.0.11"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "lobby",
|
||||
"check": true,
|
||||
"bundle": "base/lobby",
|
||||
"version": "1.0.9"
|
||||
"version": "1.0.11"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "Family",
|
||||
"check": true,
|
||||
"bundle": "base/Family",
|
||||
"version": "1.0.9"
|
||||
"version": "1.0.11"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "chat",
|
||||
"check": true,
|
||||
"bundle": "base/chat",
|
||||
"version": "1.0.9"
|
||||
"version": "1.0.11"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "newgroup",
|
||||
"check": true,
|
||||
"bundle": "base/newgroup",
|
||||
"version": "1.0.9"
|
||||
"version": "1.0.11"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "rank",
|
||||
"check": true,
|
||||
"version": "1.0.9",
|
||||
"version": "1.0.11",
|
||||
"bundle": "base/rank"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "main_majiang",
|
||||
"check": true,
|
||||
"version": "1.0.9",
|
||||
"version": "1.0.11",
|
||||
"bundle": "base/main_majiang"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "main_poker",
|
||||
"check": true,
|
||||
"version": "1.0.9",
|
||||
"version": "1.0.11",
|
||||
"bundle": "base/main_poker"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "main_zipai",
|
||||
"check": true,
|
||||
"version": "1.0.9",
|
||||
"version": "1.0.11",
|
||||
"bundle": "base/main_zipai"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "static",
|
||||
"check": true,
|
||||
"bundle": "base/static",
|
||||
"version": "1.0.9"
|
||||
"version": "1.0.11"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"is_res": true,
|
||||
"name": "embed",
|
||||
"check": true,
|
||||
"bundle": "base/embed",
|
||||
"version": "1.0.9"
|
||||
"version": "1.0.11"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "main_pokemajiang",
|
||||
"check": true,
|
||||
"version": "1.0.9",
|
||||
"version": "1.0.11",
|
||||
"bundle": "base/main_pokemajiang"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.9",
|
||||
"ver": "1.0.11",
|
||||
"name": "main_zipaimajiang",
|
||||
"check": true,
|
||||
"version": "1.0.9",
|
||||
"version": "1.0.11",
|
||||
"bundle": "base/main_zipaimajiang"
|
||||
}
|
||||
]
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue