0323

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
     }
     ]
 }

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)

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

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))
+        -- 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).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

fk101/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua

@@ -13,7 +13,8 @@ function GroupManagerView.new(blur_view, gid, btn_type, callback)
     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
@@ -103,8 +104,8 @@ 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.width = anchor.width
-    gmsv._view.height =  GRoot.inst.height
+    gmsv._view.height = anchor.height
     gmsv._view.x = 0 --offset
 
     -- first_page_config = getPageConfig(self.page_config[2])
@@ -138,7 +139,6 @@ 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)
@@ -149,8 +149,8 @@ function M:init(url, btn_type)
             -- tem._view.parent = anchor
 
             local offset = get_offset(self._full_offset)
-            tem._view.width = GRoot.inst.width - 2 * offset - page_info.anchorOffset
+            tem._view.width = anchor.width
-            tem._view.height =  GRoot.inst.height
+            tem._view.height = anchor.height
             tem._view.x = 0 --offset
             --tem._view:AddRelation(self._root_view, RelationType.Size)
             -- tem._view:MakeFullScreen()
@@ -176,12 +176,10 @@ function M:init(url, btn_type)
     end)
 end
 
-
 function M:SetCurrentGroupInfoViewIns(groupInfoViewCallBack)
     self.groupInfoViewCallBack = groupInfoViewCallBack
 end
 
-
 -- 获取指定ID的页面
 function M:GetPageByID(id)
     for i, v in pairs(self._view_map) do

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)))

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://v09du5djgq7m6
-ui://lxhyy2sdvmtu1l8
+ui://eyxz924gffp34g
-ui://lxhyy2sdpiv91ln
+ui://v2emygzogq7m8
-ui://lxhyy2sdjsw9117
+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

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": {

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
     }
   }
 }

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
     },

fk101/wb_new_ui/.objs/metas/m7iejg46/cvc87i5y.info

@@ -0,0 +1,7 @@
+{
+  "objectStatus": {
+    "n91_omkm": {
+      "collapsed": true
+    }
+  }
+}

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,

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
     }

fk101/wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info

@@ -0,0 +1,7 @@
+{
+  "objectStatus": {
+    "n3_ovii": {
+      "hidden": true
+    }
+  }
+}

fk101/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info

@@ -1 +1,7 @@
-{}
+{
+  "objectStatus": {
+    "n68_tqi8": {
+      "hidden": true
+    }
+  }
+}

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
     }
   }
 }

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://m7iejg46ul317i9q",
-    "ui://v2hilfzbgq7me6",
+    "ui://m7iejg46ul317i9y",
-    "ui://1hl55dqmq9sx0",
+    "ui://m7iejg46ul317i9z",
-    "ui://m7iejg46z3847i6m",
+    "ui://m7iejg46jvvohyd",
-    "ui://m7iejg46z3847i6q",
+    "ui://m7iejg46p0pdhvp",
-    "ui://m7iejg46mtk57i94",
+    "ui://m7iejg46jiu8hef",
-    "ui://awernf6xbazq7n",
+    "ui://m7iejg46csp47i3z",
-    "ui://2d9xdj6zfn7fao",
+    "ui://m7iejg46lnhahsf",
-    "ui://2d9xdj6zl7wn7cnf",
+    "ui://m7iejg46lnhahsh",
-    "ui://2d9xdj6zvoxxit",
+    "ui://m7iejg46oviii0w"
-    "ui://2d9xdj6zker3jg",
+  ],
-    "ui://2d9xdj6zoviicm0",
+  "packageGroup.mine": [
-    "ui://2d9xdj6zker3je",
+    "2d9xdj6z"
-    "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"
   ],
-  "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,

fk101/wb_new_ui/assets/Common/Gcm_BaseView.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750">
+<component size="2532,1170">
   <displayList>
-    <component id="n0_lwcl" name="win_mode" src="cjli6" xy="0,0" size="1334,750">
+    <component id="n0_lwcl" name="win_mode" src="cjli6" fileName="UIPanel.xml" xy="0,0" size="2532,1170">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n1_lwcl" name="contentPane" src="cjli6" xy="0,0" size="1334,750">
+    <component id="n1_lwcl" name="contentPane" src="cjli6" fileName="UIPanel.xml" xy="0,0" size="2532,1170">
       <relation target="" sidePair="center-center,height-height"/>
     </component>
   </displayList>

fk101/wb_new_ui/assets/Common/Gcm_BaseViewTips.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750">
+<component size="2532,1170">
   <displayList>
-    <component id="n0_lwcl" name="win_mode" src="cjli6" xy="0,0" size="1334,750">
+    <component id="n0_lwcl" name="win_mode" src="cjli6" fileName="UIPanel.xml" xy="0,0" size="2532,1170">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n1_lwcl" name="contentPane" src="cjli6" xy="0,0" size="1334,750">
+    <component id="n1_lwcl" name="contentPane" src="cjli6" fileName="UIPanel.xml" xy="0,0" size="2532,1170">
       <relation target="" sidePair="center-center,height-height"/>
     </component>
   </displayList>

fk101/wb_new_ui/assets/Common/Gcm_BaseView_Full.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1335,750">
+<component size="2532,1170">
   <displayList>
-    <component id="n0_lwcl" name="win_mode" src="cjli6" fileName="UIPanel.xml" xy="0,0" size="1335,750">
+    <component id="n0_lwcl" name="win_mode" src="cjli6" fileName="UIPanel.xml" xy="0,0" size="2532,1170">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n1_lwcl" name="contentPane" src="cjli6" fileName="UIPanel.xml" xy="0,0" size="1335,750">
+    <component id="n1_lwcl" name="contentPane" src="cjli6" fileName="UIPanel.xml" xy="0,0" size="2532,1170">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
   </displayList>

fk101/wb_new_ui/assets/Common/Gcm_Window.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750" adaptationTest="FitHeightAndSetCenter">
+<component size="2532,1170">
   <controller name="hide_bg" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n0_lwcl" name="win_mode" xy="-10,0" size="1354,750" type="rect" lineSize="0" fillColor="#80000000">
+    <graph id="n0_lwcl" name="win_mode" xy="-10,0" size="2552,1170" type="rect" lineSize="0" fillColor="#80000000">
       <gearDisplay controller="hide_bg" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n1_lwcl" name="contentPane" src="cjli6" fileName="UIPanel.xml" xy="0,125" pivot="0.5,0.5" size="1334,500">
+    <component id="n1_lwcl" name="contentPane" src="cjli6" fileName="UIPanel.xml" xy="0,0" pivot="0.5,0.5" size="2532,1170">
       <relation target="" sidePair="middle-middle,center-center"/>
     </component>
   </displayList>

fk101/wb_new_ui/assets/Common/Gcm_Window_Full.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750">
+<component size="2532,1170">
   <controller name="hide_bg" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n0_lwcl" name="win_mode" xy="-10,0" size="1354,750" type="rect" lineSize="0" fillColor="#bf000000">
+    <graph id="n0_lwcl" name="win_mode" xy="-10,0" size="2552,1170" type="rect" lineSize="0" fillColor="#bf000000">
       <gearLook controller="hide_bg" pages="1" values="0,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n1_lwcl" name="contentPane" src="cjli6" fileName="UIPanel.xml" xy="0,0" pivot="0.5,0.5" size="1334,750">
+    <component id="n1_lwcl" name="contentPane" src="cjli6" fileName="UIPanel.xml" xy="0,0" pivot="0.5,0.5" size="2532,1170">
       <relation target="" sidePair="center-center,height-height"/>
     </component>
   </displayList>

fk101/wb_new_ui/assets/Common/GlobalModalWaiting.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1751,1001" extention="Button">
+<component size="2532,1170" extention="Button">
   <displayList>
-    <graph id="n1_lwcl" name="n1" xy="0,0" size="1751,1001" visible="false" type="rect" lineSize="0" fillColor="#0d000000"/>
+    <graph id="n1_lwcl" name="n1" xy="0,0" size="2532,1170" visible="false" type="rect" lineSize="0" fillColor="#0d000000"/>
     <component id="n4_9p4j" name="gcm_qiu" src="cjli6" fileName="UIPanel.xml" xy="872,465" size="1,1"/>
-    <image id="n6_f86r" name="n6" src="f86rhxn" fileName="images/加载底(1).png" xy="396,442" size="897,117" group="n7_f86r"/>
+    <image id="n6_f86r" name="n6" src="f86rhxn" fileName="font/images/加载底(1).png" xy="786,526" size="897,117" group="n7_f86r"/>
-    <text id="n3_lwcl" name="title" xy="695,483" size="442,42" group="n7_f86r" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="网络信号太差，正在检查网络中..."/>
+    <text id="n3_lwcl" name="title" xy="1085,567" size="450,41" group="n7_f86r" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="网络信号太差，正在检查网络中..."/>
-    <component id="n5_j1s2" name="n5" src="j4vkhxi" fileName="component/loading.xml" xy="602,450" group="n7_f86r"/>
+    <component id="n5_j1s2" name="n5" src="j4vkhxi" fileName="component/loading.xml" xy="992,534" group="n7_f86r"/>
-    <group id="n7_f86r" name="n7" xy="396,442" size="897,117" advanced="true">
+    <group id="n7_f86r" name="n7" xy="786,526" size="897,117" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
   </displayList>

fk101/wb_new_ui/assets/Common/MessageBox.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="737,595">
+<component size="1207,840">
   <displayList>
-    <image id="n19_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" xy="-1,5" size="737,593">
+    <image id="n19_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" xy="-1,5" size="1207,838">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n7_m0vo" name="tex_message" xy="9,118" size="705,289" font="ui://27vd145bqz637ij2" fontSize="34" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间"/>
+    <text id="n7_m0vo" name="tex_message" xy="65,163" size="1087,421" font="ui://27vd145bpxed7ik2" fontSize="64" color="#0d1725" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间"/>
-    <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="124,438" size="248,82" group="n8_m0vo">
+    <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="156,606" size="400,169" group="n8_m0vo">
       <Button title=" " icon="ui://27vd145bl2997icd"/>
     </component>
-    <component id="n15_cvc8" name="btn_close" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="364,438" size="248,82" group="n8_m0vo">
+    <component id="n15_cvc8" name="btn_close" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="680,606" size="400,169" group="n8_m0vo">
       <Button title=" " icon="ui://27vd145bcvc87i5s"/>
     </component>
-    <group id="n8_m0vo" name="n8" xy="124,438" size="488,82"/>
+    <group id="n8_m0vo" name="n8" xy="156,606" size="924,169"/>
-    <component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="656,1">
+    <component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="1081,1">
       <Button icon="ui://27vd145bm0eibv"/>
     </component>
-    <component id="n17_vtgq" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="286,324" visible="false">
+    <component id="n17_vtgq" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="500,539" visible="false">
       <Button title="设置全部"/>
     </component>
   </displayList>

fk101/wb_new_ui/assets/Common/MessageBox1.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="737,595">
+<component size="1207,840">
   <displayList>
-    <image id="n17_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" xy="0,0" size="737,493">
+    <image id="n19_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" xy="-1,5" size="1207,838">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n7_m0vo" name="tex_message" xy="17,81" size="705,289" font="ui://27vd145bqz637ij2" fontSize="34" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间"/>
+    <text id="n7_m0vo" name="tex_message" xy="65,163" size="1087,421" font="ui://27vd145bpxed7ik2" fontSize="64" color="#0d1725" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间"/>
-    <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="255,391">
+    <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="403,606" size="400,169">
-      <Button title=" " icon="ui://27vd145bcvc87i5i"/>
+      <Button title=" " icon="ui://27vd145bl2997icd"/>
     </component>
-    <component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="659,0">
+    <component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="1081,1">
       <Button icon="ui://27vd145bm0eibv"/>
     </component>
-    <component id="n15_f6mj" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="-489,272" visible="false">
+    <component id="n17_vtgq" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="500,539" visible="false">
-      <Button title="是否设置全部单局"/>
+      <Button title="设置全部"/>
     </component>
   </displayList>
 </component>

fk101/wb_new_ui/assets/Common/MessageBox1——old.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1207,840">
+  <displayList>
+    <image id="n17_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" xy="0,0" size="1207,738">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n7_m0vo" name="tex_message" xy="17,81" size="705,289" font="ui://27vd145bqz637ij2" fontSize="34" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间"/>
+    <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="255,391">
+      <Button title=" " icon="ui://27vd145bcvc87i5i"/>
+    </component>
+    <component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="659,0">
+      <Button icon="ui://27vd145bm0eibv"/>
+    </component>
+    <component id="n15_f6mj" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="-489,272" visible="false">
+      <Button title="是否设置全部单局"/>
+    </component>
+  </displayList>
+</component>

fk101/wb_new_ui/assets/Common/NetConnect.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,300">
+<component size="2532,1170">
   <displayList>
-    <component id="n1" name="n1" src="l0lz9" xy="0,0" aspect="true">
+    <component id="n1" name="n1" src="l0lz9" fileName="GlobalModalWaiting.xml" xy="0,0" aspect="true">
       <Button title="正在重新连接服务器"/>
     </component>
   </displayList>

fk101/wb_new_ui/assets/Common/PopPanel.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750" opaque="false" initName="PopPanel">
+<component size="2532,1170" opaque="false" initName="PopPanel">
   <displayList>
     <graph id="n0_hznk" name="click_item" xy="1041,183" size="295,278" alpha="0" type="rect"/>
   </displayList>

fk101/wb_new_ui/assets/Common/ToolsTip.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,90" extention="Label">
+<component size="2532,90" extention="Label">
   <displayList>
-    <graph id="n0" name="n0" xy="0,-85" size="1334,86" group="n2" type="rect" lineSize="0" lineColor="#ffffcc00" fillColor="#80000000">
+    <graph id="n0" name="n0" xy="0,-85" size="2532,86" group="n2" type="rect" lineSize="0" lineColor="#ffffcc00" fillColor="#80000000">
       <relation target="" sidePair="width-width"/>
     </graph>
-    <text id="n1" name="title" xy="10,-75" size="1317,68" group="n2" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="ffffff">
+    <text id="n1" name="title" xy="10,-75" size="2515,68" group="n2" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="ffffff">
       <relation target="" sidePair="width-width"/>
     </text>
-    <group id="n2" name="n2" xy="0,-85" size="1334,86" advanced="true"/>
+    <group id="n2" name="n2" xy="0,-85" size="2532,86" advanced="true"/>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="XY" target="n2" tween="true" startValue="0,-87" endValue="0,0" duration="6" ease="Quart.Out"/>

fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,286">
+<component size="2532,286">
   <displayList>
     <graph id="n5_m0vo" name="n5" xy="-208,0" size="1751,286" type="rect" lineSize="0" fillColor="#b3000000">
       <relation target="" sidePair="height-height"/>

fk101/wb_new_ui/assets/Common/buttons/Btn_Common.xml

@@ -2,7 +2,7 @@
 <component size="262,82" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n1_eeqm" name="icon" xy="0,0" size="262,82" url="ui://27vd145bofsx1k" align="center" vAlign="middle">
+    <loader id="n1_eeqm" name="icon" xy="0,0" size="262,82" url="ui://27vd145bofsx1k" align="center" vAlign="middle" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     <text id="n2_ovii" name="title" xy="0,0" pivot="0.5,0.5" size="262,82" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="5" autoSize="none" text="确定"/>

fk101/wb_new_ui/assets/Common/buttons/Btn_close.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="87,92" extention="Button" initName="btn_close">
+<component size="127,128" extention="Button" initName="btn_close">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="style" exported="true" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n3_j046" name="icon" xy="2,3" size="77,79" url="ui://27vd145bm0eibv" autoSize="true"/>
+    <loader id="n3_j046" name="icon" xy="2,3" size="125,125" url="ui://27vd145bm0eibv" autoSize="true"/>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="168,79" extention="Button">
+<component size="308,143" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_csp4" name="n0" src="l2997icg" fileName="font/images/ann_s_1.png" xy="-1,-2">

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="169,82" extention="Button">
+<component size="306,145" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_csp4" name="n0" src="csp47i4t" fileName="font/images/ann_s_3.png" xy="0,0">

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="169,82" extention="Button">
+<component size="309,145" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_eeqm" name="n0" src="eeqmch1" fileName="font/images/adban.png" xy="0,0">

fk101/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="227,47" extention="Button">
+<component size="55,55" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n7_rpaz" name="n7" src="o9jnhy2" fileName="component/create_room/image/multiple_btn_n.png" xy="13,8">
+    <image id="n7_rpaz" name="n7" src="o9jnhy2" fileName="component/create_room/image/multiple_btn_n.png" xy="0,0">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <text id="n9_rpaz" name="title" xy="59,6" size="212,39" font="ui://27vd145bqz637ij2" fontSize="20" color="#4b381b" vAlign="middle" autoSize="shrink" text="123"/>
+    <text id="n9_rpaz" name="title" xy="61,3" size="67,49" font="ui://27vd145bqz637ij2" fontSize="36" color="#0d1725" vAlign="middle" text="123"/>
     <image id="n10_vyn3" name="n10" src="o9jnhy2" fileName="component/create_room/image/multiple_btn_n.png" xy="13,8">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n11_vyn3" name="n11" src="vyn37i5g" fileName="component/create_room/image/gou.png" xy="13,4">
+    <image id="n11_vyn3" name="n11" src="vyn37i5g" fileName="component/create_room/image/gou.png" xy="0,0">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>

fk101/wb_new_ui/assets/Common/component/head/Head.xml

@@ -2,10 +2,12 @@
 <component size="77,77" extention="Button" mask="n5_nw0i" initName="btn_head">
   <displayList>
     <image id="n4_csp4" name="n4" src="mv8kccn" fileName="font/images/head/txk.png" xy="0,0" size="78,77" visible="false"/>
-    <loader id="n1" name="icon" xy="0,0" size="77,77" aspect="true" url="ui://27vd145bklso1c" align="center" vAlign="middle" fill="scale">
+    <loader id="n1" name="icon" xy="0,0" size="77,77" aspect="true" url="ui://27vd145bklso1c" align="center" vAlign="middle" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <graph id="n5_nw0i" name="n5" xy="0,0" size="77,77" type="rect" lineSize="0" corner="70"/>
+    <graph id="n5_nw0i" name="n5" xy="0,0" size="77,77" type="rect" lineSize="0" corner="99999">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

fk101/wb_new_ui/assets/Common/package.xml

@@ -9,8 +9,8 @@
     <image id="l0lza" name="netloading.png" path="/font/images/"/>
     <image id="l0lzg" name="setting_max_sound_sign.png" path="/font/images/setting/"/>
     <image id="l0lzh" name="setting_dice.png" path="/font/images/setting/" exported="true"/>
-    <image id="l0lzi" name="setting_bar_bg.png" path="/font/images/setting/" scale="9grid" scale9grid="4,4,39,17"/>
+    <image id="l0lzi" name="setting_bar_bg.png" path="/font/images/setting/" scale="9grid" scale9grid="40,4,897,12"/>
-    <image id="l0lzj" name="setting_bar.png" path="/font/images/setting/" exported="true" scale="9grid" scale9grid="4,4,35,15"/>
+    <image id="l0lzj" name="setting_bar.png" path="/font/images/setting/" exported="true" scale="9grid" scale9grid="25,16,922,17"/>
     <component id="nosez" name="ToolsTip.xml" path="/" exported="true"/>
     <component id="kio210" name="Head.xml" path="/component/head/" exported="true"/>
     <component id="djzo18" name="Component1.xml" path="/component/" exported="true"/>
@@ -239,7 +239,7 @@
     <image id="jkmabp" name="bd.png" path="/component/result/" exported="true"/>
     <image id="xhvgbq" name="fzzj.png" path="/component/share/images/" exported="true"/>
     <image id="xhvgbs" name="fxtp.png" path="/component/share/images/" exported="true"/>
-    <image id="m0eibt" name="tkd.png" path="/font/images/win/" exported="true" scale="9grid" scale9grid="300,268,171,1" gridTile="16"/>
+    <image id="m0eibt" name="tkd.png" path="/font/images/win/" exported="true" scale9grid="300,268,171,1" gridTile="16"/>
     <image id="m0eibv" name="cha.png" path="/font/images/win/"/>
     <image id="93q2bw" name="button01.png" path="/font/images/new_btns/" exported="true" scale="9grid" scale9grid="142,24,2,48"/>
     <image id="93q2bx" name="button02.png" path="/font/images/new_btns/" exported="true" scale="9grid" scale9grid="133,24,3,48"/>
@@ -489,7 +489,7 @@
     <image id="oviihyx" name="btn_comfirm1.png" path="/font/images/"/>
     <component id="oviihyy" name="Btn_Common1.xml" path="/buttons/"/>
     <font id="oviihyz" name="SIMSUN.TTC" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
-    <image id="oviihz1" name="bg_05.png" path="/font/images/btn_keyboard/" exported="true" scale="9grid" scale9grid="2,2,478,43"/>
+    <image id="oviihz1" name="bg_05.png" path="/font/images/btn_keyboard/" exported="true" scale9grid="2,16,296,22"/>
     <image id="oviihz2" name="button_04.png" path="/font/images/btn_keyboard/" exported="true"/>
     <image id="oviihz3" name="button_05.png" path="/font/images/btn_keyboard/" exported="true"/>
     <image id="oviihz4" name="button_06.png" path="/font/images/btn_keyboard/" exported="true"/>
@@ -606,7 +606,7 @@
     <image id="cvc87i5q" name="bt_tiishi.png" path="/font/images/"/>
     <image id="cvc87i5r" name="ann_queren.png" path="/font/images/" exported="true"/>
     <image id="cvc87i5s" name="ann_quxiao.png" path="/font/images/" exported="true"/>
-    <component id="cvc87i5t" name="MessageBox1.xml" path="/" exported="true"/>
+    <component id="cvc87i5t" name="MessageBox1——old.xml" path="/" exported="true"/>
     <image id="s98c7i5u" name="shurukuang5.png" path="/font/images/win/" exported="true" scale="9grid" scale9grid="45,10,75,20"/>
     <image id="s98c7i5v" name="shurukuang6.png" path="/font/images/win/" exported="true"/>
     <image id="i18j7i5w" name="chongzhi.png" path="/font/images/btn_keyboard/" exported="true"/>
@@ -1083,7 +1083,7 @@
     <font id="qz637ij2" name="SIYUAN.TTF" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="nuxq7ijc" name="zjph_txt_zsyph_01.png" path="/font/images/"/>
     <image id="nuxq7ijd" name="zjph_txt_zsyph_02.png" path="/font/images/"/>
-    <image id="nuxq7ije" name="bxx_bg_01.png" path="/font/images/win/" exported="true"/>
+    <image id="nuxq7ije" name="bxx_bg_01.png" path="/font/images/win/" exported="true" scale9grid="302,210,604,420"/>
     <image id="nuxq7ijf" name="wf_bg_01.png" path="/font/images/win/" exported="true"/>
     <image id="nuxq7ijg" name="ann_xiayibu.png" path="/component/create_room/image/"/>
     <image id="nuxq7ijh" name="ann_zhuobuyanse.png" path="/component/create_room/image/"/>
@@ -1107,6 +1107,8 @@
     <image id="jawz7ijz" name="增加记录-1 1@2x.png" path="/buttons/"/>
     <image id="ghnx7ik0" name="zb.png" path="/component/game/"/>
     <image id="ghnx7ik1" name="chat_button_blue2.png" path="/font/images/" exported="true"/>
+    <font id="pxed7ik2" name="AlimamaFangYuanTi-SemiBold-Square-600.ttf" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
+    <component id="ep9w7ik3" name="MessageBox1.xml" path="/" exported="true"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
     <atlas name="默认" index="0"/>