Skip to content

Commit 7c8c840

Browse files
committed
Merge branch 'master' into skia-text
2 parents 9a3e97b + 4e6596a commit 7c8c840

31 files changed

+1182
-10
lines changed

Assets/Scenes/Tests/LotObjectSimulationTest.unity

Lines changed: 347 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scenes/Tests/LotObjectSimulationTest.unity.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System.Collections.Generic;
2+
3+
namespace OpenTS2.Content.DBPF
4+
{
5+
/// <summary>
6+
/// Called cEdithObjectModule in game.
7+
/// </summary>
8+
public class ObjectModuleAsset : AbstractAsset
9+
{
10+
public ObjectModuleAsset(int version, Dictionary<int, int> objectIdToSaveType)
11+
{
12+
Version = version;
13+
ObjectIdToSaveType = objectIdToSaveType;
14+
}
15+
16+
public int Version { get; }
17+
18+
public Dictionary<int, int> ObjectIdToSaveType { get; }
19+
}
20+
}

Assets/Scripts/OpenTS2/Content/DBPF/ObjectModuleAsset.cs.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)