From 31c6a61c037940f931ee455d08480cce5272631b Mon Sep 17 00:00:00 2001
From: SinonJZH <44700327+SinonJZH@users.noreply.github.com>
Date: Mon, 9 Mar 2020 02:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=90=88=E6=88=90=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原来代码使用的文件路径合成要求严格的路径命名规范，在添加未严格按照命名要求的模型时出现合成路径错误的问题。为了提高泛用性，将合成路径方式改为通过循环进行，以适配更多情况。
---
 get/index.php | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/get/index.php b/get/index.php
index 741c05b..9331b3e 100644
--- a/get/index.php
+++ b/get/index.php
@@ -26,9 +26,10 @@ if (is_array($modelName)) {
     }
 }
 
-$textures = json_encode($json['textures']);
-$textures = str_replace('texture', '../model/'.$modelName.'/texture', $textures);
-$textures = json_decode($textures, 1);
+$textures = $json['textures'];
+foreach ($textures as $key => $texture){
+		$textures[$key] = '../model/' . $modelName . '/' . $texture;
+}
 $json['textures'] = $textures;
 
 $json['model'] = '../model/'.$modelName.'/'.$json['model'];
@@ -36,17 +37,26 @@ if (isset($json['pose'])) $json['pose'] = '../model/'.$modelName.'/'.$json['pose
 if (isset($json['physics'])) $json['physics'] = '../model/'.$modelName.'/'.$json['physics'];
 
 if (isset($json['motions'])) {
-    $motions = json_encode($json['motions']);
-    $motions = str_replace('sounds', '../model/'.$modelName.'/sounds', $motions);
-    $motions = str_replace('motions', '../model/'.$modelName.'/motions', $motions);
-    $motions = json_decode($motions, 1);
-    $json['motions'] = $motions;
+    $motions = $json['motions'];
+    foreach ($motions as $key1 => $motion){
+    	foreach($motion as $key2 => $resource){
+    		foreach ($resource as $key3 => $value)
+    			if($key3 == 'file'){
+    				$motions[$key1][$key2][$key3] = '../model/' . $modelName . '/' . $value;
+    			}
+    	}
+    }
 }
 
 if (isset($json['expressions'])) {
-    $expressions = json_encode($json['expressions']);
-    $expressions = str_replace('expressions', '../model/'.$modelName.'/expressions', $expressions);
-    $expressions = json_decode($expressions, 1);
+    $expressions = $json['expressions'];
+    foreach ($expressions as $key1 => $expression){
+    	foreach($expression as $key2 => $value){
+    		if($key2 == 'file'){
+    			$expressions[$key1][$key2] = '../model/' . $modelName . '/' . $value;
+    		}
+    	}
+    }
     $json['expressions'] = $expressions;
 }