From 78827f3c7dfb7662307e3af8d76f1d40d17faf9a Mon Sep 17 00:00:00 2001 From: wanghe-fit2cloud Date: Wed, 24 Jan 2024 15:21:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=20Palworld=20?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/palworld-server/README.md | 59 ------------------ apps/palworld/README.md | 5 ++ apps/{palworld-server => palworld}/data.yml | 6 +- .../latest/data.yml | 10 +-- apps/palworld/latest/data/.gitkeep | 0 .../latest/docker-compose.yml | 9 ++- apps/palworld/latest/scripts/init.sh | 3 + apps/{palworld-server => palworld}/logo.png | Bin 8 files changed, 20 insertions(+), 72 deletions(-) delete mode 100644 apps/palworld-server/README.md create mode 100644 apps/palworld/README.md rename apps/{palworld-server => palworld}/data.yml (78%) rename apps/{palworld-server => palworld}/latest/data.yml (90%) create mode 100644 apps/palworld/latest/data/.gitkeep rename apps/{palworld-server => palworld}/latest/docker-compose.yml (94%) create mode 100644 apps/palworld/latest/scripts/init.sh rename apps/{palworld-server => palworld}/logo.png (100%) diff --git a/apps/palworld-server/README.md b/apps/palworld-server/README.md deleted file mode 100644 index 2733f3d1..00000000 --- a/apps/palworld-server/README.md +++ /dev/null @@ -1,59 +0,0 @@ -# 使用说明 - -## 数据文件夹授权 - -- 1、**必要操作：** 首次安装完成后，进入已安装应用界面，点击跳转数据目录，修改目录下的`data`文件夹为`1000`用户和用户组。 - -命令行修改则类似如下，路径按需修改： -``` -chown -R 1000:1000 /opt/1panel/apps/local/palworld-server/palworld-server/data -``` - -- 2、回到已安装应用界面，重建应用。 - -# 原始相关 -*** - -# palworld-docker - -[![Check Update](https://github.com/KagurazakaNyaa/palworld-docker/actions/workflows/update.yml/badge.svg)](https://github.com/KagurazakaNyaa/palworld-docker/actions/workflows/update.yml) -[![Build Docker Image](https://github.com/KagurazakaNyaa/palworld-docker/actions/workflows/build.yml/badge.svg)](https://github.com/KagurazakaNyaa/palworld-docker/actions/workflows/build.yml) -![Docker Pulls](https://img.shields.io/docker/pulls/kagurazakanyaa/palworld) -![Docker Stars](https://img.shields.io/docker/stars/kagurazakanyaa/palworld) -![Image Size](https://img.shields.io/docker/image-size/kagurazakanyaa/palworld/latest) - -Palworld dedicated server with docker - -## Environments - -The variables in the table below affect the server's startup command, see and -| Variable | Describe | Default Values | Allowed Values | -|--------------------|-------------------------------------------------------------|----------------|----------------------| -| MAX_PLAYERS | Change the maximum number of participants on the server. | 32 | 1-32 | -| GAME_PORT | Change the port number used to listen to the server. | 8211 | 1024-65535 | -| ENABLE_MULTITHREAD | Improves performance in multi-threaded CPU environments. | true | true/false | -| IS_PUBLIC | Setup server as a community server. | false | true/false | -| PUBLIC_IP | If not specified, it will be detected automatically. | | all vaild ip address | -| PUBLIC_PORT | If not specified, it will be detected automatically. | | 1024-65535 | -| FORCE_UPDATE | Whether the server should be update each time start. | false | true/false | - -The variables in the table below only valid during initialization, if you need to make it valid, please delete `/opt/palworld/Pal/Saved/Config/LinuxServer/PalWorldSettings.ini` and restart the container. -| Variable | Describe | Default Values | Allowed Values | -|--------------------|--------------------------|-------------------------|----------------| -| SERVER_NAME | Server name | Default Palworld Server | string | -| SERVER_DESC | Server description | Default Palworld Server | string | -| ADMIN_PASSWORD | AdminPassword | | string | -| SERVER_PASSWORD | Set the server password. | | string | -| RCON_ENABLED | Enable RCON | false | true/false | -| RCON_PORT | Port number for RCON | 25575 | 1024-65535 | - -For balance changes, please directly modify `/opt/palworld/Pal/Saved/Config/LinuxServer/PalWorldSettings.ini`, please refer to - -## Volumes - -|Path |Describe | -|--------------------------|----------------------| -|`/opt/palworld/Pal/Saved` |Game config and saves.| - -NOTE: If you use bind instead of volume to mount, you need to manually change the volume owner to uid=1000. -In the case of the docker-compose.yml of the example, you need to execute `chown -R 1000:1000 ./data` \ No newline at end of file diff --git a/apps/palworld/README.md b/apps/palworld/README.md new file mode 100644 index 00000000..576f0426 --- /dev/null +++ b/apps/palworld/README.md @@ -0,0 +1,5 @@ +# Palworld + +**《幻兽帕鲁》** 是 **Pocketpair** 开发的一款开放世界生存制作游戏，游戏于 2023 年 11 月 02 日至 11 月 05 日进行了封闭网络测试，于 2024 年 01 月 18 日发行抢先体验版本。 + +游戏中，玩家可以在广阔的世界中收集神奇的生物“帕鲁”，派他们进行战斗、建造、做农活，工业生产等。 \ No newline at end of file diff --git a/apps/palworld-server/data.yml b/apps/palworld/data.yml similarity index 78% rename from apps/palworld-server/data.yml rename to apps/palworld/data.yml index 36fcff2f..b5a4c28a 100644 --- a/apps/palworld-server/data.yml +++ b/apps/palworld/data.yml @@ -1,12 +1,12 @@ -name: Palworld Dedicated Server (幻兽帕鲁) +name: Palworld tags: - 休闲游戏 title: 幻兽帕鲁服务端 type: 休闲游戏 description: 幻兽帕鲁服务端 additionalProperties: - key: palworld-server - name: Palworld Dedicated Server (幻兽帕鲁) + key: palworld + name: Palworld tags: - Game shortDescZh: 幻兽帕鲁服务端 diff --git a/apps/palworld-server/latest/data.yml b/apps/palworld/latest/data.yml similarity index 90% rename from apps/palworld-server/latest/data.yml rename to apps/palworld/latest/data.yml index 107efc15..0916d836 100644 --- a/apps/palworld-server/latest/data.yml +++ b/apps/palworld/latest/data.yml @@ -31,11 +31,11 @@ additionalProperties: labelZh: 是否启用 CPU 多线程优化 (true / false) required: true type: text - - default: 'false' + - default: 'true' edit: true envKey: PUBLIC_SWITCH labelEn: Setup server as a community server (true / false) - labelZh: 是否启将服务器设置为社区服务器 (true / false) + labelZh: 是否将服务器设置为社区服务器 (true / false) required: true type: text - default: '' @@ -47,7 +47,7 @@ additionalProperties: type: text - default: '' edit: true - envKey: PUBLIC_PORT + envKey: PANEL_APP_PORT_PUBLIC labelEn: PUBLIC PORT (If not specified, it will be detected automatically) labelZh: 服务器端口 (留空自动检测) required: false @@ -60,14 +60,14 @@ additionalProperties: labelZh: 是否每次启动都更新服务器 (true / false) required: true type: text - - default: 'Default Palworld Server' + - default: '1Panel Palworld Server' edit: true envKey: SERVER_NAME labelEn: Server name labelZh: 服务器名 required: true type: text - - default: 'Default Palworld Server' + - default: '1Panel Palworld Server' edit: true envKey: SERVER_DESC labelEn: Server description diff --git a/apps/palworld/latest/data/.gitkeep b/apps/palworld/latest/data/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/apps/palworld-server/latest/docker-compose.yml b/apps/palworld/latest/docker-compose.yml similarity index 94% rename from apps/palworld-server/latest/docker-compose.yml rename to apps/palworld/latest/docker-compose.yml index c7e981dc..11068299 100644 --- a/apps/palworld-server/latest/docker-compose.yml +++ b/apps/palworld/latest/docker-compose.yml @@ -1,6 +1,7 @@ version: '3.9' services: - palworld-server: + palworld: + image: kagurazakanyaa/palworld:latest container_name: ${CONTAINER_NAME} restart: always networks: @@ -9,15 +10,15 @@ services: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP}/udp - ${PANEL_APP_PORT_RCON}:${PANEL_APP_PORT_RCON}/tcp volumes: - - /etc/localtime:/etc/localtime:ro - ./data:/opt/palworld/Pal/Saved + - /etc/localtime:/etc/localtime:ro environment: - GAME_PORT=${PANEL_APP_PORT_HTTP} - MAX_PLAYERS=${MAX_PLAYERS} - ENABLE_MULTITHREAD=${MULTITHREAD_SWITCH} - IS_PUBLIC=${PUBLIC_SWITCH} - PUBLIC_IP=${PUBLIC_IP} - - PUBLIC_PORT=${PUBLIC_PORT} + - PUBLIC_PORT=${PANEL_APP_PORT_PUBLIC} - FORCE_UPDATE=${UPDATE_SWITCH} - SERVER_NAME=${SERVER_NAME} - SERVER_DESC=${SERVER_DESC} @@ -25,10 +26,8 @@ services: - SERVER_PASSWORD=${SERVER_PASSWORD} - RCON_ENABLED=${RCON_SWITCH} - RCON_PORT=${PANEL_APP_PORT_RCON} - image: kagurazakanyaa/palworld:latest labels: createdBy: "Apps" - networks: 1panel-network: external: true diff --git a/apps/palworld/latest/scripts/init.sh b/apps/palworld/latest/scripts/init.sh new file mode 100644 index 00000000..4e811c86 --- /dev/null +++ b/apps/palworld/latest/scripts/init.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +chown -R 1000:1000 data \ No newline at end of file diff --git a/apps/palworld-server/logo.png b/apps/palworld/logo.png similarity index 100% rename from apps/palworld-server/logo.png rename to apps/palworld/logo.png