Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beta55 #127

Merged
merged 67 commits into from
Apr 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
1479feb
beta9
Hoshinonyaruko Jan 26, 2024
4a6f523
beta11
Hoshinonyaruko Jan 26, 2024
8739198
beta11
Hoshinonyaruko Jan 26, 2024
d9e0844
beta13
Hoshinonyaruko Jan 26, 2024
ab96bf7
beta14
Hoshinonyaruko Jan 26, 2024
9b7bf0e
beta12
Hoshinonyaruko Jan 26, 2024
7c66e7d
beta13
Hoshinonyaruko Jan 26, 2024
eb0b186
beta15
Hoshinonyaruko Jan 26, 2024
122de8b
beta16
Hoshinonyaruko Jan 26, 2024
5e4903f
beta17
Hoshinonyaruko Jan 26, 2024
7a82cfb
beta18
Hoshinonyaruko Jan 27, 2024
ecc8263
mergefix
Hoshinonyaruko Jan 27, 2024
d0a0a85
beta19
Hoshinonyaruko Jan 27, 2024
afcb856
beta20
Hoshinonyaruko Jan 27, 2024
fafe0f9
beta20
Hoshinonyaruko Jan 27, 2024
397d4c7
beta21
Hoshinonyaruko Jan 27, 2024
c00e1a8
fixmerge
Hoshinonyaruko Jan 27, 2024
42ed202
add_playermanager_api
Hoshinonyaruko Jan 27, 2024
31a6771
beta22
Hoshinonyaruko Jan 27, 2024
050d359
beta22
Hoshinonyaruko Jan 27, 2024
939e818
beta23
Hoshinonyaruko Jan 28, 2024
19cf927
merge
Hoshinonyaruko Jan 28, 2024
8073f3a
beta24
Hoshinonyaruko Jan 29, 2024
fdd6016
mergechanges
Hoshinonyaruko Jan 29, 2024
b167455
beta25
Hoshinonyaruko Jan 30, 2024
844698b
merge
Hoshinonyaruko Jan 30, 2024
f5c8d82
beta26
Hoshinonyaruko Jan 30, 2024
2d5e94d
merge
Hoshinonyaruko Jan 30, 2024
3076085
beta27
Hoshinonyaruko Jan 30, 2024
a8a67ed
beta28
Hoshinonyaruko Jan 31, 2024
4c954fa
beta28
Hoshinonyaruko Jan 31, 2024
2f9063e
beta28
Hoshinonyaruko Jan 31, 2024
cd6fad7
beta29
Hoshinonyaruko Jan 31, 2024
2651176
beta29
Hoshinonyaruko Jan 31, 2024
265b5e3
beta30
Hoshinonyaruko Jan 31, 2024
8aac47a
beta31
Hoshinonyaruko Feb 2, 2024
a559fa2
beta31
Hoshinonyaruko Feb 2, 2024
f5bb66a
beta32
Hoshinonyaruko Feb 2, 2024
44fac8f
beta33
Hoshinonyaruko Feb 6, 2024
a44ef68
merge
Hoshinonyaruko Feb 6, 2024
e731f93
beta34
Hoshinonyaruko Feb 8, 2024
c8921a1
beta34
Hoshinonyaruko Feb 8, 2024
e6b4a3e
beta35
Hoshinonyaruko Feb 8, 2024
ac77292
merge
Hoshinonyaruko Feb 8, 2024
3992e84
beta35
Hoshinonyaruko Feb 8, 2024
d19fc5c
beta36
Hoshinonyaruko Feb 8, 2024
ff271bc
merge
Hoshinonyaruko Feb 8, 2024
a451334
beta37
Hoshinonyaruko Feb 18, 2024
6e4f28c
beta37
Hoshinonyaruko Feb 18, 2024
89d6c06
beta38
Hoshinonyaruko Feb 18, 2024
75002bc
beta39
Hoshinonyaruko Feb 18, 2024
e808a36
beta40
Hoshinonyaruko Feb 18, 2024
d2d5f4c
beta41
Hoshinonyaruko Feb 25, 2024
a40afd7
beta41
Hoshinonyaruko Feb 25, 2024
5977c8d
beat43
Hoshinonyaruko Mar 2, 2024
0ca7960
beta43
Hoshinonyaruko Mar 2, 2024
44b7bb5
beta45
Hoshinonyaruko Mar 2, 2024
d40d897
beta45
Hoshinonyaruko Mar 2, 2024
18282f6
beta46
Hoshinonyaruko Mar 3, 2024
4c89765
beta47
Hoshinonyaruko Mar 3, 2024
881dd1f
beta50
Hoshinonyaruko Mar 3, 2024
b5a8fbd
beta51
Hoshinonyaruko Mar 3, 2024
74bcb7c
beta52
Hoshinonyaruko Mar 3, 2024
4ef420a
beta53
Hoshinonyaruko Mar 3, 2024
159fd6a
Merge branch 'main' of https://github.com/Hoshinonyaruko/palworld-go …
Hoshinonyaruko Apr 5, 2024
dccfad2
beta54
Hoshinonyaruko Apr 5, 2024
f9e37ca
beta55
Hoshinonyaruko Apr 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions .github/workflows/cross_compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,24 @@ jobs:
CGO_ENABLED: 0
run: |
if [ "$GOOS" = "windows" ]; then
go build -o output/palworld-go-${{ matrix.os }}-${{ matrix.goarch }}.exe
go build -ldflags="-s -w" -o output/palworld-go-${{ matrix.os }}-${{ matrix.goarch }}.exe
else
go build -o output/palworld-go-${{ matrix.os }}-${{ matrix.goarch }}
go build -ldflags="-s -w" -o output/palworld-go-${{ matrix.os }}-${{ matrix.goarch }}
fi

- name: Compress executable files with UPX (except for palworld-go-android-arm64)
run: |
sudo apt-get update
sudo apt-get install -y upx
if [[ "${{ matrix.os }}" == *"windows"* ]]; then
FILENAME="output/palworld-go-${{ matrix.os }}-${{ matrix.goarch }}.exe"
else
FILENAME="output/palworld-go-${{ matrix.os }}-${{ matrix.goarch }}"
fi
if [[ "${{ matrix.os }}" == "android" && "${{ matrix.goarch }}" == "arm64" ]]; then
echo "Skipping UPX compression for $FILENAME"
else
upx --best --lzma "$FILENAME"
fi

- name: Upload artifacts
Expand Down
4 changes: 4 additions & 0 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,10 @@ func AutoConfigurePaths(config *Config) error {
status.SetsuccessReadGameWorldSettings(false)
} else {
config.WorldSettings = gameworldsettings
if config.WorldSettings.AdminPassword == "" {
config.WorldSettings.AdminPassword = "12345"
log.Println("设置默认登入密码为12345,为了你的服务器安全,请一定在管理面板的rcon密码处修改为其他密码.")
}
log.Println("从游戏parworldsetting.ini解析配置成功.")
log.Printf("从游戏parworldsetting.ini解析配置成功.%v", config.WorldSettings)
status.SetsuccessReadGameWorldSettings(true)
Expand Down
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ func main() {
if runtime.GOOS == "windows" {
//检查程序是否运行在合适目录
if _, err := os.Stat("PalServer.exe"); os.IsNotExist(err) {
// PalServer.exe不存在,查找PalServer-Win64-Test-Cmd.exe的路径
cmd := exec.Command("cmd", "/C", "wmic process where name='PalServer-Win64-Test-Cmd.exe' get ExecutablePath")
// PalServer.exe不存在,查找PalServer-Win64-Shipping-Cmd.exe的路径
cmd := exec.Command("cmd", "/C", "wmic process where name='PalServer-Win64-Shipping-Cmd.exe' get ExecutablePath")
output, err := cmd.Output()
if err != nil {
fmt.Println("Failed to execute command:", err)
Expand All @@ -66,7 +66,7 @@ func main() {

outputStr := string(output)
if !strings.Contains(outputStr, "ExecutablePath") {
fmt.Println("PalServer-Win64-Test-Cmd.exe not found")
fmt.Println("PalServer-Win64-Shipping-Cmd.exe not found")
fmt.Println("Notice:Please restart this program after launching the game server, and the installation will be completed automatically, releasing a launch icon to the desktop.")
fmt.Println("请打开游戏服务端后再次运行本程序,将会自动完成安装,释放启动图标到桌面。")
showMessage("提示", "请打开游戏服务端保持运行后的同时运行本程序,\n将会自动寻找游戏路径,\n自动完成安装,并释放启动图标到桌面。\n请到桌面使用StartPalWorld.bat启动我。\nNotice:Please restart this program after launching the game server, and the installation will be completed automatically, releasing a launch icon to the desktop.")
Expand Down
Binary file modified mod/embeds/palguard.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion sys/restart_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func KillProcess(config config.Config) error {

if runtime.GOOS == "windows" {
// Windows: 直接指定要结束的进程名称
cmd = exec.Command("taskkill", "/IM", "PalServer-Win64-Test-Cmd.exe", "/F")
cmd = exec.Command("taskkill", "/IM", "PalServer-Win64-Shipping-Cmd.exe", "/F")
} else {
// 非Windows: 使用pkill命令和进程名称
cmd = exec.Command("pkill", "-f", "PalServer-Linux-Test")
Expand Down
4 changes: 2 additions & 2 deletions sys/restart_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ func RestartService(config config.Config) {
fmt.Sprintf("-players=%d", config.WorldSettings.ServerPlayerMaxNum),
}
} else {
exePath = filepath.Join(config.GamePath, "Pal", "Binaries", "Win64", "PalServer-Win64-Test-Cmd.exe")
exePath = filepath.Join(config.GamePath, "Pal", "Binaries", "Win64", "PalServer-Win64-Shipping-Cmd.exe")
args = []string{
"Pal",
"-RconEnabled=True",
Expand Down Expand Up @@ -310,7 +310,7 @@ func RestartService(config config.Config) {
}
`
// 使用config.GamePath和processName填充PowerShell脚本模板
psScriptFormatted := fmt.Sprintf(psScript, "PalServer-Win64-Test-Cmd.exe", config.GamePath)
psScriptFormatted := fmt.Sprintf(psScript, "PalServer-Win64-Shipping-Cmd.exe", config.GamePath)

// 调用PowerShell执行脚本
cmd := exec.Command("powershell", "-Command", psScriptFormatted)
Expand Down
Loading