diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png index 42ca30b6..8c600a87 100644 Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png index 56483d78..0d84b86c 100644 Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png index 641fa36c..cc6f836e 100644 Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png differ diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png index 07f2a4ee..15bee633 100644 Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png differ 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 eaf9c917..bf500edf 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/base/login/ui/Login_fui.bytes b/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes index ed60e964..4ea0869c 100644 Binary files a/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes and b/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes differ diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index 445cc7d7..7cadfe39 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json @@ -1,11 +1,11 @@ [ { "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.25", + "ver": "1.0.26", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.25" + "version": "1.0.26" }, { "ver": "1.0.21", @@ -15,18 +15,18 @@ "version": "1.0.21" }, { - "ver": "1.0.21", + "ver": "1.0.22", "name": "login", "check": true, "bundle": "base/login", - "version": "1.0.21" + "version": "1.0.22" }, { - "ver": "1.0.8", + "ver": "1.0.21", "name": "lobby", "check": true, "bundle": "base/lobby", - "version": "1.0.8" + "version": "1.0.21" }, { "ver": "1.0.21", 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 new file mode 100644 index 00000000..501ecff6 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.26.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.61.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.61.bytes deleted file mode 100644 index 4c47057d..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.61.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.62.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.62.bytes deleted file mode 100644 index e4bc0303..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.62.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.79.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.79.bytes deleted file mode 100644 index f725ce1d..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.79.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.75.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.75.bytes deleted file mode 100644 index dc921dda..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.75.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/asset_config1.0.21.json b/wb_unity_pro/Pack/asset_config1.0.21.json deleted file mode 100644 index c895cd0b..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.21.json +++ /dev/null @@ -1,109 +0,0 @@ -[ - { - "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.21", - "name": "base_script", - "check": true, - "bundle": "base/base_script", - "version": "1.0.21" - }, - { - "ver": "1.0.21", - "name": "common", - "check": true, - "bundle": "base/common", - "version": "1.0.21" - }, - { - "ver": "1.0.21", - "name": "login", - "check": true, - "bundle": "base/login", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "lobby", - "check": true, - "bundle": "base/lobby", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "name": "Family", - "check": true, - "bundle": "base/Family", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "chat", - "check": true, - "bundle": "base/chat", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "name": "newgroup", - "check": true, - "bundle": "base/newgroup", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "rank", - "check": true, - "version": "1.0.8", - "bundle": "base/rank" - }, - { - "ver": "1.0.21", - "name": "main_majiang", - "check": true, - "version": "1.0.21", - "bundle": "base/main_majiang" - }, - { - "ver": "1.0.21", - "name": "main_poker", - "check": true, - "version": "1.0.21", - "bundle": "base/main_poker" - }, - { - "ver": "1.0.8", - "name": "main_zipai", - "check": true, - "version": "1.0.8", - "bundle": "base/main_zipai" - }, - { - "ver": "1.0.8", - "name": "static", - "check": true, - "bundle": "base/static", - "version": "1.0.8" - }, - { - "ver": "1.0.8", - "is_res": true, - "name": "embed", - "check": true, - "bundle": "base/embed", - "version": "1.0.8" - }, - { - "ver": "1.0.8", - "name": "main_pokemajiang", - "check": true, - "version": "1.0.8", - "bundle": "base/main_pokemajiang" - }, - { - "ver": "1.0.8", - "name": "main_zipaimajiang", - "check": true, - "version": "1.0.8", - "bundle": "base/main_zipaimajiang" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.22.json b/wb_unity_pro/Pack/asset_config1.0.22.json deleted file mode 100644 index ba5ca0cb..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.22.json +++ /dev/null @@ -1,109 +0,0 @@ -[ - { - "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.22", - "name": "base_script", - "check": true, - "bundle": "base/base_script", - "version": "1.0.22" - }, - { - "ver": "1.0.21", - "name": "common", - "check": true, - "bundle": "base/common", - "version": "1.0.21" - }, - { - "ver": "1.0.21", - "name": "login", - "check": true, - "bundle": "base/login", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "lobby", - "check": true, - "bundle": "base/lobby", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "name": "Family", - "check": true, - "bundle": "base/Family", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "chat", - "check": true, - "bundle": "base/chat", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "name": "newgroup", - "check": true, - "bundle": "base/newgroup", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "rank", - "check": true, - "version": "1.0.8", - "bundle": "base/rank" - }, - { - "ver": "1.0.22", - "name": "main_majiang", - "check": true, - "version": "1.0.22", - "bundle": "base/main_majiang" - }, - { - "ver": "1.0.21", - "name": "main_poker", - "check": true, - "version": "1.0.21", - "bundle": "base/main_poker" - }, - { - "ver": "1.0.8", - "name": "main_zipai", - "check": true, - "version": "1.0.8", - "bundle": "base/main_zipai" - }, - { - "ver": "1.0.8", - "name": "static", - "check": true, - "bundle": "base/static", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "is_res": true, - "name": "embed", - "check": true, - "bundle": "base/embed", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "main_pokemajiang", - "check": true, - "version": "1.0.8", - "bundle": "base/main_pokemajiang" - }, - { - "ver": "1.0.8", - "name": "main_zipaimajiang", - "check": true, - "version": "1.0.8", - "bundle": "base/main_zipaimajiang" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.23.json b/wb_unity_pro/Pack/asset_config1.0.23.json deleted file mode 100644 index 429c70db..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.23.json +++ /dev/null @@ -1,109 +0,0 @@ -[ - { - "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.23", - "name": "base_script", - "check": true, - "bundle": "base/base_script", - "version": "1.0.23" - }, - { - "ver": "1.0.21", - "name": "common", - "check": true, - "bundle": "base/common", - "version": "1.0.21" - }, - { - "ver": "1.0.21", - "name": "login", - "check": true, - "bundle": "base/login", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "lobby", - "check": true, - "bundle": "base/lobby", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "name": "Family", - "check": true, - "bundle": "base/Family", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "chat", - "check": true, - "bundle": "base/chat", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "name": "newgroup", - "check": true, - "bundle": "base/newgroup", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "rank", - "check": true, - "version": "1.0.8", - "bundle": "base/rank" - }, - { - "ver": "1.0.23", - "name": "main_majiang", - "check": true, - "version": "1.0.23", - "bundle": "base/main_majiang" - }, - { - "ver": "1.0.23", - "name": "main_poker", - "check": true, - "version": "1.0.23", - "bundle": "base/main_poker" - }, - { - "ver": "1.0.8", - "name": "main_zipai", - "check": true, - "version": "1.0.8", - "bundle": "base/main_zipai" - }, - { - "ver": "1.0.8", - "name": "static", - "check": true, - "bundle": "base/static", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "is_res": true, - "name": "embed", - "check": true, - "bundle": "base/embed", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "main_pokemajiang", - "check": true, - "version": "1.0.8", - "bundle": "base/main_pokemajiang" - }, - { - "ver": "1.0.8", - "name": "main_zipaimajiang", - "check": true, - "version": "1.0.8", - "bundle": "base/main_zipaimajiang" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.24.json b/wb_unity_pro/Pack/asset_config1.0.24.json deleted file mode 100644 index 14d09738..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.24.json +++ /dev/null @@ -1,109 +0,0 @@ -[ - { - "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.24", - "name": "base_script", - "check": true, - "bundle": "base/base_script", - "version": "1.0.24" - }, - { - "ver": "1.0.21", - "name": "common", - "check": true, - "bundle": "base/common", - "version": "1.0.21" - }, - { - "ver": "1.0.21", - "name": "login", - "check": true, - "bundle": "base/login", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "lobby", - "check": true, - "bundle": "base/lobby", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "name": "Family", - "check": true, - "bundle": "base/Family", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "chat", - "check": true, - "bundle": "base/chat", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "name": "newgroup", - "check": true, - "bundle": "base/newgroup", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "rank", - "check": true, - "version": "1.0.8", - "bundle": "base/rank" - }, - { - "ver": "1.0.24", - "name": "main_majiang", - "check": true, - "version": "1.0.24", - "bundle": "base/main_majiang" - }, - { - "ver": "1.0.23", - "name": "main_poker", - "check": true, - "version": "1.0.23", - "bundle": "base/main_poker" - }, - { - "ver": "1.0.8", - "name": "main_zipai", - "check": true, - "version": "1.0.8", - "bundle": "base/main_zipai" - }, - { - "ver": "1.0.8", - "name": "static", - "check": true, - "bundle": "base/static", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "is_res": true, - "name": "embed", - "check": true, - "bundle": "base/embed", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "main_pokemajiang", - "check": true, - "version": "1.0.8", - "bundle": "base/main_pokemajiang" - }, - { - "ver": "1.0.8", - "name": "main_zipaimajiang", - "check": true, - "version": "1.0.8", - "bundle": "base/main_zipaimajiang" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.25.json b/wb_unity_pro/Pack/asset_config1.0.25.json deleted file mode 100644 index 445cc7d7..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.25.json +++ /dev/null @@ -1,109 +0,0 @@ -[ - { - "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.25", - "name": "base_script", - "check": true, - "bundle": "base/base_script", - "version": "1.0.25" - }, - { - "ver": "1.0.21", - "name": "common", - "check": true, - "bundle": "base/common", - "version": "1.0.21" - }, - { - "ver": "1.0.21", - "name": "login", - "check": true, - "bundle": "base/login", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "lobby", - "check": true, - "bundle": "base/lobby", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "name": "Family", - "check": true, - "bundle": "base/Family", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "chat", - "check": true, - "bundle": "base/chat", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "name": "newgroup", - "check": true, - "bundle": "base/newgroup", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "rank", - "check": true, - "version": "1.0.8", - "bundle": "base/rank" - }, - { - "ver": "1.0.25", - "name": "main_majiang", - "check": true, - "version": "1.0.25", - "bundle": "base/main_majiang" - }, - { - "ver": "1.0.23", - "name": "main_poker", - "check": true, - "version": "1.0.23", - "bundle": "base/main_poker" - }, - { - "ver": "1.0.8", - "name": "main_zipai", - "check": true, - "version": "1.0.8", - "bundle": "base/main_zipai" - }, - { - "ver": "1.0.8", - "name": "static", - "check": true, - "bundle": "base/static", - "version": "1.0.8" - }, - { - "ver": "1.0.21", - "is_res": true, - "name": "embed", - "check": true, - "bundle": "base/embed", - "version": "1.0.21" - }, - { - "ver": "1.0.8", - "name": "main_pokemajiang", - "check": true, - "version": "1.0.8", - "bundle": "base/main_pokemajiang" - }, - { - "ver": "1.0.8", - "name": "main_zipaimajiang", - "check": true, - "version": "1.0.8", - "bundle": "base/main_zipaimajiang" - } -] 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}