Compare commits

..
141 changed files with 318 additions and 1616 deletions

No files matched your search

+1 -1
View File
@@ -61,6 +61,6 @@ and the player-facing `docs/*.md`; translated READMEs use `README.<locale>.md`,
When changing a public guide, update its counterparts in the same change. Write naturally for
players in each language rather than translating word for word. Keep steps, feature limits and
experimental Portable Characters warnings equivalent. Use actual UI labels; retain English labels
where the released UI falls back to English. English screenshots stay in `docs/screenshots/`; localized images use its `ru`, `de`, `fr`, `es` and `zh-CN` subfolders. Keep the interface and annotation language consistent with each guide.
where the released UI falls back to English. Screenshots are shared from `docs/screenshots/`.
The public guide index is `docs/README.md`; internal protocol specifications and audits are not
player guides. Keep canonical release histories in English and link to them instead of making copies.
Generated
+3 -3
View File
@@ -586,7 +586,7 @@ dependencies = [
[[package]]
name = "coa-core"
version = "0.7.3"
version = "0.7.1"
dependencies = [
"base64 0.22.1",
"chrono",
@@ -634,7 +634,7 @@ dependencies = [
[[package]]
name = "coa-release"
version = "0.7.3"
version = "0.7.1"
dependencies = [
"chrono",
"coa-core",
@@ -643,7 +643,7 @@ dependencies = [
[[package]]
name = "coa-server-manager"
version = "0.7.3"
version = "0.7.1"
dependencies = [
"coa-control-proto",
"coa-core",
+1 -1
View File
@@ -4,7 +4,7 @@ members = ["crates/coa-core", "crates/coa-release", "crates/coa-registry-proto",
exclude = ["services/coa-registry", "services/coa-registry-e2e", "services/coa-coordinator", "services/coa-relay"]
[workspace.package]
version = "0.7.3"
version = "0.7.1"
edition = "2021"
license = "AGPL-3.0-only"
+3 -3
View File
@@ -6,7 +6,7 @@
Eine Windows-Anwendung, mit der du deinen eigenen **Conquest of Azeroth**-Server auf Basis von AzerothCore mit wenigen Schritten einrichtest und betreibst. Konsole, manuelle Konfigurationsdateien und separate Datenbankprogramme sind dafür nicht nötig. Entwickelt mit Tauri 2, Rust und React.
![Dein Server im Überblick](docs/screenshots/de/overview.jpg)
![Dein Server im Überblick](docs/screenshots/overview.png)
## Funktionen
@@ -31,11 +31,11 @@ Eine Windows-Anwendung, mit der du deinen eigenen **Conquest of Azeroth**-Server
| Portable Characters — experimentell | Öffentliche Realms |
|---|---|
| ![Portable Characters](docs/screenshots/de/portable.jpg) | ![Öffentliche Realms](docs/screenshots/de/realms.jpg) |
| ![Portable Characters](docs/screenshots/portable.png) | ![Öffentliche Realms](docs/screenshots/realms.png) |
| Begleiter | Sicherungen |
|---|---|
| ![Begleiter](docs/screenshots/de/bots.jpg) | ![Sicherungen](docs/screenshots/de/backups.jpg) |
| ![Begleiter](docs/screenshots/bots.png) | ![Sicherungen](docs/screenshots/backups.png) |
[Zur Galerie](docs/de/SCREENSHOTS.md) · [Alle Anleitungen](docs/de/README.md). Die Galerie zeigt auch Einrichtung, Module, Spielclient, Verbindungen mit Freunden und die Übernahme eines vorhandenen Charakters.
+3 -3
View File
@@ -6,7 +6,7 @@
Una aplicación para Windows con la que instalar y gestionar tu propio servidor de **Conquest of Azeroth**, basado en AzerothCore, en pocos pasos. No necesitas usar la consola, editar archivos de configuración a mano ni manejar programas de bases de datos. Creada con Tauri 2, Rust y React.
![Tu servidor de un vistazo](docs/screenshots/es/overview.jpg)
![Tu servidor de un vistazo](docs/screenshots/overview.png)
## Funciones
@@ -31,11 +31,11 @@ Una aplicación para Windows con la que instalar y gestionar tu propio servidor
| Personajes portátiles — experimental | Reinos públicos |
|---|---|
| ![Personajes portátiles](docs/screenshots/es/portable.jpg) | ![Reinos públicos](docs/screenshots/es/realms.jpg) |
| ![Personajes portátiles](docs/screenshots/portable.png) | ![Reinos públicos](docs/screenshots/realms.png) |
| Compañeros | Copias de seguridad |
|---|---|
| ![Compañeros](docs/screenshots/es/bots.jpg) | ![Copias de seguridad](docs/screenshots/es/backups.jpg) |
| ![Compañeros](docs/screenshots/bots.png) | ![Copias de seguridad](docs/screenshots/backups.png) |
[Galería completa](docs/es/SCREENSHOTS.md) · [Todas las guías](docs/es/README.md). También encontrarás la instalación, los módulos, el cliente, las conexiones con amigos y cómo convertir un personaje existente en portátil.
+3 -3
View File
@@ -6,7 +6,7 @@
Une application Windows pour installer et gérer votre propre serveur **Conquest of Azeroth**, basé sur AzerothCore, en quelques étapes. Pas besoin de console, de modifier les fichiers de configuration à la main ou d'utiliser un outil de base de données. L'application utilise Tauri 2, Rust et React.
![Votre serveur en un coup d'œil](docs/screenshots/fr/overview.jpg)
![Votre serveur en un coup d'œil](docs/screenshots/overview.png)
## Fonctionnalités
@@ -31,11 +31,11 @@ Une application Windows pour installer et gérer votre propre serveur **Conquest
| Personnages portables — expérimental | Royaumes publics |
|---|---|
| ![Personnages portables](docs/screenshots/fr/portable.jpg) | ![Royaumes publics](docs/screenshots/fr/realms.jpg) |
| ![Personnages portables](docs/screenshots/portable.png) | ![Royaumes publics](docs/screenshots/realms.png) |
| Compagnons | Sauvegardes |
|---|---|
| ![Compagnons](docs/screenshots/fr/bots.jpg) | ![Sauvegardes](docs/screenshots/fr/backups.jpg) |
| ![Compagnons](docs/screenshots/bots.png) | ![Sauvegardes](docs/screenshots/backups.png) |
[Galerie complète](docs/fr/SCREENSHOTS.md) · [Tous les guides](docs/fr/README.md). La galerie présente aussi l'installation, les modules, le client, les connexions entre amis et la création d'un personnage portable.
+3 -3
View File
@@ -6,7 +6,7 @@
Приложение для Windows, с которым можно установить и запустить свой сервер **Conquest of Azeroth** на базе AzerothCore за несколько шагов. Управляйте сервером через интерфейс, без консоли, ручного редактирования конфигов и отдельных программ для базы данных. Менеджер написан на Tauri 2, Rust и React.
![Главное окно менеджера](docs/screenshots/ru/overview.jpg)
![Главное окно менеджера](docs/screenshots/overview.png)
## Возможности
@@ -31,11 +31,11 @@
| Переносимые персонажи — экспериментально | Публичные реалмы |
|---|---|
| ![Переносимые персонажи](docs/screenshots/ru/portable.jpg) | ![Публичные реалмы](docs/screenshots/ru/realms.jpg) |
| ![Переносимые персонажи](docs/screenshots/portable.png) | ![Публичные реалмы](docs/screenshots/realms.png) |
| Компаньоны | Резервные копии |
|---|---|
| ![Компаньоны](docs/screenshots/ru/bots.jpg) | ![Резервные копии](docs/screenshots/ru/backups.jpg) |
| ![Компаньоны](docs/screenshots/bots.png) | ![Резервные копии](docs/screenshots/backups.png) |
[Все скриншоты](docs/ru/SCREENSHOTS.md) · [Гайды для игроков и владельцев серверов](docs/ru/README.md). В галерее также показаны установка, модули, клиент, подключение друзей и создание переносимого персонажа.
+3 -3
View File
@@ -6,7 +6,7 @@
这是一款 Windows 应用,帮助你用几个简单步骤搭建和管理自己的 **Conquest of Azeroth** 服务器,服务端基于 AzerothCore。日常操作不需要使用控制台、手动修改配置文件或单独操作数据库。应用采用 Tauri 2、Rust 和 React 开发。
![服务器概览](docs/screenshots/zh-CN/overview.jpg)
![服务器概览](docs/screenshots/overview.png)
## 主要功能
@@ -31,11 +31,11 @@
| 便携角色(实验性) | 公开服务器 |
|---|---|
| ![便携角色](docs/screenshots/zh-CN/portable.jpg) | ![公开服务器](docs/screenshots/zh-CN/realms.jpg) |
| ![便携角色](docs/screenshots/portable.png) | ![公开服务器](docs/screenshots/realms.png) |
| 伙伴机器人 | 备份 |
|---|---|
| ![伙伴机器人](docs/screenshots/zh-CN/bots.jpg) | ![备份](docs/screenshots/zh-CN/backups.jpg) |
| ![伙伴机器人](docs/screenshots/bots.png) | ![备份](docs/screenshots/backups.png) |
[查看完整截图](docs/zh-CN/SCREENSHOTS.md) · [玩家与服主指南](docs/zh-CN/README.md)。图库还展示了初始设置、模块、客户端、朋友联机,以及将现有角色转换为便携角色的流程。
@@ -1,7 +0,0 @@
---
area: manager
type: added
audience: admins
title: Advanced settings cover creature melee damage, spell damage and health by rank
---
Configure normal, elite, rare, rare elite and world boss creatures separately. Existing normal-creature settings now identify their scope clearly. Changes persist in the server template and require a world server restart.
@@ -1,7 +0,0 @@
---
area: manager
type: fixed
audience: admins
title: Internet sharing accepts existing port forwards to the same server
---
When a router rejects an already configured port forward, the Manager checks its destination. Matching enabled rules are accepted; conflicting rules report the affected TCP port and remain untouched.
@@ -1,7 +0,0 @@
---
area: manager
type: changed
audience: admins
title: The Auction House Bot card has a single switch
---
The separate "Post auctions" option is gone; turning the module on is enough. A server build with the single-switch Auction House Bot is needed, and an old EnableSeller line in the config is ignored.
@@ -1,7 +0,0 @@
---
area: manager
type: fixed
audience: players
title: More character and server browser controls now use your selected language
---
Completed missing German, French, Spanish and Simplified Chinese labels and improved Chinese font support.
@@ -1,7 +0,0 @@
---
area: manager
type: fixed
audience: admins
title: A stalled database inspection no longer blocks server maintenance indefinitely
---
Update checks limit how long their database client can run and release the maintenance lock after a timeout. The Manager stops only its inspection client, keeps the database server running and reports that migration history could not be checked.
@@ -1,7 +0,0 @@
---
area: manager
type: fixed
audience: players
title: Portable characters open again after using an experimental Manager
---
Preserves saved characters and collections when opening a portable store upgraded by an experimental Manager.
-22
View File
@@ -1033,28 +1033,6 @@ Spellbook.New = 5
assert!(v.drift_keys.is_empty());
}
#[test]
fn creature_rates_save_independently_in_template_and_active_config() {
let (_d, root, meta) = fixture();
let mut changes = BTreeMap::new();
for (i, group) in ["Normal", "Elite.Elite", "Elite.RARE", "Elite.RAREELITE", "Elite.WORLDBOSS"].iter().enumerate() {
for (j, stat) in ["Damage", "SpellDamage", "HP"].iter().enumerate() {
changes.insert(format!("Rate.Creature.{group}.{stat}"), json!(0.25 + (i * 3 + j) as f64 * 0.25));
}
}
let report = save(&root, &meta, Scope::Server, &changes).unwrap();
assert_eq!(report.changed.len(), 15);
assert_eq!(report.restart, Some(Restart::World));
for path in ["Settings/worldserver.conf.template", "Core/configs/worldserver.conf"] {
let conf = load_conf(&root.join(path)).unwrap();
for (key, value) in &changes {
assert_eq!(conf.get(key).unwrap().parse::<f64>().unwrap(), value.as_f64().unwrap(), "{path}: {key}");
}
assert_eq!(conf.get("Unknown.Custom"), Some("\"keep me\""));
}
assert!(save(&root, &meta, Scope::Server, &changes).unwrap().changed.is_empty());
}
#[test]
fn save_changes_only_that_key_in_template_and_generated_conf() {
let (_d, root, meta) = fixture();
+2 -153
View File
@@ -5,10 +5,9 @@
use std::fmt;
use std::fs::File;
use std::io::{BufReader, BufWriter, Read, Seek, SeekFrom, Write};
use std::io::{BufReader, BufWriter, Read, Write};
use std::path::{Path, PathBuf};
use std::process::{Command, Stdio};
use std::time::{Duration, Instant};
use serde::Deserialize;
@@ -49,7 +48,6 @@ pub struct Db {
realm: crate::realms::Mode,
/// Name of the database container of a Docker installation; the client tools then run inside it.
container: Option<String>,
read_deadline: Option<Instant>,
}
#[derive(Deserialize)]
@@ -69,42 +67,6 @@ fn no_window(cmd: &mut Command) {
let _ = cmd;
}
fn bounded_client_output(command: &mut Command, input: &[u8], deadline: Instant) -> Result<std::process::Output> {
let timeout = || Error::Invalid("The database inspection timed out. The Manager stopped its client process; the database server was not stopped. Retry the operation or export diagnostics if this continues.".into());
if Instant::now() >= deadline {
return Err(timeout());
}
let mut stdin = tempfile::tempfile()?;
stdin.write_all(input)?;
stdin.seek(SeekFrom::Start(0))?;
let mut stdout = tempfile::tempfile()?;
let mut stderr = tempfile::tempfile()?;
command.stdin(stdin).stdout(stdout.try_clone()?).stderr(stderr.try_clone()?);
let mut child = command.spawn()?;
let status = loop {
match child.try_wait() {
Ok(Some(status)) => break status,
Ok(None) if Instant::now() < deadline => std::thread::sleep(Duration::from_millis(25)),
result => {
child.kill().map_err(|error| Error::Invalid(format!(
"The database inspection timed out, but its client could not be stopped: {error}"
)))?;
let _ = child.wait();
return match result {
Err(error) => Err(error.into()),
_ => Err(timeout()),
};
}
}
};
stdout.seek(SeekFrom::Start(0))?;
stderr.seek(SeekFrom::Start(0))?;
let mut output = std::process::Output { status, stdout: Vec::new(), stderr: Vec::new() };
stdout.read_to_end(&mut output.stdout)?;
stderr.read_to_end(&mut output.stderr)?;
Ok(output)
}
/// Schema names of the three game databases.
pub const SCHEMAS: [(&str, &str); 3] = [
("characters", "acore_characters"),
@@ -161,7 +123,6 @@ impl Db {
password: Secret(password),
realm: crate::realms::state(root)?.active,
container: None,
read_deadline: None,
})
}
@@ -182,7 +143,6 @@ impl Db {
password: Secret(password),
realm: crate::realms::state(root)?.active,
container: Some(container),
read_deadline: None,
})
}
@@ -202,7 +162,6 @@ impl Db {
password: Secret(password.to_string()),
realm,
container: None,
read_deadline: None,
}
}
@@ -321,13 +280,7 @@ impl Db {
pub fn ping(&self) -> bool {
let mut c = self.command("mysqladmin.exe");
c.arg("ping").arg("--connect-timeout=3");
bounded_client_output(&mut c, b"", Instant::now() + Duration::from_secs(5))
.map(|o| o.status.success()).unwrap_or(false)
}
pub(crate) fn with_read_deadline(mut self, deadline: Instant) -> Self {
self.read_deadline = Some(deadline);
self
c.output().map(|o| o.status.success()).unwrap_or(false)
}
/// Run SQL text (statement(s) supplied on stdin) and return the raw output.
@@ -338,13 +291,6 @@ impl Db {
"--default-character-set=utf8mb4",
"--max-allowed-packet=128M",
]);
if let Some(deadline) = self.read_deadline {
let out = bounded_client_output(&mut c, route_sql(sql, self.realm).as_bytes(), deadline)?;
if !out.status.success() {
return Err(self.fail(&out.stderr));
}
return Ok(String::from_utf8_lossy(&out.stdout).trim().to_string());
}
c.stdin(Stdio::piped());
let mut child = c.spawn()?;
child
@@ -636,103 +582,6 @@ mod realm_tests {
#[cfg(test)]
mod tests {
fn client_fixture(mode: &str) -> std::process::Command {
let mut command = std::process::Command::new(std::env::current_exe().unwrap());
command.args(["--exact", "db::tests::bounded_client_fixture", "--nocapture"])
.env("COA_DATABASE_CLIENT_TEST", mode);
super::no_window(&mut command);
command
}
#[test]
fn bounded_client_fixture() {
match std::env::var("COA_DATABASE_CLIENT_TEST").as_deref() {
Ok("hang") => std::thread::sleep(std::time::Duration::from_secs(60)),
Ok("output") => {
use std::io::{Read, Write};
let mut input = Vec::new();
std::io::stdin().read_to_end(&mut input).unwrap();
std::io::stdout().write_all(&input).unwrap();
std::io::stderr().write_all(&vec![b'e'; 256 * 1024]).unwrap();
}
Ok("fail") => std::process::exit(17),
_ => (),
}
}
#[test]
fn bounded_client_captures_large_output_without_pipe_deadlock() {
let data = vec![b'x'; 256 * 1024];
let out = super::bounded_client_output(&mut client_fixture("output"), &data,
std::time::Instant::now() + std::time::Duration::from_secs(10)).unwrap();
assert!(out.status.success());
assert!(out.stdout.windows(data.len()).any(|part| part == data));
assert_eq!(out.stderr, vec![b'e'; 256 * 1024]);
let out = super::bounded_client_output(&mut client_fixture("fail"), b"",
std::time::Instant::now() + std::time::Duration::from_secs(10)).unwrap();
assert_eq!(out.status.code(), Some(17));
}
#[test]
fn bounded_client_timeout_releases_the_update_operation_lock() {
let folder = tempfile::tempdir().unwrap();
let start = std::time::Instant::now();
let result = (|| {
let _lock = crate::update::operation_lock_for(folder.path(), "checking updates", false)?;
super::bounded_client_output(&mut client_fixture("hang"), b"",
start + std::time::Duration::from_millis(250))
})();
assert!(result.unwrap_err().to_string().contains("inspection timed out"));
assert!(start.elapsed() < std::time::Duration::from_secs(5));
crate::update::operation_lock(folder.path()).unwrap();
}
#[cfg(windows)]
#[test]
#[ignore = "requires COA_MYSQL_TEST_BIN; starts a disposable MySQL server"]
fn real_mysql_inspection_timeout_preserves_server_and_releases_lock() {
use std::os::windows::process::CommandExt;
struct Server(std::process::Child);
impl Drop for Server {
fn drop(&mut self) {
let _ = self.0.kill();
let _ = self.0.wait();
}
}
let bin = std::path::PathBuf::from(std::env::var("COA_MYSQL_TEST_BIN").unwrap());
let folder = tempfile::tempdir().unwrap();
let data = folder.path().join("data");
let initialized = std::process::Command::new(bin.join("mysqld.exe"))
.args(["--no-defaults", "--initialize-insecure"])
.arg(format!("--datadir={}", data.display()))
.creation_flags(0x0800_0000).output().unwrap();
assert!(initialized.status.success(), "{}", String::from_utf8_lossy(&initialized.stderr));
let socket = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
let port = socket.local_addr().unwrap().port();
drop(socket);
let mut server = Server(std::process::Command::new(bin.join("mysqld.exe"))
.args(["--no-defaults", "--bind-address=127.0.0.1", "--mysqlx=0", "--skip-log-bin"])
.arg(format!("--datadir={}", data.display())).arg(format!("--port={port}"))
.arg(format!("--log-error={}", folder.path().join("mysql.log").display()))
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null())
.creation_flags(0x0800_0000).spawn().unwrap());
let db = super::Db::with_tools(bin, port, "root", "", crate::realms::Mode::Coa);
let ready = std::time::Instant::now() + std::time::Duration::from_secs(30);
while !db.ping() {
assert!(std::time::Instant::now() < ready);
std::thread::sleep(std::time::Duration::from_millis(100));
}
let result = (|| {
let _lock = crate::update::operation_lock_for(folder.path(), "checking updates", false)?;
db.clone().with_read_deadline(std::time::Instant::now() + std::time::Duration::from_millis(500))
.query("SELECT SLEEP(60);")
})();
assert!(result.unwrap_err().to_string().contains("inspection timed out"));
assert!(server.0.try_wait().unwrap().is_none());
assert_eq!(db.query("SELECT 42;").unwrap(), "42");
crate::update::operation_lock(folder.path()).unwrap();
}
#[test]
fn reborn_sql_routes_only_database_identifiers() {
use crate::realms::Mode;
@@ -1,23 +0,0 @@
-- Schema 9: Multi-ruleset partitioned collections and reborn ruleset support.
-- 1. Partition collection table by (profile_id, ruleset, kind)
CREATE TABLE collection_new (
profile_id TEXT NOT NULL REFERENCES profile(profile_id),
ruleset TEXT NOT NULL CHECK (ruleset IN ('coa', 'wildcard', 'reborn')),
kind TEXT NOT NULL,
collection_revision INTEGER NOT NULL CHECK (collection_revision >= 1),
collection_hash BLOB NOT NULL CHECK (length(collection_hash) = 32),
format_version INTEGER NOT NULL,
item_count INTEGER NOT NULL,
updated_at TEXT NOT NULL,
payload BLOB NOT NULL,
PRIMARY KEY (profile_id, ruleset, kind)
) STRICT;
INSERT INTO collection_new (profile_id, ruleset, kind, collection_revision, collection_hash, format_version, item_count, updated_at, payload)
SELECT profile_id, 'coa', kind, collection_revision, collection_hash, format_version, item_count, updated_at, payload
FROM collection;
DROP TABLE collection;
ALTER TABLE collection_new RENAME TO collection;
CREATE INDEX IF NOT EXISTS character_profile_ruleset ON character(profile_id, ruleset);
+5 -7
View File
@@ -27,7 +27,6 @@ const MIGRATIONS: &[&str] = &[
include_str!("migrations/006_collections.sql"),
include_str!("migrations/007_capabilities.sql"),
include_str!("migrations/008_projection.sql"),
include_str!("migrations/009_multiruleset.sql"),
];
pub const DEFAULT_HISTORY_KEEP: u32 = 20;
@@ -658,7 +657,6 @@ impl Store {
}
// ---- collections ----------------------------------------------------------------------------------------
// These APIs exchange CoA collections only. Preserve other schema-9 partitions without reading or modifying them.
/// `stored = stored U incoming`. Nothing is ever removed. When the union equals what is stored, no revision is
/// created and the hash stays the same.
@@ -703,9 +701,9 @@ impl Store {
let payload = merged.encode();
let at = now();
tx.execute(
"INSERT INTO collection(profile_id, ruleset, kind, collection_revision, collection_hash, format_version, item_count, updated_at, payload)
VALUES (?1, 'coa', ?2, ?3, ?4, ?5, ?6, ?7, ?8)
ON CONFLICT(profile_id, ruleset, kind) DO UPDATE SET collection_revision = excluded.collection_revision, collection_hash = excluded.collection_hash,
"INSERT INTO collection(profile_id, kind, collection_revision, collection_hash, format_version, item_count, updated_at, payload)
VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)
ON CONFLICT(profile_id, kind) DO UPDATE SET collection_revision = excluded.collection_revision, collection_hash = excluded.collection_hash,
format_version = excluded.format_version, item_count = excluded.item_count, updated_at = excluded.updated_at, payload = excluded.payload",
params![profile.to_string(), kind, (revision + 1) as i64, hash.as_slice(), PORTABLE_COLLECTION_FORMAT_VERSION, merged.len() as i64, at, payload],
)?;
@@ -732,7 +730,7 @@ impl Store {
let row = self
.conn
.query_row(
"SELECT collection_revision, collection_hash, item_count, updated_at FROM collection WHERE profile_id = ?1 AND ruleset = 'coa' AND kind = ?2",
"SELECT collection_revision, collection_hash, item_count, updated_at FROM collection WHERE profile_id = ?1 AND kind = ?2",
params![profile.to_string(), kind],
|r| Ok((r.get::<_, i64>(0)?, r.get::<_, Vec<u8>>(1)?, r.get::<_, i64>(2)?, r.get::<_, String>(3)?)),
)
@@ -782,7 +780,7 @@ fn read_collection(
) -> Result<Option<(CollectionInfo, IdSet)>> {
let row = conn
.query_row(
"SELECT collection_revision, collection_hash, item_count, updated_at, payload FROM collection WHERE profile_id = ?1 AND ruleset = 'coa' AND kind = ?2",
"SELECT collection_revision, collection_hash, item_count, updated_at, payload FROM collection WHERE profile_id = ?1 AND kind = ?2",
params![profile.to_string(), kind],
|r| Ok((r.get::<_, i64>(0)?, r.get::<_, Vec<u8>>(1)?, r.get::<_, i64>(2)?, r.get::<_, String>(3)?, r.get::<_, Vec<u8>>(4)?)),
)
@@ -7,101 +7,6 @@ fn fresh() -> (Store, ProfileId) {
(store, profile)
}
#[test]
fn schema_nine_upgrade_preserves_characters_and_isolates_collections() {
let dir = tempfile::tempdir().unwrap();
let conn = Connection::open(Store::path_of(dir.path())).unwrap();
for sql in &MIGRATIONS[..8] {
conn.execute_batch(sql).unwrap();
}
conn.pragma_update(None, "application_id", APPLICATION_ID)
.unwrap();
conn.pragma_update(None, "user_version", 8).unwrap();
let mut old = Store { conn };
let profile = old.default_profile().unwrap();
let id = created(&mut old, profile);
old.bind_server(id, "realm-a", 42, 1, MappingState::Synced)
.unwrap();
let before = old.load_current(id).unwrap();
let set = IdSet::from_ids([10, 20]).unwrap();
let kind = "coa:wardrobe";
old.conn
.execute(
"INSERT INTO collection VALUES (?1, ?2, 7, ?3, ?4, 2, 'before', ?5)",
params![
profile.to_string(),
kind,
set.hash(kind).as_slice(),
PORTABLE_COLLECTION_FORMAT_VERSION,
set.encode()
],
)
.unwrap();
drop(old);
let mut store = Store::open(dir.path()).unwrap();
assert_eq!(store.schema_version().unwrap(), 9);
assert_eq!(store.load_current(id).unwrap(), before);
assert_eq!(store.server_mappings(id).unwrap()[0].local_guid, 42);
assert_eq!(store.collection(profile, kind).unwrap().unwrap().1, set);
assert_eq!(
store
.collection_info(profile, kind)
.unwrap()
.unwrap()
.revision,
7
);
// An experimental Manager may already have populated another partition.
store.conn.execute(
"INSERT INTO collection SELECT profile_id, 'reborn', kind, collection_revision, collection_hash, format_version, item_count, updated_at, payload FROM collection WHERE ruleset = 'coa'",
[],
).unwrap();
store
.merge_collection(profile, kind, &IdSet::from_ids([30]).unwrap())
.unwrap();
assert_eq!(
store.collection(profile, kind).unwrap().unwrap().1,
IdSet::from_ids([10, 20, 30]).unwrap()
);
let foreign: (i64, Vec<u8>) = store
.conn
.query_row(
"SELECT collection_revision, payload FROM collection WHERE ruleset = 'reborn'",
[],
|r| Ok((r.get(0)?, r.get(1)?)),
)
.unwrap();
assert_eq!(foreign, (7, set.encode()));
drop(store);
assert_eq!(
Store::open(dir.path()).unwrap().load_current(id).unwrap(),
before
);
}
#[test]
#[ignore = "Requires a disposable SQLite backup in COA_PORTABLE_SCHEMA9_FIXTURE"]
fn schema_nine_existing_store_and_runtime_smoke() {
let root = std::path::PathBuf::from(
std::env::var_os("COA_PORTABLE_SCHEMA9_FIXTURE").expect("fixture path"),
);
for role in ["owner", "host"] {
let store = Store::open(&root.join(role)).unwrap();
assert_eq!(store.schema_version().unwrap(), 9);
let records = store.list_characters_all().unwrap();
assert!(!records.is_empty());
for record in records {
store.load_current(record.character_id).unwrap();
store.list_revisions(record.character_id).unwrap();
}
}
let runtime =
crate::portable::service::PortableRuntime::start(&root, Box::new(Vec::new), None).unwrap();
runtime.call(|_| ()).unwrap();
runtime.shutdown();
}
fn created(store: &mut Store, profile: ProfileId) -> CharacterId {
store
.create_character(profile, fixtures::geared_level_eighty(), "realm-a")
-3
View File
@@ -1527,9 +1527,6 @@ impl RepackEnv<'_> {
return Ok(Some(0));
}
let count = |db: &crate::db::Db| -> Result<usize> {
let db = db.clone().with_read_deadline(
std::time::Instant::now() + std::time::Duration::from_secs(15),
);
let realms = crate::realms::state(self.root)?;
let modes = realms.modes();
let mut count = 0;
+4 -74
View File
@@ -160,11 +160,8 @@ pub fn external_ip(gw: &Gateway) -> Result<Ipv4Addr> {
}
pub fn add_mapping(gw: &Gateway, port: u16, lan: Ipv4Addr, what: &str) -> Result<()> {
add_mapping_with(port, lan, what, |action, args| soap(gw, action, args))
}
fn add_mapping_with(port: u16, lan: Ipv4Addr, what: &str, mut request: impl FnMut(&str, &[(&str, String)]) -> Result<String>) -> Result<()> {
let result = request(
soap(
gw,
"AddPortMapping",
&[
("NewRemoteHost", String::new()),
@@ -179,28 +176,8 @@ fn add_mapping_with(port: u16, lan: Ipv4Addr, what: &str, mut request: impl FnMu
),
("NewLeaseDuration", "0".into()),
],
);
match result {
Ok(_) => Ok(()),
Err(error) => {
// Some routers reject a mapping that already points to us. Read it back;
// never delete or replace another host's mapping.
let existing = request("GetSpecificPortMappingEntry", &[
("NewRemoteHost", String::new()),
("NewExternalPort", port.to_string()),
("NewProtocol", "TCP".into()),
]);
if let Ok(xml) = existing {
let client = between(&xml, "<NewInternalClient>", "</NewInternalClient>").and_then(|v| v.parse::<Ipv4Addr>().ok());
let internal_port = between(&xml, "<NewInternalPort>", "</NewInternalPort>").and_then(|v| v.parse::<u16>().ok());
let enabled = between(&xml, "<NewEnabled>", "</NewEnabled>");
if client == Some(lan) && internal_port == Some(port) && matches!(enabled, Some("1" | "true")) {
return Ok(());
}
}
Err(Error::Invalid(format!("Could not forward TCP port {port}: {error}. Check the router's existing port forwarding rules for this port.")))
}
}
)
.map(|_| ())
}
pub fn remove_mapping(gw: &Gateway, port: u16) -> Result<()> {
@@ -225,53 +202,6 @@ mod tests {
<service><serviceType>urn:schemas-upnp-org:service:WANIPConnection:1</serviceType><controlURL>/ctl/IPConn</controlURL></service>\
</serviceList></device></deviceList></device></deviceList></device></root>";
#[test]
fn existing_mapping_is_accepted_only_for_the_requested_destination() {
let lan = "192.168.1.5".parse().unwrap();
for (client, port, enabled, accepted) in [
("192.168.1.5", "3724", "1", true),
("192.168.1.5", "3724", "true", true),
("192.168.1.6", "3724", "1", false),
("192.168.1.5", "8085", "1", false),
("192.168.1.5", "3724", "0", false),
("", "", "", false),
] {
let mut actions = Vec::new();
let result = add_mapping_with(3724, lan, "Login", |action, args| {
actions.push(action.to_string());
assert!(args.contains(&("NewExternalPort", "3724".into())));
assert!(args.contains(&("NewProtocol", "TCP".into())));
match action {
"AddPortMapping" => Err(Error::Invalid("ConflictInMappingEntry".into())),
"GetSpecificPortMappingEntry" => Ok(format!("<NewInternalClient>{client}</NewInternalClient><NewInternalPort>{port}</NewInternalPort><NewEnabled>{enabled}</NewEnabled>")),
_ => panic!("must not delete or modify an existing mapping"),
}
});
assert_eq!(result.is_ok(), accepted);
assert_eq!(actions, ["AddPortMapping", "GetSpecificPortMappingEntry"]);
if let Err(error) = result {
assert!(error.to_string().contains("TCP port 3724"));
assert!(error.to_string().contains("ConflictInMappingEntry"));
}
}
}
#[test]
fn successful_add_does_not_require_router_readback_support() {
add_mapping_with(8085, "192.168.1.5".parse().unwrap(), "World", |action, _| {
assert_eq!(action, "AddPortMapping");
Ok(String::new())
}).unwrap();
}
#[test]
fn failed_readback_keeps_the_original_error() {
let error = add_mapping_with(8085, "192.168.1.5".parse().unwrap(), "World", |action, _| {
Err(Error::Invalid(if action == "AddPortMapping" { "ConflictInMappingEntry" } else { "Unsupported action" }.into()))
}).unwrap_err().to_string();
assert!(error.contains("ConflictInMappingEntry") && error.contains("8085"));
}
#[test]
fn parses_ssdp_location_and_description() {
let resp = "HTTP/1.1 200 OK\r\nCACHE-CONTROL: max-age=120\r\nLocation: http://192.168.1.1:5000/rootDesc.xml\r\nST: x\r\n\r\n";
+20
View File
@@ -2,24 +2,44 @@
**English** · [Русский](ru/SCREENSHOTS.md) · [Deutsch](de/SCREENSHOTS.md) · [Français](fr/SCREENSHOTS.md) · [Español](es/SCREENSHOTS.md) · [简体中文](zh-CN/SCREENSHOTS.md)
### Your server, a few clicks away
![Your server, a few clicks away](screenshots/setup.png)
### Your server at a glance
![Your server at a glance](screenshots/overview.png)
### Build your own adventuring company
![Build your own adventuring company](screenshots/bots.png)
### Manage your server modules
![Manage your server modules](screenshots/modules.png)
### Your client, ready to play
![Your client, ready to play](screenshots/client.png)
### Keep your progress safe
![Keep your progress safe](screenshots/backups.png)
### Bring your friends along
![Bring your friends along](screenshots/friends.png)
### Find your next realm
![Find your next realm](screenshots/realms.png)
### Portable characters · Experimental
![Portable characters · Experimental](screenshots/portable.png)
### Make a character portable · Experimental
![Make a character portable · Experimental](screenshots/remote-character.png)
[All guides](README.md)
+9 -9
View File
@@ -9,26 +9,26 @@ Der Manager kann einen Charakter speichern, mit dem du anschließend auf kompati
## Den ersten Charakter übernehmen
1. Logge den Charakter im Spiel aus. Lass den Manager geöffnet.
2. Öffne **Charaktere (Characters)** und wähle **Vorhandenen Charakter portabel machen (Make an existing character portable)**.
2. Öffne **Charaktere (Characters)** und wähle **Make an existing character portable**.
3. Wähle einen Realm, auf den du Zugriff hast, und den gewünschten Charakter.
4. Klicke auf **Portabel machen (Make portable)**. Der Charakter erscheint unter **Deine Charaktere (Your characters)**.
4. Klicke auf **Make portable**. Der Charakter erscheint unter **Your characters**.
Lässt sich ein Charakter nicht auswählen, steht der Grund daneben. Bot-Charaktere, laufende Herausforderungen und bestimmte ausstehende Belohnungen können die Übernahme verhindern. Die portable Kopie löscht den ursprünglichen Realm-Charakter nicht.
## Einen Charakter von einem anderen Realm übernehmen
1. Öffne **Server (Servers)** und wähle den Realm des Charakters.
2. Wähle **Vorhandenes Konto verknüpfen (Link an existing account)** und gib dein vorhandenes Konto dieses Realms an.
2. Wähle **Link an existing account** und gib dein vorhandenes Konto dieses Realms an.
3. Melde dich im Spiel auf dem Realm an und bleibe in der Charakterauswahl.
4. Wechsle mit **Alt+Tab** zurück zum Manager und wähle **Meine Charaktere anzeigen (Show my characters)**.
5. Suche deinen Charakter und klicke auf **Portabel machen (Make portable)**.
4. Wechsle mit **Alt+Tab** zurück zum Manager und wähle **Show my characters**.
5. Suche deinen Charakter und klicke auf **Make portable**.
6. Warte auf die Bestätigung und die Kennzeichnung **Portable**.
![Ein Realm-Konto verknüpfen](../screenshots/de/09-link-realm-account.jpg)
![Ein Realm-Konto verknüpfen](../screenshots/09-link-realm-account.jpg)
![Den Charakter auswählen](../screenshots/de/10-remote-portable-candidates.jpg)
![Den Charakter auswählen](../screenshots/10-remote-portable-candidates.jpg)
![Der Charakter wurde gespeichert](../screenshots/de/11-remote-portable-saved.jpg)
![Der Charakter wurde gespeichert](../screenshots/11-remote-portable-saved.jpg)
## Mit dem gespeicherten Charakter spielen
@@ -42,6 +42,6 @@ Auf Realms mit einer niedrigeren Höchststufe kann dein Charakter vorübergehend
## Gespeicherte Versionen und Konflikte
Unter **Gespeicherte Versionen (Saved versions)** siehst du, wann dein Fortschritt gespeichert wurde. Bei einem Konflikt lies zuerst die Erklärung des Managers. Spiele nicht mit zwei Kopien gleichzeitig und behalte zusätzlich normale Serversicherungen.
Unter **Saved versions** siehst du, wann dein Fortschritt gespeichert wurde. Bei einem Konflikt lies zuerst die Erklärung des Managers. Spiele nicht mit zwei Kopien gleichzeitig und behalte zusätzlich normale Serversicherungen.
[Alle Anleitungen](README.md)
+1 -1
View File
@@ -9,7 +9,7 @@
- [Warcraft Reborn](WARCRAFT-REBORN.md) — einen Realm anlegen und auswählen.
- [Updates, Sicherungen und Reparatur](REPAIR_AND_REALMS.md) — den Server pflegen und Probleme beheben.
Die Screenshots zeigen die deutsche Oberfläche. Englische Bezeichnungen in Klammern helfen beim Vergleich mit anderen App-Sprachen.
Englische Schaltflächennamen stehen in Klammern, damit du sie auch auf den Screenshots wiederfindest. Die Screenshots zeigen die englische Oberfläche.
**Portable Characters sind experimentell.** Der Manager wird aktiv entwickelt und kann noch Fehler enthalten. Bitte melde Probleme [als Issue](https://github.com/Corfirean/coa-server-manager/issues/new/choose).
+31 -11
View File
@@ -2,26 +2,46 @@
[English](../SCREENSHOTS.md) · [Русский](../ru/SCREENSHOTS.md) · **Deutsch** · [Français](../fr/SCREENSHOTS.md) · [Español](../es/SCREENSHOTS.md) · [简体中文](../zh-CN/SCREENSHOTS.md)
Die Screenshots zeigen die deutsche Oberfläche.
Die Screenshots zeigen die englische Oberfläche von Version 0.7.0.
![Server einrichten](../screenshots/de/setup.jpg)
### Dein eigener Server in wenigen Schritten
![Serverübersicht](../screenshots/de/overview.jpg)
![Server einrichten](../screenshots/setup.png)
![Begleiter verwalten](../screenshots/de/bots.jpg)
### Deinen Server im Blick behalten
![Servermodule](../screenshots/de/modules.jpg)
![Serverübersicht](../screenshots/overview.png)
![Spielclient](../screenshots/de/client.jpg)
### Deine eigene Abenteurergruppe zusammenstellen
![Sicherungen](../screenshots/de/backups.jpg)
![Begleiter verwalten](../screenshots/bots.png)
![Mit Freunden spielen](../screenshots/de/friends.jpg)
### Module auswählen und einstellen
![Realm-Browser](../screenshots/de/realms.jpg)
![Servermodule](../screenshots/modules.png)
![Portable Characters — experimentelle Funktion](../screenshots/de/portable.jpg)
### Den Client spielbereit machen
![Einen Charakter portabel machen](../screenshots/de/remote-character.jpg)
![Spielclient](../screenshots/client.png)
### Deinen Fortschritt sichern
![Sicherungen](../screenshots/backups.png)
### Freunde einladen
![Mit Freunden spielen](../screenshots/friends.png)
### Einen passenden Realm finden
![Realm-Browser](../screenshots/realms.png)
### Portable Characters — experimentell
![Portable Characters — experimentelle Funktion](../screenshots/portable.png)
### Einen vorhandenen Charakter übernehmen — experimentell
![Einen Charakter portabel machen](../screenshots/remote-character.png)
[Alle Anleitungen](README.md)
+2 -2
View File
@@ -10,8 +10,8 @@ Profile liegen unter `Settings/realm-profiles`. Bei einer Unterbrechung lässt s
Schnell- und Datenbanksicherungen umfassen beide Charakterdatenbanken und die gemeinsamen Konten. Vollständige Sicherungen enthalten auch beide Welten. Wähle vor dem Wiederherstellen den im Wiederherstellungspunkt angegebenen Realm. Serverupdates bearbeiten beide Realms und die gemeinsame Kontendatenbank einmal. Wird der Serverlauncher ersetzt, richtet der Manager den Realm-Adapter vor dem nächsten Start erneut ein.
![Wildcard-Übersicht](../screenshots/de/wildcard-overview.jpg)
![Wildcard-Übersicht](../screenshots/wildcard-demo/overview.jpg)
![Modulkompatibilität](../screenshots/de/wildcard-modules.jpg)
![Modulkompatibilität](../screenshots/wildcard-demo/modules.jpg)
[Alle Anleitungen](README.md) · [Beide Realms gemeinsam starten](REPAIR_AND_REALMS.md)
+9 -9
View File
@@ -9,26 +9,26 @@ El Manager guarda una copia de tu personaje para jugar con él en reinos CoA com
## Crea tu primer personaje portátil
1. Desconecta al personaje en el juego y deja el Manager abierto.
2. Abre **Personajes (Characters)** y elige **Convertir un personaje existente en portátil (Make an existing character portable)**.
2. Abre **Personajes (Characters)** y elige **Make an existing character portable**.
3. Selecciona un reino al que tengas acceso y después tu personaje.
4. Pulsa **Hacer portátil (Make portable)**. Aparecerá en **Tus personajes (Your characters)**.
4. Pulsa **Make portable**. Aparecerá en **Your characters**.
Si no puedes seleccionar un personaje, lee el motivo que aparece junto a él. Los bots, los desafíos activos y algunas recompensas pendientes pueden impedir la operación. Crear la copia portátil no elimina el personaje original del reino.
## Usa un personaje de otro reino
1. En **Servidores (Servers)**, selecciona el reino donde está el personaje.
2. Elige **Vincular una cuenta existente (Link an existing account)** e indica la cuenta que ya utilizas allí.
2. Elige **Link an existing account** e indica la cuenta que ya utilizas allí.
3. Entra en ese reino desde el juego y quédate en la selección de personajes.
4. Vuelve al Manager con **Alt+Tab** y pulsa **Mostrar mis personajes (Show my characters)**.
5. Busca tu personaje y pulsa **Hacer portátil (Make portable)**.
4. Vuelve al Manager con **Alt+Tab** y pulsa **Show my characters**.
5. Busca tu personaje y pulsa **Make portable**.
6. Espera la confirmación y la etiqueta **Portable**.
![Vincular la cuenta del reino](../screenshots/es/09-link-realm-account.jpg)
![Vincular la cuenta del reino](../screenshots/09-link-realm-account.jpg)
![Elegir el personaje](../screenshots/es/10-remote-portable-candidates.jpg)
![Elegir el personaje](../screenshots/10-remote-portable-candidates.jpg)
![Personaje guardado](../screenshots/es/11-remote-portable-saved.jpg)
![Personaje guardado](../screenshots/11-remote-portable-saved.jpg)
## Juega con tu personaje portátil
@@ -42,6 +42,6 @@ Si el reino tiene un nivel máximo menor, tu personaje puede jugar temporalmente
## Versiones guardadas y conflictos
En **Versiones guardadas (Saved versions)** puedes ver cuándo se guardó el progreso. Si aparece un conflicto, lee la explicación antes de continuar. Evita jugar con dos copias a la vez y conserva también las copias normales del servidor.
En **Saved versions** puedes ver cuándo se guardó el progreso. Si aparece un conflicto, lee la explicación antes de continuar. Evita jugar con dos copias a la vez y conserva también las copias normales del servidor.
[Todas las guías](README.md)
+1 -1
View File
@@ -9,7 +9,7 @@
- [Warcraft Reborn](WARCRAFT-REBORN.md) — crea y selecciona un reino.
- [Actualizaciones, copias y reparación](REPAIR_AND_REALMS.md) — cuida el servidor y resuelve problemas.
Las capturas muestran la interfaz en español. Los nombres ingleses entre paréntesis sirven de referencia si usas la aplicación en otro idioma.
Los nombres ingleses entre paréntesis te ayudan a identificar los botones en las capturas, que muestran la interfaz en inglés.
**Los personajes portátiles son experimentales.** El Manager está en desarrollo activo y aún puede tener errores. Si encuentras alguno, [abre una incidencia](https://github.com/Corfirean/coa-server-manager/issues/new/choose).
+31 -11
View File
@@ -2,26 +2,46 @@
[English](../SCREENSHOTS.md) · [Русский](../ru/SCREENSHOTS.md) · [Deutsch](../de/SCREENSHOTS.md) · [Français](../fr/SCREENSHOTS.md) · **Español** · [简体中文](../zh-CN/SCREENSHOTS.md)
Las capturas muestran la interfaz en español.
Las capturas muestran la interfaz en inglés de la versión 0.7.0.
![Configurar el servidor](../screenshots/es/setup.jpg)
### Tu servidor en pocos pasos
![Resumen del servidor](../screenshots/es/overview.jpg)
![Configurar el servidor](../screenshots/setup.png)
![Gestionar compañeros](../screenshots/es/bots.jpg)
### Tu servidor de un vistazo
![Módulos del servidor](../screenshots/es/modules.jpg)
![Resumen del servidor](../screenshots/overview.png)
![Cliente de juego](../screenshots/es/client.jpg)
### Forma tu propio grupo de aventureros
![Copias de seguridad](../screenshots/es/backups.jpg)
![Gestionar compañeros](../screenshots/bots.png)
![Jugar con amigos](../screenshots/es/friends.jpg)
### Activa y configura los módulos
![Catálogo de reinos](../screenshots/es/realms.jpg)
![Módulos del servidor](../screenshots/modules.png)
![Personajes portátiles — función experimental](../screenshots/es/portable.jpg)
### El cliente listo para jugar
![Crear una copia portátil](../screenshots/es/remote-character.jpg)
![Cliente de juego](../screenshots/client.png)
### Protege tu progreso
![Copias de seguridad](../screenshots/backups.png)
### Invita a tus amigos
![Jugar con amigos](../screenshots/friends.png)
### Encuentra tu próximo reino
![Catálogo de reinos](../screenshots/realms.png)
### Personajes portátiles — experimental
![Personajes portátiles — función experimental](../screenshots/portable.png)
### Convierte un personaje existente en portátil — experimental
![Crear una copia portátil](../screenshots/remote-character.png)
[Todas las guías](README.md)
+2 -2
View File
@@ -10,8 +10,8 @@ Los perfiles se guardan en `Settings/realm-profiles`. Si un cambio se interrumpe
Las copias rápidas y de bases incluyen las dos bases de personajes y las cuentas comunes; las completas añaden ambos mundos. Elige el reino indicado en el punto de restauración antes de restaurar. Las actualizaciones se aplican a ambos reinos y una sola vez a las cuentas compartidas. Si se sustituye el lanzador del servidor, el Manager vuelve a instalar el adaptador de reinos antes del siguiente inicio.
![Resumen de Wildcard](../screenshots/es/wildcard-overview.jpg)
![Resumen de Wildcard](../screenshots/wildcard-demo/overview.jpg)
![Compatibilidad de módulos](../screenshots/es/wildcard-modules.jpg)
![Compatibilidad de módulos](../screenshots/wildcard-demo/modules.jpg)
[Todas las guías](README.md) · [Iniciar ambos reinos](REPAIR_AND_REALMS.md)
+9 -9
View File
@@ -9,26 +9,26 @@ Le Manager conserve une copie sauvegardée de votre personnage, utilisable sur l
## Créer son premier personnage portable
1. Déconnectez le personnage dans le jeu. Laissez le Manager ouvert.
2. Ouvrez **Personnages (Characters)** et choisissez **Rendre un personnage existant portable (Make an existing character portable)**.
2. Ouvrez **Personnages (Characters)** et choisissez **Make an existing character portable**.
3. Sélectionnez un royaume auquel vous avez accès, puis votre personnage.
4. Cliquez sur **Rendre portable (Make portable)**. Le personnage apparaît dans **Vos personnages (Your characters)**.
4. Cliquez sur **Make portable**. Le personnage apparaît dans **Your characters**.
Si un personnage n'est pas sélectionnable, consultez la raison affichée à côté. Les bots, les défis en cours et certaines récompenses en attente peuvent empêcher l'opération. La copie portable ne supprime pas le personnage d'origine sur son royaume.
## Récupérer un personnage d'un autre royaume
1. Dans **Serveurs (Servers)**, sélectionnez le royaume du personnage.
2. Choisissez **Associer un compte existant (Link an existing account)** et indiquez le compte que vous utilisez sur ce royaume.
2. Choisissez **Link an existing account** et indiquez le compte que vous utilisez sur ce royaume.
3. Connectez-vous au royaume dans le jeu et restez sur l'écran de sélection des personnages.
4. Revenez au Manager avec **Alt+Tab** et cliquez sur **Afficher mes personnages (Show my characters)**.
5. Trouvez votre personnage et cliquez sur **Rendre portable (Make portable)**.
4. Revenez au Manager avec **Alt+Tab** et cliquez sur **Show my characters**.
5. Trouvez votre personnage et cliquez sur **Make portable**.
6. Attendez la confirmation et l'indication **Portable**.
![Associer le compte du royaume](../screenshots/fr/09-link-realm-account.jpg)
![Associer le compte du royaume](../screenshots/09-link-realm-account.jpg)
![Choisir un personnage](../screenshots/fr/10-remote-portable-candidates.jpg)
![Choisir un personnage](../screenshots/10-remote-portable-candidates.jpg)
![Personnage enregistré](../screenshots/fr/11-remote-portable-saved.jpg)
![Personnage enregistré](../screenshots/11-remote-portable-saved.jpg)
## Jouer avec le personnage portable
@@ -42,6 +42,6 @@ Sur un royaume dont le niveau maximal est inférieur, votre personnage peut temp
## Versions sauvegardées et conflits
**Versions sauvegardées (Saved versions)** permet de voir quand le progrès a été enregistré. Si un conflit apparaît, lisez l'explication avant de continuer. Évitez de jouer avec deux copies simultanément et conservez aussi des sauvegardes classiques du serveur.
**Saved versions** permet de voir quand le progrès a été enregistré. Si un conflit apparaît, lisez l'explication avant de continuer. Évitez de jouer avec deux copies simultanément et conservez aussi des sauvegardes classiques du serveur.
[Tous les guides](README.md)
+1 -1
View File
@@ -9,7 +9,7 @@
- [Warcraft Reborn](WARCRAFT-REBORN.md) — créer et sélectionner un royaume.
- [Mises à jour, sauvegardes et réparation](REPAIR_AND_REALMS.md) — entretenir le serveur et résoudre les problèmes.
Les captures présentent l’interface en français. Les libellés anglais entre parenthèses permettent de se repérer dans les autres langues de l’application.
Les libellés anglais entre parenthèses permettent de retrouver les boutons sur les captures, qui présentent l'interface en anglais.
**Les personnages portables sont expérimentaux.** Le Manager est en développement actif et peut encore présenter des bugs. Merci de [signaler les problèmes](https://github.com/Corfirean/coa-server-manager/issues/new/choose).
+31 -11
View File
@@ -2,26 +2,46 @@
[English](../SCREENSHOTS.md) · [Русский](../ru/SCREENSHOTS.md) · [Deutsch](../de/SCREENSHOTS.md) · **Français** · [Español](../es/SCREENSHOTS.md) · [简体中文](../zh-CN/SCREENSHOTS.md)
Les captures présentent l’interface en français.
Les captures présentent l'interface anglaise de la version 0.7.0.
![Installer son serveur](../screenshots/fr/setup.jpg)
### Votre serveur en quelques étapes
![État du serveur](../screenshots/fr/overview.jpg)
![Installer son serveur](../screenshots/setup.png)
![Gestion des compagnons](../screenshots/fr/bots.jpg)
### Garder une vue d'ensemble
![Modules du serveur](../screenshots/fr/modules.jpg)
![État du serveur](../screenshots/overview.png)
![Client de jeu](../screenshots/fr/client.jpg)
### Former votre propre groupe d'aventuriers
![Sauvegardes](../screenshots/fr/backups.jpg)
![Gestion des compagnons](../screenshots/bots.png)
![Jouer avec des amis](../screenshots/fr/friends.jpg)
### Choisir et régler les modules
![Catalogue des royaumes](../screenshots/fr/realms.jpg)
![Modules du serveur](../screenshots/modules.png)
![Personnages portables — fonctionnalité expérimentale](../screenshots/fr/portable.jpg)
### Un client prêt à jouer
![Créer une copie portable](../screenshots/fr/remote-character.jpg)
![Client de jeu](../screenshots/client.png)
### Protéger votre progression
![Sauvegardes](../screenshots/backups.png)
### Inviter vos amis
![Jouer avec des amis](../screenshots/friends.png)
### Trouver votre prochain royaume
![Catalogue des royaumes](../screenshots/realms.png)
### Personnages portables — expérimental
![Personnages portables — fonctionnalité expérimentale](../screenshots/portable.png)
### Rendre un personnage existant portable — expérimental
![Créer une copie portable](../screenshots/remote-character.png)
[Tous les guides](README.md)
+2 -2
View File
@@ -10,8 +10,8 @@ Les réglages sont enregistrés dans `Settings/realm-profiles`. Si le changement
Les sauvegardes rapides et de bases incluent les deux bases de personnages et les comptes communs ; les complètes ajoutent les deux mondes. Sélectionnez le royaume indiqué sur le point de restauration avant de restaurer. Les mises à jour s'appliquent aux deux royaumes, et une seule fois aux comptes communs. Si le lanceur serveur est remplacé, le Manager réinstalle son adaptateur de royaumes avant le prochain démarrage.
![Vue d'ensemble de Wildcard](../screenshots/fr/wildcard-overview.jpg)
![Vue d'ensemble de Wildcard](../screenshots/wildcard-demo/overview.jpg)
![Compatibilité des modules](../screenshots/fr/wildcard-modules.jpg)
![Compatibilité des modules](../screenshots/wildcard-demo/modules.jpg)
[Tous les guides](README.md) · [Lancer les deux royaumes ensemble](REPAIR_AND_REALMS.md)
+3 -3
View File
@@ -24,11 +24,11 @@
5. Выберите нужного персонажа и нажмите **«Сделать переносимым» (Make portable)**.
6. Дождитесь подтверждения и отметки **Portable**.
![Привязка аккаунта реалма](../screenshots/ru/09-link-realm-account.jpg)
![Привязка аккаунта реалма](../screenshots/09-link-realm-account.jpg)
![Выбор персонажа](../screenshots/ru/10-remote-portable-candidates.jpg)
![Выбор персонажа](../screenshots/10-remote-portable-candidates.jpg)
![Персонаж сохранён](../screenshots/ru/11-remote-portable-saved.jpg)
![Персонаж сохранён](../screenshots/11-remote-portable-saved.jpg)
## Как играть
+1 -1
View File
@@ -9,7 +9,7 @@
- [Warcraft Reborn](WARCRAFT-REBORN.md) — создание и выбор реалма.
- [Обновления, копии и восстановление](REPAIR_AND_REALMS.md) — обслуживание сервера и помощь при сбоях.
Скриншоты показывают русский интерфейс. Английские названия в скобках помогут свериться с другими языками приложения.
Английские названия кнопок приведены в скобках, чтобы их было легко найти на скриншотах. Сами скриншоты показывают английский интерфейс.
**Переносимые персонажи — экспериментальная функция.** Менеджер активно развивается, ошибки ещё возможны. О проблемах сообщайте через [issue](https://github.com/Corfirean/coa-server-manager/issues/new/choose).
+31 -11
View File
@@ -2,26 +2,46 @@
[English](../SCREENSHOTS.md) · **Русский** · [Deutsch](../de/SCREENSHOTS.md) · [Français](../fr/SCREENSHOTS.md) · [Español](../es/SCREENSHOTS.md) · [简体中文](../zh-CN/SCREENSHOTS.md)
На скриншотах показан русский интерфейс.
На скриншотах показан английский интерфейс версии 0.7.0.
![Настройка сервера](../screenshots/ru/setup.jpg)
### Свой сервер за несколько шагов
![Обзор сервера](../screenshots/ru/overview.jpg)
![Настройка сервера](../screenshots/setup.png)
![Управление компаньонами](../screenshots/ru/bots.jpg)
### Вся информация о сервере перед глазами
![Управление модулями](../screenshots/ru/modules.jpg)
![Обзор сервера](../screenshots/overview.png)
![Игровой клиент](../screenshots/ru/client.jpg)
### Соберите свою группу приключенцев
![Резервные копии](../screenshots/ru/backups.jpg)
![Управление компаньонами](../screenshots/bots.png)
![Игра с друзьями](../screenshots/ru/friends.jpg)
### Модули и их настройки
![Каталог реалмов](../screenshots/ru/realms.jpg)
![Управление модулями](../screenshots/modules.png)
![Переносимые персонажи — экспериментальная функция](../screenshots/ru/portable.jpg)
### Клиент готов к игре
![Создание переносимой копии персонажа](../screenshots/ru/remote-character.jpg)
![Игровой клиент](../screenshots/client.png)
### Сохраните свой прогресс
![Резервные копии](../screenshots/backups.png)
### Пригласите друзей
![Игра с друзьями](../screenshots/friends.png)
### Найдите подходящий реалм
![Каталог реалмов](../screenshots/realms.png)
### Переносимые персонажи — экспериментально
![Переносимые персонажи — экспериментальная функция](../screenshots/portable.png)
### Сделайте существующего персонажа переносимым — экспериментально
![Создание переносимой копии персонажа](../screenshots/remote-character.png)
[Все гайды](README.md)
+2 -2
View File
@@ -10,8 +10,8 @@
Быстрые копии и копии баз включают обе базы персонажей и общие аккаунты; полные — также оба мира. В точке восстановления указан её реалм: выберите его перед восстановлением. Обновления применяются к обоим реалмам, а общая база аккаунтов обновляется один раз. После замены серверного лаунчера менеджер повторно настраивает маршрутизацию реалмов перед запуском.
![Обзор Wildcard](../screenshots/ru/wildcard-overview.jpg)
![Обзор Wildcard](../screenshots/wildcard-demo/overview.jpg)
![Совместимость модулей](../screenshots/ru/wildcard-modules.jpg)
![Совместимость модулей](../screenshots/wildcard-demo/modules.jpg)
[Все гайды](README.md) · [Как запустить оба реалма](REPAIR_AND_REALMS.md)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 105 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 103 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

Loaded 100 of 141 files, more files were not shown because too many files have changed in this diff. Show more