diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 9ffa03ab..2d03698e 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,11 @@ ----------------------------------------- История изменений: +###Scripts version 2231### Дата: 24.11.2023 / Размер скачиваемого обновления: 8 мегабайт +* обновлен PROTON_LG до версии 8-24 +* обновлён установщик World of Sea Battle x64 (спасибо @Iglu47 и Cefeiko) +* + ###Scripts version 2230### Дата: 10.11.2023 / Размер скачиваемого обновления: 8 мегабайт * подготовка к обновлению установoщика PortProton diff --git a/data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT 2 RU) b/data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT 2 RU) new file mode 100755 index 00000000..880d299e --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT 2 RU) @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +#Author: Cefeiko +#launcher.exe +#Rating=? +################################################ +export PW_COMMENT_DB="World of Sea Battle + +Если Ваша система на РУССКОМ, +то для ввода логина и пароля выберите другой ДБ файл: +WORLD OF SEA BATTLE (TEXT EN) + +С этим ДБ файлом писать на АНГЛИЙСКОМ не получится, +пока не исправит разработчик" +export PW_PREFIX_NAME="DOTNET" +export PW_WINDOWS_VER="10" +export PW_VULKAN_USE="2" +export WINEDLLOVERRIDES="vulkan-1=n,b" +export PW_NO_ESYNC="1" +export PW_USE_D3D_EXTRAS="1" +export PW_USE_GSTREAMER="1" +export PW_FORCE_LARGE_ADDRESS_AWARE="1" +export PW_USE_SHADER_CACHE="1" +export LAUNCH_PARAMETERS="" +# export LANG=en_US.UTF-8 diff --git a/data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT EN) b/data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT EN) new file mode 100755 index 00000000..070979a5 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT EN) @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +#Author: Cefeiko +#launcher.exe +#Rating=? +################################################ +export PW_COMMENT_DB="World of Sea Battle + +Если Ваша система на РУССКОМ, то: +Для ввода логина и пароля используйте этот ДБ файл. +После аутентификации перезапустите игру со вторым ДБ файлом: +WORLD OF SEA BATTLE (TEXT 2 RU)" +export PW_PREFIX_NAME="DOTNET" +export PW_WINDOWS_VER="10" +export PW_VULKAN_USE="2" +export WINEDLLOVERRIDES="vulkan-1=n,b" +export PW_NO_ESYNC="1" +export PW_USE_D3D_EXTRAS="1" +export PW_USE_GSTREAMER="1" +export PW_FORCE_LARGE_ADDRESS_AWARE="1" +export PW_USE_SHADER_CACHE="1" +export LAUNCH_PARAMETERS="" +export LANG=en_US.UTF-8 diff --git a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient deleted file mode 100755 index fb2111e3..00000000 --- a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -#Author: Cefeiko -#wos_client.exe -#WorldOfSeaBattleClient.exe -#Rating=1-5 -#####################examples########################### -export PW_PREFIX_NAME="DOTNET" -export PW_DLL_INSTALL="faudio dotnet48 dotnet20sp2 dotnetdesktop7" -export WINEDLLOVERRIDES="quartz=b" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB index 7685088b..c6cc477b 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB @@ -3,18 +3,21 @@ ######################################################################## export PW_PREFIX_NAME="DOTNET" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/wos_client.exe" -export LAUNCH_PARAMETERS=("/VERYSILENT") +export LAUNCH_PARAMETERS=("/S") export PW_DLL_INSTALL="faudio dotnet48" export PW_VULKAN_USE=1 +WOSB_VERSION="$(curl -s --list-only --connect-timeout 3 https://www.worldofseabattle.com/download2 2>/dev/null | grep '/web_installer.exe' | awk -F'xsolla-launcher-update/' '{print $2}' | awk -F'/' '{print $1}')" +[[ ! -z "$WOSB_VERSION" ]] && print_info "Found version: $WOSB_VERSION" || zenity_error "Error while get version of WOSB INSTALLER." + start_portwine -if try_download "https://165311.selcdn.ru/wosb_installer/wos_client.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://installer.launcher.xsolla.com/xlauncher-builds/xsolla-launcher-update/${WOSB_VERSION}/bin/installer.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing World of Sea Battle. ${loc_gui_please_wait} " - pw_kill_autostart WorldOfSeaBattleClient.exe & + # pw_kill_autostart WorldOfSeaBattleClient.exe & pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe="$WINEPREFIX/drive_c/Games/World Of Sea Battle/WorldOfSeaBattleClient.exe" + portwine_exe="$WINEPREFIX/drive_c/users/$USER/AppData/Local/Wosb Launcher/launcher.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" kill_portwine diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index a78e8b61..102c6e31 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -169,6 +169,13 @@ portwine_start_debug () { echo "-----" >> "${PORT_WINE_PATH}/${portname}.log" echo "inxi -G:" >> "${PORT_WINE_PATH}/${portname}.log" "${PW_WINELIB}/portable/bin/inxi" -Gc0 >> "${PORT_WINE_PATH}/${portname}.log" + if echo "$LSPCI_VGA" | grep -i nvidia &>/dev/null ; then + if command -v ldconfig &>/dev/null ; then + echo "------" >> "${PORT_WINE_PATH}/${portname}.log" + echo "ldconfig -p | grep libGLX_nvidia" >> "${PORT_WINE_PATH}/${portname}.log" + ldconfig -p | grep libGLX_nvidia >> "${PORT_WINE_PATH}/${portname}.log" + fi + fi echo "----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Vulkan info device name:" >> "${PORT_WINE_PATH}/${portname}.log" [[ `command -v vulkaninfo` ]] && vulkaninfo --summary 2>/dev/null | grep -E '^GPU|deviceName|driverName' >> "${PORT_WINE_PATH}/${portname}.log" @@ -794,7 +801,7 @@ else --field=" Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click PW_ROCKSTAR"' \ --field=" League of Legends"!"$PW_GUI_ICON_PATH/lol.png"!"":"FBTN" '@bash -c "button_click PW_LOL"' \ --field=" Gameforge Client"!"$PW_GUI_ICON_PATH/gameforge.png"!"":"FBTN" '@bash -c "button_click PW_GAMEFORGE"' \ - --field=" World of Sea Battle (BETA)"!"$PW_GUI_ICON_PATH/wosb.png"!"":"FBTN" '@bash -c "button_click PW_WOSB"' \ + --field=" World of Sea Battle (x64)"!"$PW_GUI_ICON_PATH/wosb.png"!"":"FBTN" '@bash -c "button_click PW_WOSB"' \ --field=" CALIBER"!"$PW_GUI_ICON_PATH/caliber.png"!"":"FBTN" '@bash -c "button_click PW_CALIBER"' \ --field=" Crossout"!"$PW_GUI_ICON_PATH/crossout.png"!"":"FBTN" '@bash -c "button_click PW_CROSSOUT"' \ --field=" Warframe"!"$PW_GUI_ICON_PATH/warframe.png"!"":"FBTN" '@bash -c "button_click PW_WARFRAME"' \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index e87b9a52..862173b1 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -39,7 +39,7 @@ export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v12" export PW_FAKE_DLSS_VER="230506" ###WINE_AND_PROTON_LG### -export PW_PROTON_LG_VER="PROTON_LG_8-22" +export PW_PROTON_LG_VER="PROTON_LG_8-24" export PW_WINE_LG_VER="WINE_LG_8-18-1" export PW_WINE_FULLSCREEN_FSR="1" ###DXVK_AND_VKD3D###