diff --git a/lua_probject/base_project/Game/View/ChatView.lua b/lua_probject/base_project/Game/View/ChatView.lua index 9fb96e21..8b38f2da 100644 --- a/lua_probject/base_project/Game/View/ChatView.lua +++ b/lua_probject/base_project/Game/View/ChatView.lua @@ -86,4 +86,10 @@ function M:HideInputField() self._view:GetController("sdk").selectedIndex = 1 end +function M:Show() + getmetatable(M).__index.Show(self) + self._view:Center() + self._view.x = self._view.x + (GRoot.inst.width - self._view.width -300)/2 +end + return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua index 9df9fe8d..058e473c 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua @@ -54,7 +54,7 @@ function M:InitView() self.begin_time, self.end_time = self.time_panel:GetDate() self.record_data = {} self.record_data.numItems = 0 - self:GetRecoedData(0) + self:GetRecoedData(0, self._data_selectedSortType) end, { showDay = group.lev < 3 and 30 or 7 }) local ctr_page = self._view:GetController("type") diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua index eb3a0f81..38501cb4 100644 --- a/lua_probject/base_project/Main.lua +++ b/lua_probject/base_project/Main.lua @@ -64,7 +64,7 @@ function Main() if Application.platform == RuntimePlatform.WindowsEditor then debug_print = true end - debug_print = true + -- debug_print = true local NetManager = taurus.client.NetManager NetManager.debug_print = debug_print -- 网络延时8秒 diff --git a/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info b/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info index 137f78a0..cb415d8e 100644 --- a/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info +++ b/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info @@ -8,6 +8,9 @@ }, "n70_zgd9": { "hidden": true + }, + "n77_syh3": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 9c433bea..bd1ac8be 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,11 +2,14 @@ "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://lkq9ne9speuq8b", - "ui://lkq9ne9ssyh3rk", - "ui://lkq9ne9speuq3r", - "ui://lkq9ne9so0c1ru", - "ui://lkq9ne9speuq4i" + "ui://m7iejg4610snh5j", + "ui://l0ds4ys6h1uu26", + "ui://27vd145bp2bz6s", + "ui://27vd145bhznkce2", + "ui://27vd145blwcl28", + "ui://27vd145bimywcd5", + "ui://27vd145bcjli6", + "ui://lkq9ne9speuq8b" ], "test.device": "Huawei Mate20", "canvasColor": 10066329, @@ -15,11 +18,7 @@ "libview.twoColumn": false, "libview.expandedNodes": [ "lkq9ne9s", - "/", - "lkq9ne9s", - "/component/", - "lkq9ne9s", - "/component/Main/" + "/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Chat/Main.xml b/wb_new_ui/assets/Chat/Main.xml index cd71f4a6..2d90ff0e 100644 --- a/wb_new_ui/assets/Chat/Main.xml +++ b/wb_new_ui/assets/Chat/Main.xml @@ -62,7 +62,7 @@ - + diff --git a/wb_new_ui/assets/Common/Gcm_BaseView.xml b/wb_new_ui/assets/Common/Gcm_BaseView.xml index 5e63a242..b224bde2 100644 --- a/wb_new_ui/assets/Common/Gcm_BaseView.xml +++ b/wb_new_ui/assets/Common/Gcm_BaseView.xml @@ -4,8 +4,8 @@ - - + + diff --git a/wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes b/wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes index 1faaa4b3..39195945 100644 Binary files a/wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes and b/wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes index 5dd843a1..9d978526 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ diff --git a/wb_unity_pro/Assets/Scripts/VerCheck.cs b/wb_unity_pro/Assets/Scripts/VerCheck.cs index 450524cc..29d1725b 100644 --- a/wb_unity_pro/Assets/Scripts/VerCheck.cs +++ b/wb_unity_pro/Assets/Scripts/VerCheck.cs @@ -93,6 +93,7 @@ public class VerCheck : MonoBehaviour + if (isGFF==false&&isDXYGFF==false) { diff --git a/wb_unity_pro/Assets/StreamingAssets/Pack.byte b/wb_unity_pro/Assets/StreamingAssets/Pack.byte index 8296f494..52ec1947 100644 Binary files a/wb_unity_pro/Assets/StreamingAssets/Pack.byte and b/wb_unity_pro/Assets/StreamingAssets/Pack.byte differ diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.12.bytes index c6883c38..ed538ee9 100644 Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.12.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.12.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes index a5e4dd7d..fec3b84c 100644 Binary files a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.9.bytes index ebce15fa..4c53f37b 100644 Binary files a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.9.bytes and b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.9.bytes differ