diff --git a/lua_probject/base_project/Game/View/FGAssistView.lua b/lua_probject/base_project/Game/View/FGAssistView.lua index 2f0b6a31..b612b24e 100644 --- a/lua_probject/base_project/Game/View/FGAssistView.lua +++ b/lua_probject/base_project/Game/View/FGAssistView.lua @@ -101,9 +101,24 @@ function M:GetOnlinePlayers(index) fgCtr:FG_GroupList(function(res) if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败") + else + fgCtr:FG_EnterGroup(self.group_id, function(res) + ViewUtil:CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败") + else + self:GetOnlinePlayersshow(fgCtr, DataManager.groups:get(self.group_id), index) + return 1 + end + end) end end) + else + self:GetOnlinePlayersshow(fgCtr, group, index) end +end + +function M:GetOnlinePlayersshow(fgCtr, group, index) if #group.members == 0 or index ~= 0 then fgCtr:FG_GroupMembers12(self.group_id, 0, index + 10, 2, 2, function(res) if res.ReturnCode ~= 0 then diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua index 766c9b7a..c535ee68 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -83,6 +83,7 @@ function M:_evtInviteResponse(...) local groupid = arg[5] local roomCtr = ControllerManager.GetController(RoomController) local gameId = DataManager.groups:get(groupid):getPlay(pid).gameId + UIPackage.AddPackage('base/newgroup/ui/FGAssist') local imv = FGInvitedMsgView.new( self._root_view, diff --git a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua index 7849c3c7..88129da5 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua @@ -1,10 +1,10 @@ -- 被邀请界面 -local FGInvitedMsgView = {} +local FamilyInvitedMsgView = {} -local M = FGInvitedMsgView +local M = FamilyInvitedMsgView setmetatable(M, { __index = BaseWindow }) -function FGInvitedMsgView.new(groupid, pid, invite_id, blur_view, callback) +function FamilyInvitedMsgView.new(groupid, pid, invite_id, blur_view, callback) print("lingmeng FGAssistInviteView") local self = setmetatable({}, { __index = M }) self.class = "FGAssistInviteView" @@ -18,7 +18,7 @@ function FGInvitedMsgView.new(groupid, pid, invite_id, blur_view, callback) self.invite_id = invite_id self.callback = callback print("lingmeng FGAssistInviteView1") - + UIPackage.AddPackage('base/newgroup/ui/FGAssist') self:initView("ui://FGAssist/panel_invite") print("lingmeng FGAssistInviteView2") diff --git a/lua_probject/base_project/Game/View/NewGroup/FGInvitedMsgView.lua b/lua_probject/base_project/Game/View/NewGroup/FGInvitedMsgView.lua index 683e4a15..0aa0274d 100644 --- a/lua_probject/base_project/Game/View/NewGroup/FGInvitedMsgView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/FGInvitedMsgView.lua @@ -2,17 +2,15 @@ local FGInvitedMsgView = {} local M = FGInvitedMsgView -setmetatable(M, {__index = BaseWindow}) +setmetatable(M, { __index = BaseWindow }) function FGInvitedMsgView.new(blur_view, group_id, callback) - - local self = setmetatable({}, {__index = M}) + local self = setmetatable({}, { __index = M }) self.class = "FGInvitedMsgView" - self._blur_view = blur_view + self._blur_view = blur_view self._animation = true self._close_destroy = true self._close_time = 15 - self.group_id = group_id self.callback = callback UIPackage.AddPackage("base/newgroup/ui/FGAssist") @@ -21,51 +19,51 @@ function FGInvitedMsgView.new(blur_view, group_id, callback) end function M:FillData(data) - self._view:GetChild("tex_name").text = data.nick - self._view:GetChild("tex_id").text = "ID:" .. data.uid - local btn_head = self._view:GetChild("btn_head") - ImageLoad.Load(data.portrait, btn_head._iconObject) + self._view:GetChild("tex_name").text = data.nick + self._view:GetChild("tex_id").text = "ID:" .. data.uid + local btn_head = self._view:GetChild("btn_head") + ImageLoad.Load(data.portrait, btn_head._iconObject) - local group = DataManager.groups:get(self.group_id) - local play = group:getPlay(data.pid) - self._view:GetChild("tex_play_name").text = play and play.name or pid - self._view:GetChild("tex_game_name").text = data.g_name + local group = DataManager.groups:get(self.group_id) + local play = group:getPlay(data.pid) + self._view:GetChild("tex_play_name").text = play and play.name or pid + self._view:GetChild("tex_game_name").text = data.g_name local btn_refuse = self._view:GetChild("btn_refuse") - local id = data.invi_id + local id = data.invi_id local btn_yes = self._view:GetChild("btn_yes") - btn_yes.onClick:Set(function() - local refuse = btn_refuse.selected and 1 or 0 + btn_yes.onClick:Set(function() + local refuse = btn_refuse.selected and 1 or 0 self:SendResponse(id, refuse) self:Destroy() if self.callback then - self.callback(data.roomid) + self.callback(data.roomid) end end) local btn_no = self._view:GetChild("btn_no") btn_no.onClick:Set(function() - local refuse = btn_refuse.selected and 1 or 0 + local refuse = btn_refuse.selected and 1 or 0 self:SendResponse(id, refuse) self:Destroy() end) self._co = coroutine.start(function() - while self._close_time > 0 do - coroutine.wait(1) - self._close_time = self._close_time - 1 - self:ShowLeftTime() - end - self:Destroy() + while self._close_time > 0 do + coroutine.wait(1) + self._close_time = self._close_time - 1 + self:ShowLeftTime() + end + self:Destroy() end) end function M:ShowLeftTime() - self._view:GetChild("tex_left_time").text = self._close_time .. "s" + self._view:GetChild("tex_left_time").text = self._close_time .. "s" end function M:SendResponse(id, refuse) local mgr_ctr = ControllerManager.GetController(GroupMgrController) - mgr_ctr:FG_ResponseInvited(id, refuse) + mgr_ctr:FG_ResponseInvited(id, refuse) end function M:Destroy() @@ -73,7 +71,7 @@ function M:Destroy() coroutine.stop(self._co) self._co = nil end - BaseWindow.Destroy(self) + BaseWindow.Destroy(self) end -return M \ No newline at end of file +return M diff --git a/wb_new_ui/assets/FGAssist/package.xml b/wb_new_ui/assets/FGAssist/package.xml index ae3314c9..10ef6aef 100644 --- a/wb_new_ui/assets/FGAssist/package.xml +++ b/wb_new_ui/assets/FGAssist/package.xml @@ -32,7 +32,7 @@ - + diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png.meta b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png.meta index 43f89534..58dc9bb3 100644 --- a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png.meta +++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta index 359de821..9386943e 100644 --- a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta +++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes index dafcba1e..1f4d58fc 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0_1.png.meta b/wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0_1.png.meta index 7160b040..37a2e2af 100644 --- a/wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0_1.png.meta +++ b/wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0_1.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/chat/c690b7c4ecc0dd8501b1a391699eb710 assetBundleVariant: 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 85f5b8b0..98dff783 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_atlas0.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png index 6ea389c8..0bfcd9dd 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 2c32fb18..e2e35ce4 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_17.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png.meta index c1a57c7e..0bb99a98 100644 --- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png.meta +++ b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/common/af187115a4824290240734622129b80b assetBundleVariant: 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 17929cc3..ff8065eb 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/main_majiang/sound/401.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/401.mp3.meta index 2baff5b7..45f12d47 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/401.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/401.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/e2fdc6f2928043d4d3468b2c3ef68f2d assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/402.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/402.mp3.meta index 43c933fc..7a3d0cdf 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/402.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/402.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/dd8e326975a27b189bf300abaac8698d assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/403.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/403.mp3.meta index b746d5cd..1147e312 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/403.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/403.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/38b6c67feb52240d5daeae8860c9d2ed assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/404.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/404.mp3.meta index 0218a071..3820d30a 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/404.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/404.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/89ee1120b9c2b58e72bc85aeb473181c assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/501.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/501.mp3.meta index ba61863c..246211fa 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/501.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/501.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/40dbc86970f882d6f5a2f8711ec0ac28 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/502.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/502.mp3.meta index a1894e1f..f775a4a8 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/502.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/502.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/706ecedf37c8f6e89f89f8085af9e2e0 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/503.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/503.mp3.meta index 019fb5b3..75bb872b 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/503.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/503.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/5e8dea4f1206c2f86ef26c7844b70f54 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/buzhang.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/buzhang.mp3.meta index ec7ac28e..9f3c62a6 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/buzhang.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/buzhang.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/5626f27f5d019cc5fcbcfa3708b6d121 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/101.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/101.mp3.meta index 28e760ef..609f0429 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/101.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/101.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/cfd1130710d794d8215918f51ec7c56e assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/102.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/102.mp3.meta index 960a2ecf..fb42cc96 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/102.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/102.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/7d5463b3d40ddfcbf35a2563017f30af assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/103.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/103.mp3.meta index 7d4b5541..7dd3c04d 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/103.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/103.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/4667cfd6cad48a42c8dd327dd879361d assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/104.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/104.mp3.meta index 3f0b6fe7..b68314bd 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/104.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/104.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/dc83353794d35095624e561e3ff3856e assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/105.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/105.mp3.meta index 4df5ce6f..e25387a1 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/105.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/105.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/d71ba308da93b3be87f1d8b7099b18f1 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/106.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/106.mp3.meta index 2b29acf3..1aafc574 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/106.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/106.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/f8df23b6d09adb3013fbfadd5f2b12e7 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/107.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/107.mp3.meta index 41f0523b..05c8fd7c 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/107.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/107.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/1e07164c0f8eb4e1eeb76572954e24e8 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/108.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/108.mp3.meta index 61177550..ec532a21 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/108.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/108.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/beebbaad68b423d0388691c156679cb5 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/109.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/109.mp3.meta index 937aa030..01364dd2 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/109.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/109.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/3bf819be3556e9584a241d99e6ea2f2a assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/201.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/201.mp3.meta index 1669e101..e1ccf010 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/201.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/201.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/86b301c98bcc9e43a0e6201bf6c59895 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/202.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/202.mp3.meta index c80bb903..aacfebf2 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/202.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/202.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/82a3380f72d5ec72d5655dfae47598ef assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/203.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/203.mp3.meta index 89252966..8d398f1e 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/203.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/203.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/b446a57989111b0981333b2f02094bed assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/204.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/204.mp3.meta index 819a1d42..bdab1c44 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/204.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/204.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/86af8a373f024115d38bf9138c6502c2 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/205.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/205.mp3.meta index c95ee226..4a6faf5b 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/205.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/205.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/661f7be316d55a0e68dec6a88b729c6d assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/206.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/206.mp3.meta index b543f353..faf37cda 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/206.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/206.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/d1a2463c00e85731454f726b73237342 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/207.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/207.mp3.meta index 5bfbcb7d..e4516e53 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/207.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/207.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/7005ffeec10911d294f89c042311b3a2 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/208.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/208.mp3.meta index 9f85b563..8c879d32 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/208.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/208.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/e60d72f4e4b30d070a76dab67c5df0a2 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/209.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/209.mp3.meta index b44e5cb8..836727c0 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/209.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/209.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/e85b57c88a2506fed6a02cbd8962082c assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/301.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/301.mp3.meta index 3f0ca0d2..d9ffac27 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/301.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/301.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/3a6128627d1f56a3e303e541189d0772 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/302.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/302.mp3.meta index 6f2d3f82..1e8218a1 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/302.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/302.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/dcd52e5e5588d94c361015dd29b0ab12 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/303.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/303.mp3.meta index 3b03390a..3d9a34e9 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/303.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/303.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/0cfcf6e8904fb6079b720c63d030de19 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/304.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/304.mp3.meta index 76a32c27..f669734c 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/304.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/304.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/7ff9d008494d087f9a52bc2f604f564a assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/305.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/305.mp3.meta index bc3b8151..cf767154 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/305.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/305.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/8ed46cb6d32056db57663180d0043ccd assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/306.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/306.mp3.meta index 0edf3323..fedb2f08 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/306.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/306.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/92830446bb523dd918924533f6887db4 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/307.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/307.mp3.meta index 7b4b50bb..6c30bd0c 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/307.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/307.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/f77d3b4d489adf141347a08d16096f1e assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/308.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/308.mp3.meta index f0782fe0..501214a6 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/308.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/308.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/20898cd006f116c6fcfa1d11e537b837 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/309.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/309.mp3.meta index 6045346a..a1cf59c5 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/309.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/309.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/cff4a635ab49d02d11bfabce97d157a5 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/401.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/401.mp3.meta index 7fa6e5ef..e7259949 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/401.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/401.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/3c041cd179a4aa3bce60467da3222ff2 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/402.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/402.mp3.meta index 657d59a5..dbbc4c84 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/402.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/402.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/95c92553595b87a3bb857de497ec5c21 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/403.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/403.mp3.meta index 71505565..d5a8d385 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/403.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/403.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/f33fb9412a172e9c36bedd22e652554a assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/404.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/404.mp3.meta index 46f2f1d8..024b1294 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/404.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/404.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/333e4b70a7334b39ddd55983b432198e assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/501.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/501.mp3.meta index 474f234f..8ee0ef12 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/501.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/501.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/128417fea46c4678dd008a73464e9fd9 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/502.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/502.mp3.meta index a39655e9..7d4c89ae 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/502.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/502.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/734ddd6bea7c5026c1cc720fd2165020 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/503.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/503.mp3.meta index 70152487..ff402c37 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/503.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/503.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/9037194660ca4860434143c44b7fb0e2 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/chi.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/chi.mp3.meta index 462ddacf..39397470 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/chi.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/chi.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/255346a8d054488200cce7b3b5d4900d assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/gang.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/gang.mp3.meta index c01a82c6..1b6ae281 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/gang.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/gang.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/d6e8cc1b2e02b6fef35b7d7b9ba8e4ec assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/hu.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/hu.mp3.meta index 6479d52f..2d6f1c02 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/hu.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/hu.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/a1294d32e6e2c54084b0f18cdf670315 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/peng.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/peng.mp3.meta index a0bb5c59..8eb8db92 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/peng.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/peng.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/4158643c7cf0ba87f6a80c8b39c58ed2 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/zimo.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/zimo.mp3.meta index 5d748fde..e3bf3dca 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/zimo.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/man/zimo.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/6311019edaab1c6dcc12cf4d9294bc5a assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/401.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/401.mp3.meta index 9bcff70f..9d3a82a7 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/401.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/401.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/081697eba6c47d4d9a23052e4e1446b6 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/402.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/402.mp3.meta index 297d9c81..fdcdb6d0 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/402.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/402.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/ced0ba948abbb1c0fcb8cb56eb7eed94 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/404.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/404.mp3.meta index 92f068ec..fb29d7a9 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/404.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/404.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/4953c39400edff8c7d3b39817204f534 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/501.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/501.mp3.meta index 5b87ecda..5f834d51 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/501.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/501.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/bffda68e51e4c40e5e6d94086fa2bd66 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/502.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/502.mp3.meta index 9bcbc170..49a96b0f 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/502.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/502.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/a3998e7e2a7d21133b93ac91ef83fe67 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/503.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/503.mp3.meta index 730f5c5b..d37fc0ed 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/503.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/503.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/30dee632bb770a13f0dce8d977b2110b assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/chi.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/chi.mp3.meta index f593b23f..1e37800d 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/chi.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/chi.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/79521423807a18a5c96f97c97afbaa83 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/gang.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/gang.mp3.meta index 3292e92d..2eeea786 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/gang.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/gang.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/9ee14d7c125a07a5a7bfc1650af22162 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/hu.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/hu.mp3.meta index 78981b1b..4158034b 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/hu.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/hu.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/867f4925bfc95e1a1e2b6208e716ae76 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/peng.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/peng.mp3.meta index fc461e49..9acee771 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/peng.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/peng.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/b9b39f377d82258fcbfcb4ad2232ebd8 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/zimo.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/zimo.mp3.meta index 069620c5..5b6657fa 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/zimo.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/zimo.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/06f050f3af961e997704291ee173f6a6 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/zimo.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/zimo.mp3.meta index 515a6ca2..2b1cca73 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/zimo.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/zimo.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/240365e132b8f9e7ec5c098d59f3100f assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes index 62bcefeb..714714aa 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png index 1fa980da..141e74d6 100644 Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes index 23fabc09..0ad0ee45 100644 Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes and b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png index ca01ddfd..81ba7380 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png index 885c5907..7f3f703d 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png index 08a97ca7..a9aede41 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes index 35ecba7e..02959887 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png index f0a542cf..6a091542 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png index 0e2eb993..9b509716 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes index af4f5ac7..eb788d91 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png index c8e6d9df..49dbda3c 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png index 7da8a23c..c51eaf13 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes index 46996c07..faeb650d 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png index c539dc73..ac666a41 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png index 0e2eb993..9b509716 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes index d2ab2086..ee53bfed 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes differ diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json index a59c428b..7306ee7b 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init1_1.json @@ -1,9 +1,9 @@ [ { - "ver": "1.0.24", + "ver": "1.0.25", "name": "跑得快", "check": true, - "version": "1.0.24", + "version": "1.0.25", "game_id": "66", "bundle": "extend/poker/runfast" }, diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index 96f21a35..dbe4feae 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.26", + "ver": "1.0.6", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.26" + "version": "1.0.6" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "common", "check": true, "bundle": "base/common", - "version": "1.0.26" + "version": "1.0.6" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "login", "check": true, "bundle": "base/login", - "version": "1.0.26" + "version": "1.0.6" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "lobby", "check": true, "bundle": "base/lobby", - "version": "1.0.26" + "version": "1.0.6" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "Family", "check": true, "bundle": "base/Family", - "version": "1.0.26" + "version": "1.0.6" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "chat", "check": true, "bundle": "base/chat", - "version": "1.0.26" + "version": "1.0.6" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "newgroup", "check": true, "bundle": "base/newgroup", - "version": "1.0.26" + "version": "1.0.6" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "rank", "check": true, - "version": "1.0.26", + "version": "1.0.6", "bundle": "base/rank" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "main_majiang", "check": true, - "version": "1.0.26", + "version": "1.0.6", "bundle": "base/main_majiang" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "main_poker", "check": true, - "version": "1.0.26", + "version": "1.0.6", "bundle": "base/main_poker" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "main_zipai", "check": true, - "version": "1.0.26", + "version": "1.0.6", "bundle": "base/main_zipai" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "static", "check": true, "bundle": "base/static", - "version": "1.0.26" + "version": "1.0.6" }, { - "ver": "1.0.26", + "ver": "1.0.6", "is_res": true, "name": "embed", "check": true, "bundle": "base/embed", - "version": "1.0.26" + "version": "1.0.6" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "main_pokemajiang", "check": true, - "version": "1.0.26", + "version": "1.0.6", "bundle": "base/main_pokemajiang" }, { - "ver": "1.0.26", + "ver": "1.0.6", "name": "main_zipaimajiang", "check": true, - "version": "1.0.26", + "version": "1.0.6", "bundle": "base/main_zipaimajiang" } ] diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.25.bytes deleted file mode 100644 index 3c24d30e..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.26.bytes deleted file mode 100644 index 19a6ba85..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.26.bytes and /dev/null differ 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 new file mode 100644 index 00000000..bbc97737 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.25.bytes deleted file mode 100644 index 766bea9d..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.26.bytes deleted file mode 100644 index 0e03f9b2..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.25.bytes deleted file mode 100644 index 99c5efe7..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.26.bytes deleted file mode 100644 index 99c5efe7..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.25.bytes deleted file mode 100644 index 6edde587..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.26.bytes deleted file mode 100644 index 6edde587..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.25.bytes deleted file mode 100644 index 6c73165e..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.26.bytes deleted file mode 100644 index 6c73165e..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.25.bytes deleted file mode 100644 index 290277c7..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.26.bytes deleted file mode 100644 index ce10d063..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.25.bytes deleted file mode 100644 index 6378704c..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.26.bytes deleted file mode 100644 index 6378704c..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.25.bytes deleted file mode 100644 index a197a821..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.26.bytes deleted file mode 100644 index a197a821..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.25.bytes deleted file mode 100644 index 61a3b1ca..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.26.bytes deleted file mode 100644 index 61a3b1ca..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.25.bytes deleted file mode 100644 index 2c145dc6..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.26.bytes deleted file mode 100644 index 2c145dc6..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.25.bytes deleted file mode 100644 index 7ee3cf02..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.26.bytes deleted file mode 100644 index 7ee3cf02..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.25.bytes deleted file mode 100644 index 9b37ed12..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.26.bytes deleted file mode 100644 index 9b37ed12..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.25.bytes deleted file mode 100644 index cfda2eb6..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.26.bytes deleted file mode 100644 index cfda2eb6..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.25.bytes deleted file mode 100644 index 12a32b93..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.26.bytes deleted file mode 100644 index 12a32b93..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.25.bytes deleted file mode 100644 index 2a107fe5..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.26.bytes deleted file mode 100644 index 2a107fe5..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.26.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.13.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.13.bytes deleted file mode 100644 index 3e088d7a..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.13.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.14.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.14.bytes deleted file mode 100644 index 3856af36..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.14.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.19.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.19.bytes deleted file mode 100644 index d6434ba6..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.19.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.18.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.18.bytes deleted file mode 100644 index 1fe4f849..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.18.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 66098738..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.23.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.23.bytes deleted file mode 100644 index f28383b2..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.23.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.24.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.24.bytes deleted file mode 100644 index f28383b2..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.24.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 798e6421..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.2.bytes and /dev/null differ