package.pyを更新

ResourceManager::NameToFullPathの挙動を変更

diff --git a/client/CommandManager.cpp b/client/CommandManager.cpp
index 8212080..ddcc5ad 100644 (file)
--- a/client/CommandManager.cpp
+++ b/client/CommandManager.cpp
@@ -58,8 +58,7 @@ void CommandManager::Update()
                        case ClientReceiveServerInfo:
                        {
                                network::Utils::Deserialize(command->body(), & stage_);
-                               const auto& model_list = ResourceManager::GetModelNameList();
-                               if (std::find(model_list.begin(),model_list.end(), stage_) == model_list.end()) {
+                               if (ResourceManager::NameToFullPath(unicode::ToTString(stage_)).empty()) {
                                        status_ = STATUS_ERROR_NOSTAGE;
                                } else {
                                        status_ = STATUS_READY;

diff --git a/client/ResourceManager.cpp b/client/ResourceManager.cpp
index d30064a..b8cda6d 100644 (file)
Binary files a/client/ResourceManager.cpp and b/client/ResourceManager.cpp differ

diff --git a/client/ResourceManager.hpp b/client/ResourceManager.hpp
index 6507076..f52bd3c 100644 (file)
--- a/client/ResourceManager.hpp
+++ b/client/ResourceManager.hpp
@@ -76,13 +76,14 @@ class ResourceManager {
         static void BuildModelFileTree();
         static void CacheBakedModel();
         static ModelHandle LoadModelFromName(const tstring&, bool async = false);
+
         static void RequestModelFromName(const tstring&);
         static bool IsCachedModelName(const tstring&);
                static const std::vector<std::string>& GetModelNameList();
+
                static void SetModelEdgeSize(int handle);
                static void set_model_edge_size(float edge_size);
 
-       private:
                static tstring NameToFullPath(const tstring& name);
 
     private:

diff --git a/client/scene/Init.cpp b/client/scene/Init.cpp
index 26a91aa..f42f58a 100644 (file)
Binary files a/client/scene/Init.cpp and b/client/scene/Init.cpp differ

diff --git a/package.py b/package.py
index 63ad7c8..17deab1 100644 (file)
--- a/package.py
+++ b/package.py
@@ -32,6 +32,8 @@ zip.write(os.path.join(base_dir, 'readme.txt'), 'readme.txt')
 zip.write(os.path.join(base_dir, 'license.txt'), 'license.txt')
 zip.write(os.path.join(base_dir, 'mmd.txt'), 'mmd.txt')
 
+zip.write(os.path.join(base_dir, 'server/config.json'), 'server/config.json')
+
 zip.write(os.path.join(bin_path, 'config.json'), 'config.json')
 zip.write(os.path.join(bin_path, 'server/server.exe'), 'server/server.exe')
 

diff --git a/server/config.json b/server/config.json
index 85d7371..d8571bb 100644 (file)
--- a/server/config.json
+++ b/server/config.json
@@ -1,6 +1,6 @@
 {
        "port": 39390,
-       "server_name": "MMO Server 公式",
-       "stage": "stage:ã\81\8cã\82\8cã\81\8d町",
+       "server_name": "MMO Server",
+       "stage": "stage:ã\82±ã\83­ã\83ªã\83³町",
        "capacity": 20
 }
\ No newline at end of file