diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua index 288c7b33..0b34e031 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua @@ -67,7 +67,7 @@ function M:InitView() self._player_card_info = {} local _player_card_info = self._player_card_info if room.curren_round > 0 then - for i = 1, #room.room_config.people_num do + for i = 1, #room.player_list do local p = room.player_list[i] local index = self:GetPos(p.seat) print("lingmeng index", index) @@ -82,7 +82,7 @@ function M:InitView() cardInfo:UpdateFzList(p.fz_list[i], -1) end info:FillData(p) - info._view.visible = false + info._view.visible = true end else for i = 1, room.room_config.people_num do diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua index 222511c8..6b82c763 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua @@ -67,7 +67,7 @@ function M:InitView(url) self._player_card_info = {} local _player_card_info = self._player_card_info if room.curren_round > 0 then - for i = 1, #room.room_config.people_num do + for i = 1, #room.player_list do local p = room.player_list[i] local index = self:GetPos(p.seat) print("lingmeng index", index) @@ -82,7 +82,7 @@ function M:InitView(url) cardInfo:UpdateFzList(p.fz_list[i], -1) end info:FillData(p) - info._view.visible = false + info._view.visible = true end else for i = 1, room.room_config.people_num do diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index aa0108b9..7f9ec258 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -68,7 +68,7 @@ function M:InitView() self._player_card_info = {} local _player_card_info = self._player_card_info if room.curren_round > 0 then - for i = 1, #room.room_config.people_num do + for i = 1, #room.player_list do local p = room.player_list[i] local index = self:GetPos(p.seat) print("lingmeng index", index) @@ -83,7 +83,7 @@ function M:InitView() cardInfo:UpdateFzList(p.fz_list[i], -1) end info:FillData(p) - info._view.visible = false + info._view.visible = true end else for i = 1, room.room_config.people_num do @@ -157,71 +157,13 @@ end function M:EventInit() -- UIPackage.AddPackage("extend/majiang/hongzhong/ui/Extend_MJ_HongZhong") - MainView.EventInit(self) + getmetatable(M).__index.EventInit(self) local _room = self._room local _view = self._view local _gcm_outcard_url = UIPackage.GetItemURL("Main_Majiang", "Gcm_OutCard") local _player_info = self._player_info local _gamectr = self._gamectr - _gamectr:AddEventListener(GameEvent.PlayerEnter, function(...) - self:PlayMJSound("user_enter.mp3") - local arg = { ... } - local p = arg[1] - local info1 = self._player_info[self:GetPos(p.seat)] - info1:FillData(p) - info1._view.visible = true - - local info2 = self._player_card_info[self:GetPos(p.seat)] - info2:SetPlayer(p) - info2:FillData() - end) - - _gamectr:AddEventListener(GameEvent.PlayerLeave, function(...) - local arg = { ... } - local p = arg[1] - local info1 = self._player_info[self:GetPos(p.seat)] - info1._view.visible = false - self:PlayMJSound("user_leave.mp3") - end) - - _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...) - self:PlayMJSound("user_enter.mp3") - local arg = { ... } - local witnessPlayerList = arg[1] - self._room.witness_player_list = witnessPlayerList - - local _room = DataManager.CurrenRoom - local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players') - if viewList_witness.numItems == #_room.witness_player_list then - viewList_witness:RefreshVirtualList() - else - viewList_witness.numItems = #_room.witness_player_list - end - end) - - _gamectr:AddEventListener(GameEvent.WitnessPlayerLeave, function(...) - ---- print("刷新托管数据=====") - local arg = { ... } - local player = arg[1] - local witnessPlayerList = self._room.witness_player_list - for i, _player in ipairs(witnessPlayerList) do - if _player.aid == player then - table.remove(witnessPlayerList, i) - break - end - end - - local _room = DataManager.CurrenRoom - local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players') - print("linemng", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems) - if viewList_witness.numItems == #_room.witness_player_list then - viewList_witness:RefreshVirtualList() - else - viewList_witness.numItems = #_room.witness_player_list - end - end) - _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...) local arg = { ... } print("lingmeng witness SendLaiZi") @@ -237,67 +179,10 @@ function M:EventInit() print("lingmeng witness EventBuGang") end) - _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) - print("lingmeng witness SendCards") - self:ShowJing() - if self._clearingView then - self._clearingView:Destroy() - self._clearingView = nil - end - self:UpdateRound() - self:RemoveCursor() - self._state.selectedIndex = 4 - local list = _room.player_list - for i = 1, #list do - local p = list[i] - local info = self._player_info[self:GetPos(p.seat)] - info:FillData(p) - info:MarkBank(p.seat == _room.banker_seat) - info:Ready(false) - local card_info = self._player_card_info[self:GetPos(p.seat)] - card_info:Clear() - card_info:UpdateHandCardWitness() - end - end) - _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) - print("lingmeng witness EventTurn") - local arg = { ... } - -- self._left_time = 15 - local seat = arg[1] - self:UpdateCardBox(self:GetPos(seat)) - local playerInfo = self._player_info[self:GetPos(seat)] - local info = self._player_card_info[self:GetPos(seat)] - print("lingmeng hand_left_count", info._player.hand_left_count) - info._player.hand_left_count = info._player.hand_left_count + 1 - info:UpdateHandCardWitness(true) - end) - _gamectr:AddEventListener(TX_GameEvent.OutHint, function(...) print("lingmeng witness OutHint") end) - local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard" - _gamectr:AddEventListener(TX_GameEvent.OutCard, function(...) - print("lingmeng witness OutCard") - self._left_time = 0 - local arg = { ... } - local p = arg[1] - local card = arg[2] - local seat = p.seat - local info = self._player_card_info[self:GetPos(seat)] - - self:RemoveCursor() - - info:UpdateHandCardWitness(false) - - info:UpdateOutCardList(nil, nil, self._cursor) - self:PlayMJSound("chupai.mp3") - self:PlaySound("LiChuan_MJ", p.self_user.sex, tostring(card)) - if seat == _room.self_player.seat then - _room.curren_outcard_seat = -1 - end - print("ling 2zhihou2") - end) _gamectr:AddEventListener(TX_GameEvent.GetCard, function(...) print("lingmeng witness GetCard") end) @@ -417,6 +302,7 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...) + self:PlayMJSound("end_music.mp3") local _room = self._room self._left_time = 0 self:UpdateCardBox(0) diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua index c0a57a14..ad6e9539 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua @@ -67,7 +67,7 @@ function M:InitView() self._player_card_info = {} local _player_card_info = self._player_card_info if room.curren_round > 0 then - for i = 1, #room.room_config.people_num do + for i = 1, #room.player_list do local p = room.player_list[i] local index = self:GetPos(p.seat) print("lingmeng index", index) @@ -82,7 +82,7 @@ function M:InitView() cardInfo:UpdateFzList(p.fz_list[i], -1) end info:FillData(p) - info._view.visible = false + info._view.visible = true end else for i = 1, room.room_config.people_num do diff --git a/lua_probject/main_project/main/majiang/MJWitnessView.lua b/lua_probject/main_project/main/majiang/MJWitnessView.lua index 4b9fed07..db51daa4 100644 --- a/lua_probject/main_project/main/majiang/MJWitnessView.lua +++ b/lua_probject/main_project/main/majiang/MJWitnessView.lua @@ -2,7 +2,7 @@ local WitnessView = require("Game.View.WitnessView") local TableBG = require("Game.Data.TableBG") local HuCardImg = import(".HuCardImg") local MJSettingView = require("main.majiang.MJSettingViewNew") - +local TX_GameEvent = import(".TX_GameEvent") local bg_config = { @@ -71,4 +71,125 @@ function M:PlaySound(group, sex, path) ViewUtil.PlaySound(group, path1) end +function M:EventInit() + local _gamectr = self._gamectr + local _room = self._room + + _gamectr:AddEventListener(GameEvent.PlayerEnter, function(...) + self:PlayMJSound("user_enter.mp3") + local arg = { ... } + local p = arg[1] + local info1 = self._player_info[self:GetPos(p.seat)] + info1:FillData(p) + info1._view.visible = true + + local info2 = self._player_card_info[self:GetPos(p.seat)] + info2:SetPlayer(p) + info2:FillData() + end) + + _gamectr:AddEventListener(GameEvent.PlayerLeave, function(...) + local arg = { ... } + local p = arg[1] + local info1 = self._player_info[self:GetPos(p.seat)] + info1._view.visible = false + self:PlayMJSound("user_leave.mp3") + end) + + _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...) + self:PlayMJSound("user_enter.mp3") + local arg = { ... } + local witnessPlayerList = arg[1] + self._room.witness_player_list = witnessPlayerList + + local _room = DataManager.CurrenRoom + local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players') + if viewList_witness.numItems == #_room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #_room.witness_player_list + end + end) + + _gamectr:AddEventListener(GameEvent.WitnessPlayerLeave, function(...) + ---- print("刷新托管数据=====") + local arg = { ... } + local player = arg[1] + local witnessPlayerList = self._room.witness_player_list + for i, _player in ipairs(witnessPlayerList) do + if _player.aid == player then + table.remove(witnessPlayerList, i) + break + end + end + + local _room = DataManager.CurrenRoom + local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players') + print("linemng", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems) + if viewList_witness.numItems == #_room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #_room.witness_player_list + end + end) + + _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) + print("lingmeng witness SendCards") + self:ShowJing() + if self._clearingView then + self._clearingView:Destroy() + self._clearingView = nil + end + self:UpdateRound() + self:RemoveCursor() + self._state.selectedIndex = 4 + local list = _room.player_list + for i = 1, #list do + local p = list[i] + local info = self._player_info[self:GetPos(p.seat)] + info:FillData(p) + info:MarkBank(p.seat == _room.banker_seat) + info:Ready(false) + local card_info = self._player_card_info[self:GetPos(p.seat)] + card_info:Clear() + card_info:UpdateHandCardWitness() + end + end) + + _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) + print("lingmeng witness EventTurn") + local arg = { ... } + -- self._left_time = 15 + local seat = arg[1] + self:UpdateCardBox(self:GetPos(seat)) + local playerInfo = self._player_info[self:GetPos(seat)] + local info = self._player_card_info[self:GetPos(seat)] + print("lingmeng hand_left_count", info._player.hand_left_count) + info._player.hand_left_count = info._player.hand_left_count + 1 + info:UpdateHandCardWitness(true) + end) + + _gamectr:AddEventListener(TX_GameEvent.OutCard, function(...) + print("lingmeng witness OutCard") + self._left_time = 0 + local arg = { ... } + local p = arg[1] + local card = arg[2] + local seat = p.seat + local info = self._player_card_info[self:GetPos(seat)] + + self:RemoveCursor() + + info:UpdateHandCardWitness(false) + + info:UpdateOutCardList(nil, nil, self._cursor) + self:PlayMJSound("chupai.mp3") + self:PlaySound("LiChuan_MJ", p.self_user.sex, tostring(card)) + if seat == _room.self_player.seat then + _room.curren_outcard_seat = -1 + end + print("ling 2zhihou2") + end) +end + return M diff --git a/lua_probject/main_project/main/majiang/TX_GameEvent.lua b/lua_probject/main_project/main/majiang/TX_GameEvent.lua new file mode 100644 index 00000000..58df4802 --- /dev/null +++ b/lua_probject/main_project/main/majiang/TX_GameEvent.lua @@ -0,0 +1,38 @@ +local TX_GameEvent = { + -- 发牌 + SendCards = "SendCards", + + EventTurn = "EventTurn", + + OutHint = "OutHint", + + GetCard = "GetCard", + + OutCard = "OutCard", + + FangziAction = "FangziAction", + + FZTips = "FZTips", + -- 胡牌 + ZPHuCard = "ZPHuCard", + -- 结算事件 + ZPResult1 = "ZPResult1", + -- 大结算事件 + ZPResult2 = "ZPResult2", + + EventNiao = "EventNiao", + + EvnetPiaoTip = "EvnetPiaoTip", + + EvnetPiao = "EvnetPiao", + + + --- + SendLaiZi = "SendLaiZi", + SendGangZi = "SendGangZi", + EventBuGang = "EventBuGang", + + --- + EventResidueCard = "EventResidueCard" +} +return TX_GameEvent diff --git a/wb_new_ui/assets/Lobby/PlayerInfo.xml b/wb_new_ui/assets/Lobby/PlayerInfo.xml index 28f6e7e7..4e234672 100644 --- a/wb_new_ui/assets/Lobby/PlayerInfo.xml +++ b/wb_new_ui/assets/Lobby/PlayerInfo.xml @@ -20,40 +20,36 @@ - - + + - - - + + - + - + - - - + + - + - + - - - + + - + - + - - - + + diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes index bc700187..bc5d31c1 100644 Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he13.mp3.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he13.mp3.meta index 73a2cf6d..6d586f5e 100644 --- a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he13.mp3.meta +++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he13.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: extend/majiang/lichuan/826211fa030fc99062a2736b491ed996 assetBundleVariant: diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json index cd3e3ce8..65c8597c 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init1_1.json @@ -8,34 +8,34 @@ "bundle": "extend/poker/runfast" }, { - "ver": "1.0.38", + "ver": "1.0.40", "name": "南城麻将", "check": true, - "version": "1.0.38", + "version": "1.0.40", "game_id": "86", "bundle": "extend/majiang/nancheng" }, { - "ver": "1.0.41", + "ver": "1.0.43", "name": "黎川麻将", "check": true, - "version": "1.0.41", + "version": "1.0.43", "game_id": "87", "bundle": "extend/majiang/lichuan" }, { - "ver": "1.0.25", + "ver": "1.0.27", "name": "金溪麻将", "check": true, - "version": "1.0.25", + "version": "1.0.27", "game_id": "88", "bundle": "extend/majiang/jinxi" }, { - "ver": "1.0.24", + "ver": "1.0.26", "name": "抚州麻将", "check": true, - "version": "1.0.24", + "version": "1.0.26", "game_id": "89", "bundle": "extend/majiang/fuzhou" } diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index dbe4feae..20648be7 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.7", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.6" + "version": "1.0.7" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "common", "check": true, "bundle": "base/common", - "version": "1.0.6" + "version": "1.0.7" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "login", "check": true, "bundle": "base/login", - "version": "1.0.6" + "version": "1.0.7" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "lobby", "check": true, "bundle": "base/lobby", - "version": "1.0.6" + "version": "1.0.7" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "Family", "check": true, "bundle": "base/Family", - "version": "1.0.6" + "version": "1.0.7" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "chat", "check": true, "bundle": "base/chat", - "version": "1.0.6" + "version": "1.0.7" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "newgroup", "check": true, "bundle": "base/newgroup", - "version": "1.0.6" + "version": "1.0.7" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "rank", "check": true, - "version": "1.0.6", + "version": "1.0.7", "bundle": "base/rank" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "main_majiang", "check": true, - "version": "1.0.6", + "version": "1.0.7", "bundle": "base/main_majiang" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "main_poker", "check": true, - "version": "1.0.6", + "version": "1.0.7", "bundle": "base/main_poker" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "main_zipai", "check": true, - "version": "1.0.6", + "version": "1.0.7", "bundle": "base/main_zipai" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "static", "check": true, "bundle": "base/static", - "version": "1.0.6" + "version": "1.0.7" }, { - "ver": "1.0.6", + "ver": "1.0.7", "is_res": true, "name": "embed", "check": true, "bundle": "base/embed", - "version": "1.0.6" + "version": "1.0.7" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "main_pokemajiang", "check": true, - "version": "1.0.6", + "version": "1.0.7", "bundle": "base/main_pokemajiang" }, { - "ver": "1.0.6", + "ver": "1.0.7", "name": "main_zipaimajiang", "check": true, - "version": "1.0.6", + "version": "1.0.7", "bundle": "base/main_zipaimajiang" } ] diff --git a/wb_unity_pro/Pack/Android/extend/majiang/fuzhou/asset_pack1.0.24.bytes b/wb_unity_pro/Pack/Android/extend/majiang/fuzhou/asset_pack1.0.24.bytes deleted file mode 100644 index a5cc243c..00000000 Binary files a/wb_unity_pro/Pack/Android/extend/majiang/fuzhou/asset_pack1.0.24.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android/extend/majiang/jinxi/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android/extend/majiang/jinxi/asset_pack1.0.25.bytes deleted file mode 100644 index f1977d98..00000000 Binary files a/wb_unity_pro/Pack/Android/extend/majiang/jinxi/asset_pack1.0.25.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android/extend/majiang/lichuan/asset_pack1.0.41.bytes b/wb_unity_pro/Pack/Android/extend/majiang/lichuan/asset_pack1.0.41.bytes deleted file mode 100644 index 9fa55321..00000000 Binary files a/wb_unity_pro/Pack/Android/extend/majiang/lichuan/asset_pack1.0.41.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android/extend/majiang/nancheng/asset_pack1.0.38.bytes b/wb_unity_pro/Pack/Android/extend/majiang/nancheng/asset_pack1.0.38.bytes deleted file mode 100644 index 69464d00..00000000 Binary files a/wb_unity_pro/Pack/Android/extend/majiang/nancheng/asset_pack1.0.38.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 deleted file mode 100644 index 9bc6365c..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.7.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.7.bytes new file mode 100644 index 00000000..6efb9f6a Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.7.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.7.bytes similarity index 98% rename from wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes index 9a28c213..9685fe26 100644 Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.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.7.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.7.bytes 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.7.bytes similarity index 99% rename from wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.7.bytes index 7483bf6c..eb60960e 100644 Binary files a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.7.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.7.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.7.bytes 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.7.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.7.bytes 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.7.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.7.bytes 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.7.bytes similarity index 99% rename from wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.7.bytes index b86c8195..fc095d49 100644 Binary files a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.7.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.7.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.7.bytes 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.7.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.7.bytes 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.7.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.7.bytes 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.7.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.7.bytes 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.7.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.7.bytes 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.7.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.7.bytes 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.7.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.7.bytes diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.24.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.26.bytes similarity index 99% rename from wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.24.bytes rename to wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.26.bytes index 5f22d3c2..38e71f0a 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.24.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.26.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.27.bytes similarity index 99% rename from wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.25.bytes rename to wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.27.bytes index 0023d986..2bcf24db 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.25.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.27.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.41.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.43.bytes similarity index 98% rename from wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.41.bytes rename to wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.43.bytes index bb40c7d3..ebe2762c 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.41.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.43.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.38.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.40.bytes similarity index 99% rename from wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.38.bytes rename to wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.40.bytes index e2ad3d2f..839f9b11 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.38.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.40.bytes differ diff --git a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset index 4da061a7..a7bcfc3d 100644 --- a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset +++ b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset @@ -39,7 +39,6 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}