diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index bb16c171..714a0796 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -389,6 +389,7 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) + self:PlayMJSound("end_music.mp3") self:UnmarkSelfTuoguan() self._left_time = 0 self:UpdateCardBox(0) diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index 83f496e0..ed9a2279 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -412,6 +412,7 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...) + self:PlayMJSound("end_music.mp3") MJMainView.OnResult1(self, ...) --[[ self._popEvent = false diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 566dd0a5..28ac71cb 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -412,6 +412,7 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...) + self:PlayMJSound("end_music.mp3") MJMainView.OnResult1(self, ...) --[[ self._popEvent = false diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index d0586b23..a74c20cd 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -483,6 +483,7 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) + self:PlayMJSound("end_music.mp3") self:UnmarkSelfTuoguan() self._left_time = 0 self:UpdateCardBox(0) diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index 9f7a398e..742a084e 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -455,6 +455,7 @@ function M:markOutCards(showTip, data) end function M:OnPlayerEnter(...) + self:PlayMJSound("user_enter.mp3") MainView.OnPlayerEnter(self, ...) local arg = { ... } local p = arg[1] @@ -464,6 +465,8 @@ function M:OnPlayerEnter(...) end function M:OnPlayerReady(...) + self:PlayMJSound("user_ready.mp3") + local arg = { ... } local p = arg[1] local _room = self._room @@ -555,6 +558,7 @@ function M:CountCardLeftNum(card) end function M:OnPlayerLeave(...) + self:PlayMJSound("user_leave.mp3") MainView.OnPlayerLeave(self, ...) local _room = self._room if _room.banker_seat == _room.self_player.seat then diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml index 882e6b11..42b614b2 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml @@ -1,6 +1,6 @@ - + @@ -16,12 +16,15 @@ + + + @@ -30,7 +33,7 @@ - + @@ -248,7 +251,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml index c9952a30..2207aa44 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml @@ -17,15 +17,19 @@ + + + + @@ -246,7 +250,7 @@ - + diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_0.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_0.mp3 index 45350e00..f176716a 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_0.mp3 and b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_0.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_1.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_1.mp3 index 99a835c9..d26ca491 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_1.mp3 and b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_1.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_10.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_10.mp3 deleted file mode 100644 index f250be1f..00000000 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_10.mp3 and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_2.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_2.mp3 index f176716a..d34ca7ce 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_2.mp3 and b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_2.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_3.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_3.mp3 index fe69009a..4aea2c4b 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_3.mp3 and b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_3.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_5.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_5.mp3 index d26ca491..fe69009a 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_5.mp3 and b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_5.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_6.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_6.mp3 index 4aea2c4b..99a835c9 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_6.mp3 and b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_6.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_7.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_7.mp3 deleted file mode 100644 index d34ca7ce..00000000 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_7.mp3 and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_8.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_8.mp3 deleted file mode 100644 index e38730ed..00000000 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_8.mp3 and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_9.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/man/chat_9.mp3 deleted file mode 100644 index c2a80eb6..00000000 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_9.mp3 and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_0.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_0.mp3 index 921a9485..e63daa61 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_0.mp3 and b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_0.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_1.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_1.mp3 index 979e9610..50218b12 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_1.mp3 and b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_1.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_10.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_10.mp3 deleted file mode 100644 index 0f5f5a82..00000000 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_10.mp3 and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_10.mp3.meta b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_10.mp3.meta deleted file mode 100644 index f5c50181..00000000 --- a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_10.mp3.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: b245dbce11f4f5b4ab6376fb8eb6292b -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: base/common/c9fde7a5c681bd9e4c9c4b43e813d7fd - assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_2.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_2.mp3 index e63daa61..a42313c7 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_2.mp3 and b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_2.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_5.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_5.mp3 index 50218b12..626511fd 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_5.mp3 and b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_5.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_6.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_6.mp3 index 76730395..979e9610 100644 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_6.mp3 and b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_6.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_7.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_7.mp3 deleted file mode 100644 index a42313c7..00000000 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_7.mp3 and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_7.mp3.meta b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_7.mp3.meta deleted file mode 100644 index 6c91085c..00000000 --- a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_7.mp3.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 2c5626d5932e9ac488687fef3dcd1eb3 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: base/common/ad16e3847f1d504ca7e2e98f17cb8db6 - assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_8.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_8.mp3 deleted file mode 100644 index 357ca535..00000000 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_8.mp3 and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_8.mp3.meta b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_8.mp3.meta deleted file mode 100644 index 34307291..00000000 --- a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_8.mp3.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 01cbcd741fc7f514daafd4504729e70f -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: base/common/440bef7d85dff6698ab1fa9cab6a9973 - assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_9.mp3 b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_9.mp3 deleted file mode 100644 index 535dc25f..00000000 Binary files a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_9.mp3 and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_9.mp3.meta b/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_9.mp3.meta deleted file mode 100644 index 7fcff955..00000000 --- a/wb_unity_pro/Assets/ART/base/common/sound/woman/chat_9.mp3.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 39f79d35cdfe56647b16d9acaff2742b -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: base/common/407d4e3425c5cf4fbf00cd16c246fcc5 - assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/end_music.mp3 b/wb_unity_pro/Assets/ART/base/main_majiang/sound/end_music.mp3 new file mode 100644 index 00000000..25413b52 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/sound/end_music.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_8.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/end_music.mp3.meta similarity index 78% rename from wb_unity_pro/Assets/ART/base/common/sound/man/chat_8.mp3.meta rename to wb_unity_pro/Assets/ART/base/main_majiang/sound/end_music.mp3.meta index d9095498..27a7ebe7 100644 --- a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_8.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/end_music.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d8ddf77d2fe345c438f0ef55bb960541 +guid: 714fad1f942befc47a993d33c0508bfb AudioImporter: externalObjects: {} serializedVersion: 6 @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: base/common/7a35d9a2cdcda19502755d66b75ed095 + assetBundleName: base/main_majiang/53c76ac749410d6c85a3ec1742dac7ef assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/gameover.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/gameover.mp3.meta index fec06ee3..663f14ae 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/sound/gameover.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/gameover.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: base/main_majiang/bc7d7d432fd0ecc21c2ee4f44aa7ceea assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_enter.mp3 b/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_enter.mp3 new file mode 100644 index 00000000..74d8c409 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_enter.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_10.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_enter.mp3.meta similarity index 78% rename from wb_unity_pro/Assets/ART/base/common/sound/man/chat_10.mp3.meta rename to wb_unity_pro/Assets/ART/base/main_majiang/sound/user_enter.mp3.meta index ccb6f2ca..7e71dce0 100644 --- a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_10.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_enter.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8b86ea13912daaa4faa9b9f5e2e54532 +guid: e970c4eee9c1afe4e88b87430288ac26 AudioImporter: externalObjects: {} serializedVersion: 6 @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: base/common/99d6f9d1475fa9528ebfb23b5c5aae2c + assetBundleName: base/main_majiang/8835cea8debfda87033d6a703b50dc0e assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_leave.mp3 b/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_leave.mp3 new file mode 100644 index 00000000..c34beb1a Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_leave.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_9.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_leave.mp3.meta similarity index 78% rename from wb_unity_pro/Assets/ART/base/common/sound/man/chat_9.mp3.meta rename to wb_unity_pro/Assets/ART/base/main_majiang/sound/user_leave.mp3.meta index 27c6bb06..533653cd 100644 --- a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_9.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_leave.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7e8432a2da6a6a441b64a4422d9d8e35 +guid: 04b23dd330069cd4b9c90b31bcaa76f3 AudioImporter: externalObjects: {} serializedVersion: 6 @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: base/common/01591d8f5600ef7664b313b2f7315cf9 + assetBundleName: base/main_majiang/56742f86b0226e8b7e8634a384ad064a assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_ready.mp3 b/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_ready.mp3 new file mode 100644 index 00000000..945fd907 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_ready.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_7.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_ready.mp3.meta similarity index 78% rename from wb_unity_pro/Assets/ART/base/common/sound/man/chat_7.mp3.meta rename to wb_unity_pro/Assets/ART/base/main_majiang/sound/user_ready.mp3.meta index 63407d8a..4f7a7978 100644 --- a/wb_unity_pro/Assets/ART/base/common/sound/man/chat_7.mp3.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/user_ready.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a8366000285dca94eb9ed22c4120fe67 +guid: 0c6cccbbe7ee40747a5af58d3b6130b3 AudioImporter: externalObjects: {} serializedVersion: 6 @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: base/common/9a7273e71c8e1f14d6bbfe9dce34a085 + assetBundleName: base/main_majiang/412bcb3f0a4743c8750680ffbb65585e 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 1b2c7326..d76ca5ac 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/Pack/Android32/base/Family/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.8.bytes index 4ef1c62b..daf49412 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.8.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes index 17253500..c6044e7f 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/common/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes index 41750e46..a9d3a7cd 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/lobby/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes index a830f4bd..b49698cd 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/main_majiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes index 0351b027..d43c06ed 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/newgroup/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes index b58db9f3..b374a750 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/static/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes index 05b6aee4..b1c41db1 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/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} diff --git a/wb_unity_pro/ProjectSettings/ProjectSettings.asset b/wb_unity_pro/ProjectSettings/ProjectSettings.asset index fd2f0474..bf6734dc 100644 --- a/wb_unity_pro/ProjectSettings/ProjectSettings.asset +++ b/wb_unity_pro/ProjectSettings/ProjectSettings.asset @@ -179,7 +179,7 @@ PlayerSettings: iPhone: 1 AndroidBundleVersionCode: 12 AndroidMinSdkVersion: 22 - AndroidTargetSdkVersion: 26 + AndroidTargetSdkVersion: 32 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 0 @@ -787,7 +787,7 @@ PlayerSettings: platformArchitecture: iPhone: 1 scriptingBackend: - Android: 0 + Android: 1 Standalone: 1 iPhone: 1 il2cppCompilerConfiguration: {}