diff --git a/fk101/EasyHook.dll b/fk101/EasyHook.dll new file mode 100644 index 00000000..d0f5cfda Binary files /dev/null and b/fk101/EasyHook.dll differ diff --git a/fk101/emmy_core.dll b/fk101/emmy_core.dll new file mode 100644 index 00000000..4376aeb3 Binary files /dev/null and b/fk101/emmy_core.dll differ diff --git a/fk101/emmy_hook.dll b/fk101/emmy_hook.dll new file mode 100644 index 00000000..2d1dec0b Binary files /dev/null and b/fk101/emmy_hook.dll differ diff --git a/fk101/emmy_tool.exe b/fk101/emmy_tool.exe new file mode 100644 index 00000000..605e9a91 Binary files /dev/null and b/fk101/emmy_tool.exe differ diff --git a/fk101/lua_probject/.vscode/launch.json b/fk101/lua_probject/.vscode/launch.json index 8191125a..0a9c9756 100644 --- a/fk101/lua_probject/.vscode/launch.json +++ b/fk101/lua_probject/.vscode/launch.json @@ -111,6 +111,15 @@ ], "port": 7003, "printType": 1 - } + }, + { + "type": "emmylua_new", + "request": "launch", + "name": "EmmyLua-Debug", + "host": "localhost", + "port": 9966, + "ext": ["lua", "lua.txt", "lua.bytes"], + "ideConnectDebugger": false + } ] } \ No newline at end of file diff --git a/fk101/lua_probject/base_project/Game/View/LobbyView.lua b/fk101/lua_probject/base_project/Game/View/LobbyView.lua index b7cff20b..e7a943be 100644 --- a/fk101/lua_probject/base_project/Game/View/LobbyView.lua +++ b/fk101/lua_probject/base_project/Game/View/LobbyView.lua @@ -154,7 +154,7 @@ function M:InitView(url) --[[btn_service.onClick:Set(function() self:__show_service() end)--]] - btn_service.displayObject.gameObject:SetActive(false) + -- btn_service.displayObject.gameObject:SetActive(false) self.groupMainView = GroupMainView.new(self._view:GetChild("group"),self._root_view,self._view) diff --git a/fk101/lua_probject/base_project/Game/View/LoginView.lua b/fk101/lua_probject/base_project/Game/View/LoginView.lua index 24c24796..dd5ceda7 100644 --- a/fk101/lua_probject/base_project/Game/View/LoginView.lua +++ b/fk101/lua_probject/base_project/Game/View/LoginView.lua @@ -10,6 +10,7 @@ function LoginView.new() local self = setmetatable({}, {__index = M}) self.class = "LoginView" self._full = true + self._full_offset = false self:init() return self end diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index bf741864..54eeb89e 100644 --- a/fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -1084,8 +1084,9 @@ function M:InitView(url) if not room then return end - pt(self.curGroup:getPlay(room.pid)) - return ROOM_ITEM[(self.curGroup:getPlay(room.pid).gameId%10)%6+1 ] + -- pt(self.curGroup:getPlay(room.pid)) + -- return ROOM_ITEM[(self.curGroup:getPlay(room.pid).gameId%10)%6+1 ] + return ROOM_ITEM[self.curGroup:getPlay(room.pid).gameType or 1] end self.lst_room.fairyBatching = true @@ -1138,9 +1139,9 @@ function M:InitView(url) function () self.lstgameVisible = not self.lstgameVisible if (self.lstgameVisible) then - self.lst_game:TweenMove(Vector2.New(3,100), 0.3) + self.lst_game:TweenMove(Vector2.New(3,194), 0.3) else - self.lst_game:TweenMove(Vector2.New(3,760), 0.3) + self.lst_game:TweenMove(Vector2.New(3,1170), 0.3) end end diff --git a/fk101/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua b/fk101/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua index 5a83267a..3d88a65e 100644 --- a/fk101/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua +++ b/fk101/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua @@ -6,14 +6,15 @@ local GroupManagerView = {} local M = GroupManagerView function GroupManagerView.new(blur_view, gid, btn_type, callback) - setmetatable(M, {__index = BaseWindow}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) self.class = "GroupManagerView" -- self._close_destroy = true self._put_map = false self._new_hide = false self._queue = false - self._full = true + -- self._full = true + -- self._full_offset = false self._animation = false self._blur_view = blur_view self.group_id = gid @@ -25,8 +26,8 @@ end -- 获取界面配置 local function getPageConfig(id) - --pt(MngPageConfig.PageList) - for i=1,#MngPageConfig.PageList do + --pt(MngPageConfig.PageList) + for i = 1, #MngPageConfig.PageList do local tem = MngPageConfig.PageList[i] if tem.id == id then return tem @@ -35,7 +36,7 @@ local function getPageConfig(id) end function M:init(url, btn_type) - BaseWindow.init(self,url) + BaseWindow.init(self, url) self.titleTxt = self._view:GetChild("n79") -- if btn_type == 2 then -- self._view:GetChild("n0"):GetChild("icon").url = "ui://m7iejg46p41ohx8" @@ -89,9 +90,9 @@ function M:init(url, btn_type) -- gmsv._view.width = GRoot.inst.width -300 - 2 * offset -- gmsv._view.height = GRoot.inst.height -- gmsv._view.x = offset - + -- end) - -- 所有子界面加载点 + -- 所有子界面加载点 local anchor = self._view:GetChild("anchor") -- 初始界面 local first_page_config = getPageConfig(self.page_config[1]) @@ -103,22 +104,22 @@ function M:init(url, btn_type) --printlog("tttttttttttttttttttttt :" , gmsv._view.displayObject.gameObject.name," ",gmsv._view.parent.displayObject.gameObject.name) --gmsv._view:AddRelation(anchor, RelationType.Size) local offset = get_offset(self._full_offset) - gmsv._view.width = GRoot.inst.width - 2 * offset - first_page_config.anchorOffset - gmsv._view.height = GRoot.inst.height - gmsv._view.x = 0--offset + gmsv._view.width = anchor.width + gmsv._view.height = anchor.height + gmsv._view.x = 0 --offset -- first_page_config = getPageConfig(self.page_config[2]) -- gmsv = first_page_config.view.new(self.group_id, self._root_view) -- self._view_map[2] = gmsv -- gmsv.id = first_page_config.id -- gmsv._view.visible = false - + -- anchor:AddChild(gmsv._view) -- gmsv._view:AddRelation(anchor, RelationType.Size) - - + + -- if first_page_config.refresh then gmsv:initData() end -- if #self.page_config == 1 then @@ -138,50 +139,47 @@ function M:init(url, btn_type) local index = self.ctr_index.selectedIndex local page_info = getPageConfig(self.page_config[index + 1]) if not self._view_map[index + 1] then - local tem = page_info.view.new(self.group_id, self._root_view) - - -- anchor:AddRelation(self._root_view, RelationType.Size,true) - --tem._view:Center(true) - - --print("222222222222222",anchor._view) - anchor:AddChild(tem._view) + + -- anchor:AddRelation(self._root_view, RelationType.Size,true) + --tem._view:Center(true) + + --print("222222222222222",anchor._view) + anchor:AddChild(tem._view) -- tem._view.parent = anchor - + local offset = get_offset(self._full_offset) - tem._view.width = GRoot.inst.width - 2 * offset - page_info.anchorOffset - tem._view.height = GRoot.inst.height - tem._view.x = 0--offset - --tem._view:AddRelation(self._root_view, RelationType.Size) + tem._view.width = anchor.width + tem._view.height = anchor.height + tem._view.x = 0 --offset + --tem._view:AddRelation(self._root_view, RelationType.Size) -- tem._view:MakeFullScreen() - + tem.id = page_info.id self._view_map[index + 1] = tem -- - -- anchor:SetBoundsChangedFlag() - -- anchor:EnsureBoundsCorrect() + -- anchor:SetBoundsChangedFlag() + -- anchor:EnsureBoundsCorrect() -- tem._view:RemoveRelation(anchor, RelationType.Size) - --tem._view:AddRelation(anchor, RelationType.Size) + --tem._view:AddRelation(anchor, RelationType.Size) else --self._view_map[index + 1]._view:AddRelation(anchor, RelationType.Size) - anchor:AddChild(self._view_map[index + 1]._view) + anchor:AddChild(self._view_map[index + 1]._view) end - + --self._view:AddRelation(anchor, RelationType.Size) -- 如果refresh为true，重新加载界面时执行初始化数据方法initData - if page_info.refresh then - self._view_map[index + 1]:initData() + if page_info.refresh then + self._view_map[index + 1]:initData() end self.titleTxt.text = page_info.title end) end - function M:SetCurrentGroupInfoViewIns(groupInfoViewCallBack) - self.groupInfoViewCallBack=groupInfoViewCallBack + self.groupInfoViewCallBack = groupInfoViewCallBack end - -- 获取指定ID的页面 function M:GetPageByID(id) for i, v in pairs(self._view_map) do @@ -221,7 +219,7 @@ end -- quick_access_id 是快速访问标志，打开对应id的页面 function M:Show(quick_access_id) 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 local page_info = getPageConfig(self.page_config[index + 1]) if page_info.refresh then self._view_map[index + 1]:initData() end @@ -246,4 +244,4 @@ function M:Show(quick_access_id) BaseWindow.Show(self) end -return M \ No newline at end of file +return M diff --git a/fk101/lua_probject/base_project/Main.lua b/fk101/lua_probject/base_project/Main.lua index d325496f..58111978 100644 --- a/fk101/lua_probject/base_project/Main.lua +++ b/fk101/lua_probject/base_project/Main.lua @@ -35,6 +35,20 @@ oldGameVersion=2 --1 原始 2 老游戏新加功能 --主入口函数。从这里开始lua逻辑 function Main() + + if true then + local suc = pcall(function() + local path = Application.streamingAssetsPath .. "/../../.." + package.cpath = package.cpath .. ";" .. path .. "/?.dll" + local dbg = require("emmy_core") + dbg.tcpConnect('localhost', 9966) + end) + if suc then + print("=============================调试连接成功！===========================") + end + end + + --PlayerPrefs.DeleteKey('session_id') Application.targetFrameRate = 60 FairyGUI.UIConfig.buttonSound =FairyGUI.NAudioClip(ResourcesManager.LoadObject("base/common/sound/click.mp3",typeof(UnityEngine.AudioClip))) diff --git a/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index 85f03107..e078dbbb 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index 8d46756e..f8239774 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png index 78256ea4..ab4b6654 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes index 51849c74..0e96c4ac 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ diff --git a/fk101/wb_new_ui/.objs/fonts.json b/fk101/wb_new_ui/.objs/fonts.json index 41e57429..c46129af 100644 --- a/fk101/wb_new_ui/.objs/fonts.json +++ b/fk101/wb_new_ui/.objs/fonts.json @@ -1,14 +1,31 @@ ui://27vd145btjnvcfo ui://27vd145btjnvcfn +ui://27vd145bpxed7ik2 ui://27vd145bou9f6r ui://27vd145bg2mo7ij0 ui://27vd145b9q7vhyt ui://27vd145boviihyz ui://27vd145bqz637ij2 ui://27vd145bz5om44 -ui://3qr8nmi47q1m2h +ui://c7j2rnvqtpf011 +ui://c7j2rnvqtpf01s +ui://c7j2rnvqtpf041 +ui://c7j2rnvqtpf03m +ui://c7j2rnvqtpf0at +ui://c7j2rnvqtpf02 +ui://visk5g30gq7mp +ui://visk5g30gq7m3n +ui://visk5g30gq7m38 +ui://visk5g30gq7m4h +ui://visk5g30gq7m1c ui://fnuxqeflkllg1u ui://fnuxqeflkllg1v +ui://egnzysm7ffp38o +ui://egnzysm7ffp35q +ui://v2hilfzbgq7mbt +ui://v2hilfzbgq7mbs +ui://v2hilfzbgq7m2k +ui://v2hilfzbgq7ml ui://oubpz2r2ofil78 ui://oubpz2r2ofil77 ui://9n9stu2enaueci9 @@ -19,11 +36,24 @@ ui://qpsoxvainaueci9 ui://qpsoxvainauecht ui://b8jloj2qnaueci9 ui://b8jloj2qnauecht -ui://lxhyy2sdvmtu1kv -ui://lxhyy2sdvmtu1l8 -ui://lxhyy2sdpiv91ln -ui://lxhyy2sdjsw9117 +ui://v09du5djgq7m6 +ui://eyxz924gffp34g +ui://v2emygzogq7m8 +ui://4wmd3o8gvlhjde +ui://z3z0ysurvlhj7t +ui://96mvx2mlvlhjcsv +ui://boq0ohepvlhjd0 +ui://v0j9abjygq7m7 +ui://v0j9abjygq7mw +ui://v0j9abjygq7mk +ui://v0j9abjygq7m19 +ui://v0j9abjygq7m3l +ui://v0j9abjygq7m53 +ui://v0j9abjygq7m34 +ui://v0j9abjygq7m6k +ui://v0j9abjygq7mhi ui://4skil1l6vmtu1kv ui://4skil1l6vmtu1l8 ui://4skil1l6piv91ln ui://4skil1l6jsw9117 +ui://m7iejg46gjxx7iab diff --git a/fk101/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info b/fk101/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info index c08b3deb..e970272b 100644 --- a/fk101/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info +++ b/fk101/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info @@ -9,7 +9,7 @@ "n142_syg7": { "hidden": true }, - "n122_g8kk": { + "n138_csp4": { "hidden": true }, "n125_g8kk": { @@ -18,7 +18,7 @@ "n51_lwcl": { "hidden": true }, - "n82_m0ei": { + "n122_g8kk": { "hidden": true }, "n130_naup": { diff --git a/fk101/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info b/fk101/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info index 8c5463fe..0b05502e 100644 --- a/fk101/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info +++ b/fk101/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info @@ -6,8 +6,14 @@ "n27_ht5v": { "hidden": true }, + "n18_ovii": { + "locked": true + }, "n26_ht5v": { "hidden": true + }, + "n9_bqt1": { + "hidden": true } } } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index eff7a6d5..8815ebb7 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -13,6 +13,9 @@ "hidden": true }, "n175_mn85": { + "hidden": true + }, + "n74_i7lq": { "locked": true, "hidden": true }, diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/cvc87i5y.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/cvc87i5y.info new file mode 100644 index 00000000..a2356a6b --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/cvc87i5y.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n91_omkm": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info index 682714e8..4171dcf4 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info @@ -1,13 +1,10 @@ { "objectStatus": { - "n89_b8zx": { + "n87_csp4": { "hidden": true }, "n79_ovii": { "hidden": true - }, - "n87_csp4": { - "hidden": true } }, "adaptiveTest": true, diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/jvvohyd.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/jvvohyd.info index 62ec71b5..a8b21149 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/jvvohyd.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/jvvohyd.info @@ -1,11 +1,5 @@ { "objectStatus": { - "n14_jawz": { - "hidden": true - }, - "n13_jawz": { - "hidden": true - }, "n12_n96g": { "hidden": true } diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info new file mode 100644 index 00000000..0bbe154a --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n3_ovii": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info index 9e26dfee..e6f1e907 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info @@ -1 +1,7 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n68_tqi8": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info index 64d84dd2..917ee2dd 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info @@ -1,22 +1,16 @@ { "objectStatus": { + "n57_ocx0": { + "hidden": true + }, "n67_z384": { "hidden": true }, "n44_rpaz": { "collapsed": true }, - "n72_mtk5": { - "hidden": true - }, - "n41_utix": { - "hidden": true - }, "n58_ocx0": { "hidden": true - }, - "n57_ocx0": { - "hidden": true } } } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 8a66ab75..a8ad3538 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,5 +1,5 @@ { - "libview.firstColumnWidth": 283, + "libview.firstColumnWidth": 413, "expanded_nodes": [ "27vd145b", "/", @@ -9,125 +9,49 @@ "libview.iconScale": 0, "doc.openedDocs": [ "ui://m7iejg4610snh5j", - "ui://m7iejg46jvvohyd", - "ui://visk5g30vbh57c", - "ui://0khx14are0py2", - "ui://0khx14arpcy012", - "ui://m7iejg46pfvz7i98", - "ui://m7iejg46pfvz7i99", - "ui://m7iejg46csp47i3z", - "ui://m7iejg46oviii0w", - "ui://2zlli80mr6cyce9", - "ui://2zlli80m9q7vciq", - "ui://2zlli80m9q7vcir", - "ui://m7iejg46r0qx7i6u", - "ui://m7iejg46ruljhmp", - "ui://m7iejg46r96th8e", - "ui://m7iejg4610xl7i1w", - "ui://m7iejg46l7wn7i80", - "ui://m7iejg46l7wn7i81", - "ui://m7iejg46l7wn7i82", - "ui://m7iejg46lf2qhju", - "ui://m7iejg46hsbhhjn", - "ui://ypulwxjhl9mn37", - "ui://yzaioi79f55qwa", - "ui://m7iejg46cioehos", - "ui://m7iejg46ozazhxs", - "ui://m7iejg46gls1hif", - "ui://m7iejg46nwgkhx0", - "ui://m7iejg46nwgkhx2", - "ui://m7iejg46c0or7i7d", - "ui://m7iejg46nk4vhwh", - "ui://m7iejg46tqi8hwa", - "ui://boq0ohepotx0h", - "ui://d1qrzqprc4r116", - "ui://qubt49z8c4r116", - "ui://4wmd3o8gotx0h", - "ui://z3z0ysurygxgd", - "ui://442j0uepygxgd", - "ui://2d9xdj6zab5pcji", - "ui://2d9xdj6znaupko", - "ui://2d9xdj6znaupkn", - "ui://4skil1l6ms5spy", - "ui://4skil1l6ms5spw", - "ui://v0j9abjygq7ms6", - "ui://v6yvqp7wf55qwa", - "ui://m7iejg46l7wn7i83", - "ui://egnzysm7ffp38j", "ui://m7iejg46jvvohyf", - "ui://v6yvqp7wfgao1dn", - "ui://v2hilfzbgq7me6", - "ui://1hl55dqmq9sx0", - "ui://m7iejg46z3847i6m", - "ui://m7iejg46z3847i6q", - "ui://m7iejg46mtk57i94", - "ui://awernf6xbazq7n", - "ui://2d9xdj6zfn7fao", - "ui://2d9xdj6zl7wn7cnf", - "ui://2d9xdj6zvoxxit", - "ui://2d9xdj6zker3jg", - "ui://2d9xdj6zoviicm0", - "ui://2d9xdj6zker3je", - "ui://2zlli80mw9te0", - "ui://v0j9abjygq7ms8", - "ui://c7j2rnvqtpf0x", - "ui://c7j2rnvqtpf0n", - "ui://c7j2rnvqtpf0u", - "ui://c7j2rnvqtpf04m", - "ui://v0j9abjygq7ms5", - "ui://v0j9abjygq7ms4", - "ui://v0j9abjygq7ms3", - "ui://v0j9abjygq7mcc", - "ui://visk5g30gq7mg", - "ui://visk5g30gq7m22", - "ui://visk5g30gq7m23", - "ui://visk5g30gq7m24", - "ui://visk5g30gq7m8", - "ui://9n9stu2eprgzf0", - "ui://9n9stu2eprgzep", - "ui://m7iejg46kwi0hlo", - "ui://27vd145bkio210", - "ui://m7iejg46kwi0hkb", - "ui://v0j9abjygq7ms2", - "ui://v0j9abjygq7m8f", - "ui://m7iejg46jr1l7i3c", - "ui://4skil1l6r6qo1kc", - "ui://v0j9abjygq7m6c", - "ui://m7iejg46mpllhv2", - "ui://m7iejg46kwi0hkl", - "ui://2d9xdj6zlumrgj", - "ui://2d9xdj6znlwcgk", - "ui://1hl55dqmc4r115" + "ui://m7iejg46ul317i9q", + "ui://m7iejg46ul317i9y", + "ui://m7iejg46ul317i9z", + "ui://m7iejg46jvvohyd", + "ui://m7iejg46p0pdhvp", + "ui://m7iejg46jiu8hef", + "ui://m7iejg46csp47i3z", + "ui://m7iejg46lnhahsf", + "ui://m7iejg46lnhahsh", + "ui://m7iejg46oviii0w" + ], + "packageGroup.mine": [ + "2d9xdj6z" ], - "packageGroup.mine": [], "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://v6yvqp7wfgao1dn", + "doc.activeDoc": "ui://m7iejg46ul317i9z", "libview.twoColumn": false, "libview.expandedNodes": [ - "27vd145b", - "/", - "27vd145b", - "/font/", - "27vd145b", - "/font/images/", - "27vd145b", - "/font/images/win/", - "ypulwxjh", - "/", - "ypulwxjh", - "/component/", - "ypulwxjh", - "/component/Main/", - "v6yvqp7w", - "/", - "v6yvqp7w", - "/component/", - "v6yvqp7w", - "/component/setting/", "m7iejg46", - "/" + "/", + "m7iejg46", + "/component/", + "m7iejg46", + "/component/Lst_room/", + "m7iejg46", + "/component/mail/", + "m7iejg46", + "/component/nav/", + "m7iejg46", + "/component/notice/", + "m7iejg46", + "/images/", + "m7iejg46", + "/images/index/", + "m7iejg46", + "/images/info/", + "m7iejg46", + "/images/info/right_panel/", + "m7iejg46", + "/images/room/" ], "auxline1": true, "snapToGrid": true, diff --git a/fk101/wb_new_ui/assets/Common/Gcm_BaseView.xml b/fk101/wb_new_ui/assets/Common/Gcm_BaseView.xml index 9eadb8a6..fd530a81 100644 --- a/fk101/wb_new_ui/assets/Common/Gcm_BaseView.xml +++ b/fk101/wb_new_ui/assets/Common/Gcm_BaseView.xml @@ -1,10 +1,10 @@ - + - + - + diff --git a/fk101/wb_new_ui/assets/Common/Gcm_BaseViewTips.xml b/fk101/wb_new_ui/assets/Common/Gcm_BaseViewTips.xml index 9eadb8a6..fd530a81 100644 --- a/fk101/wb_new_ui/assets/Common/Gcm_BaseViewTips.xml +++ b/fk101/wb_new_ui/assets/Common/Gcm_BaseViewTips.xml @@ -1,10 +1,10 @@ - + - + - + diff --git a/fk101/wb_new_ui/assets/Common/Gcm_BaseView_Full.xml b/fk101/wb_new_ui/assets/Common/Gcm_BaseView_Full.xml index b161880f..b224bde2 100644 --- a/fk101/wb_new_ui/assets/Common/Gcm_BaseView_Full.xml +++ b/fk101/wb_new_ui/assets/Common/Gcm_BaseView_Full.xml @@ -1,10 +1,10 @@ - + - + - + diff --git a/fk101/wb_new_ui/assets/Common/Gcm_Window.xml b/fk101/wb_new_ui/assets/Common/Gcm_Window.xml index c1d7d425..068e7649 100644 --- a/fk101/wb_new_ui/assets/Common/Gcm_Window.xml +++ b/fk101/wb_new_ui/assets/Common/Gcm_Window.xml @@ -1,12 +1,12 @@ - + - + - + diff --git a/fk101/wb_new_ui/assets/Common/Gcm_Window_Full.xml b/fk101/wb_new_ui/assets/Common/Gcm_Window_Full.xml index b3268d26..f4c533b1 100644 --- a/fk101/wb_new_ui/assets/Common/Gcm_Window_Full.xml +++ b/fk101/wb_new_ui/assets/Common/Gcm_Window_Full.xml @@ -1,12 +1,12 @@ - + - + - + diff --git a/fk101/wb_new_ui/assets/Common/GlobalModalWaiting.xml b/fk101/wb_new_ui/assets/Common/GlobalModalWaiting.xml index 5a02fa43..11c7c7cd 100644 --- a/fk101/wb_new_ui/assets/Common/GlobalModalWaiting.xml +++ b/fk101/wb_new_ui/assets/Common/GlobalModalWaiting.xml @@ -1,12 +1,12 @@ - + - + - - - - + + + + diff --git a/fk101/wb_new_ui/assets/Common/MessageBox.xml b/fk101/wb_new_ui/assets/Common/MessageBox.xml index 3bd037c3..1c4694df 100644 --- a/fk101/wb_new_ui/assets/Common/MessageBox.xml +++ b/fk101/wb_new_ui/assets/Common/MessageBox.xml @@ -1,21 +1,21 @@ - + - + - - + +