jianghe2nd/TowerMigrator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修正地图尺寸相关bug

Browse Source
This commit is contained in:
ShakeFlower 2024-11-17 10:07:56 +08:00
parent 43aeb84d39
commit 719da5917d
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ViewModels/Migrator/FloorsMigrator.cs
View File

@ -17,8 +17,8 @@ namespace H5MotaUpdate.ViewModels
/// </summary> /// </summary>
public FloorsMigrator(string oldProjectDirectory, string newProjectDirectory, Version ver, int width, int height) public FloorsMigrator(string oldProjectDirectory, string newProjectDirectory, Version ver, int width, int height)
{ {
sourcePath = System.IO.Path.Combine(oldProjectDirectory, FILENAME); sourcePath = Path.Combine(oldProjectDirectory, FILENAME);
destPath = System.IO.Path.Combine(newProjectDirectory, FILENAME); destPath = Path.Combine(newProjectDirectory, FILENAME);
this.version = ver; this.version = ver;
this.mapWidth = width; this.mapWidth = width;
this.mapHeight = height; this.mapHeight = height;
@ -91,18 +91,31 @@ namespace H5MotaUpdate.ViewModels
jsonObject["autoEvent"] = new JObject(); jsonObject["autoEvent"] = new JObject();
// 设置每张地图的尺寸。如果自己有就用自己的，否则设为默认长宽。 // 设置每张地图的尺寸。如果自己有就用自己的，否则设为默认长宽。
JToken width = jsonObject["width"],
height = jsonObject["height"]; int width, height;
if (width == null)
if (jsonObject["width"] != null && jsonObject["width"].Type == JTokenType.Integer)
{ {
jsonObject["width"] = mapWidth; width = (int)jsonObject["width"];
} }
if (height == null) else
{ {
jsonObject["height"] = mapHeight; width = mapWidth;
jsonObject["width"] = width;
} }
#region if (jsonObject["height"] != null && jsonObject["height"].Type == JTokenType.Integer)
{
height = (int)jsonObject["height"];
}
else
{
height = mapHeight;
jsonObject["height"] = height;
}
#region 楼层贴图
// 楼层贴图：老版本为一字符串或数组，字符串会被自动转为[0,0,str] // 楼层贴图：老版本为一字符串或数组，字符串会被自动转为[0,0,str]
// 其中t[0],t[1]分别为x,y,t[2]为贴图名字 剩下的不知道干嘛的 // 其中t[0],t[1]分别为x,y,t[2]为贴图名字 剩下的不知道干嘛的
JToken oldImages = jsonObject["images"]; JToken oldImages = jsonObject["images"];
@ -126,15 +139,15 @@ namespace H5MotaUpdate.ViewModels
new JProperty("canvas", "bg"), new JProperty("canvas", "bg"),
new JProperty("sx", 0), new JProperty("sx", 0),
new JProperty("sy", 0), new JProperty("sy", 0),
new JProperty("w", 416), new JProperty("w", 32 * width),
new JProperty("h", 416) new JProperty("h", 32 * height)
); );
jsonObject["images"] = new JArray(newImages); jsonObject["images"] = new JArray(newImages);
#endregion #endregion
#region #region
JArray mapMatrix = (JArray)jsonObject["map"]; JArray mapMatrix = (JArray)jsonObject["map"];
JArray zeroBgMatrix = StringUtils.CreateMatrix(mapWidth, mapWidth); JArray zeroBgMatrix = StringUtils.CreateMatrix(width, height);
for (int i = 0; i < mapMatrix.Count; i++) for (int i = 0; i < mapMatrix.Count; i++)
{ {
JArray lineArr = (JArray)mapMatrix[i]; JArray lineArr = (JArray)mapMatrix[i];