人物动画修改
|
|
@ -458,7 +458,7 @@ function M:InitClip()
|
||||||
local puke = self._view:GetChild('btn_ChuangJian')
|
local puke = self._view:GetChild('btn_ChuangJian')
|
||||||
local pukeIndex = 0
|
local pukeIndex = 0
|
||||||
|
|
||||||
local jiangbeiEnd = 150
|
local jiangbeiEnd = 149
|
||||||
local jiangbeiName = "ui://Lobby/jiangbei_00"
|
local jiangbeiName = "ui://Lobby/jiangbei_00"
|
||||||
local jiangbei = self._view:GetChild('btn_more_group')
|
local jiangbei = self._view:GetChild('btn_more_group')
|
||||||
local jiangbeiIndex = 0
|
local jiangbeiIndex = 0
|
||||||
|
|
@ -471,12 +471,12 @@ function M:InitClip()
|
||||||
coroutine.start(
|
coroutine.start(
|
||||||
function()
|
function()
|
||||||
while true do
|
while true do
|
||||||
taohuaIndex = self:ReplaceClip1(taohuaEnd, taohua, taohuaIndex, taohuaName)
|
-- taohuaIndex = self:ReplaceClip1(taohuaEnd, taohua, taohuaIndex, taohuaName)
|
||||||
renwuIndex = self:ReplaceClip1(renwuEnd, renwu, renwuIndex, renwuName)
|
renwuIndex = self:ReplaceClip1(renwuEnd, renwu, renwuIndex, renwuName)
|
||||||
-- pukeIndex = self:ReplaceClip2(pukeEnd, puke, pukeIndex, pukeName)
|
-- pukeIndex = self:ReplaceClip2(pukeEnd, puke, pukeIndex, pukeName)
|
||||||
jiangbeiIndex = self:ReplaceClip2(jiangbeiEnd, jiangbei, jiangbeiIndex, jiangbeiName)
|
-- jiangbeiIndex = self:ReplaceClip2(jiangbeiEnd, jiangbei, jiangbeiIndex, jiangbeiName)
|
||||||
-- hechengIndex = self:ReplaceClip2(hechengEnd, hecheng, hechengIndex, hechengName)
|
-- hechengIndex = self:ReplaceClip2(hechengEnd, hecheng, hechengIndex, hechengName)
|
||||||
coroutine.wait(0.01)
|
coroutine.wait(0.060)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
)
|
)
|
||||||
|
|
@ -487,7 +487,7 @@ function M:ReplaceClip1(e, t, i, n)
|
||||||
i = 0
|
i = 0
|
||||||
end
|
end
|
||||||
t.url = string.format("%s%03d", n, i)
|
t.url = string.format("%s%03d", n, i)
|
||||||
return i + 1
|
return i + 2
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:ReplaceClip2(e, t, i, n)
|
function M:ReplaceClip2(e, t, i, n)
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@ local GroupManagerView = {}
|
||||||
local M = GroupManagerView
|
local M = GroupManagerView
|
||||||
|
|
||||||
function GroupManagerView.new(blur_view, gid, btn_type, callback)
|
function GroupManagerView.new(blur_view, gid, btn_type, callback)
|
||||||
setmetatable(M, {__index = BaseWindow})
|
setmetatable(M, { __index = BaseWindow })
|
||||||
local self = setmetatable({}, {__index = M})
|
local self = setmetatable({}, { __index = M })
|
||||||
self.class = "GroupManagerView"
|
self.class = "GroupManagerView"
|
||||||
-- self._close_destroy = true
|
-- self._close_destroy = true
|
||||||
self._put_map = false
|
self._put_map = false
|
||||||
self._new_hide = false
|
self._new_hide = false
|
||||||
self._queue = false
|
self._queue = false
|
||||||
self._full = true
|
self._full = false
|
||||||
self._animation = false
|
self._animation = false
|
||||||
self._blur_view = blur_view
|
self._blur_view = blur_view
|
||||||
self.group_id = gid
|
self.group_id = gid
|
||||||
|
|
@ -26,7 +26,7 @@ end
|
||||||
-- 获取界面配置
|
-- 获取界面配置
|
||||||
local function getPageConfig(id)
|
local function getPageConfig(id)
|
||||||
--pt(MngPageConfig.PageList)
|
--pt(MngPageConfig.PageList)
|
||||||
for i=1,#MngPageConfig.PageList do
|
for i = 1, #MngPageConfig.PageList do
|
||||||
local tem = MngPageConfig.PageList[i]
|
local tem = MngPageConfig.PageList[i]
|
||||||
if tem.id == id then
|
if tem.id == id then
|
||||||
return tem
|
return tem
|
||||||
|
|
@ -35,7 +35,7 @@ local function getPageConfig(id)
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:init(url, btn_type)
|
function M:init(url, btn_type)
|
||||||
BaseWindow.init(self,url)
|
BaseWindow.init(self, url)
|
||||||
self.titleTxt = self._view:GetChild("n79")
|
self.titleTxt = self._view:GetChild("n79")
|
||||||
-- if btn_type == 2 then
|
-- if btn_type == 2 then
|
||||||
-- self._view:GetChild("n0"):GetChild("icon").url = "ui://m7iejg46p41ohx8"
|
-- self._view:GetChild("n0"):GetChild("icon").url = "ui://m7iejg46p41ohx8"
|
||||||
|
|
@ -102,10 +102,10 @@ function M:init(url, btn_type)
|
||||||
anchor:AddChild(gmsv._view)
|
anchor:AddChild(gmsv._view)
|
||||||
--printlog("tttttttttttttttttttttt :" , gmsv._view.displayObject.gameObject.name," ",gmsv._view.parent.displayObject.gameObject.name)
|
--printlog("tttttttttttttttttttttt :" , gmsv._view.displayObject.gameObject.name," ",gmsv._view.parent.displayObject.gameObject.name)
|
||||||
--gmsv._view:AddRelation(anchor, RelationType.Size)
|
--gmsv._view:AddRelation(anchor, RelationType.Size)
|
||||||
local offset = get_offset(self._full_offset)
|
-- local offset = get_offset(self._full_offset)
|
||||||
gmsv._view.width = GRoot.inst.width - 2 * offset - first_page_config.anchorOffset
|
-- gmsv._view.width = GRoot.inst.width - 2 * offset - first_page_config.anchorOffset
|
||||||
gmsv._view.height = GRoot.inst.height
|
-- gmsv._view.height = GRoot.inst.height
|
||||||
gmsv._view.x = 0--offset
|
-- gmsv._view.x = 0 --offset
|
||||||
|
|
||||||
-- first_page_config = getPageConfig(self.page_config[2])
|
-- first_page_config = getPageConfig(self.page_config[2])
|
||||||
-- gmsv = first_page_config.view.new(self.group_id, self._root_view)
|
-- gmsv = first_page_config.view.new(self.group_id, self._root_view)
|
||||||
|
|
@ -138,7 +138,6 @@ function M:init(url, btn_type)
|
||||||
local index = self.ctr_index.selectedIndex
|
local index = self.ctr_index.selectedIndex
|
||||||
local page_info = getPageConfig(self.page_config[index + 1])
|
local page_info = getPageConfig(self.page_config[index + 1])
|
||||||
if not self._view_map[index + 1] then
|
if not self._view_map[index + 1] then
|
||||||
|
|
||||||
local tem = page_info.view.new(self.group_id, self._root_view)
|
local tem = page_info.view.new(self.group_id, self._root_view)
|
||||||
|
|
||||||
-- anchor:AddRelation(self._root_view, RelationType.Size,true)
|
-- anchor:AddRelation(self._root_view, RelationType.Size,true)
|
||||||
|
|
@ -151,7 +150,7 @@ function M:init(url, btn_type)
|
||||||
local offset = get_offset(self._full_offset)
|
local offset = get_offset(self._full_offset)
|
||||||
tem._view.width = GRoot.inst.width - 2 * offset - page_info.anchorOffset
|
tem._view.width = GRoot.inst.width - 2 * offset - page_info.anchorOffset
|
||||||
tem._view.height = GRoot.inst.height
|
tem._view.height = GRoot.inst.height
|
||||||
tem._view.x = 0--offset
|
tem._view.x = 0 --offset
|
||||||
--tem._view:AddRelation(self._root_view, RelationType.Size)
|
--tem._view:AddRelation(self._root_view, RelationType.Size)
|
||||||
-- tem._view:MakeFullScreen()
|
-- tem._view:MakeFullScreen()
|
||||||
|
|
||||||
|
|
@ -176,12 +175,10 @@ function M:init(url, btn_type)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
function M:SetCurrentGroupInfoViewIns(groupInfoViewCallBack)
|
function M:SetCurrentGroupInfoViewIns(groupInfoViewCallBack)
|
||||||
self.groupInfoViewCallBack=groupInfoViewCallBack
|
self.groupInfoViewCallBack = groupInfoViewCallBack
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
-- 获取指定ID的页面
|
-- 获取指定ID的页面
|
||||||
function M:GetPageByID(id)
|
function M:GetPageByID(id)
|
||||||
for i, v in pairs(self._view_map) do
|
for i, v in pairs(self._view_map) do
|
||||||
|
|
@ -221,7 +218,7 @@ end
|
||||||
-- quick_access_id 是快速访问标志,打开对应id的页面
|
-- quick_access_id 是快速访问标志,打开对应id的页面
|
||||||
function M:Show(quick_access_id)
|
function M:Show(quick_access_id)
|
||||||
local index = self.ctr_index.selectedIndex
|
local index = self.ctr_index.selectedIndex
|
||||||
printlog("index+1index+1index+1index+1 ",index+1)
|
printlog("index+1index+1index+1index+1 ", index + 1)
|
||||||
if not quick_access_id then
|
if not quick_access_id then
|
||||||
local page_info = getPageConfig(self.page_config[index + 1])
|
local page_info = getPageConfig(self.page_config[index + 1])
|
||||||
if page_info.refresh then self._view_map[index + 1]:initData() end
|
if page_info.refresh then self._view_map[index + 1]:initData() end
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,8 @@ ui://v2hilfzbgq7mbt
|
||||||
ui://v2hilfzbgq7mbs
|
ui://v2hilfzbgq7mbs
|
||||||
ui://v2hilfzbgq7m2k
|
ui://v2hilfzbgq7m2k
|
||||||
ui://v2hilfzbgq7ml
|
ui://v2hilfzbgq7ml
|
||||||
|
ui://ppu1wv7699we4s
|
||||||
|
ui://ppu1wv7699we2l
|
||||||
ui://oubpz2r2ofil78
|
ui://oubpz2r2ofil78
|
||||||
ui://oubpz2r2ofil77
|
ui://oubpz2r2ofil77
|
||||||
ui://9n9stu2enaueci9
|
ui://9n9stu2enaueci9
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,9 @@
|
||||||
"n68_joap": {
|
"n68_joap": {
|
||||||
"hidden": true
|
"hidden": true
|
||||||
},
|
},
|
||||||
|
"n28_r8m8": {
|
||||||
|
"collapsed": true
|
||||||
|
},
|
||||||
"n67_joap": {
|
"n67_joap": {
|
||||||
"hidden": true
|
"hidden": true
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,22 @@
|
||||||
"n69_jd7v": {
|
"n69_jd7v": {
|
||||||
"hidden": true
|
"hidden": true
|
||||||
},
|
},
|
||||||
|
"n86_t1hq": {
|
||||||
|
"hidden": true
|
||||||
|
},
|
||||||
"n113_csp4": {
|
"n113_csp4": {
|
||||||
"hidden": true
|
"hidden": true
|
||||||
},
|
},
|
||||||
"n86_t1hq": {
|
"n33_rpaz": {
|
||||||
|
"hidden": true
|
||||||
|
},
|
||||||
|
"n35_rpaz": {
|
||||||
|
"hidden": true
|
||||||
|
},
|
||||||
|
"n89_t1hq": {
|
||||||
|
"collapsed": true
|
||||||
|
},
|
||||||
|
"n88_t1hq": {
|
||||||
"hidden": true
|
"hidden": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,16 @@
|
||||||
"n58_ocx0": {
|
"n58_ocx0": {
|
||||||
"hidden": true
|
"hidden": true
|
||||||
},
|
},
|
||||||
|
"n57_ocx0": {
|
||||||
|
"hidden": true
|
||||||
|
},
|
||||||
"n26_kwi0": {
|
"n26_kwi0": {
|
||||||
"collapsed": true
|
"collapsed": true
|
||||||
},
|
},
|
||||||
"n44_rpaz": {
|
"n44_rpaz": {
|
||||||
"collapsed": true
|
"collapsed": true
|
||||||
},
|
},
|
||||||
"n57_ocx0": {
|
"n72_mtk5": {
|
||||||
"hidden": true
|
"hidden": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"libview.firstColumnWidth": 297,
|
"libview.firstColumnWidth": 522,
|
||||||
"expanded_nodes": [
|
"expanded_nodes": [
|
||||||
"27vd145b",
|
"27vd145b",
|
||||||
"/",
|
"/",
|
||||||
|
|
@ -10,29 +10,22 @@
|
||||||
"doc.openedDocs": [
|
"doc.openedDocs": [
|
||||||
"ui://m7iejg4610snh5j",
|
"ui://m7iejg4610snh5j",
|
||||||
"ui://2d9xdj6zfn7fao",
|
"ui://2d9xdj6zfn7fao",
|
||||||
"ui://2d9xdj6zker3jg",
|
|
||||||
"ui://m7iejg46hsbhhjn",
|
"ui://m7iejg46hsbhhjn",
|
||||||
"ui://v6yvqp7wf55qwa",
|
|
||||||
"ui://v6yvqp7wf55qvx",
|
|
||||||
"ui://m7iejg46r0qx7i6v"
|
"ui://m7iejg46r0qx7i6v"
|
||||||
],
|
],
|
||||||
"packageGroup.mine": [],
|
"packageGroup.mine": [],
|
||||||
"test.device": "720p Phone",
|
"test.device": "720p Phone",
|
||||||
"canvasColor": 10066329,
|
"canvasColor": 10066329,
|
||||||
"auxline2": true,
|
"auxline2": true,
|
||||||
"doc.activeDoc": "ui://v6yvqp7wf55qvx",
|
"doc.activeDoc": "ui://m7iejg46r0qx7i6v",
|
||||||
"libview.twoColumn": false,
|
"libview.twoColumn": false,
|
||||||
"libview.expandedNodes": [
|
"libview.expandedNodes": [
|
||||||
"v6yvqp7w",
|
"m7iejg46",
|
||||||
"/",
|
"/",
|
||||||
"v6yvqp7w",
|
"m7iejg46",
|
||||||
"/component/",
|
"/images/",
|
||||||
"v6yvqp7w",
|
"m7iejg46",
|
||||||
"/component/Main/",
|
"/images/bxx/"
|
||||||
"v6yvqp7w",
|
|
||||||
"/component/Main/images/",
|
|
||||||
"v6yvqp7w",
|
|
||||||
"/component/niao/"
|
|
||||||
],
|
],
|
||||||
"auxline1": true,
|
"auxline1": true,
|
||||||
"snapToGrid": true,
|
"snapToGrid": true,
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 872 KiB |
|
Before Width: | Height: | Size: 910 KiB |
|
Before Width: | Height: | Size: 927 KiB |
|
Before Width: | Height: | Size: 926 KiB |
|
Before Width: | Height: | Size: 959 KiB |
|
Before Width: | Height: | Size: 968 KiB |
|
Before Width: | Height: | Size: 965 KiB |
|
Before Width: | Height: | Size: 978 KiB |
|
Before Width: | Height: | Size: 987 KiB |
|
Before Width: | Height: | Size: 962 KiB |
|
Before Width: | Height: | Size: 998 KiB |
|
Before Width: | Height: | Size: 1001 KiB |
|
Before Width: | Height: | Size: 1008 KiB |
|
Before Width: | Height: | Size: 1020 KiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.2 MiB |