319 changed files with 200792 additions and 16865 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,11 +1,7 @@
-.idea
 /target
 /hotpatch.toml
 /configserver.toml
 /loginserver.toml
 /gateway.toml
 /gameserver.toml
-/wicked-waifus-protocol-internal/generated
-/wicked-waifus-protocol/generated
-/data/assets/config-server
-/data/assets/game-data
+/shorekeeper-protocol/generated
--- a/.gitmodules
+++ b/.gitmodules
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,5 +1,5 @@
 [workspace]
-members = ["wicked-waifus-asset-updater", "wicked-waifus-commons", "wicked-waifus-config-server", "wicked-waifus-hotpatch-server", "wicked-waifus-login-server", "wicked-waifus-gateway-server", "wicked-waifus-gateway-server/kcp", "wicked-waifus-database", "wicked-waifus-http", "wicked-waifus-protokey", "wicked-waifus-protocol-internal", "wicked-waifus-game-server", "wicked-waifus-network", "wicked-waifus-data"]
+members = ["common", "config-server", "hotpatch-server", "login-server", "gateway-server", "gateway-server/kcp", "shorekeeper-database", "shorekeeper-http", "shorekeeper-protokey", "shorekeeper-protocol", "shorekeeper-protocol/shorekeeper-protocol-derive", "game-server", "shorekeeper-network", "shorekeeper-data"]
 resolver = "2"

 [workspace.package]
@ -8,7 +8,6 @@ version = "0.1.0"
 [workspace.dependencies]
 # Framework
 tokio = { version = "1.39.3", features = ["full"] }
-tower-http = { version = "0.6.1", features = ["fs", "trace"] }
 axum = "0.7.5"
 axum-server = "0.7.1"
 zeromq = { version = "0.4.0", default-features = false, features = ["tokio-runtime", "tcp-transport"] }
@ -20,14 +19,12 @@ sqlx = { version = "0.8.2", features = ["postgres", "runtime-tokio-rustls"] }
 aes = "0.8.4"
 cbc = { version = "0.1.2", features = ["alloc"] }
 cipher = "0.4.4"
-crc32fast = "1.4.2"
 rand = "0.8.5"
 rsa = { version = "0.9.6", features = ["pem"] }

 # Serialization
 serde = { version = "1.0.209", features = ["derive"] }
 serde_json = "1.0.128"
-serde_repr = "0.1.19"
 toml = "0.8.19"
 prost = "0.13.2"
 prost-build = "0.13.2"
@ -40,24 +37,22 @@ rbase64 = "2.0.3"
 dashmap = "6.1.0"
 hex = "0.4.3"
 byteorder = "1.5.0"
+crc32fast = "1.4.2"

 # Tracing
 tracing = "0.1.40"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+tracing-subscriber = "0.3.18"

 # Internal
-kcp = { path = "wicked-waifus-gateway-server/kcp" }
-wicked-waifus-asset-updater = { path = "wicked-waifus-asset-updater" }
-wicked-waifus-commons = { path = "wicked-waifus-commons" }
-wicked-waifus-http = { path = "wicked-waifus-http" }
-wicked-waifus-data = { path = "wicked-waifus-data" }
-wicked-waifus-database = { path = "wicked-waifus-database" }
-wicked-waifus-network = { path = "wicked-waifus-network" }
-wicked-waifus-protocol-internal = { path = "wicked-waifus-protocol-internal" }
-wicked-waifus-protokey = { path = "wicked-waifus-protokey" }
-
-wicked-waifus-protocol = { git = "https://git.xeondev.com/wickedwaifus/wicked-waifus-proto" }
-wicked-waifus-protocol-derive = { git = "https://git.xeondev.com/wickedwaifus/wicked-waifus-proto" }
+kcp = { path = "gateway-server/kcp" }
+common = { path = "common/" }
+shorekeeper-http = { path = "shorekeeper-http/" }
+shorekeeper-data = { path = "shorekeeper-data/" }
+shorekeeper-database = { path = "shorekeeper-database/" }
+shorekeeper-network = { path = "shorekeeper-network/" }
+shorekeeper-protocol = { path = "shorekeeper-protocol/" }
+shorekeeper-protocol-derive = { path = "shorekeeper-protocol/shorekeeper-protocol-derive" }
+shorekeeper-protokey = { path = "shorekeeper-protokey/" }

 [profile.release]
 strip = true      # Automatically strip symbols from the binary.
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM rust:1.82-alpine3.20
+FROM rust:1.81-alpine3.20

 WORKDIR /app
 COPY . .
--- a/2
+++ b/2
@ -2,5 +2,5 @@ FROM alpine:3.20
 ARG MICROSERVICE

 WORKDIR /app
-COPY --from=wicked-waifus-builder:2.1.0-SNAPSHOT /app/target/release/$MICROSERVICE ./service
+COPY --from=shorekeeper-builder:1.3.0-SNAPSHOT /app/target/release/$MICROSERVICE ./service
 CMD ["./service"]
--- a/README.md
+++ b/README.md
@ -1,12 +1,9 @@
-# Wicked Waifus
+# Shorekeeper

-![Screenshot](screenshot.png)
+![Screenshot](https://git.xeondev.com/Shorekeeper/Shorekeeper/raw/branch/master/screenshot.png)

 ## About
-**Wicked Waifus is an open-source Wuthering Waves server emulator written in Rust**. 
-The goal of this project is to ensure a clean, easy-to-understand code environment. 
-Wicked Waifus uses **tokio** for asynchronous networking operations, **axum** as http framework and **ZeroMQ** for communication between servers.
-It also implements **performant and extensible ECS** for emulation of the game world.
+**Shorekeeper is an open-source Wuthering Waves server emulator written in Rust**. The goal of this project is to ensure a clean, easy-to-understand code environment. Shorekeeper uses **tokio** for asynchronous networking operations, **axum** as http framework and **ZeroMQ** for communication between servers. It also implements **performant and extensible ECS** for emulation of the game world.

 ## Getting started
 #### Requirements
@ -18,13 +15,13 @@ It also implements **performant and extensible ECS** for emulation of the game w
 ##### a) building from sources

 ```sh
-git clone --recursive https://git.xeondev.com/wickedwaifus/wicked-waifus-rs.git
-cd wicked-waifus-rs
-cargo run --bin wicked-waifus-config-server
-cargo run --bin wicked-waifus-hotpatch-server
-cargo run --bin wicked-waifus-login-server
-cargo run --bin wicked-waifus-gateway-server
-cargo run --bin wicked-waifus-game-server
+git clone https://git.xeondev.com/Shorekeeper/Shorekeeper.git
+cd Shorekeeper
+cargo run --bin config-server
+cargo run --bin hotpatch-server
+cargo run --bin login-server
+cargo run --bin gateway-server
+cargo run --bin game-server
 ```

 ##### b) building from sources(docker edition)
@ -43,9 +40,9 @@ docker compose up -d
 ```

 ##### c) using pre-built binaries
-Navigate to the [Releases](https://git.xeondev.com/wickedwaifus/wicked-waifus-rs/releases)
+Navigate to the [Releases](https://git.xeondev.com/Shorekeeper/Shorekeeper/releases)
 page and download the latest release for your platform.<br>
-Launch all servers: `wicked-waifus-config-server`, `wicked-waifus-hotpatch-server`, `wicked-waifus-login-server`, `wicked-waifus-gateway-server`, `wicked-waifus-game-server`
+Launch all servers: `config-server`, `hotpatch-server`, `login-server`, `gateway-server`, `game-server`

 ##### NOTE: you don't have to install Rust and Protoc if you're going to use pre-built binaries, although the preferred way is building from sources.<br>We don't provide any support for pre-built binaries.

@ -60,15 +57,15 @@ You have to specify credentials for **PostgreSQL**<br>
 host = "localhost:5432"
 user_name = "postgres"
 password = ""
-db_name = "wicked_waifus_db"
+db_name = "shorekeeper"
 ```
-##### NOTE: don't forget to create database with specified `db_name` (default: `wicked_waifus_db`). For example, you can do so with PgAdmin.
+##### NOTE: don't forget to create database with specified `db_name` (default: `shorekeeper`). For example, you can do so with PgAdmin.

 #### Data
-The data files: Logic JSON collections (`data/assets/game-data/BinData`) and config/hotpatch indexes (`data/assets/config-server`, `data/assets/hotpatch-server`) are included in this repository. Keep in mind that you need to have the `data` subdirectory in current working directory.
+The data files: Logic JSON collections (`assets/logic/json`) and config/hotpatch indexes (`assets/config`, `assets/hotpatch`) are included in this repository. Keep in mind that you need to have the `assets` subdirectory in current working directory.

 #### Connecting
-You have to download client of Wuthering Waves Beta 2.1, apply the [wicked-waifus-win-patch](https://git.xeondev.com/wickedwaifus/wicked-waifus-win-patch/releases) and add necessary `.pak` files, which you can get here: [wicked-waifus-pak](https://git.xeondev.com/wickedwaifus/wicked-waifus-pak)
+You have to download client of Wuthering Waves Beta 1.3, apply the [shorekeeper-patch](https://git.xeondev.com/xeon/shorekeeper-patch/releases) and add necessary `.pak` files, which you can get here: [shorekeeper-pak](https://git.xeondev.com/Shorekeeper/shorekeeper-pak)

 ### Troubleshooting
 [Visit our discord](https://discord.gg/reversedrooms) if you have any questions/issues
--- a/assets/config/index.json
+++ b/assets/config/index.json
@ -0,0 +1,52 @@
+{
+    "default": {
+        "CdnUrl": [
+            {
+                "url": "http://127.0.0.1:10002/prod/client/",
+                "weight": "2323"
+            }
+        ],
+        "SecondaryUrl": [],
+        "PriceRatio": 1,
+        "SpeedRatio": 1,
+        "GachaUrl": {
+            "GachaRecord": "http://127.0.0.1:10001/gacha/record",
+            "GachaPoolDetail": "http://127.0.0.1:10001/gacha/detail"
+        },
+        "LogReport": {
+            "name": "pioneer-upload-log-1319073642",
+            "region": "dev-reversedrooms"
+        },
+        "PackageUpdateDescUrl": {
+            "MainUrl": "http://127.0.0.1:10001/force_update/UpdateDesc.html",
+            "SubUrl": "http://127.0.0.1:10001/force_update/UpdateDesc.html"
+        },
+        "PackageUpdateUrl": {
+            "MainUrl": "http://127.0.0.1:10001/force_update/UpdateJs.html",
+            "SubUrl": "http://127.0.0.1:10001/force_update/UpdateJs.html"
+        },
+        "TDCfg": {
+            "AppID": "3e2e647670b7498fa645eb9574f78c2c",
+            "URL": "http://127.0.0.1:10001/TDCfg"
+        },
+        "GmOpen": false,
+        "IosAuditFirstDownloadTip": false,
+        "NoticeUrl": "http://127.0.0.1:10001/notice",
+        "MixUri": "rODM5DcqOhYsIOtsEuZWNGFa2guZgl57",
+        "ResUri": "rODM5DcqOhYsIOtsEuZWNGFa2guZgl57",
+        "LoginServers": [
+            {
+                "id": "f9e0fc655c1931bc03ad976e9fc14473",
+                "ip": "http://127.0.0.1:5500",
+                "name": "Shorekeeper"
+            }
+        ],
+        "PrivateServers": {
+            "enable": false,
+            "serverUrl": ""
+        }
+    },
+    "p1": {
+        "IosAuditFirstDownloadTip": false
+    }
+}
--- a/assets/config/samples/cn_beta_1.3.0.json
+++ b/assets/config/samples/cn_beta_1.3.0.json
@ -0,0 +1,64 @@
+{
+  "default": {
+    "CdnUrl": [
+      {
+        "url": "https://cdn-huoshan-cn-mc.aki-game.com/prod/client/",
+        "weight": "2323"
+      },
+      {
+        "url": "https://cdn-qiniu-cn-mc.aki-game.com/prod/client/",
+        "weight": "0"
+      },
+      {
+        "url": "https://cdn-qcloud-cn-mc.aki-game.com/prod/client/",
+        "weight": "5443"
+      },
+      {
+        "url": "https://cdn-aliyun-cn-mc.aki-game.com/prod/client/",
+        "weight": "0"
+      }
+    ],
+    "SecondaryUrl": [],
+    "PriceRatio": 1,
+    "SpeedRatio": 1,
+    "GachaUrl": {
+      "GachaRecord": "http://127.0.0.1:10001/gacha/record",
+      "GachaPoolDetail": "http://127.0.0.1:10001/gacha/detail"
+    },
+    "LogReport": {
+      "name": "pioneer-upload-log-1319073642",
+      "region": "dev-reversedrooms"
+    },
+    "PackageUpdateDescUrl": {
+      "MainUrl": "http://127.0.0.1:10001/force_update/UpdateDesc.html",
+      "SubUrl": "http://127.0.0.1:10001/force_update/UpdateDesc.html"
+    },
+    "PackageUpdateUrl": {
+      "MainUrl": "http://127.0.0.1:10001/force_update/UpdateJs.html",
+      "SubUrl": "http://127.0.0.1:10001/force_update/UpdateJs.html"
+    },
+    "TDCfg": {
+      "AppID": "3e2e647670b7498fa645eb9574f78c2c",
+      "URL": "http://127.0.0.1:10001/TDCfg"
+    },
+    "GmOpen": false,
+    "IosAuditFirstDownloadTip": false,
+    "NoticeUrl": "http://127.0.0.1:10001/notice",
+    "MixUri": "rODM5DcqOhYsIOtsEuZWNGFa2guZgl57",
+    "ResUri": "rODM5DcqOhYsIOtsEuZWNGFa2guZgl57",
+    "LoginServers": [
+      {
+        "id": "f9e0fc655c1931bc03ad976e9fc14473",
+        "ip": "http://127.0.0.1:5500",
+        "name": "Shorekeeper"
+      }
+    ],
+    "PrivateServers": {
+      "enable": false,
+      "serverUrl": ""
+    }
+  },
+  "p1": {
+    "IosAuditFirstDownloadTip": false
+  }
+}
--- a/assets/config/samples/cn_live_1.3.0.json
+++ b/assets/config/samples/cn_live_1.3.0.json
@ -0,0 +1,64 @@
+{
+  "default": {
+    "CdnUrl": [
+      {
+        "url": "https://cdn-huoshan-cn-mc.aki-game.com/prod/client/",
+        "weight": "0"
+      },
+      {
+        "url": "https://cdn-qiniu-cn-mc.aki-game.com/prod/client/",
+        "weight": "4181"
+      },
+      {
+        "url": "https://cdn-qcloud-cn-mc.aki-game.com/prod/client/",
+        "weight": "2937"
+      },
+      {
+        "url": "https://cdn-aliyun-cn-mc.aki-game.com/prod/client/",
+        "weight": "0"
+      }
+    ],
+    "SecondaryUrl": [],
+    "PriceRatio": 1,
+    "SpeedRatio": 1,
+    "GachaUrl": {
+      "GachaRecord": "https://aki-gm-resources.aki-game.com",
+      "GachaPoolDetail": "https://aki-gm-resources.aki-game.com"
+    },
+    "LogReport": {
+      "name": "aki-upload-log-1319073642",
+      "region": "ap-shanghai"
+    },
+    "PackageUpdateDescUrl": {
+      "MainUrl": "https://aki-gm-resources-back.aki-game.com/force_update/UpdateDesc.html",
+      "SubUrl": "https://aki-gm-resources-back-qiniu.aki-game.com/force_update/UpdateDesc.html"
+    },
+    "PackageUpdateUrl": {
+      "MainUrl": "https://aki-gm-resources-back.aki-game.com/force_update/UpdateJs.html",
+      "SubUrl": "https://aki-gm-resources-back-qiniu.aki-game.com/force_update/UpdateJs.html"
+    },
+    "TDCfg": {
+      "AppID": "7be70c9c181f4fa8bc013e9b89d2b63b",
+      "URL": "http://cn-datareceiver.aki-game.com"
+    },
+    "GmOpen": false,
+    "IosAuditFirstDownloadTip": false,
+    "NoticeUrl": "https://aki-gm-resources-back.aki-game.com",
+    "MixUri": "e66lKLx7RnUf9QlkMCGaW0jdyjRV1weo",
+    "ResUri": "e66lKLx7RnUf9QlkMCGaW0jdyjRV1weo",
+    "LoginServers": [
+      {
+        "id": "76402e5b20be2c39f095a152090afddc",
+        "ip": "https://login-sh.aki-game.com",
+        "name": "鸣潮"
+      }
+    ],
+    "PrivateServers": {
+      "enable": false,
+      "serverUrl": ""
+    }
+  },
+  "p1": {
+    "IosAuditFirstDownloadTip": false
+  }
+}
--- a/assets/config/samples/os_live_1.3.0.json
+++ b/assets/config/samples/os_live_1.3.0.json
@ -0,0 +1,115 @@
+{
+  "default": {
+    "CdnUrl": [
+      {
+        "url": "https://cdn-aws-hw-mc.aki-game.net/prod/client/",
+        "weight": "829"
+      },
+      {
+        "url": "https://cdn-qcloud-hw-mc.aki-game.net/prod/client/",
+        "weight": "0"
+      },
+      {
+        "url": "https://cdn-akamai-hw-mc.aki-game.net/prod/client/",
+        "weight": "262"
+      },
+      {
+        "url": "https://cdn-huoshan-hw-mc.aki-game.net/prod/client/",
+        "weight": "829"
+      }
+    ],
+    "SecondaryUrl": [],
+    "PriceRatio": 1,
+    "SpeedRatio": 1,
+    "GachaUrl": {
+      "GachaRecord": "https://aki-gm-resources-oversea.aki-game.net",
+      "GachaPoolDetail": "https://aki-gm-resources-oversea.aki-game.net"
+    },
+    "LogReport": {
+      "name": "hw-aki-upload-log-1319073642",
+      "region": "ap-singapore"
+    },
+    "PackageUpdateDescUrl": {
+      "MainUrl": "https://aki-gm-resources-back.aki-game.net/force_update/UpdateDesc.html",
+      "SubUrl": "https://aki-gm-resources-back-aws.aki-game.net/force_update/UpdateDesc.html"
+    },
+    "PackageUpdateUrl": {
+      "MainUrl": "https://aki-gm-resources-back.aki-game.net/force_update/UpdateJs.html",
+      "SubUrl": "https://aki-gm-resources-back-aws.aki-game.net/force_update/UpdateJs.html"
+    },
+    "GARUrl": "https://gar-service.aki-game.net",
+    "TDCfg": {
+      "URL": "http://us-datareceiver.aki-game.net",
+      "AppID": "bf3f44edc6cf43c582e347ba660876c0"
+    },
+    "GmOpen": false,
+    "IosAuditFirstDownloadTip": false,
+    "NoticeUrl": "https://aki-gm-resources-back.aki-game.net",
+    "MixUri": "u4S3uXaif7gNKnNGnbZ6WnW67vWFmQgd",
+    "ResUri": "u4S3uXaif7gNKnNGnbZ6WnW67vWFmQgd",
+    "LoginServers": [
+      {
+        "PingUrl": "49.51.79.239",
+        "Region": "America",
+        "TDCfg": {
+          "AppID": "12c7c870b57541caa2093e275212f083",
+          "URL": "http://us-datareceiver.aki-game.net"
+        },
+        "id": "591d6af3a3090d8ea00d8f86cf6d7501",
+        "ip": "https://login-us.aki-game.net",
+        "name": "America"
+      },
+      {
+        "PingUrl": "124.156.236.245",
+        "Region": "Asia",
+        "TDCfg": {
+          "AppID": "dc2e8c02609546e89d78c2eb2974becb",
+          "URL": "http://jp-datareceiver.aki-game.net"
+        },
+        "id": "86d52186155b148b5c138ceb41be9650",
+        "ip": "https://login-jp.aki-game.net",
+        "name": "Asia"
+      },
+      {
+        "PingUrl": "49.51.129.88",
+        "Region": "Europe",
+        "TDCfg": {
+          "AppID": "0fb77e4801db41a7a1fb1a3431625fbd",
+          "URL": "http://eu-datareceiver.aki-game.net"
+        },
+        "id": "6eb2a235b30d05efd77bedb5cf60999e",
+        "ip": "https://login-eu.aki-game.net",
+        "name": "Europe"
+      },
+      {
+        "PingUrl": "43.129.150.38",
+        "Region": "HMT",
+        "TDCfg": {
+          "AppID": "5ccd297c928d405a9e6b18a122f4d48d",
+          "URL": "http://hk-datareceiver.aki-game.net"
+        },
+        "id": "919752ae5ea09c1ced910dd668a63ffb",
+        "ip": "https://login-hk.aki-game.net",
+        "name": "HMT(HK, MO, TW)"
+      },
+      {
+        "PingUrl": "101.33.100.22",
+        "Region": "SEA",
+        "TDCfg": {
+          "AppID": "dffd1143291b4877a8866fb24c623038",
+          "URL": "http://as-datareceiver.aki-game.net"
+        },
+        "id": "10cd7254d57e58ae560b15d51e34b4c8",
+        "ip": "https://login-sg.aki-game.net",
+        "name": "SEA"
+      }
+    ],
+    "PrivateServers": {
+      "enable": false,
+      "serverUrl": ""
+    }
+  },
+  "p1": {
+    "IosAuditFirstDownloadTip": false
+  }
+}
--- a/assets/hotpatch/prod/Windows/config.json
+++ b/assets/hotpatch/prod/Windows/config.json
@ -0,0 +1,60 @@
+{
+    "PackageVersion": "1.3.0",
+    "LauncherVersion": "1.3.9",
+    "ResourceVersion": "1.3.9",
+    "LauncherIndexSha1": {
+        "1.3.1": "90FDF17EA0B4015D43C344CB7229E76AB32549DD",
+        "1.3.2": "C9A587AB1FA6CA57CD23E0FB3F0103BFDCAA8E37",
+        "1.3.3": "1C7AF02F13DBE69637DB43039E2FFB8C9AD9A04B",
+        "1.3.4": "DA50F315041E216568A7713074C6475F6AB4530E",
+        "1.3.5": "EA9C6F6D5E920F47F96D8F8BC366A4CED62A0346",
+        "1.3.6": "8CA7E6573A52B16CFAA29E996D389918B6829E7A",
+        "1.3.7": "FCAAED58E5983027A82F52C350418CCE7BD531D2",
+        "1.3.8": "91D6231B3F4C9A6605B79E23D0C02F9790DD6BCF",
+        "1.3.9": "B36BD648AB2A637A4E087B7B115A6CCBDAEBDF9A"
+    },
+    "ResourceIndexSha1": {
+        "1.3.1": "2D635E549EB6F99659571D72741B62249473A77A",
+        "1.3.2": "C5814A80EA3E7D80D4CFBCD884D1FD158BF0AD9D",
+        "1.3.3": "1E0F05333B09A9215B4AA5C437BFC7DC4014E348",
+        "1.3.4": "6155D492540A99ECF0DA06D2B7EEBFE36231FBC2",
+        "1.3.5": "1E60C8F60CA1AAA9955441B4F4265C8288B95F33",
+        "1.3.6": "AA10A8DD1025D5033E291060C686B816513ADCAD",
+        "1.3.7": "A9881305EBD3DC5A6892D49BDAF540F56EE56232",
+        "1.3.8": "261CA25DAD6877DF3C57DA39947130867FCC09CE",
+        "1.3.9": "88A9E40631FC1C11A91A61CB3F4BE8C13C5E2BD3"
+    },
+    "ChangeList": "2333675",
+    "CompatibleChangeLists": [],
+    "Versions": [
+        {
+            "Name": "en",
+            "Version": "1.3.0",
+            "IndexSha1": {
+                "1.3.0": "6FB5B66EF8B3EECBBBEBE74A82BC23E3FC35450B"
+            }
+        },
+        {
+            "Name": "ja",
+            "Version": "1.3.0",
+            "IndexSha1": {
+                "1.3.0": "E4DA1960DB36CE8166C042AD8B9AF98C1A9119F3"
+            }
+        },
+        {
+            "Name": "ko",
+            "Version": "1.3.0",
+            "IndexSha1": {
+                "1.3.0": "498B379E95FC617385CCD832B8C359FA5AC220CE"
+            }
+        },
+        {
+            "Name": "zh",
+            "Version": "1.3.0",
+            "IndexSha1": {
+                "1.3.0": "CC58C357A80E7B3846264918197FC3ECAA1FE190"
+            }
+        }
+    ],
+    "UpdateTime": 1725869509
+}
--- a/assets/logic/json/BaseProperty.json
+++ b/assets/logic/json/BaseProperty.json
--- a/assets/logic/json/ExploreTools.json
+++ b/assets/logic/json/ExploreTools.json
@ -0,0 +1,246 @@
+[
+{
+	"PhantomSkillId": 1004,
+	"Name": "ExploreTools_1004_Name",
+	"SkillType": 1,
+	"CurrentSkillInfo": "ExploreTools_1004_CurrentSkillInfo",
+	"HelpId": 0,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT3.SP_IconT3",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT3.SP_IconT3",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT3.SP_IconT3",
+	"SortId": 3,
+	"AutoFill": true,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": false,
+	"Cost": {},
+	"Authorization": {},
+	"SummonConfigId": 0
+},
+{
+	"PhantomSkillId": 1001,
+	"Name": "ExploreTools_1001_Name",
+	"SkillType": 1,
+	"CurrentSkillInfo": "ExploreTools_1001_CurrentSkillInfo",
+	"HelpId": 0,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT6.SP_IconT6",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT6.SP_IconT6",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT6.SP_IconT6",
+	"SortId": 1,
+	"AutoFill": true,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": false,
+	"Cost": {},
+	"Authorization": {},
+	"SummonConfigId": 0
+},
+{
+	"PhantomSkillId": 1003,
+	"Name": "ExploreTools_1003_Name",
+	"SkillType": 1,
+	"CurrentSkillInfo": "ExploreTools_1003_CurrentSkillInfo",
+	"HelpId": 0,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT1.SP_IconT1",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT1.SP_IconT1",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT1.SP_IconT1",
+	"SortId": 4,
+	"AutoFill": true,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": false,
+	"Cost": {},
+	"Authorization": {},
+	"SummonConfigId": 0
+},
+{
+	"PhantomSkillId": 1005,
+	"Name": "ExploreTools_1005_Name",
+	"SkillType": 2,
+	"CurrentSkillInfo": "ExploreTools_1005_CurrentSkillInfo",
+	"HelpId": 0,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT2.SP_IconT2",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT2.SP_IconT2",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT2.SP_IconT2",
+	"SortId": 5,
+	"AutoFill": false,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": false,
+	"Cost": {},
+	"Authorization": {},
+	"SummonConfigId": 0
+},
+{
+	"PhantomSkillId": 1006,
+	"Name": "ExploreTools_1006_Name",
+	"SkillType": 2,
+	"CurrentSkillInfo": "ExploreTools_1006_CurrentSkillInfo",
+	"HelpId": 0,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT5.SP_IconT5",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT5.SP_IconT5",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT5.SP_IconT5",
+	"SortId": 6,
+	"AutoFill": false,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": false,
+	"Cost": {},
+	"Authorization": {},
+	"SummonConfigId": 0
+},
+{
+	"PhantomSkillId": 1007,
+	"Name": "ExploreTools_1007_Name",
+	"SkillType": 1,
+	"CurrentSkillInfo": "ExploreTools_1007_CurrentSkillInfo",
+	"HelpId": 0,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT29.SP_IconT29",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT29.SP_IconT29",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT29.SP_IconT29",
+	"SortId": 7,
+	"AutoFill": false,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": false,
+	"Cost": {},
+	"Authorization": {},
+	"SummonConfigId": 0
+},
+{
+	"PhantomSkillId": 1009,
+	"Name": "ExploreTools_1009_Name",
+	"SkillType": 1,
+	"CurrentSkillInfo": "ExploreTools_1009_CurrentSkillInfo",
+	"HelpId": 0,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT9.SP_IconT9",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT9.SP_IconT9",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT9.SP_IconT9",
+	"SortId": 9,
+	"AutoFill": false,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": true,
+	"Cost": {},
+	"Authorization": {},
+	"SummonConfigId": 0
+},
+{
+	"PhantomSkillId": 3001,
+	"Name": "ExploreTools_1009_Name",
+	"SkillType": 3,
+	"CurrentSkillInfo": "ExploreTools_1009_CurrentSkillInfo",
+	"HelpId": 0,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT9.SP_IconT9",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT9.SP_IconT9",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT9.SP_IconT9",
+	"SortId": 10,
+	"AutoFill": false,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": false,
+	"Cost": {},
+	"Authorization": {},
+	"SummonConfigId": 0
+},
+{
+	"PhantomSkillId": 3002,
+	"Name": "ExploreTools_1009_Name",
+	"SkillType": 3,
+	"CurrentSkillInfo": "ExploreTools_1009_CurrentSkillInfo",
+	"HelpId": 0,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT9.SP_IconT9",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT9.SP_IconT9",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/UiSkillswitching/Atlas/SP_SkillswitchingItemNone.SP_SkillswitchingItemNone",
+	"SortId": 10,
+	"AutoFill": false,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": false,
+	"Cost": {},
+	"Authorization": {},
+	"SummonConfigId": 0
+},
+{
+	"PhantomSkillId": 1010,
+	"Name": "ExploreTools_1010_Name",
+	"SkillType": 1,
+	"CurrentSkillInfo": "ExploreTools_1010_CurrentSkillInfo",
+	"HelpId": 30,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT30.SP_IconT30",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT30.SP_IconT30",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT30.SP_IconT30",
+	"SortId": 11,
+	"AutoFill": true,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": false,
+	"Cost": {
+		"10808": 1
+	},
+	"Authorization": {},
+	"SummonConfigId": 0
+},
+{
+	"PhantomSkillId": 1011,
+	"Name": "ExploreTools_1011_Name",
+	"SkillType": 1,
+	"CurrentSkillInfo": "ExploreTools_1011_CurrentSkillInfo",
+	"HelpId": 28,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT32.SP_IconT32",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT32.SP_IconT32",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT32.SP_IconT32",
+	"SortId": 12,
+	"AutoFill": true,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": false,
+	"Cost": {
+		"10807": 1
+	},
+	"Authorization": {
+		"1": 10805,
+		"900": 10805
+	},
+	"SummonConfigId": 0
+},
+{
+	"PhantomSkillId": 1012,
+	"Name": "ExploreTools_1012_Name",
+	"SkillType": 1,
+	"CurrentSkillInfo": "ExploreTools_1012_CurrentSkillInfo",
+	"HelpId": 29,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT31.SP_IconT31",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT31.SP_IconT31",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT31.SP_IconT31",
+	"SortId": 13,
+	"AutoFill": true,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": false,
+	"Cost": {},
+	"Authorization": {
+		"1": 10806,
+		"900": 10806
+	},
+	"SummonConfigId": 0
+},
+{
+	"PhantomSkillId": 1013,
+	"Name": "ExploreTools_1013_Name",
+	"SkillType": 1,
+	"CurrentSkillInfo": "ExploreTools_1013_CurrentSkillInfo",
+	"HelpId": 0,
+	"Icon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT34.SP_IconT34",
+	"BackGround": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT34.SP_IconT34",
+	"BattleViewIcon": "/Game/Aki/UI/UIResources/Common/Atlas/SkillIcon/SkillIconNor/SP_IconT34.SP_IconT34",
+	"SortId": 14,
+	"AutoFill": true,
+	"ShowUnlock": false,
+	"SkillGroupId": 1,
+	"IsUseInPhantomTeam": false,
+	"Cost": {},
+	"Authorization": {},
+	"SummonConfigId": 24000022
+}
+]
--- a/assets/logic/json/FunctionCondition.json
+++ b/assets/logic/json/FunctionCondition.json
--- a/assets/logic/json/InstanceDungeon.json
+++ b/assets/logic/json/InstanceDungeon.json
--- a/assets/logic/json/RoleInfo.json
+++ b/assets/logic/json/RoleInfo.json
--- a/assets/logic/json/WeaponConf.json
+++ b/assets/logic/json/WeaponConf.json
--- a/builder.bat
+++ b/builder.bat
@ -1,12 +1,12 @@
-docker build -t wicked-waifus-builder:2.1.0-SNAPSHOT -f Dockerfile-builder .
+docker build -t shorekeeper-builder:1.3.0-SNAPSHOT -f Dockerfile-builder .

-docker build -t wicked-waifus-config-server:2.1.0-SNAPSHOT --build-arg MICROSERVICE=wicked-waifus-config-server -f Dockerfile-service .
-docker build -t wicked-waifus-hotpatch-server:2.1.0-SNAPSHOT --build-arg MICROSERVICE=wicked-waifus-server -f Dockerfile-service .
-docker build -t wicked-waifus-login-server:2.1.0-SNAPSHOT --build-arg MICROSERVICE=wicked-waifus-login-server -f Dockerfile-service .
-docker build -t wicked-waifus-gateway-server:2.1.0-SNAPSHOT --build-arg MICROSERVICE=wicked-waifus-gateway-server -f Dockerfile-service .
-docker build -t wicked-waifus-game-server:2.1.0-SNAPSHOT --build-arg MICROSERVICE=wicked-waifus-game-server -f Dockerfile-service .
+docker build -t shorekeeper-config-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=config-server -f Dockerfile-service .
+docker build -t shorekeeper-hotpatch-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=hotpatch-server -f Dockerfile-service .
+docker build -t shorekeeper-login-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=login-server -f Dockerfile-service .
+docker build -t shorekeeper-gateway-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=gateway-server -f Dockerfile-service .
+docker build -t shorekeeper-game-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=game-server -f Dockerfile-service .

-docker rmi wicked-waifus-builder:2.1.0-SNAPSHOT
+docker rmi shorekeeper-builder:1.3.0-SNAPSHOT

 : Persistence for the application
-: docker volume create wicked-waifus-postgres-vol
+docker volume create shorekeeper-postgres-vol
--- a/builder.sh
+++ b/builder.sh
@ -1,12 +1,12 @@
-docker build -t wicked-waifus-builder:2.1.0-SNAPSHOT -f Dockerfile-builder .
+docker build -t shorekeeper-builder:1.3.0-SNAPSHOT -f Dockerfile-builder .

-docker build -t wicked-waifus-config-server:2.1.0-SNAPSHOT --build-arg MICROSERVICE=wicked-waifus-config-server -f Dockerfile-service .
-docker build -t wicked-waifus-hotpatch-server:2.1.0-SNAPSHOT --build-arg MICROSERVICE=wicked-waifus-hotpatch-server -f Dockerfile-service .
-docker build -t wicked-waifus-login-server:2.1.0-SNAPSHOT --build-arg MICROSERVICE=wicked-waifus-login-server -f Dockerfile-service .
-docker build -t wicked-waifus-gateway-server:2.1.0-SNAPSHOT --build-arg MICROSERVICE=wicked-waifus-gateway-server -f Dockerfile-service .
-docker build -t wicked-waifus-game-server:2.1.0-SNAPSHOT --build-arg MICROSERVICE=wicked-waifus-game-server -f Dockerfile-service .
+docker build -t shorekeeper-config-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=config-server -f Dockerfile-service .
+docker build -t shorekeeper-hotpatch-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=hotpatch-server -f Dockerfile-service .
+docker build -t shorekeeper-login-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=login-server -f Dockerfile-service .
+docker build -t shorekeeper-gateway-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=gateway-server -f Dockerfile-service .
+docker build -t shorekeeper-game-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=game-server -f Dockerfile-service .

-docker rmi wicked-waifus-builder:2.1.0-SNAPSHOT
+docker rmi shorekeeper-builder:1.3.0-SNAPSHOT

 # Persistence for the application
-# docker volume create wicked-waifus-postgres-vol
+docker volume create shorekeeper-postgres-vol
--- a/wicked-waifus-commons/Cargo.toml
+++ b/wicked-waifus-commons/Cargo.toml
@ -1,5 +1,5 @@
 [package]
-name = "wicked-waifus-commons"
+name = "common"
 edition = "2021"
 version.workspace = true

--- a/wicked-waifus-commons/src/config_util.rs
+++ b/wicked-waifus-commons/src/config_util.rs
--- a/wicked-waifus-commons/src/lib.rs
+++ b/wicked-waifus-commons/src/lib.rs
--- a/common/src/logging.rs
+++ b/common/src/logging.rs
@ -0,0 +1,8 @@
+use tracing::Level;
+
+pub fn init(max_level: Level) {
+    tracing_subscriber::fmt()
+        .with_max_level(max_level)
+        .with_target(false)
+        .init();
+}
--- a/common/src/splash.rs
+++ b/common/src/splash.rs
@ -0,0 +1,3 @@
+pub fn print_splash() {
+    println!("   _____ __                    __                            \n  / ___// /_  ____  ________  / /_____  ___  ____  ___  _____\n  \\__ \\/ __ \\/ __ \\/ ___/ _ \\/ //_/ _ \\/ _ \\/ __ \\/ _ \\/ ___/\n ___/ / / / / /_/ / /  /  __/ ,< /  __/  __/ /_/ /  __/ /    \n/____/_/ /_/\\____/_/   \\___/_/|_|\\___/\\___/ .___/\\___/_/     \n                                         /_/                 ");
+}
--- a/wicked-waifus-commons/src/time_util.rs
+++ b/wicked-waifus-commons/src/time_util.rs
@ -1,17 +1,5 @@
 use std::time::{SystemTime, UNIX_EPOCH};

-const SECONDS_PER_MINUTE: u64 = 60;
-const SECONDS_PER_HOUR: u64 = 60 * SECONDS_PER_MINUTE;
-const SECONDS_PER_DAY: u64 = 24 * SECONDS_PER_HOUR;
-
-pub fn unix_days() -> i32 {
-    (SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .unwrap()
-        .as_secs()
-        / SECONDS_PER_DAY) as i32
-}
-
 pub fn unix_timestamp() -> u64 {
    SystemTime::now()
        .duration_since(UNIX_EPOCH)
--- a/wicked-waifus-hotpatch-server/Cargo.toml
+++ b/wicked-waifus-hotpatch-server/Cargo.toml
@ -1,11 +1,12 @@
 [package]
-name = "wicked-waifus-hotpatch-server"
+name = "config-server"
 edition = "2021"
 version.workspace = true

 [dependencies]
 # Framework
 tokio.workspace = true
+shorekeeper-http.workspace = true

 # Serialization
 serde.workspace = true
@ -18,5 +19,4 @@ anyhow.workspace = true
 tracing.workspace = true

 # Internal
-wicked-waifus-commons.workspace = true
-wicked-waifus-http.workspace = true
+common.workspace = true
--- a/config-server/configserver.default.toml
+++ b/config-server/configserver.default.toml
@ -0,0 +1,6 @@
+[network]
+http_addr = "0.0.0.0:10001"
+
+[encryption]
+key = "t+AEu5SGdpz06tomonajLMau9AJgmyTvVhz9VtGf1+0="
+iv = "fprc5lBWADQB7tim0R2JxQ=="
--- a/config-server/src/main.rs
+++ b/config-server/src/main.rs
@ -0,0 +1,45 @@
+use std::fs;
+use std::sync::LazyLock;
+
+use anyhow::Result;
+
+use common::config_util::{self, TomlConfig};
+use serde::Deserialize;
+use shorekeeper_http::{
+    config::{AesSettings, NetworkSettings},
+    Application,
+};
+
+#[derive(Deserialize)]
+pub struct ServerConfig {
+    pub network: NetworkSettings,
+    pub encryption: AesSettings,
+}
+
+impl TomlConfig for ServerConfig {
+    const DEFAULT_TOML: &str = include_str!("../configserver.default.toml");
+}
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    static CONFIG: LazyLock<ServerConfig> =
+        LazyLock::new(|| config_util::load_or_create("configserver.toml"));
+
+    ::common::splash::print_splash();
+    ::common::logging::init(::tracing::Level::DEBUG);
+
+    Application::new()
+        .get("/index.json", get_index)
+        .with_encryption(&CONFIG.encryption)
+        .serve(&CONFIG.network)
+        .await?;
+
+    Ok(())
+}
+
+async fn get_index() -> &'static str {
+    static INDEX: LazyLock<String> =
+        LazyLock::new(|| fs::read_to_string("assets/config/index.json").unwrap());
+
+    &*INDEX
+}
--- a/data/assets/hotpatch-server/prod/Windows/config.json
+++ b/data/assets/hotpatch-server/prod/Windows/config.json
@ -1,44 +0,0 @@
-{
-    "PackageVersion": "1.4.0",
-    "LauncherVersion": "1.4.0",
-    "ResourceVersion": "1.4.3",
-    "LauncherIndexSha1": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
-    "ResourceIndexSha1": {
-        "1.4.1": "0C747E444EC6DBA11D0C57B34E2638DE5182029F",
-        "1.4.2": "41751A94DBD406653DB52262E85BB716E45D9864",
-        "1.4.3": "424EDFD97BA8699CBC2CB9E27D3FCBB6F7C70806"
-    },
-    "ChangeList": "2585778",
-    "CompatibleChangeLists": [],
-    "Versions": [
-        {
-            "Name": "en",
-            "Version": "1.4.0",
-            "IndexSha1": {
-                "1.4.0": "34F9AC326B3E81E972B93094E43751967A6A3396"
-            }
-        },
-        {
-            "Name": "ja",
-            "Version": "1.4.0",
-            "IndexSha1": {
-                "1.4.0": "3233223428D586FBC0A2EC817F4E94DDD10C646F"
-            }
-        },
-        {
-            "Name": "ko",
-            "Version": "1.4.0",
-            "IndexSha1": {
-                "1.4.0": "3CC0312BDFFF5FA4D3F5256E2618D0EF6AA84912"
-            }
-        },
-        {
-            "Name": "zh",
-            "Version": "1.4.0",
-            "IndexSha1": {
-                "1.4.0": "2F3AD1412C6991FE0E146C5E2F6F86D8D9F44A5D"
-            }
-        }
-    ],
-    "UpdateTime": 1729243476
-}
--- a/data/docker/gameserver.toml
+++ b/data/docker/gameserver.toml
@ -1,13 +0,0 @@
-service_id = 2
-
-[database]
-host = "wicked-waifus-postgres:5432"
-user_name = "wicked_waifus_user"
-password = "wicked_waifus_pass"
-db_name = "wicked_waifus_db"
-
-[service_end_point]
-addr = "tcp://0.0.0.0:10004"
-
-[gateway_end_point]
-addr = "tcp://wicked-waifus-gateway-server:10003"
--- a/data/docker/loginserver.toml
+++ b/data/docker/loginserver.toml
@ -1,12 +0,0 @@
-[network]
-http_addr = "0.0.0.0:5500"
-
-[gateway]
-host = "host.docker.internal"
-port = 7777
-
-[database]
-host = "wicked-waifus-postgres:5432"
-user_name = "wicked_waifus_user"
-password = "wicked_waifus_pass"
-db_name = "wicked_waifus_db"
--- a/data/docker/postgres/scripts/0_INIT.sql
+++ b/data/docker/postgres/scripts/0_INIT.sql
@ -1,3 +0,0 @@
-CREATE DATABASE wicked_waifus_db;
-CREATE USER wicked_waifus_user WITH encrypted password 'wicked_waifus_pass';
-GRANT ALL PRIVILEGES ON DATABASE wicked_waifus_db to wicked_waifus_user;
--- a/data/docker/postgres/scripts/1_PERMS.sql
+++ b/data/docker/postgres/scripts/1_PERMS.sql
@ -1,2 +0,0 @@
-\c wicked_waifus_db;
-GRANT ALL ON SCHEMA public TO wicked_waifus_user;
--- a/docker-compose-hotpatch.yml
+++ b/docker-compose-hotpatch.yml
@ -1,13 +0,0 @@
-name: wicked-waifus-ps
-
-services:
-  wicked-waifus-hotpatch-server:
-    image: wicked-waifus-hotpatch-server:2.1.0-SNAPSHOT
-    depends_on:
-      wicked-waifus-postgres:
-        condition: service_healthy
-    ports:
-      - '10002:10002'
-    volumes:
-      - "./data/docker/hotpatch.toml:/app/hotpatch.toml"
-      - "./data/assets/hotpatch-server:/app/assets/hotpatch"
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,53 +1,63 @@
-name: wicked-waifus-ps
+name: shorekeeper-ps

 services:
-  wicked-waifus-config-server:
-    image: wicked-waifus-config-server:2.1.0-SNAPSHOT
+  shorekeeper-config-server:
+    image: shorekeeper-config-server:1.3.0-SNAPSHOT
    depends_on:
-      wicked-waifus-postgres:
+      shorekeeper-postgres:
        condition: service_healthy
    ports:
      - '10001:10001'
    volumes:
-      - "./data/docker/configserver.toml:/app/configserver.toml"
-      - "./data/assets/config:/app/assets/config"
-  wicked-waifus-login-server:
-    image: wicked-waifus-login-server:2.1.0-SNAPSHOT
+      - "./docker/configserver.toml:/app/configserver.toml"
+      - "./assets/config:/app/assets/config"
+  shorekeeper-hotpatch-server:
+    image: shorekeeper-hotpatch-server:1.3.0-SNAPSHOT
    depends_on:
-      wicked-waifus-postgres:
+      shorekeeper-postgres:
+        condition: service_healthy
+    ports:
+      - '10002:10002'
+    volumes:
+      - "./docker/hotpatch.toml:/app/hotpatch.toml"
+      - "./assets/hotpatch:/app/assets/hotpatch"
+  shorekeeper-login-server:
+    image: shorekeeper-login-server:1.3.0-SNAPSHOT
+    depends_on:
+      shorekeeper-postgres:
        condition: service_healthy
    ports:
      - '5500:5500'
    volumes:
-      - "./data/docker/loginserver.toml:/app/loginserver.toml"
-  wicked-waifus-gateway-server:
-    image: wicked-waifus-gateway-server:2.1.0-SNAPSHOT
+      - "./docker/loginserver.toml:/app/loginserver.toml"
+  shorekeeper-gateway-server:
+    image: shorekeeper-gateway-server:1.3.0-SNAPSHOT
    depends_on:
-      wicked-waifus-postgres:
+      shorekeeper-postgres:
        condition: service_healthy
    ports:
      # Uncomment this if you want to have manual access
      #      - '10003:10003'
      - '7777:7777/udp'
    volumes:
-      - "./data/docker/gateway.toml:/app/gateway.toml"
-  wicked-waifus-game-server:
-    image: wicked-waifus-game-server:2.1.0-SNAPSHOT
+      - "./docker/gateway.toml:/app/gateway.toml"
+  shorekeeper-game-server:
+    image: shorekeeper-game-server:1.3.0-SNAPSHOT
    depends_on:
-      wicked-waifus-postgres:
+      shorekeeper-postgres:
        condition: service_healthy
    # Uncomment this if you want to have manual access
 #    ports:
 #      - '10004:10004'
    volumes:
-      - "./data/docker/gameserver.toml:/app/gameserver.toml"
-      - "./data/assets/game-data:/app/data/assets/game-data"
-  wicked-waifus-postgres:
+      - "./docker/gameserver.toml:/app/gameserver.toml"
+      - "./assets/logic:/app/assets/logic"
+  shorekeeper-postgres:
    image: postgres:16.4-alpine3.20
    user: postgres
    # Uncomment this if you want to have manual access
-    ports:
-      - '5432:5432'
+#    ports:
+#      - '5432:5432'
    healthcheck:
      test: ["CMD-SHELL", "pg_isready"]
      interval: 10s
@ -56,8 +66,8 @@ services:
    environment:
      - "POSTGRES_PASSWORD=toor"
    volumes:
-      - "./data/docker/postgres/scripts:/docker-entrypoint-initdb.d"
-      - wicked-waifus-postgres-vol:/var/lib/postgresql/data
+      - "./docker/postgres/scripts:/docker-entrypoint-initdb.d"
+      - shorekeeper-postgres-vol:/var/lib/postgresql/data
 volumes:
-  wicked-waifus-postgres-vol:
+  shorekeeper-postgres-vol:
    external: true
--- a/data/docker/configserver.toml
+++ b/data/docker/configserver.toml
@ -4,7 +4,3 @@ http_addr = "0.0.0.0:10001"
 [encryption]
 key = "t+AEu5SGdpz06tomonajLMau9AJgmyTvVhz9VtGf1+0="
 iv = "fprc5lBWADQB7tim0R2JxQ=="
-
-[serve]
-serve_web_path = "/"
-serve_dir_path = "assets/config-server"
--- a/docker/gameserver.toml
+++ b/docker/gameserver.toml
@ -0,0 +1,13 @@
+service_id = 2
+
+[database]
+host = "shorekeeper-postgres:5432"
+user_name = "shorekeeper_user"
+password = "shorekeeper_pass"
+db_name = "shorekeeper_db"
+
+[service_end_point]
+addr = "tcp://0.0.0.0:10004"
+
+[gateway_end_point]
+addr = "tcp://shorekeeper-gateway-server:10003"
--- a/data/docker/gateway.toml
+++ b/data/docker/gateway.toml
@ -11,10 +11,10 @@ use_client_key = true
 addr = "tcp://0.0.0.0:10003"

 [game_server_end_point]
-addr = "tcp://wicked-waifus-game-server:10004"
+addr = "tcp://shorekeeper-game-server:10004"

 [database]
-host = "wicked-waifus-postgres:5432"
-user_name = "wicked_waifus_user"
-password = "wicked_waifus_pass"
-db_name = "wicked_waifus_db"
+host = "shorekeeper-postgres:5432"
+user_name = "shorekeeper_user"
+password = "shorekeeper_pass"
+db_name = "shorekeeper_db"
--- a/data/docker/hotpatch.toml
+++ b/data/docker/hotpatch.toml
--- a/docker/loginserver.toml
+++ b/docker/loginserver.toml
@ -0,0 +1,12 @@
+[network]
+http_addr = "0.0.0.0:5500"
+
+[gateway]
+host = "host.docker.internal"
+port = 7777
+
+[database]
+host = "shorekeeper-postgres:5432"
+user_name = "shorekeeper_user"
+password = "shorekeeper_pass"
+db_name = "shorekeeper_db"
--- a/docker/postgres/scripts/0_INIT.sql
+++ b/docker/postgres/scripts/0_INIT.sql
@ -0,0 +1,3 @@
+CREATE DATABASE shorekeeper_db;
+CREATE USER shorekeeper_user WITH encrypted password 'shorekeeper_pass';
+GRANT ALL PRIVILEGES ON DATABASE shorekeeper_db to shorekeeper_user;
--- a/docker/postgres/scripts/1_PERMS.sql
+++ b/docker/postgres/scripts/1_PERMS.sql
@ -0,0 +1,2 @@
+\c shorekeeper_db;
+GRANT ALL ON SCHEMA public TO shorekeeper_user;
--- a/game-server/Cargo.toml
+++ b/game-server/Cargo.toml
@ -0,0 +1,28 @@
+[package]
+name = "game-server"
+edition = "2021"
+version.workspace = true
+
+[dependencies]
+# Framework
+tokio.workspace = true
+
+# Serialization
+serde.workspace = true
+
+# Util
+anyhow.workspace = true
+thiserror.workspace = true
+paste.workspace = true
+dashmap.workspace = true
+hex.workspace = true
+
+# Tracing
+tracing.workspace = true
+
+# Internal
+common.workspace = true
+shorekeeper-data.workspace = true
+shorekeeper-database.workspace = true
+shorekeeper-network.workspace = true
+shorekeeper-protocol.workspace = true
--- a/wicked-waifus-game-server/scripts/censorshipfix.js
+++ b/wicked-waifus-game-server/scripts/censorshipfix.js
--- a/game-server/gameserver.default.toml
+++ b/game-server/gameserver.default.toml
@ -0,0 +1,13 @@
+service_id = 2
+
+[database]
+host = "localhost:5432"
+user_name = "postgres"
+password = ""
+db_name = "shorekeeper"
+
+[service_end_point]
+addr = "tcp://127.0.0.1:10004"
+
+[gateway_end_point]
+addr = "tcp://127.0.0.1:10003"
--- a/game-server/src/config.rs
+++ b/game-server/src/config.rs
@ -0,0 +1,16 @@
+use common::config_util::TomlConfig;
+use serde::Deserialize;
+use shorekeeper_database::DatabaseSettings;
+use shorekeeper_network::config::ServiceEndPoint;
+
+#[derive(Deserialize)]
+pub struct ServiceConfig {
+    pub service_id: u32,
+    pub database: DatabaseSettings,
+    pub service_end_point: ServiceEndPoint,
+    pub gateway_end_point: ServiceEndPoint,
+}
+
+impl TomlConfig for ServiceConfig {
+    const DEFAULT_TOML: &str = include_str!("../gameserver.default.toml");
+}
--- a/wicked-waifus-game-server/src/gateway_connection.rs
+++ b/wicked-waifus-game-server/src/gateway_connection.rs
@ -1,6 +1,6 @@
 use std::sync::OnceLock;

-use wicked_waifus_network::{config::ServiceEndPoint, ServiceClient, ServiceMessage};
+use shorekeeper_network::{config::ServiceEndPoint, ServiceClient, ServiceMessage};

 static CLIENT: OnceLock<ServiceClient> = OnceLock::new();

--- a/game-server/src/logic/components/attribute.rs
+++ b/game-server/src/logic/components/attribute.rs
@ -0,0 +1,198 @@
+use std::collections::HashMap;
+
+use shorekeeper_data::BasePropertyData;
+use shorekeeper_protocol::{
+    entity_component_pb::ComponentPb, AttrData, AttributeComponentPb, EAttributeType,
+    EntityComponentPb, LivingStatus,
+};
+
+use crate::logic::ecs::component::Component;
+
+pub struct Attribute {
+    pub attr_map: HashMap<EAttributeType, (i32, i32)>,
+}
+
+macro_rules! impl_from_data {
+    ($($name:ident),*) => {
+        pub fn from_data(base_property: &BasePropertyData) -> Self {
+            Self {
+                attr_map: HashMap::from([$(
+                    ::paste::paste!((EAttributeType::[<$name:camel>], (base_property.$name, 0))),
+                )*]),
+            }
+        }
+    };
+}
+
+impl Component for Attribute {
+    fn set_pb_data(&self, pb: &mut shorekeeper_protocol::EntityPb) {
+        pb.living_status = (if self.is_alive() { LivingStatus::Alive } else { LivingStatus::Dead })
+            .into();
+
+        pb.component_pbs.push(EntityComponentPb {
+            component_pb: Some(ComponentPb::AttributeComponent(AttributeComponentPb {
+                attr_data: self
+                    .attr_map
+                    .iter()
+                    .map(|(ty, (base, incr))| AttrData {
+                        attribute_type: (*ty).into(),
+                        base_value: *base,
+                        increment: *incr,
+                    })
+                    .collect(),
+                hardness_mode_id: 0,
+                rage_mode_id: 0,
+            })),
+        })
+    }
+}
+
+impl Attribute {
+    pub fn is_alive(&self) -> bool {
+        self.attr_map
+            .get(&EAttributeType::Life)
+            .copied()
+            .unwrap_or_default()
+            .0
+            > 0
+    }
+
+    impl_from_data!(
+        lv,
+        life_max,
+        life,
+        sheild,
+        sheild_damage_change,
+        sheild_damage_reduce,
+        atk,
+        crit,
+        crit_damage,
+        def,
+        energy_efficiency,
+        cd_reduse,
+        reaction_efficiency,
+        damage_change_normal_skill,
+        damage_change,
+        damage_reduce,
+        damage_change_auto,
+        damage_change_cast,
+        damage_change_ultra,
+        damage_change_qte,
+        damage_change_phys,
+        damage_change_element1,
+        damage_change_element2,
+        damage_change_element3,
+        damage_change_element4,
+        damage_change_element5,
+        damage_change_element6,
+        damage_resistance_phys,
+        damage_resistance_element1,
+        damage_resistance_element2,
+        damage_resistance_element3,
+        damage_resistance_element4,
+        damage_resistance_element5,
+        damage_resistance_element6,
+        heal_change,
+        healed_change,
+        damage_reduce_phys,
+        damage_reduce_element1,
+        damage_reduce_element2,
+        damage_reduce_element3,
+        damage_reduce_element4,
+        damage_reduce_element5,
+        damage_reduce_element6,
+        reaction_change1,
+        reaction_change2,
+        reaction_change3,
+        reaction_change4,
+        reaction_change5,
+        reaction_change6,
+        reaction_change7,
+        reaction_change8,
+        reaction_change9,
+        reaction_change10,
+        reaction_change11,
+        reaction_change12,
+        reaction_change13,
+        reaction_change14,
+        reaction_change15,
+        energy_max,
+        energy,
+        special_energy_1_max,
+        special_energy_1,
+        special_energy_2_max,
+        special_energy_2,
+        special_energy_3_max,
+        special_energy_3,
+        special_energy_4_max,
+        special_energy_4,
+        strength_max,
+        strength,
+        strength_recover,
+        strength_punish_time,
+        strength_run,
+        strength_swim,
+        strength_fast_swim,
+        hardness_max,
+        hardness,
+        hardness_recover,
+        hardness_punish_time,
+        hardness_change,
+        hardness_reduce,
+        rage_max,
+        rage,
+        rage_recover,
+        rage_punish_time,
+        rage_change,
+        rage_reduce,
+        tough_max,
+        tough,
+        tough_recover,
+        tough_change,
+        tough_reduce,
+        tough_recover_delay_time,
+        element_power1,
+        element_power2,
+        element_power3,
+        element_power4,
+        element_power5,
+        element_power6,
+        special_damage_change,
+        strength_fast_climb_cost,
+        element_property_type,
+        weak_time,
+        ignore_def_rate,
+        ignore_damage_resistance_phys,
+        ignore_damage_resistance_element1,
+        ignore_damage_resistance_element2,
+        ignore_damage_resistance_element3,
+        ignore_damage_resistance_element4,
+        ignore_damage_resistance_element5,
+        ignore_damage_resistance_element6,
+        skill_tough_ratio,
+        strength_climb_jump,
+        strength_gliding,
+        mass,
+        braking_friction_factor,
+        gravity_scale,
+        speed_ratio,
+        damage_change_phantom,
+        auto_attack_speed,
+        cast_attack_speed,
+        status_build_up_1_max,
+        status_build_up_1,
+        status_build_up_2_max,
+        status_build_up_2,
+        status_build_up_3_max,
+        status_build_up_3,
+        status_build_up_4_max,
+        status_build_up_4,
+        status_build_up_5_max,
+        status_build_up_5,
+        paralysis_time_max,
+        paralysis_time,
+        paralysis_time_recover,
+        element_energy_max,
+        element_energy
+    );
+}
--- a/game-server/src/logic/components/entity_config.rs
+++ b/game-server/src/logic/components/entity_config.rs
@ -0,0 +1,15 @@
+use shorekeeper_protocol::EntityConfigType;
+
+use crate::logic::ecs::component::Component;
+
+pub struct EntityConfig {
+    pub config_id: i32,
+    pub config_type: EntityConfigType,
+}
+
+impl Component for EntityConfig {
+    fn set_pb_data(&self, pb: &mut shorekeeper_protocol::EntityPb) {
+        pb.config_id = self.config_id;
+        pb.config_type = self.config_type.into();
+    }
+}
--- a/wicked-waifus-game-server/src/logic/components/equip.rs
+++ b/wicked-waifus-game-server/src/logic/components/equip.rs
@ -1,6 +1,6 @@
 use crate::logic::ecs::component::Component;
-use wicked_waifus_protocol::entity_component_pb::ComponentPb;
-use wicked_waifus_protocol::{EntityComponentPb, EquipComponentPb};
+use shorekeeper_protocol::entity_component_pb::ComponentPb;
+use shorekeeper_protocol::{EntityComponentPb, EquipComponentPb};

 pub struct Equip {
    pub weapon_id: i32,
@ -8,7 +8,7 @@ pub struct Equip {
 }

 impl Component for Equip {
-    fn set_pb_data(&self, pb: &mut wicked_waifus_protocol::EntityPb) {
+    fn set_pb_data(&self, pb: &mut shorekeeper_protocol::EntityPb) {
        pb.component_pbs.push(EntityComponentPb {
            component_pb: Some(ComponentPb::EquipComponent(EquipComponentPb {
                weapon_id: self.weapon_id,
--- a/game-server/src/logic/components/mod.rs
+++ b/game-server/src/logic/components/mod.rs
@ -0,0 +1,19 @@
+mod attribute;
+mod entity_config;
+mod equip;
+mod movement;
+mod owner_player;
+mod player_entity_marker;
+mod position;
+mod visibility;
+mod vision_skill;
+
+pub use attribute::Attribute;
+pub use entity_config::EntityConfig;
+pub use equip::Equip;
+pub use movement::Movement;
+pub use owner_player::OwnerPlayer;
+pub use player_entity_marker::PlayerEntityMarker;
+pub use position::Position;
+pub use visibility::Visibility;
+pub use vision_skill::VisionSkill;
--- a/wicked-waifus-game-server/src/logic/components/movement.rs
+++ b/wicked-waifus-game-server/src/logic/components/movement.rs
@ -1,6 +1,6 @@
 use std::collections::VecDeque;

-use wicked_waifus_protocol::MoveReplaySample;
+use shorekeeper_protocol::MoveReplaySample;

 use crate::logic::ecs::component::Component;

@ -10,5 +10,5 @@ pub struct Movement {
 }

 impl Component for Movement {
-    fn set_pb_data(&self, _: &mut wicked_waifus_protocol::EntityPb) {}
+    fn set_pb_data(&self, _: &mut shorekeeper_protocol::EntityPb) {}
 }
--- a/wicked-waifus-game-server/src/logic/components/owner_player.rs
+++ b/wicked-waifus-game-server/src/logic/components/owner_player.rs
@ -3,7 +3,7 @@ use crate::logic::ecs::component::Component;
 pub struct OwnerPlayer(pub i32);

 impl Component for OwnerPlayer {
-    fn set_pb_data(&self, pb: &mut wicked_waifus_protocol::EntityPb) {
+    fn set_pb_data(&self, pb: &mut shorekeeper_protocol::EntityPb) {
        pb.player_id = self.0;
    }
 }
--- a/game-server/src/logic/components/player_entity_marker.rs
+++ b/game-server/src/logic/components/player_entity_marker.rs
@ -0,0 +1,11 @@
+use shorekeeper_protocol::EEntityType;
+
+use crate::logic::ecs::component::Component;
+
+pub struct PlayerEntityMarker;
+
+impl Component for PlayerEntityMarker {
+    fn set_pb_data(&self, pb: &mut shorekeeper_protocol::EntityPb) {
+        pb.entity_type = EEntityType::Player.into();
+    }
+}
--- a/wicked-waifus-game-server/src/logic/components/position.rs
+++ b/wicked-waifus-game-server/src/logic/components/position.rs
@ -3,7 +3,7 @@ use crate::logic::{ecs::component::Component, math::Transform};
 pub struct Position(pub Transform);

 impl Component for Position {
-    fn set_pb_data(&self, pb: &mut wicked_waifus_protocol::EntityPb) {
+    fn set_pb_data(&self, pb: &mut shorekeeper_protocol::EntityPb) {
        pb.pos = Some(self.0.get_position_protobuf());
        pb.rot = Some(self.0.get_rotation_protobuf());
        pb.init_pos = Some(self.0.get_position_protobuf());
--- a/game-server/src/logic/components/visibility.rs
+++ b/game-server/src/logic/components/visibility.rs
@ -0,0 +1,9 @@
+use crate::logic::ecs::component::Component;
+
+pub struct Visibility(pub bool);
+
+impl Component for Visibility {
+    fn set_pb_data(&self, pb: &mut shorekeeper_protocol::EntityPb) {
+        pb.is_visible = self.0;
+    }
+}
--- a/wicked-waifus-game-server/src/logic/components/vision_skill.rs
+++ b/wicked-waifus-game-server/src/logic/components/vision_skill.rs
@ -1,4 +1,4 @@
-use wicked_waifus_protocol::{
+use shorekeeper_protocol::{
    entity_component_pb::ComponentPb, EntityComponentPb, VisionSkillComponentPb,
    VisionSkillInformation,
 };
@ -10,7 +10,7 @@ pub struct VisionSkill {
 }

 impl Component for VisionSkill {
-    fn set_pb_data(&self, pb: &mut wicked_waifus_protocol::EntityPb) {
+    fn set_pb_data(&self, pb: &mut shorekeeper_protocol::EntityPb) {
        pb.component_pbs.push(EntityComponentPb {
            component_pb: Some(ComponentPb::VisionSkillComponent(VisionSkillComponentPb {
                vision_skill_infos: vec![VisionSkillInformation {
--- a/wicked-waifus-game-server/src/logic/ecs/component.rs
+++ b/wicked-waifus-game-server/src/logic/ecs/component.rs
@ -1,4 +1,4 @@
-use wicked_waifus_protocol::EntityPb;
+use shorekeeper_protocol::EntityPb;

 use crate::logic::components::*;

@ -11,7 +11,7 @@ macro_rules! impl_component_container {
        }

        impl ComponentContainer {
-            pub fn set_pb_data(&self, pb: &mut wicked_waifus_protocol::EntityPb) {
+            pub fn set_pb_data(&self, pb: &mut shorekeeper_protocol::EntityPb) {
                match self {
                $(
                    Self::$comp(comp) => comp.set_pb_data(pb),
@ -28,22 +28,10 @@ impl_component_container! {
    OwnerPlayer;
    Visibility;
    Attribute;
-    PlayerOwnedEntityMarker;
+    PlayerEntityMarker;
    Movement;
    Equip;
    VisionSkill;
-    MonsterAi;
-    Fsm;
-    RoleSkin;
-    FightBuff;
-    StateTag;
-    Tag;
-    Autonomous;
-    Interact;
-    Concomitant;
-    Summoner;
-    SoarWingSkin;
-    ParaglidingSkin;
 }

 pub trait Component {
--- a/game-server/src/logic/ecs/entity.rs
+++ b/game-server/src/logic/ecs/entity.rs
@ -0,0 +1,57 @@
+use std::{cell::RefCell, collections::HashSet};
+
+use super::component::ComponentContainer;
+
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
+pub struct Entity(i64);
+
+pub struct EntityBuilder<'comp>(Entity, &'comp mut Vec<RefCell<ComponentContainer>>);
+
+#[derive(Default)]
+pub struct EntityManager {
+    entity_id_counter: i64,
+    active_entity_set: HashSet<Entity>,
+}
+
+impl EntityManager {
+    pub fn create(&mut self) -> Entity {
+        self.entity_id_counter += 1;
+        let entity = Entity(self.entity_id_counter);
+
+        self.active_entity_set.insert(entity);
+        entity
+    }
+
+    pub fn get(&self, id: i64) -> Option<Entity> {
+        self.active_entity_set.get(&Entity(id)).copied()
+    }
+
+    #[expect(dead_code)]
+    pub fn remove(&mut self, entity: Entity) -> bool {
+        self.active_entity_set.remove(&entity)
+    }
+}
+
+impl<'comp> EntityBuilder<'comp> {
+    pub fn builder(
+        entity: Entity,
+        components: &'comp mut Vec<RefCell<ComponentContainer>>,
+    ) -> Self {
+        Self(entity, components)
+    }
+
+    pub fn with(self, component: ComponentContainer) -> Self {
+        self.1.push(RefCell::new(component));
+        self
+    }
+
+    pub fn build(self) -> Entity {
+        self.0
+    }
+}
+
+impl From<Entity> for i64 {
+    fn from(value: Entity) -> Self {
+        value.0
+    }
+}
--- a/game-server/src/logic/ecs/mod.rs
+++ b/game-server/src/logic/ecs/mod.rs
@ -0,0 +1,64 @@
+pub mod component;
+pub mod entity;
+pub mod world;
+
+// Query specified components from all entities
+#[macro_export]
+macro_rules! query_with {
+    ($world:expr, $($comp:ident),*) => {
+        $world.components().iter().filter(|(_, comps)| {
+            $(comps.iter().any(|comp| matches!(&*comp.borrow(), ComponentContainer::$comp(_))) && )* true
+        })
+        .map(|(e, comps)| {
+            (*e,
+                $(
+                    comps.iter().find_map(|comp| {
+                        let r = comp.try_borrow_mut().ok()?;
+                        if matches!(&*r, ComponentContainer::$comp(_)) {
+                            Some(::std::cell::RefMut::map(r, |r| {
+                                let ComponentContainer::$comp(comp_inner) = r else { unreachable!() };
+                                comp_inner
+                            }))
+                        }
+                        else {
+                            None
+                        }
+                    }).unwrap(),
+                )*
+            )
+        })
+        .collect::<Vec<_>>()
+    };
+}
+
+#[macro_export]
+macro_rules! ident_as_none {
+    ($t:ident) => {
+        None
+    };
+}
+
+// Query components of specified entity
+#[macro_export]
+macro_rules! query_components {
+    ($world:expr, $entity_id:expr, $($comp:ident),*) => {
+        $world.components().iter().find(|(id, _)| $entity_id == i64::from(**id))
+        .map(|(_, comps)| {
+            ($(
+                comps.iter().find_map(|comp| {
+                    let r = comp.try_borrow_mut().ok()?;
+                    if matches!(&*r, ComponentContainer::$comp(_)) {
+                        Some(::std::cell::RefMut::map(r, |r| {
+                            let ComponentContainer::$comp(comp_inner) = r else { unreachable!() };
+                            comp_inner
+                        }))
+                    }
+                    else {
+                        None
+                    }
+                }),
+            )*)
+        })
+        .unwrap_or_else(|| ($( $crate::ident_as_none!($comp), )*))
+    };
+}
--- a/game-server/src/logic/ecs/world.rs
+++ b/game-server/src/logic/ecs/world.rs
@ -0,0 +1,58 @@
+use std::cell::{RefCell, RefMut};
+use std::collections::hash_map::{Keys, Values};
+use std::collections::HashMap;
+
+use crate::logic::player::InWorldPlayer;
+
+use super::component::ComponentContainer;
+use super::entity::{Entity, EntityBuilder, EntityManager};
+
+pub struct World {
+    components: HashMap<Entity, Vec<RefCell<ComponentContainer>>>,
+    entity_manager: EntityManager,
+    in_world_players: HashMap<i32, InWorldPlayer>, // joined players metadata
+}
+
+impl World {
+    pub fn new() -> Self {
+        Self {
+            components: HashMap::new(),
+            entity_manager: EntityManager::default(),
+            in_world_players: HashMap::new(),
+        }
+    }
+
+    pub fn create_entity(&mut self) -> EntityBuilder {
+        let entity = self.entity_manager.create();
+        EntityBuilder::builder(entity, self.components.entry(entity).or_default())
+    }
+
+    pub fn is_in_world(&self, entity_id: i64) -> bool {
+        self.entity_manager.get(entity_id).is_some()
+    }
+
+    pub fn components(&self) -> &HashMap<Entity, Vec<RefCell<ComponentContainer>>> {
+        &self.components
+    }
+
+    pub fn get_entity_components(&self, entity: Entity) -> Vec<RefMut<ComponentContainer>> {
+        let Some(components) = self.components.get(&entity) else {
+            return Vec::with_capacity(0);
+        };
+
+        components.iter().map(|rc| rc.borrow_mut()).collect()
+    }
+
+    pub fn player_ids(&self) -> Keys<'_, i32, InWorldPlayer> {
+        self.in_world_players.keys()
+    }
+
+    pub fn players(&self) -> Values<'_, i32, InWorldPlayer> {
+        self.in_world_players.values()
+    }
+
+    pub fn set_in_world_player_data(&mut self, in_world_player: InWorldPlayer) {
+        self.in_world_players
+            .insert(in_world_player.player_id, in_world_player);
+    }
+}
--- a/game-server/src/logic/handler/misc.rs
+++ b/game-server/src/logic/handler/misc.rs
@ -0,0 +1,11 @@
+use shorekeeper_protocol::{IYa, InputSettingRequest, InputSettingResponse};
+
+use crate::logic::player::Player;
+
+pub fn on_input_setting_request(
+    _: &Player,
+    _: InputSettingRequest,
+    response: &mut InputSettingResponse,
+) {
+    response.i_ya = Some(IYa::default());
+}
--- a/game-server/src/logic/handler/mod.rs
+++ b/game-server/src/logic/handler/mod.rs
@ -0,0 +1,94 @@
+mod misc;
+mod scene;
+mod skill;
+pub use misc::*;
+pub use scene::*;
+pub use skill::*;
+
+use shorekeeper_protocol::message::Message;
+
+macro_rules! handle_request {
+    ($($name:ident $(, $inner_package:ident)?;)*) => {
+        fn handle_request(player: &mut super::player::Player, mut msg: Message) {
+            use ::shorekeeper_protocol::{MessageID, Protobuf};
+
+            ::paste::paste! {
+                match msg.get_message_id() {
+                    $(
+                        ::shorekeeper_protocol::$($inner_package::)?[<$name Request>]::MESSAGE_ID => {
+                            let Ok(request) = ::shorekeeper_protocol::$($inner_package::)?[<$name Request>]::decode(&*msg.remove_payload()) else {
+                                tracing::debug!("failed to decode {}, player_id: {}", stringify!($($inner_package::)?[<$name Request>]), player.basic_info.id);
+                                return;
+                            };
+
+                            tracing::debug!("logic: processing request {}", stringify!($($inner_package::)?[<$name Request>]));
+
+                            let mut response = ::shorekeeper_protocol::$($inner_package::)?[<$name Response>]::default();
+                            [<on_ $($inner_package:snake _)? $name:snake _request>](player, request, &mut response);
+
+                            player.respond(response, msg.get_rpc_id());
+                        },
+                    )*
+                    unhandled => ::tracing::warn!("can't find handler for request with message_id={unhandled}")
+                }
+            }
+        }
+    };
+}
+
+macro_rules! handle_push {
+    ($($name:ident $(, $inner_package:ident)?;)*) => {
+        fn handle_push(player: &mut super::player::Player, mut msg: Message) {
+            use ::shorekeeper_protocol::{MessageID, Protobuf};
+
+            ::paste::paste! {
+                match msg.get_message_id() {
+                    $(
+                        ::shorekeeper_protocol::$($inner_package::)?[<$name Push>]::MESSAGE_ID => {
+                            let Ok(push) = ::shorekeeper_protocol::$($inner_package::)?[<$name Push>]::decode(&*msg.remove_payload()) else {
+                                tracing::debug!("failed to decode {}, player_id: {}", stringify!($($inner_package::)?[<$name Push>]), player.basic_info.id);
+                                return;
+                            };
+
+                            tracing::debug!("logic: processing push {}", stringify!($($inner_package::)?[<$name Push>]));
+
+                            [<on_ $($inner_package:snake _)? $name:snake _push>](player, push);
+                        },
+                    )*
+                    unhandled => ::tracing::warn!("can't find handler for push with message_id={unhandled}")
+                }
+            }
+        }
+    };
+}
+
+handle_request! {
+    // Scene
+    UpdateSceneDate;
+    EntityActive;
+    EntityOnLanded;
+    CombatSendPack, combat_message;
+
+    // Skill
+    VisionExploreSkillSet;
+
+    // Misc
+    InputSetting;
+}
+
+handle_push! {
+    MovePackage;
+}
+
+pub fn handle_logic_message(player: &mut super::player::Player, msg: Message) {
+    match msg {
+        Message::Request { .. } => handle_request(player, msg),
+        Message::Push { .. } => handle_push(player, msg),
+        _ => tracing::warn!(
+            "handle_logic_message: wrong message type: {}, message_id: {}, player_id: {}",
+            msg.get_message_type(),
+            msg.get_message_id(),
+            player.basic_info.id,
+        ),
+    }
+}
--- a/game-server/src/logic/handler/scene.rs
+++ b/game-server/src/logic/handler/scene.rs
@ -0,0 +1,87 @@
+use shorekeeper_protocol::combat_message::{CombatSendPackRequest, CombatSendPackResponse};
+use shorekeeper_protocol::{
+    EntityActiveRequest, EntityActiveResponse, EntityOnLandedRequest, EntityOnLandedResponse,
+    ErrorCode, MovePackagePush, UpdateSceneDateRequest, UpdateSceneDateResponse,
+};
+
+use crate::{logic::ecs::component::ComponentContainer, logic::player::Player, query_components};
+
+pub fn on_update_scene_date_request(
+    _player: &Player,
+    _request: UpdateSceneDateRequest,
+    response: &mut UpdateSceneDateResponse,
+) {
+    response.error_code = ErrorCode::Success.into();
+}
+
+pub fn on_combat_message_combat_send_pack_request(
+    _player: &Player,
+    _request: CombatSendPackRequest,
+    response: &mut CombatSendPackResponse,
+) {
+    response.error_code = ErrorCode::Success.into();
+}
+
+pub fn on_entity_active_request(
+    player: &Player,
+    request: EntityActiveRequest,
+    response: &mut EntityActiveResponse,
+) {
+    let world = player.world.borrow();
+
+    if !world.is_in_world(request.entity_id) {
+        tracing::debug!(
+            "EntityActiveRequest: entity with id {} doesn't exist, player_id: {}",
+            request.entity_id,
+            player.basic_info.id
+        );
+        return;
+    };
+
+    if let Some(position) = query_components!(world, request.entity_id, Position).0 {
+        // TODO: proper entity "activation" logic
+        response.pos = Some(position.0.get_position_protobuf());
+        response.rot = Some(position.0.get_rotation_protobuf());
+    }
+
+    response.component_pbs = Vec::new(); // not implemented
+    response.error_code = ErrorCode::Success.into();
+}
+
+pub fn on_entity_on_landed_request(
+    _: &Player,
+    request: EntityOnLandedRequest,
+    _: &mut EntityOnLandedResponse,
+) {
+    tracing::debug!(
+        "EntityOnLandedRequest: entity with id {} landed",
+        request.entity_id
+    );
+}
+
+pub fn on_move_package_push(player: &mut Player, push: MovePackagePush) {
+    let world = player.world.borrow();
+
+    for moving_entity in push.moving_entities {
+        if !world.is_in_world(moving_entity.entity_id) {
+            tracing::debug!(
+                "MovePackage: entity with id {} doesn't exist",
+                moving_entity.entity_id
+            );
+            continue;
+        }
+
+        let Some(mut movement) = query_components!(world, moving_entity.entity_id, Movement).0
+        else {
+            tracing::warn!(
+                "MovePackage: entity {} doesn't have movement component",
+                moving_entity.entity_id
+            );
+            continue;
+        };
+
+        movement
+            .pending_movement_vec
+            .extend(moving_entity.move_infos);
+    }
+}
--- a/game-server/src/logic/handler/skill.rs
+++ b/game-server/src/logic/handler/skill.rs
@ -0,0 +1,32 @@
+use crate::logic::ecs::component::ComponentContainer;
+use shorekeeper_protocol::{
+    VisionExploreSkillSetRequest, VisionExploreSkillSetResponse, VisionSkillChangeNotify,
+    VisionSkillInformation,
+};
+
+use crate::{logic::player::Player, query_with};
+
+pub fn on_vision_explore_skill_set_request(
+    player: &mut Player,
+    request: VisionExploreSkillSetRequest,
+    response: &mut VisionExploreSkillSetResponse,
+) {
+    player.explore_tools.active_explore_skill = request.skill_id;
+
+    let world = player.world.borrow();
+    for (entity, owner, mut vision_skill) in query_with!(world, OwnerPlayer, VisionSkill) {
+        if owner.0 == player.basic_info.id {
+            vision_skill.skill_id = request.skill_id;
+            player.notify(VisionSkillChangeNotify {
+                entity_id: entity.into(),
+                vision_skill_infos: vec![VisionSkillInformation {
+                    skill_id: request.skill_id,
+                    ..Default::default()
+                }],
+                ..Default::default()
+            })
+        }
+    }
+
+    response.skill_id = request.skill_id;
+}
--- a/wicked-waifus-game-server/src/logic/math/mod.rs
+++ b/wicked-waifus-game-server/src/logic/math/mod.rs
@ -1,6 +1,5 @@
 mod transform;
 mod vector;
-mod area_range;

 pub use transform::Transform;
 pub use vector::Vector3f;
--- a/wicked-waifus-game-server/src/logic/math/transform.rs
+++ b/wicked-waifus-game-server/src/logic/math/transform.rs
@ -1,6 +1,4 @@
-use wicked_waifus_data::RawVectorData;
-use wicked_waifus_protocol::Rotator;
-use wicked_waifus_protocol_internal::TransformData;
+use shorekeeper_protocol::{Rotator, TransformData};

 use super::Vector3f;

@ -11,19 +9,19 @@ pub struct Transform {
 }

 impl Transform {
-    pub fn get_position_protobuf(&self) -> wicked_waifus_protocol::Vector {
+    pub fn get_position_protobuf(&self) -> shorekeeper_protocol::Vector {
        self.position.to_protobuf()
    }

    pub fn get_rotation_protobuf(&self) -> Rotator {
        Rotator {
-            roll: self.rotation.x,
-            pitch: self.rotation.y,
-            yaw: self.rotation.z,
+            pitch: self.rotation.x,
+            yaw: self.rotation.y,
+            roll: self.rotation.z,
        }
    }

-    pub fn set_position_from_protobuf(&mut self, pos: &wicked_waifus_protocol::Vector) {
+    pub fn set_position_from_protobuf(&mut self, pos: &shorekeeper_protocol::Vector) {
        self.position.x = pos.x;
        self.position.y = pos.y;
        self.position.z = pos.z;
@ -49,15 +47,3 @@ impl Transform {
        }
    }
 }
-
-impl From<&[RawVectorData]> for Transform {
-     // - transform[0] is position component
-     // - transform[1] is rotation component
-     // - transform[2] is scale component
-    fn from(transform: &[RawVectorData]) -> Self {
-        Self {
-            position: Vector3f::from_raw_scaled(&transform[0], &transform[2]),
-            rotation: Vector3f::from_raw_scaled(&transform[1], &transform[2]),
-        }
-    }
-}
--- a/game-server/src/logic/math/vector.rs
+++ b/game-server/src/logic/math/vector.rs
@ -0,0 +1,42 @@
+use shorekeeper_protocol::{Vector, VectorData};
+
+#[derive(Default, Clone, PartialEq, Debug)]
+pub struct Vector3f {
+    pub x: f32,
+    pub y: f32,
+    pub z: f32,
+}
+
+impl Vector3f {
+    pub fn to_protobuf(&self) -> Vector {
+        Vector {
+            x: self.x,
+            y: self.y,
+            z: self.z,
+        }
+    }
+
+    pub fn from_save(data: VectorData) -> Self {
+        Self {
+            x: data.x,
+            y: data.y,
+            z: data.z,
+        }
+    }
+
+    pub fn save_data(&self) -> VectorData {
+        VectorData {
+            x: self.x,
+            y: self.y,
+            z: self.z,
+        }
+    }
+
+    pub fn from_data(data: &shorekeeper_data::VectorData) -> Self {
+        Self {
+            x: data.get_x(),
+            y: data.get_y(),
+            z: data.get_z(),
+        }
+    }
+}
--- a/wicked-waifus-game-server/src/logic/mod.rs
+++ b/wicked-waifus-game-server/src/logic/mod.rs
@ -7,4 +7,3 @@ pub mod role;
 pub mod systems;
 pub mod thread_mgr;
 pub mod utils;
-pub mod gacha;
--- a/wicked-waifus-game-server/src/logic/player/basic_info.rs
+++ b/wicked-waifus-game-server/src/logic/player/basic_info.rs
@ -1,8 +1,6 @@
-use wicked_waifus_protocol::{
-    player_attr, BasicInfoNotify, PlayerAttr, PlayerAttrKey, PlayerAttrType,
+use shorekeeper_protocol::{
+    player_attr, BasicInfoNotify, PlayerAttr, PlayerAttrKey, PlayerAttrType, PlayerBasicData,
 };
-use wicked_waifus_protocol_internal::PlayerBasicData;
-use crate::logic::player::player_inventory::PlayerInventory;

 pub struct PlayerBasicInfo {
    pub id: i32,
@ -12,33 +10,20 @@ pub struct PlayerBasicInfo {
    pub exp: i32,
    pub head_photo: i32,
    pub head_frame: i32,
-    pub cur_map_id: i32,
-    pub role_show_list: Vec<i32>,
 }

 impl PlayerBasicInfo {
-    pub fn build_notify(&self, inventory: &PlayerInventory) -> BasicInfoNotify {
+    pub fn build_notify(&self) -> BasicInfoNotify {
        BasicInfoNotify {
            id: self.id,
            attributes: vec![
+                build_str_attr(PlayerAttrKey::Name, self.name.as_str()),
                build_int_attr(PlayerAttrKey::Level, self.level),
                build_int_attr(PlayerAttrKey::Exp, self.exp),
-                build_int_attr(PlayerAttrKey::Coin, inventory.get_shell_credits()),
-                build_int_attr(PlayerAttrKey::RareCoin, inventory.get_astrite()),
+                build_int_attr(PlayerAttrKey::Sex, self.sex),
                build_int_attr(PlayerAttrKey::HeadPhoto, self.head_photo),
                build_int_attr(PlayerAttrKey::HeadFrame, self.head_frame),
-                build_int_attr(PlayerAttrKey::AreaId, 1), // TODO:
-                build_str_attr(PlayerAttrKey::Name, self.name.as_str()),
-                build_str_attr(PlayerAttrKey::Sign, ""), // TODO:
-                build_int_attr(PlayerAttrKey::Sex, self.sex),
-                build_int_attr(PlayerAttrKey::OriginWorldLevel, 1), // TODO:
-                build_int_attr(PlayerAttrKey::CurWorldLevel, 1), // TODO:
-                build_int_attr(PlayerAttrKey::WorldLevelTimeStamp, 0), // TODO:
-                build_int_attr(PlayerAttrKey::CashCoin, inventory.get_lunite()),
-                build_int_attr(PlayerAttrKey::WorldPermission, 0), // TODO:
            ],
-            card_unlock_list: vec![], // TODO: 80060000
-            cur_card_id: 0, // TODO: 80060000
            ..Default::default()
        }
    }
@ -52,8 +37,6 @@ impl PlayerBasicInfo {
            exp: data.exp,
            head_photo: data.head_photo,
            head_frame: data.head_frame,
-            cur_map_id: data.cur_map_id,
-            role_show_list: data.role_show_list,
        }
    }

@ -66,24 +49,6 @@ impl PlayerBasicInfo {
            exp: self.exp,
            head_photo: self.head_photo,
            head_frame: self.head_frame,
-            cur_map_id: self.cur_map_id,
-            role_show_list: self.role_show_list.clone(),
-        }
-    }
-}
-
-impl Default for PlayerBasicInfo {
-    fn default() -> Self {
-        Self {
-            id: 0,
-            name: "".to_string(),
-            sex: 0,
-            level: 0,
-            exp: 0,
-            head_photo: 0,
-            head_frame: 0,
-            cur_map_id: 0,
-            role_show_list: vec![],
        }
    }
 }
--- a/wicked-waifus-game-server/src/logic/player/explore_tools.rs
+++ b/wicked-waifus-game-server/src/logic/player/explore_tools.rs
@ -1,8 +1,10 @@
 use std::collections::HashSet;

-use wicked_waifus_data::explore_tools_data;
-use wicked_waifus_protocol::{ExploreSkillRoulette, ExploreSkillRouletteUpdateNotify, ExploreToolAllNotify, VisionExploreSkillNotify};
-use wicked_waifus_protocol_internal::PlayerExploreToolsData;
+use shorekeeper_data::explore_tools_data;
+use shorekeeper_protocol::{
+    ExploreSkillRoulette, ExploreSkillRouletteUpdateNotify, ExploreToolAllNotify,
+    PlayerExploreToolsData,
+};

 type Roulette = [i32; 8];

@ -33,7 +35,6 @@ impl ExploreTools {
    }

    pub fn build_explore_tool_all_notify(&self) -> ExploreToolAllNotify {
-        // TODO: NewUnlock handling
        ExploreToolAllNotify {
            skill_list: self.unlocked_explore_skills.iter().cloned().collect(),
            explore_skill: self.active_explore_skill,
@ -41,12 +42,6 @@ impl ExploreTools {
        }
    }

-    pub fn build_vision_explore_skill_notify(&self) -> VisionExploreSkillNotify {
-        VisionExploreSkillNotify {
-            explore_skill: self.active_explore_skill
-        }
-    }
-
    pub fn build_roulette_update_notify(&self) -> ExploreSkillRouletteUpdateNotify {
        ExploreSkillRouletteUpdateNotify {
            roulette_info: vec![ExploreSkillRoulette {
--- a/wicked-waifus-game-server/src/logic/player/in_world_player.rs
+++ b/wicked-waifus-game-server/src/logic/player/in_world_player.rs
--- a/wicked-waifus-game-server/src/logic/player/location.rs
+++ b/wicked-waifus-game-server/src/logic/player/location.rs
@ -1,5 +1,5 @@
-use wicked_waifus_data::instance_dungeon_data;
-use wicked_waifus_protocol_internal::PlayerLocationData;
+use shorekeeper_data::instance_dungeon_data;
+use shorekeeper_protocol::PlayerLocationData;

 use crate::logic::math::{Transform, Vector3f};

--- a/game-server/src/logic/player/mod.rs
+++ b/game-server/src/logic/player/mod.rs
@ -0,0 +1,268 @@
+use std::{cell::RefCell, collections::HashSet, rc::Rc, sync::Arc};
+
+use basic_info::PlayerBasicInfo;
+use common::time_util;
+use explore_tools::ExploreTools;
+use location::PlayerLocation;
+use player_func::PlayerFunc;
+use shorekeeper_protocol::{
+    message::Message, ItemPkgOpenNotify, PbGetRoleListNotify, PlayerBasicData, PlayerRoleData,
+    PlayerSaveData, ProtocolUnit,
+};
+
+use crate::session::Session;
+
+use super::{
+    ecs::world::World,
+    role::{Role, RoleFormation},
+};
+
+mod basic_info;
+mod explore_tools;
+mod in_world_player;
+mod location;
+mod player_func;
+
+pub use in_world_player::InWorldPlayer;
+
+pub struct Player {
+    session: Option<Arc<Session>>,
+    // Persistent
+    pub basic_info: PlayerBasicInfo,
+    pub role_list: Vec<Role>,
+    pub formation_list: Vec<RoleFormation>,
+    pub location: PlayerLocation,
+    pub func: PlayerFunc,
+    pub explore_tools: ExploreTools,
+    // Runtime
+    pub world: Rc<RefCell<World>>,
+    pub last_save_time: u64,
+}
+
+impl Player {
+    pub fn init(&mut self) {
+        if self.role_list.is_empty() {
+            self.on_first_enter();
+        }
+
+        // we need shorekeeper
+        // TODO: remove this part after implementing team switch
+        if !self.role_list.iter().any(|r| r.role_id == 1505) {
+            let mut shorekeeper = Role::new(1505);
+            shorekeeper.equip_weapon = 21050036;
+            self.role_list.push(shorekeeper);
+        }
+
+        self.formation_list.clear();
+        self.formation_list.push(RoleFormation {
+            id: 1,
+            cur_role: 1505,
+            role_id_set: HashSet::from([1505]),
+            is_current: true,
+        });
+        // End shorekeeper hardcode part
+
+        self.ensure_current_formation();
+        self.ensure_basic_unlock_func();
+    }
+
+    pub fn notify_general_data(&self) {
+        self.notify(self.basic_info.build_notify());
+        self.notify(self.func.build_func_open_notify());
+        self.notify(self.build_role_list_notify());
+        self.notify(self.explore_tools.build_explore_tool_all_notify());
+        self.notify(self.explore_tools.build_roulette_update_notify());
+
+        self.notify(ItemPkgOpenNotify {
+            open_pkg: (0..8).collect(),
+        });
+    }
+
+    fn on_first_enter(&mut self) {
+        self.role_list.push(Self::create_main_character_role(
+            self.basic_info.name.clone(),
+            self.basic_info.sex,
+        ));
+
+        let role = &self.role_list[0];
+
+        self.formation_list.push(RoleFormation {
+            id: 1,
+            cur_role: role.role_id,
+            role_id_set: HashSet::from([role.role_id]),
+            is_current: true,
+        });
+
+        self.location = PlayerLocation::default();
+    }
+
+    // Ensure basic functionality is unlocked
+    // Should be handled by quest progression,
+    // but as of right now, just unlock what we need
+    fn ensure_basic_unlock_func(&mut self) {
+        self.func.unlock(10026); // explore tools
+    }
+
+    fn ensure_current_formation(&mut self) {
+        if self.formation_list.is_empty() {
+            let role = &self.role_list[0];
+
+            self.formation_list.push(RoleFormation {
+                id: 1,
+                cur_role: role.role_id,
+                role_id_set: HashSet::from([role.role_id]),
+                is_current: true,
+            });
+        }
+
+        if !self.formation_list.iter().any(|rf| rf.is_current) {
+            self.formation_list[0].is_current = true;
+        }
+
+        if let Some(rf) = self.formation_list.iter_mut().find(|rf| rf.is_current) {
+            if rf.role_id_set.is_empty() {
+                rf.role_id_set.insert(self.role_list[0].role_id);
+            }
+
+            if !rf.role_id_set.contains(&rf.cur_role) {
+                rf.cur_role = *rf.role_id_set.iter().nth(0).unwrap();
+            }
+        }
+    }
+
+    pub fn build_in_world_player(&self) -> InWorldPlayer {
+        InWorldPlayer {
+            player_id: self.basic_info.id,
+            player_name: self.basic_info.name.clone(),
+            player_icon: 0,
+            level: self.basic_info.level,
+            group_type: 1,
+        }
+    }
+
+    pub fn get_current_formation_role_list(&self) -> Vec<&Role> {
+        self.formation_list
+            .iter()
+            .find(|rf| rf.is_current)
+            .unwrap()
+            .role_id_set
+            .iter()
+            .flat_map(|id| self.role_list.iter().find(|r| r.role_id == *id))
+            .collect()
+    }
+
+    pub fn get_cur_role_id(&self) -> i32 {
+        self.formation_list
+            .iter()
+            .find(|rf| rf.is_current)
+            .unwrap()
+            .cur_role
+    }
+
+    pub fn load_from_save(save_data: PlayerSaveData) -> Self {
+        let role_data = save_data.role_data.unwrap_or_default();
+
+        Self {
+            session: None,
+            basic_info: PlayerBasicInfo::load_from_save(save_data.basic_data.unwrap_or_default()),
+            role_list: role_data
+                .role_list
+                .into_iter()
+                .map(Role::load_from_save)
+                .collect(),
+            formation_list: role_data
+                .role_formation_list
+                .into_iter()
+                .map(RoleFormation::load_from_save)
+                .collect(),
+            location: save_data
+                .location_data
+                .map(PlayerLocation::load_from_save)
+                .unwrap_or_default(),
+            func: save_data
+                .func_data
+                .map(PlayerFunc::load_from_save)
+                .unwrap_or_default(),
+            explore_tools: save_data
+                .explore_tools_data
+                .map(ExploreTools::load_from_save)
+                .unwrap_or_default(),
+            world: Rc::new(RefCell::new(World::new())),
+            last_save_time: time_util::unix_timestamp(),
+        }
+    }
+
+    pub fn build_save_data(&self) -> PlayerSaveData {
+        PlayerSaveData {
+            basic_data: Some(self.basic_info.build_save_data()),
+            role_data: Some(PlayerRoleData {
+                role_list: self.role_list.iter().map(|r| r.build_save_data()).collect(),
+                role_formation_list: self
+                    .formation_list
+                    .iter()
+                    .map(|rf| rf.build_save_data())
+                    .collect(),
+            }),
+            location_data: Some(self.location.build_save_data()),
+            func_data: Some(self.func.build_save_data()),
+            explore_tools_data: Some(self.explore_tools.build_save_data()),
+        }
+    }
+
+    pub fn set_session(&mut self, session: Arc<Session>) {
+        self.session = Some(session);
+    }
+
+    pub fn build_role_list_notify(&self) -> PbGetRoleListNotify {
+        PbGetRoleListNotify {
+            role_list: self.role_list.iter().map(|r| r.to_protobuf()).collect(),
+        }
+    }
+
+    pub fn notify(&self, content: impl ProtocolUnit) {
+        if let Some(session) = self.session.as_ref() {
+            session.forward_to_gateway(Message::Push {
+                sequence_number: 0,
+                message_id: content.get_message_id(),
+                payload: Some(content.encode_to_vec().into_boxed_slice()),
+            });
+        }
+    }
+
+    pub fn respond(&self, content: impl ProtocolUnit, rpc_id: u16) {
+        if let Some(session) = self.session.as_ref() {
+            session.forward_to_gateway(Message::Response {
+                sequence_number: 0,
+                message_id: content.get_message_id(),
+                rpc_id,
+                payload: Some(content.encode_to_vec().into_boxed_slice()),
+            });
+        }
+    }
+
+    fn create_main_character_role(name: String, sex: i32) -> Role {
+        let mut role = match sex {
+            0 => Role::new(Role::MAIN_CHARACTER_FEMALE_ID),
+            1 => Role::new(Role::MAIN_CHARACTER_MALE_ID),
+            _ => unreachable!(),
+        };
+
+        role.name = name;
+        role
+    }
+
+    pub fn create_default_save_data(id: i32, name: String, sex: i32) -> PlayerSaveData {
+        PlayerSaveData {
+            basic_data: Some(PlayerBasicData {
+                id,
+                name,
+                sex,
+                level: 1,
+                head_photo: 1505,
+                head_frame: 80060009,
+                ..Default::default()
+            }),
+            ..Default::default()
+        }
+    }
+}
--- a/wicked-waifus-game-server/src/logic/player/player_func.rs
+++ b/wicked-waifus-game-server/src/logic/player/player_func.rs
@ -1,9 +1,7 @@
 use std::collections::HashMap;

-use wicked_waifus_data::function_condition_data;
-use wicked_waifus_protocol::{FuncOpenNotify, Function};
-use wicked_waifus_protocol_internal::PlayerFuncData;
-use crate::config;
+use shorekeeper_data::function_condition_data;
+use shorekeeper_protocol::{FuncOpenNotify, Function, PlayerFuncData};

 pub struct PlayerFunc {
    pub func_map: HashMap<i32, i32>,
@ -42,19 +40,11 @@ impl PlayerFunc {

 impl Default for PlayerFunc {
    fn default() -> Self {
-        if config::get_config().default_unlocks.unlock_all_functions {
-            Self {
-                func_map: function_condition_data::iter()
-                    .map(|fc| (fc.function_id, 2))
-                    .collect(),
-            }
-        } else {
-            Self {
-                func_map: function_condition_data::iter()
-                    .filter(|fc| fc.open_condition_id == 0)
-                    .map(|fc| (fc.function_id, 2))
-                    .collect(),
-            }
+        Self {
+            func_map: function_condition_data::iter()
+                .filter(|fc| fc.open_condition_id == 0 && fc.is_on)
+                .map(|fc| (fc.function_id, 2))
+                .collect(),
        }
    }
 }
--- a/game-server/src/logic/role/formation.rs
+++ b/game-server/src/logic/role/formation.rs
@ -0,0 +1,30 @@
+use std::collections::HashSet;
+
+use shorekeeper_protocol::RoleFormationData;
+
+pub struct RoleFormation {
+    pub id: i32,
+    pub cur_role: i32,
+    pub role_id_set: HashSet<i32>,
+    pub is_current: bool,
+}
+
+impl RoleFormation {
+    pub fn load_from_save(data: RoleFormationData) -> Self {
+        Self {
+            id: data.formation_id,
+            cur_role: data.cur_role,
+            role_id_set: data.role_id_list.into_iter().collect(),
+            is_current: data.is_current,
+        }
+    }
+
+    pub fn build_save_data(&self) -> RoleFormationData {
+        RoleFormationData {
+            formation_id: self.id,
+            cur_role: self.cur_role,
+            role_id_list: self.role_id_set.iter().cloned().collect(),
+            is_current: self.is_current,
+        }
+    }
+}
--- a/game-server/src/logic/role/mod.rs
+++ b/game-server/src/logic/role/mod.rs
@ -0,0 +1,92 @@
+use std::collections::HashMap;
+
+use common::time_util;
+pub use formation::RoleFormation;
+use shorekeeper_data::role_info_data;
+use shorekeeper_protocol::{ArrayIntInt, RoleData, RoleInfo};
+
+mod formation;
+pub struct Role {
+    pub role_id: i32,
+    pub name: String,
+    pub level: i32,
+    pub exp: i32,
+    pub breakthrough: i32,
+    pub skill_map: HashMap<i32, i32>,
+    pub star: i32,
+    pub favor: i32,
+    pub create_time: u32,
+    pub equip_weapon: i32,
+}
+
+impl Role {
+    pub const MAIN_CHARACTER_MALE_ID: i32 = 1501;
+    pub const MAIN_CHARACTER_FEMALE_ID: i32 = 1502;
+
+    pub fn new(role_id: i32) -> Self {
+        let data = role_info_data::iter().find(|d| d.id == role_id).unwrap();
+
+        Self {
+            role_id,
+            name: String::with_capacity(0),
+            level: data.max_level,
+            exp: 0,
+            breakthrough: 0,
+            skill_map: HashMap::new(), // TODO!
+            star: 0,
+            favor: 0,
+            create_time: time_util::unix_timestamp() as u32,
+            equip_weapon: data.init_weapon_item_id,
+        }
+    }
+
+    pub fn to_protobuf(&self) -> RoleInfo {
+        RoleInfo {
+            role_id: self.role_id,
+            name: self.name.clone(),
+            level: self.level,
+            exp: self.exp,
+            breakthrough: self.breakthrough,
+            create_time: self.create_time,
+            skills: self
+                .skill_map
+                .iter()
+                .map(|(k, v)| ArrayIntInt { key: *k, value: *v })
+                .collect(),
+            star: self.star,
+            favor: self.favor,
+            ..Default::default()
+        }
+    }
+
+    pub fn load_from_save(data: RoleData) -> Self {
+        Self {
+            role_id: data.role_id,
+            name: data.name,
+            level: data.level,
+            exp: data.exp,
+            breakthrough: data.breakthrough,
+            skill_map: data.skill_map,
+            star: data.star,
+            favor: data.favor,
+            create_time: data.create_time,
+            equip_weapon: data.equip_weapon,
+        }
+    }
+
+    pub fn build_save_data(&self) -> RoleData {
+        RoleData {
+            role_id: self.role_id,
+            name: self.name.clone(),
+            level: self.level,
+            exp: self.exp,
+            breakthrough: self.breakthrough,
+            skill_map: self.skill_map.clone(),
+            star: self.star,
+            favor: self.favor,
+            create_time: self.create_time,
+            equip_weapon: self.equip_weapon,
+            ..Default::default()
+        }
+    }
+}
--- a/wicked-waifus-game-server/src/logic/systems/mod.rs
+++ b/wicked-waifus-game-server/src/logic/systems/mod.rs
--- a/wicked-waifus-game-server/src/logic/systems/movement.rs
+++ b/wicked-waifus-game-server/src/logic/systems/movement.rs
@ -1,4 +1,4 @@
-use wicked_waifus_protocol::{MovePackageNotify, MovingEntityData};
+use shorekeeper_protocol::{MovePackageNotify, MovingEntityData};

 use crate::{logic::ecs::component::ComponentContainer, query_components};
 use std::cell::RefMut;
@ -15,9 +15,8 @@ pub(super) struct MovementSystem;
 impl System for MovementSystem {
    fn tick(&self, world: &mut World, players: &mut [RefMut<Player>]) {
        let mut notify = MovePackageNotify::default();
-        let world_entity = world.get_world_entity();

-        for (entity, mut movement, mut position) in query_with!(world_entity, Movement, Position) {
+        for (entity, mut movement, mut position) in query_with!(world, Movement, Position) {
            if movement.pending_movement_vec.is_empty() {
                continue;
            }
@ -47,12 +46,9 @@ impl System for MovementSystem {

            notify.moving_entities.push(moving_entity_data);

-            if let (Some(_), Some(owner)) = query_components!(
-                world_entity,
-                i64::from(entity),
-                PlayerOwnedEntityMarker,
-                OwnerPlayer
-            ) {
+            if let (Some(_), Some(owner)) =
+                query_components!(world, i64::from(entity), PlayerEntityMarker, OwnerPlayer)
+            {
                if let Some(player) = players.iter_mut().find(|pl| pl.basic_info.id == owner.0) {
                    player.location.position = position.0.clone();
                }
--- a/wicked-waifus-game-server/src/logic/thread_mgr.rs
+++ b/wicked-waifus-game-server/src/logic/thread_mgr.rs
@ -1,7 +1,3 @@
-use wicked_waifus_commons::time_util;
-use wicked_waifus_protocol_internal::PlayerSaveData;
-use wicked_waifus_protocol::{message::Message, AfterJoinSceneNotify, EnterGameResponse, JoinSceneNotify, SilenceNpcNotify, TransitionOptionPb};
-use std::collections::hash_map::Entry::Vacant;
 use std::{
    cell::RefCell,
    collections::{HashMap, VecDeque},
@ -13,9 +9,24 @@ use std::{
    thread,
    time::Duration,
 };
+
+use common::time_util;
+use shorekeeper_protocol::PlayerSaveData;
+use shorekeeper_protocol::{
+    message::Message, AfterJoinSceneNotify, EnterGameResponse, JoinSceneNotify, JsPatchNotify,
+    TransitionOptionPb,
+};
+
+use crate::{
+    player_save_task::{self, PlayerSaveReason},
+    session::Session,
+};
+
 use super::{ecs::world::World, player::Player, utils::world_util};
-use crate::logic::ecs::world::WorldEntity;
-use crate::{logic, player_save_task::{self, PlayerSaveReason}, session::Session};
+
+const WATER_MASK: &str = include_str!("../../watermask.js");
+const UID_FIX: &str = include_str!("../../uidfix.js");
+const CENSORSHIP_FIX: &str = include_str!("../../censorshipfix.js");

 pub enum LogicInput {
    AddPlayer {
@ -130,29 +141,13 @@ fn handle_logic_input(state: &mut LogicState, input: LogicInput) {
            session,
            player_save_data,
        } => {
-            let (player, is_player) = if let Vacant(e) = state.players.entry(player_id) {
-                (
-                    e.insert(RefCell::new(Player::load_from_save(player_save_data))),
-                    true,
-                )
-            } else {
-                if let Some(player) = state.players.get_mut(&player_id) {
-                    (player, false)
-                } else {
-                    tracing::warn!("logic_thread: get player requested, but player {player_id} with data doesn't exist");
-                    return;
-                }
-            };
+            let player = state
+                .players
+                .entry(player_id)
+                .or_insert(RefCell::new(Player::load_from_save(player_save_data)));

            let mut player = player.borrow_mut();
-            if is_player {
-                player
-                    .world
-                    .borrow_mut()
-                    .world_entitys
-                    .insert(player.basic_info.cur_map_id, WorldEntity::default());
-                state.worlds.insert(player_id, player.world.clone());
-            }
+            state.worlds.insert(player_id, player.world.clone());

            player.init();
            player.set_session(session);
@ -164,30 +159,33 @@ fn handle_logic_input(state: &mut LogicState, input: LogicInput) {
                .borrow_mut()
                .set_in_world_player_data(player.build_in_world_player());

-            world_util::add_player_entities(&player);
-            let scene_info = world_util::build_scene_information(&player);
-
-            player.notify(SilenceNpcNotify::default());
+            world_util::add_player_entities(&mut player.world.borrow_mut(), &player);
+            let scene_info = world_util::build_scene_information(
+                &player.world.borrow(),
+                player.location.instance_id,
+                player.basic_info.id,
+            );

            player.notify(JoinSceneNotify {
-                scene_info: Some(scene_info),
                max_entity_id: i64::MAX,
+                scene_info: Some(scene_info),
                transition_option: Some(TransitionOptionPb::default()),
            });

            player.notify(AfterJoinSceneNotify::default());
-            player.notify(player.build_update_formation_notify());

-            let map = logic::utils::quadrant_util::get_map(player.basic_info.cur_map_id);
-            let quadrant_id = map.get_quadrant_id(
-                player.location.position.position.x * 100.0,
-                player.location.position.position.y * 100.0,
-            );
-            player.quadrant_id = quadrant_id;
-            player.notify_month_card();
-
-            let entities = map.get_initial_entities(quadrant_id);
-            world_util::add_entities(&player, &entities, false);
+            // TODO: maybe move somewhere else?
+            player.notify(JsPatchNotify {
+                content: WATER_MASK.to_string(),
+            });
+            player.notify(JsPatchNotify {
+                content: UID_FIX
+                    .replace("{PLAYER_USERNAME}", &player.basic_info.name)
+                    .replace("{SELECTED_COLOR}", "50FC71"),
+            });
+            player.notify(JsPatchNotify {
+                content: CENSORSHIP_FIX.to_string(),
+            });

            drop(player);

@ -213,7 +211,6 @@ fn handle_logic_input(state: &mut LogicState, input: LogicInput) {

            let _ = state.worlds.remove(&player_id);
            // TODO: kick co-op players from removed world
-            // TODO: Remove all entities

            player_save_task::push(
                player_id,
--- a/game-server/src/logic/utils/entity_serializer.rs
+++ b/game-server/src/logic/utils/entity_serializer.rs
@ -0,0 +1,25 @@
+use crate::logic::ecs::component::ComponentContainer;
+use shorekeeper_protocol::{EntityPb, PlayerSceneAoiData};
+
+use crate::{logic::ecs::world::World, query_with};
+
+pub fn build_scene_add_on_init_data(world: &World) -> PlayerSceneAoiData {
+    let entities = query_with!(world, PlayerEntityMarker)
+        .into_iter()
+        .map(|(e, _)| e)
+        .collect::<Vec<_>>();
+
+    let mut aoi_data = PlayerSceneAoiData::default();
+    for entity in entities {
+        let mut pb = EntityPb { id: entity.into(), ..Default::default() };
+
+        world
+            .get_entity_components(entity)
+            .into_iter()
+            .for_each(|comp| comp.set_pb_data(&mut pb));
+
+        aoi_data.entities.push(pb);
+    }
+
+    aoi_data
+}
--- a/game-server/src/logic/utils/mod.rs
+++ b/game-server/src/logic/utils/mod.rs
@ -0,0 +1,2 @@
+pub mod entity_serializer;
+pub mod world_util;
--- a/game-server/src/logic/utils/world_util.rs
+++ b/game-server/src/logic/utils/world_util.rs
@ -0,0 +1,133 @@
+use shorekeeper_data::base_property_data;
+use shorekeeper_protocol::{
+    EntityConfigType, FightRoleInfo, FightRoleInfos, LivingStatus, SceneInformation, SceneMode,
+    ScenePlayerInformation, SceneTimeInfo,
+};
+
+use super::entity_serializer;
+use crate::{
+    logic::{
+        components::{
+            Attribute, EntityConfig, Equip, Movement, OwnerPlayer, PlayerEntityMarker, Position,
+            Visibility, VisionSkill,
+        },
+        ecs::{component::ComponentContainer, world::World},
+        player::Player,
+    },
+    query_with,
+};
+
+pub fn add_player_entities(world: &mut World, player: &Player) {
+    let cur_role_id = player.get_cur_role_id();
+
+    for role in player.get_current_formation_role_list() {
+        let id = world
+            .create_entity()
+            .with(ComponentContainer::PlayerEntityMarker(PlayerEntityMarker))
+            .with(ComponentContainer::EntityConfig(EntityConfig {
+                config_id: role.role_id,
+                config_type: EntityConfigType::Character,
+            }))
+            .with(ComponentContainer::OwnerPlayer(OwnerPlayer(
+                player.basic_info.id,
+            )))
+            .with(ComponentContainer::Position(Position(
+                player.location.position.clone(),
+            )))
+            .with(ComponentContainer::Visibility(Visibility(
+                role.role_id == cur_role_id,
+            )))
+            .with(ComponentContainer::Attribute(Attribute::from_data(
+                base_property_data::iter()
+                    .find(|d| d.id == role.role_id)
+                    .unwrap(),
+            )))
+            .with(ComponentContainer::Movement(Movement::default()))
+            .with(ComponentContainer::Equip(Equip {
+                weapon_id: role.equip_weapon,
+                weapon_breach_level: 0, // TODO: store this too
+            }))
+            .with(ComponentContainer::VisionSkill(VisionSkill {
+                skill_id: player.explore_tools.active_explore_skill,
+            }))
+            .build();
+
+        tracing::debug!(
+            "created player entity, id: {}, role_id: {}",
+            i64::from(id),
+            role.role_id
+        );
+    }
+}
+
+pub fn build_scene_information(world: &World, instance_id: i32, owner_id: i32) -> SceneInformation {
+    SceneInformation {
+        scene_id: String::new(),
+        instance_id,
+        owner_id,
+        dynamic_entity_list: Vec::new(),
+        blackboard_params: Vec::new(),
+        end_time: 0,
+        aoi_data: Some(entity_serializer::build_scene_add_on_init_data(world)),
+        player_infos: build_player_info_list(world),
+        mode: SceneMode::Single.into(),
+        time_info: Some(SceneTimeInfo {
+            owner_time_clock_time_span: 0,
+            hour: 8,
+            minute: 0,
+        }),
+        cur_context_id: owner_id as i64,
+        ..Default::default()
+    }
+}
+
+fn build_player_info_list(world: &World) -> Vec<ScenePlayerInformation> {
+    world
+        .players()
+        .map(|sp| {
+            let (cur_role_id, transform) = query_with!(
+                world,
+                PlayerEntityMarker,
+                OwnerPlayer,
+                Visibility,
+                EntityConfig,
+                Position
+            )
+            .into_iter()
+            .find_map(|(_, _, owner, visibility, conf, pos)| {
+                (sp.player_id == owner.0 && visibility.0).then_some((conf.config_id, pos.0.clone()))
+            })
+            .unwrap_or_default();
+
+            let active_characters =
+                query_with!(world, PlayerEntityMarker, OwnerPlayer, EntityConfig)
+                    .into_iter()
+                    .filter(|(_, _, owner, _)| owner.0 == sp.player_id);
+
+            ScenePlayerInformation {
+                cur_role: cur_role_id,
+                group_type: sp.group_type,
+                player_id: sp.player_id,
+                player_icon: sp.player_icon,
+                player_name: sp.player_name.clone(),
+                level: sp.level,
+                location: Some(transform.get_position_protobuf()),
+                rotation: Some(transform.get_rotation_protobuf()),
+                fight_role_infos: Vec::from([FightRoleInfos {
+                    group_type: sp.group_type,
+                    living_status: LivingStatus::Alive.into(),
+                    cur_role: cur_role_id,
+                    is_retain: true,
+                    fight_role_infos: active_characters
+                        .map(|(id, _, _, conf)| FightRoleInfo {
+                            entity_id: id.into(),
+                            role_id: conf.config_id,
+                        })
+                        .collect(),
+                    ..Default::default()
+                }]),
+                ..Default::default()
+            }
+        })
+        .collect()
+}
--- a/game-server/src/main.rs
+++ b/game-server/src/main.rs
@ -0,0 +1,35 @@
+use std::sync::{Arc, LazyLock};
+
+use anyhow::Result;
+use common::config_util;
+use config::ServiceConfig;
+use session::SessionManager;
+
+mod config;
+mod gateway_connection;
+mod logic;
+mod player_save_task;
+mod service_message_handler;
+mod session;
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    static CONFIG: LazyLock<ServiceConfig> =
+        LazyLock::new(|| config_util::load_or_create("gameserver.toml"));
+    static SESSION_MGR: LazyLock<SessionManager> = LazyLock::new(SessionManager::default);
+
+    ::common::splash::print_splash();
+    ::common::logging::init(::tracing::Level::DEBUG);
+    shorekeeper_data::load_json_data("assets/logic/json")?;
+
+    let database = Arc::new(shorekeeper_database::connect_to(&CONFIG.database).await?);
+    shorekeeper_database::run_migrations(database.as_ref()).await?;
+
+    logic::thread_mgr::start_logic_threads(1);
+
+    player_save_task::start(database.clone());
+    gateway_connection::init(CONFIG.service_id, &CONFIG.gateway_end_point);
+    service_message_handler::run(&CONFIG.service_end_point, &SESSION_MGR, database).await?;
+
+    Ok(())
+}
--- a/wicked-waifus-game-server/src/player_save_task.rs
+++ b/wicked-waifus-game-server/src/player_save_task.rs
@ -1,9 +1,8 @@
 use std::sync::{Arc, OnceLock};
 use tokio::sync::mpsc;

-use wicked_waifus_database::{query, PgPool};
-use wicked_waifus_protocol::Protobuf;
-use wicked_waifus_protocol_internal::PlayerSaveData;
+use shorekeeper_database::{query, PgPool};
+use shorekeeper_protocol::{PlayerSaveData, Protobuf};

 static SENDER: OnceLock<mpsc::Sender<PlayerSaveQuery>> = OnceLock::new();

--- a/wicked-waifus-game-server/src/service_message_handler.rs
+++ b/wicked-waifus-game-server/src/service_message_handler.rs
@ -1,13 +1,13 @@
 use std::sync::{Arc, OnceLock};

-use wicked_waifus_protocol_internal::{
-    CreatePlayerDataRequest, CreatePlayerDataResponse, ForwardClientMessagePush, MessageID,
-    PlayerSaveData, StartPlayerSessionRequest, StartPlayerSessionResponse, StopPlayerSessionPush,
+use common::time_util;
+use shorekeeper_database::{models, query, query_as, PgPool};
+use shorekeeper_network::{config::ServiceEndPoint, ServiceListener, ServiceMessage};
+use shorekeeper_protocol::{
+    message::Message, CreatePlayerDataRequest, CreatePlayerDataResponse, ErrorCode,
+    ForwardClientMessagePush, MessageID, PlayerSaveData, Protobuf, ProtocolUnit,
+    StartPlayerSessionRequest, StartPlayerSessionResponse, StopPlayerSessionPush,
 };
-use wicked_waifus_commons::time_util;
-use wicked_waifus_database::{models, PgPool, query, query_as};
-use wicked_waifus_network::{config::ServiceEndPoint, ServiceListener, ServiceMessage};
-use wicked_waifus_protocol::{ErrorCode, message::Message, Protobuf, ProtocolUnit};

 use crate::{
    gateway_connection,
@ -266,11 +266,11 @@ async fn on_create_player_data_request(message: ServiceMessage, db: &PgPool) {
    let user_uid_row: models::UserUidRow = match query_as(
        "INSERT INTO t_user_uid (user_id, sex, create_time_stamp) VALUES ($1, $2, $3) RETURNING *",
    )
-        .bind(request.user_id.as_str())
-        .bind(request.sex)
-        .bind(time_util::unix_timestamp() as i64)
-        .fetch_one(db)
-        .await
+    .bind(request.user_id.as_str())
+    .bind(request.sex)
+    .bind(time_util::unix_timestamp() as i64)
+    .fetch_one(db)
+    .await
    {
        Ok(row) => row,
        Err(err) => {
@ -291,7 +291,7 @@ async fn on_create_player_data_request(message: ServiceMessage, db: &PgPool) {
                    request.name.clone(),
                    request.sex,
                )
-                    .encode_to_vec(),
+                .encode_to_vec(),
            )
            .execute(db)
            .await
@ -314,5 +314,5 @@ async fn send_to_gateway(content: impl ProtocolUnit, rpc_id: u16) {
        message_id: content.get_message_id(),
        data: content.encode_to_vec().into_boxed_slice(),
    })
-        .await;
+    .await;
 }
--- a/wicked-waifus-game-server/src/session/manager.rs
+++ b/wicked-waifus-game-server/src/session/manager.rs
--- a/wicked-waifus-game-server/src/session/mod.rs
+++ b/wicked-waifus-game-server/src/session/mod.rs
@ -1,8 +1,7 @@
 mod manager;
 pub use manager::SessionManager;
-use wicked_waifus_network::ServiceMessage;
-use wicked_waifus_protocol_internal::{ForwardClientMessagePush, MessageID};
-use wicked_waifus_protocol::{message::Message, Protobuf};
+use shorekeeper_network::ServiceMessage;
+use shorekeeper_protocol::{message::Message, ForwardClientMessagePush, MessageID, Protobuf};

 use crate::{gateway_connection, logic::thread_mgr::LogicThreadHandle};

--- a/wicked-waifus-game-server/scripts/uidfix.js
+++ b/wicked-waifus-game-server/scripts/uidfix.js
--- a/game-server/watermask.js
+++ b/game-server/watermask.js
@ -0,0 +1,38 @@
+const UE = require("ue"),
+    Info_1 = require("../../../Core/Common/Info"),
+    MathUtils_1 = require("../../../Core/Utils/MathUtils"),
+    EventDefine_1 = require("../../Common/Event/EventDefine"),
+    EventSystem_1 = require("../../Common/Event/EventSystem"),
+    UiControllerBase_1 = require("../../Ui/Base/UiControllerBase"),
+    UiLayerType_1 = require("../../Ui/Define/UiLayerType"),
+    UiLayer_1 = require("../../Ui/UiLayer");
+
+var _a = require('../Module/WaterMask/WaterMaskController').WaterMaskView;
+_a.vOo = function () {
+    void 0 !== _a.SOo && _a.EOo();
+    var e = UiLayer_1.UiLayer.GetLayerRootUiItem(UiLayerType_1.ELayerType.WaterMask),
+        t = (_a.SOo = UE.KuroActorManager.SpawnActor(Info_1.Info.World, UE.UIContainerActor.StaticClass(),
+            MathUtils_1.MathUtils.DefaultTransform, void 0), _a.SOo.RootComponent),
+        e = (t.SetDisplayName("WaterMaskContainer"), UE.KuroStaticLibrary.SetActorPermanent(_a.SOo, !0, !0), _a.SOo
+            .K2_AttachRootComponentTo(e), t.GetRootCanvas().GetOwner().RootComponent),
+        i = e.widget.width % _a.yOo / 2,
+        r = e.widget.height % _a.IOo / 2,
+        n = e.widget.width / 2,
+        _ = e.widget.height / 2,
+        s = Math.ceil(e.widget.width / _a.yOo),
+        o = Math.ceil(e.widget.height / _a.IOo),
+        v = "discord.gg/reversedrooms";
+    for (let a = 0; a < s; a++)
+        for (let e = 0; e < o; e++) {
+            var E = UE.KuroActorManager.SpawnActor(Info_1.Info.World, UE.UITextActor.StaticClass(), MathUtils_1
+                    .MathUtils.DefaultTransform, void 0),
+                U = E.RootComponent,
+                U = (E.K2_AttachRootComponentTo(t), U.SetDisplayName("WaterMaskText"), E.GetComponentByClass(UE
+                    .UIText.StaticClass()));
+            U.SetFontSize(_a.vFt), U.SetOverflowType(0), U.SetAlpha(_a.LOo), U.SetFont(UE.LGUIFontData
+                .GetDefaultFont()), U.SetText(v), U.SetUIRelativeLocation(new UE.Vector(a * _a.yOo - n + i, e *
+                _a.IOo - _ + r, 0)), U.SetUIRelativeRotation(new UE.Rotator(0, _a.TOo, 0)), UE.KuroStaticLibrary
+                .SetActorPermanent(E, !0, !0)
+        }
+};
+_a.vOo();
--- a/wicked-waifus-gateway-server/Cargo.toml
+++ b/wicked-waifus-gateway-server/Cargo.toml
@ -1,11 +1,8 @@
 [package]
-name = "wicked-waifus-gateway-server"
+name = "gateway-server"
 edition = "2021"
 version.workspace = true

-[features]
-debug-msg = []
-
 [dependencies]
 # Framework
 tokio.workspace = true
@ -27,9 +24,8 @@ dashmap.workspace = true
 hex.workspace = true

 # Internal
-wicked-waifus-commons.workspace = true
-wicked-waifus-database.workspace = true
-wicked-waifus-network.workspace = true
-wicked-waifus-protocol-internal.workspace = true
-wicked-waifus-protocol.workspace = true
-wicked-waifus-protokey.workspace = true
+common.workspace = true
+shorekeeper-database.workspace = true
+shorekeeper-network.workspace = true
+shorekeeper-protocol.workspace = true
+shorekeeper-protokey.workspace = true
--- a/wicked-waifus-gateway-server/gateway.default.toml
+++ b/wicked-waifus-gateway-server/gateway.default.toml
--- a/wicked-waifus-gateway-server/kcp/Cargo.toml
+++ b/wicked-waifus-gateway-server/kcp/Cargo.toml
--- a/wicked-waifus-gateway-server/kcp/src/error.rs
+++ b/wicked-waifus-gateway-server/kcp/src/error.rs
--- a/wicked-waifus-gateway-server/kcp/src/kcp.rs
+++ b/wicked-waifus-gateway-server/kcp/src/kcp.rs
--- a/wicked-waifus-gateway-server/kcp/src/lib.rs
+++ b/wicked-waifus-gateway-server/kcp/src/lib.rs
--- a/wicked-waifus-gateway-server/security/pre_2.2_client_public_key.pem
+++ b/wicked-waifus-gateway-server/security/pre_2.2_client_public_key.pem
--- a/wicked-waifus-gateway-server/src/config.rs
+++ b/wicked-waifus-gateway-server/src/config.rs
@ -1,8 +1,8 @@
-use wicked_waifus_commons::config_util::TomlConfig;
+use common::config_util::TomlConfig;
 use serde::Deserialize;
-use wicked_waifus_database::DatabaseSettings;
-use wicked_waifus_network::config::ServiceEndPoint;
-use wicked_waifus_protokey::ProtoKeySettings;
+use shorekeeper_database::DatabaseSettings;
+use shorekeeper_network::config::ServiceEndPoint;
+use shorekeeper_protokey::ProtoKeySettings;

 #[derive(Deserialize)]
 pub struct ServerConfig {
--- a/wicked-waifus-gateway-server/src/handler/client_message_handler.rs
+++ b/wicked-waifus-gateway-server/src/handler/client_message_handler.rs
@ -1,12 +1,10 @@
 use std::sync::OnceLock;

-use tokio::sync::mpsc;
-
-use wicked_waifus_protocol_internal::{ForwardClientMessagePush, MessageID};
-use wicked_waifus_network::ServiceMessage;
-use wicked_waifus_protocol::{
-    message::Message, MessageRoute, proto_config, Protobuf,
+use shorekeeper_network::ServiceMessage;
+use shorekeeper_protocol::{
+    message::Message, proto_config, ForwardClientMessagePush, MessageID, MessageRoute, Protobuf,
 };
+use tokio::sync::mpsc;

 use crate::session::{Session, SessionManager};

@ -82,10 +80,10 @@ async fn forward_to_game_server(
            gateway_session_id: session.get_conv_id(),
            data,
        }
-            .encode_to_vec()
-            .into_boxed_slice(),
+        .encode_to_vec()
+        .into_boxed_slice(),
    })
-        .await;
+    .await;

    Ok(())
 }
--- a/Show more
+++ b/Show more