diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index 21f71f22..8d3b12db 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -302,7 +302,7 @@ function M:FG_OPEN_ISOPEN_CHATROOM(groupId, callback) end) end --- +-- 设置不允许成员可以查看聊天室 function M:FG_CLOSE_ISOPEN_CHATROOM(groupId, callback) local _data = {} _data.groupId = groupId @@ -312,6 +312,16 @@ function M:FG_CLOSE_ISOPEN_CHATROOM(groupId, callback) end) end +-- 拉取聊天室数据 +function M:FG_ENTER_CHATROOM(groupId, callback) + local _data = {} + _data.groupId = groupId + _data.uid = DataManager.SelfUser.account_id + self._mgr_client:send(Protocol.FGMGR_EVT_ENTER_CHATROOM, _data, function(res) + callback(res) + end) +end + -- 邀请在线玩家 function M:FG_InvitePlayer(group_id, tag, player_id, roomid, pid, game_name, callback) local _data = {} @@ -395,7 +405,7 @@ function M:OnExit() end function M:__OnNetEvent(msg) - print("消息ID===>>"..msg.Command) + print("消息ID===>>" .. msg.Command) local func = self._eventmap[msg.Command] if (func ~= nil) then func(self, msg.Data) end end diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index 79cdeada..5ca74c0c 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -349,6 +349,8 @@ Protocol = { WEB_FG_Witness_ROOM = "group/room/join_spectator", -- 圈子退出观战房间 WEB_FG_Exit_Witness_ROOM = "group/room/out_spectator", + -- 设置是否允许观战 + WEB_FG_SET_CANWATCH = "group/set_group_guest", -------------- group-mgr -------------------- -- 进入圈子 @@ -382,14 +384,13 @@ Protocol = { -- 未读邮件提示事件 FGMGR_EVT_NEW_MAIL = "update_mail_tip", -- 设置允许成员查看聊天室 - FGMGR_EVT_OPEN_ISOPEN_CHATROOM = "13001", + FGMGR_EVT_OPEN_ISOPEN_CHATROOM = "13001", -- 设置不允许成员查看聊天室 - FGMGR_EVT_CLOSE_ISOPEN_CHATROOM = "13002", - + FGMGR_EVT_CLOSE_ISOPEN_CHATROOM = "13002", -- 监听聊天室是否开启 - FGMGR_EVT_ISOPEN_CHATROOM = "12011", - -- 设置是否允许观战 - WEB_FG_SET_CANWATCH = "set_group_guest", + FGMGR_EVT_ISOPEN_CHATROOM = "12011", + -- 进入聊天室 + FGMGR_EVT_ENTER_CHATROOM = "13004", --end::::::::::::::牌友圈协议:::::::::::::::::::: diff --git a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua b/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua index 4897edc7..94673006 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua @@ -14,6 +14,9 @@ function FamilyJoinAndCreate:init(root) self.input_name = self._view:GetChild('input_name') self.input_wxId = self._view:GetChild('input_wxId') + self.input_name.emojies = EmojiDitc.EmojiesDitc + self.input_wxId.emojies = EmojiDitc.EmojiesDitc + self._view:GetChild('btn_create').onClick:Add(function() if self.style.selectedIndex ~= 1 then diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua index e6f6ca6b..4839beaf 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua @@ -223,6 +223,7 @@ function FamilyMyFamily:Init() local curView = ViewManager.GetCurrenView() if curView.class == "FamilyMainView" then curView:OpenAllNumber(self.family) + BaseWindow.DestroyAll() else local view = ViewManager.ChangeView(ViewManager.View_Family, function() view:OpenAllNumber(self.family) diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index a3e3b0d9..821611c9 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -281,21 +281,10 @@ function M:BanFamily() if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "一键打样失败") else - self._group.ban = not self._group.ban self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0 self:RefalshMoreBtn() end end) - --[[ - fgCtr:FG_UpdateGroupInfo(self._group.id, self._group.name, "", not self._group.ban, self._group.dissolve_opt, - self._group.kick_opt, self._group.apply, self._group.ban_chat1, self._group.ban_chat2, self._group.option, 0, - function(res) - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "一键打样失败") - else - self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0 - end - end)]] end function M:BanDeskmate() @@ -333,6 +322,13 @@ function M:ConnetFamilyRoom(fgCtr, id) else self:UpdateFamilyRoom(fgCtr, id) self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0 + + local mgr_ctr = ControllerManager.GetController(GroupMgrController) + mgr_ctr:FG_ENTER_CHATROOM(self._group.id, function(res) + print("拉取到聊天室数据") + pt(res) + end) + return 1 end end) diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua index a74dadc9..125e79ca 100644 --- a/lua_probject/base_project/Main.lua +++ b/lua_probject/base_project/Main.lua @@ -52,7 +52,9 @@ function Main() end end - EmojiLuaHelper.Init() + pcall(function() + EmojiLuaHelper.Init() + end) --PlayerPrefs.DeleteKey('session_id') Application.targetFrameRate = 60 diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml index 23b003d7..312c9329 100644 --- a/wb_new_ui/assets/Family/Main.xml +++ b/wb_new_ui/assets/Family/Main.xml @@ -6,7 +6,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -195,6 +195,6 @@ - + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/Main/Component/c_familyMember.xml b/wb_new_ui/assets/Family/Main/Component/c_familyMember.xml index c9318ecb..33109f4b 100644 --- a/wb_new_ui/assets/Family/Main/Component/c_familyMember.xml +++ b/wb_new_ui/assets/Family/Main/Component/c_familyMember.xml @@ -4,14 +4,14 @@ - + - + - + diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png index 0ffc8976..51da68a3 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png index 88f5a2f8..ad2de47e 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png index 7f78b66b..ea6f532a 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png differ diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png index 1fca0f70..f10bd842 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png differ diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png index 0257d3a5..b672483d 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png differ diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png index b493320d..ab1d72a6 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png 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 fbd2e514..57d59de6 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/ART/base/lobby/ui/Lobby_atlas0_9.png.meta b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_9.png.meta index 9c7d281f..41bdb23a 100644 --- a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_9.png.meta +++ b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_9.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-105-Heavy.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-105-Heavy.ttf.meta index 33478232..1b3fd205 100644 --- a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-105-Heavy.ttf.meta +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-105-Heavy.ttf.meta @@ -27,5 +27,5 @@ TrueTypeFontImporter: useLegacyBoundsCalculation: 0 shouldRoundAdvanceValue: 1 userData: - assetBundleName: + assetBundleName: base/static/108c414d6db00284737c5a213639e94b assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-115-Black.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-115-Black.ttf.meta index 6d4883de..a5f2dcc0 100644 --- a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-115-Black.ttf.meta +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-115-Black.ttf.meta @@ -28,5 +28,5 @@ TrueTypeFontImporter: useLegacyBoundsCalculation: 0 shouldRoundAdvanceValue: 1 userData: - assetBundleName: + assetBundleName: base/static/42868b9537c20e8e91defc08808329a2 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-35-Thin.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-35-Thin.ttf.meta index b4893be4..79e86975 100644 --- a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-35-Thin.ttf.meta +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-35-Thin.ttf.meta @@ -19,5 +19,5 @@ TrueTypeFontImporter: useLegacyBoundsCalculation: 0 shouldRoundAdvanceValue: 1 userData: - assetBundleName: + assetBundleName: base/static/55df2a9ecf16068215e56b7ae363f6c0 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-45-Light.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-45-Light.ttf.meta index 85006a3b..4bc72504 100644 --- a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-45-Light.ttf.meta +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-45-Light.ttf.meta @@ -20,5 +20,5 @@ TrueTypeFontImporter: useLegacyBoundsCalculation: 0 shouldRoundAdvanceValue: 1 userData: - assetBundleName: + assetBundleName: base/static/9fe13c3573d8955a481c677c2c3f49de assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-Regular.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-Regular.ttf.meta index dec1d3ad..ff96ad07 100644 --- a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-Regular.ttf.meta +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-Regular.ttf.meta @@ -21,5 +21,5 @@ TrueTypeFontImporter: useLegacyBoundsCalculation: 0 shouldRoundAdvanceValue: 1 userData: - assetBundleName: + assetBundleName: base/static/642ccc84db09eac2c5fa32b1354612ac assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-RegularL3.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-RegularL3.ttf.meta index d7995def..60e84fb3 100644 --- a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-RegularL3.ttf.meta +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-RegularL3.ttf.meta @@ -23,5 +23,5 @@ TrueTypeFontImporter: useLegacyBoundsCalculation: 0 shouldRoundAdvanceValue: 1 userData: - assetBundleName: + assetBundleName: base/static/aa3b15df09925e46083a2fd061c517bf assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-75-SemiBold.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-75-SemiBold.ttf.meta index 1f24801b..1dc3f4ae 100644 --- a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-75-SemiBold.ttf.meta +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-75-SemiBold.ttf.meta @@ -25,5 +25,5 @@ TrueTypeFontImporter: useLegacyBoundsCalculation: 0 shouldRoundAdvanceValue: 1 userData: - assetBundleName: + assetBundleName: base/static/8f609b04db628f0adab4063f607dac24 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-85-Bold.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-85-Bold.ttf.meta index 57b0d108..ae9a725f 100644 --- a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-85-Bold.ttf.meta +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-85-Bold.ttf.meta @@ -26,5 +26,5 @@ TrueTypeFontImporter: useLegacyBoundsCalculation: 0 shouldRoundAdvanceValue: 1 userData: - assetBundleName: + assetBundleName: base/static/fa510d9be06d7bf4fc6ee3265b1cfaa7 assetBundleVariant: diff --git a/wb_unity_pro/Assets/Modules/ToLua/Editor/ToLuaExport.cs b/wb_unity_pro/Assets/Modules/ToLua/Editor/ToLuaExport.cs index 0b66f4d5..681f4bb6 100644 --- a/wb_unity_pro/Assets/Modules/ToLua/Editor/ToLuaExport.cs +++ b/wb_unity_pro/Assets/Modules/ToLua/Editor/ToLuaExport.cs @@ -166,7 +166,11 @@ public static class ToLuaExport "KeyValuePair.Deconstruct", "ParticleSystem.SetJob", "ParticleSystem.subEmitters", /*2019.09 ios编译出错，也可能是unity版本问题*/ - "Type.IsSZArray" + "Type.IsSZArray", + //Editor + "MeshRenderer.scaleInLightmap", + "MeshRenderer.stitchLightmapSeams", + "MeshRenderer.receiveGI", }; class _MethodBase diff --git a/wb_unity_pro/Assets/Scripts/Editor/EmojiTool.cs b/wb_unity_pro/Assets/Scripts/Editor/EmojiTool.cs index 267b811e..99066f76 100644 --- a/wb_unity_pro/Assets/Scripts/Editor/EmojiTool.cs +++ b/wb_unity_pro/Assets/Scripts/Editor/EmojiTool.cs @@ -3,6 +3,7 @@ using System.IO; using UnityEditor; using FairyGUI; using System.Collections; +using UnityEngine; public static class EmojiTool { @@ -45,7 +46,9 @@ public static class EmojiTool } catch { - + //GameObject go; + //MeshRenderer m; + //var l = m.scaleInLightmap; } } } diff --git a/wb_unity_pro/Assets/Source/Generate/UnityEngine_MeshRendererWrap.cs b/wb_unity_pro/Assets/Source/Generate/UnityEngine_MeshRendererWrap.cs index 521f1d68..3098eb87 100644 --- a/wb_unity_pro/Assets/Source/Generate/UnityEngine_MeshRendererWrap.cs +++ b/wb_unity_pro/Assets/Source/Generate/UnityEngine_MeshRendererWrap.cs @@ -12,9 +12,6 @@ public class UnityEngine_MeshRendererWrap L.RegFunction("__tostring", ToLua.op_ToString); L.RegVar("additionalVertexStreams", get_additionalVertexStreams, set_additionalVertexStreams); L.RegVar("subMeshStartIndex", get_subMeshStartIndex, null); - L.RegVar("scaleInLightmap", get_scaleInLightmap, set_scaleInLightmap); - L.RegVar("receiveGI", get_receiveGI, set_receiveGI); - L.RegVar("stitchLightmapSeams", get_stitchLightmapSeams, set_stitchLightmapSeams); L.EndClass(); } @@ -98,63 +95,6 @@ public class UnityEngine_MeshRendererWrap } } - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int get_scaleInLightmap(IntPtr L) - { - object o = null; - - try - { - o = ToLua.ToObject(L, 1); - UnityEngine.MeshRenderer obj = (UnityEngine.MeshRenderer)o; - float ret = obj.scaleInLightmap; - LuaDLL.lua_pushnumber(L, ret); - return 1; - } - catch(Exception e) - { - return LuaDLL.toluaL_exception(L, e, o, "attempt to index scaleInLightmap on a nil value"); - } - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int get_receiveGI(IntPtr L) - { - object o = null; - - try - { - o = ToLua.ToObject(L, 1); - UnityEngine.MeshRenderer obj = (UnityEngine.MeshRenderer)o; - UnityEngine.ReceiveGI ret = obj.receiveGI; - ToLua.Push(L, ret); - return 1; - } - catch(Exception e) - { - return LuaDLL.toluaL_exception(L, e, o, "attempt to index receiveGI on a nil value"); - } - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int get_stitchLightmapSeams(IntPtr L) - { - object o = null; - - try - { - o = ToLua.ToObject(L, 1); - UnityEngine.MeshRenderer obj = (UnityEngine.MeshRenderer)o; - bool ret = obj.stitchLightmapSeams; - LuaDLL.lua_pushboolean(L, ret); - return 1; - } - catch(Exception e) - { - return LuaDLL.toluaL_exception(L, e, o, "attempt to index stitchLightmapSeams on a nil value"); - } - } - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int set_additionalVertexStreams(IntPtr L) { @@ -173,62 +113,5 @@ public class UnityEngine_MeshRendererWrap return LuaDLL.toluaL_exception(L, e, o, "attempt to index additionalVertexStreams on a nil value"); } } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int set_scaleInLightmap(IntPtr L) - { - object o = null; - - try - { - o = ToLua.ToObject(L, 1); - UnityEngine.MeshRenderer obj = (UnityEngine.MeshRenderer)o; - float arg0 = (float)LuaDLL.luaL_checknumber(L, 2); - obj.scaleInLightmap = arg0; - return 0; - } - catch(Exception e) - { - return LuaDLL.toluaL_exception(L, e, o, "attempt to index scaleInLightmap on a nil value"); - } - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int set_receiveGI(IntPtr L) - { - object o = null; - - try - { - o = ToLua.ToObject(L, 1); - UnityEngine.MeshRenderer obj = (UnityEngine.MeshRenderer)o; - UnityEngine.ReceiveGI arg0 = (UnityEngine.ReceiveGI)ToLua.CheckObject(L, 2, typeof(UnityEngine.ReceiveGI)); - obj.receiveGI = arg0; - return 0; - } - catch(Exception e) - { - return LuaDLL.toluaL_exception(L, e, o, "attempt to index receiveGI on a nil value"); - } - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int set_stitchLightmapSeams(IntPtr L) - { - object o = null; - - try - { - o = ToLua.ToObject(L, 1); - UnityEngine.MeshRenderer obj = (UnityEngine.MeshRenderer)o; - bool arg0 = LuaDLL.luaL_checkboolean(L, 2); - obj.stitchLightmapSeams = arg0; - return 0; - } - catch(Exception e) - { - return LuaDLL.toluaL_exception(L, e, o, "attempt to index stitchLightmapSeams on a nil value"); - } - } } diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index dbe4feae..af385fff 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json @@ -1,109 +1,109 @@ [ { "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.6", + "ver": "1.0.8", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.6" + "version": "1.0.8" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "common", "check": true, "bundle": "base/common", - "version": "1.0.6" + "version": "1.0.8" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "login", "check": true, "bundle": "base/login", - "version": "1.0.6" + "version": "1.0.8" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "lobby", "check": true, "bundle": "base/lobby", - "version": "1.0.6" + "version": "1.0.8" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "Family", "check": true, "bundle": "base/Family", - "version": "1.0.6" + "version": "1.0.8" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "chat", "check": true, "bundle": "base/chat", - "version": "1.0.6" + "version": "1.0.8" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "newgroup", "check": true, "bundle": "base/newgroup", - "version": "1.0.6" + "version": "1.0.8" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "rank", "check": true, - "version": "1.0.6", + "version": "1.0.8", "bundle": "base/rank" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "main_majiang", "check": true, - "version": "1.0.6", + "version": "1.0.8", "bundle": "base/main_majiang" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "main_poker", "check": true, - "version": "1.0.6", + "version": "1.0.8", "bundle": "base/main_poker" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "main_zipai", "check": true, - "version": "1.0.6", + "version": "1.0.8", "bundle": "base/main_zipai" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "static", "check": true, "bundle": "base/static", - "version": "1.0.6" + "version": "1.0.8" }, { - "ver": "1.0.6", + "ver": "1.0.8", "is_res": true, "name": "embed", "check": true, "bundle": "base/embed", - "version": "1.0.6" + "version": "1.0.8" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "main_pokemajiang", "check": true, - "version": "1.0.6", + "version": "1.0.8", "bundle": "base/main_pokemajiang" }, { - "ver": "1.0.6", + "ver": "1.0.8", "name": "main_zipaimajiang", "check": true, - "version": "1.0.6", + "version": "1.0.8", "bundle": "base/main_zipaimajiang" } ] diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes deleted file mode 100644 index 356e5cfb..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.8.bytes index 7ae7a76c..acbb794a 100644 Binary files a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes deleted file mode 100644 index 20c90744..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes index 0b8073f9..e77672ae 100644 Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.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 deleted file mode 100644 index 626b8d67..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes index 59f6c15e..626b8d67 100644 Binary files a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes deleted file mode 100644 index b6d262c4..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes index c6d737b9..f5587fef 100644 Binary files a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes deleted file mode 100644 index 016bfd31..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes deleted file mode 100644 index 1c07ecfd..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes index 933aadc5..ff5d01fe 100644 Binary files a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes deleted file mode 100644 index eeaefe30..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes deleted file mode 100644 index 15483e0e..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes index 6a7ece78..72fce224 100644 Binary files a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes deleted file mode 100644 index 91dd3958..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes index 870f56db..91dd3958 100644 Binary files a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes deleted file mode 100644 index 11215723..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes deleted file mode 100644 index 20e6d905..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes index b2a87d70..20e6d905 100644 Binary files a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes deleted file mode 100644 index 23c0ef0f..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes index 7ad4db59..23c0ef0f 100644 Binary files a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes deleted file mode 100644 index 359e5856..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes index 8888e654..84f14f34 100644 Binary files a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes deleted file mode 100644 index 79eef24e..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes deleted file mode 100644 index f829c87b..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes index 12046647..260eec1a 100644 Binary files a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.14.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.14.bytes deleted file mode 100644 index 854f050c..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.14.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.15.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.15.bytes deleted file mode 100644 index 1bbedcc1..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.15.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.20.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.20.bytes deleted file mode 100644 index 307158ea..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.20.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.19.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.19.bytes deleted file mode 100644 index d2b500b2..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.19.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/chuntian/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/extend/poker/chuntian/asset_pack1.0.1.bytes deleted file mode 100644 index 5a39bea6..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/poker/chuntian/asset_pack1.0.1.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.26.bytes deleted file mode 100644 index 25dc1657..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.2.bytes b/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.2.bytes deleted file mode 100644 index 0787652a..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.2.bytes and /dev/null differ