Skip to content
Snippets Groups Projects
Commit 26906743 authored by MaZiFAU's avatar MaZiFAU
Browse files

Bug Fix; QoL; WIP; ListFuncs V1.0; StageFileUpdate;

Bug Fix:
+Starting Game in RiverWorld gets stuck
+Removed Guard clause from Loader
QoL:
+Increased Angle Hint visibility
WIP:
+AttachedFuncFact temporarely reverted to using Arrays (MMT type missing)
ListFuncs V1.0:
+ListFuncs fully Operational
parent 5d577382
Branches
No related tags found
No related merge requests found
Showing
with 5050 additions and 6581 deletions
......@@ -299,18 +299,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
m_Name:
m_EditorClassIdentifier:
_URI:
FactText:
- {fileID: 3527746868028771423}
- {fileID: 6234540560952625969}
StringLabelFormats:
- '{0}'
- '{0}'
renderer:
- {fileID: 3394522495515098202}
Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
renderer:
- {fileID: 3394522495515098202}
--- !u!1 &3394522496185282000
GameObject:
m_ObjectHideFlags: 0
......@@ -439,17 +440,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
m_Name:
m_EditorClassIdentifier:
_URI:
FactText:
- {fileID: 3527746868028771423}
- {fileID: 6234540560952625969}
StringLabelFormats:
- '{0}'
- '{0}'
renderer: []
Default: {fileID: 0}
Selected: {fileID: 0}
Hint: {fileID: 0}
Solution: {fileID: 0}
Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
renderer:
- {fileID: 3394522495515098202}
--- !u!1 &7144232170300037021
GameObject:
m_ObjectHideFlags: 0
......@@ -495,17 +498,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
m_Name:
m_EditorClassIdentifier:
_URI:
FactText:
- {fileID: 3527746868028771423}
- {fileID: 6234540560952625969}
StringLabelFormats:
- '{0}'
- '{0}'
renderer: []
Default: {fileID: 0}
Selected: {fileID: 0}
Hint: {fileID: 0}
Solution: {fileID: 0}
renderer: []
--- !u!1 &8247887023038618208
GameObject:
m_ObjectHideFlags: 0
......
......@@ -342,6 +342,7 @@ MonoBehaviour:
- FunctionCallFact
- FunctionFact
- LineFact
- ListFact
- OnCircleFact
- OnLineFact
- OrthogonalCircleLineFact
......@@ -371,6 +372,7 @@ MonoBehaviour:
- {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, type: 3}
- {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, type: 3}
- {fileID: 4221381813544557775, guid: 8106c748f1aeb084d87fdc71dd009b67, type: 3}
- {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, type: 3}
- {fileID: 2115817999818309900, guid: df93bd4d977e4ab42a626f7bd06596d6, type: 3}
- {fileID: 6050914136827205310, guid: 496d04605465c7f4dba7638cc6e2dc6e, type: 3}
- {fileID: 8554350198830106250, guid: 9ce7444f588cd054989126eaff75c5f3, type: 3}
......
......@@ -20,9 +20,23 @@ public static void GenerateAll()
Debug.LogWarning("Generating and Overwriting Stage Files");
GenerateTreeStage();
GenerateRiverStage();
GenerateCanonBallStage();
Action[] DemoGeneration = new Action[]{
GenerateTreeStage,
GenerateRiverStage,
GenerateCanonBallStage
};
foreach (Action action in DemoGeneration)
try
{
action();
Debug.Log("Successfully executed " + action.Method.Name);
}
catch (Exception ex)
{
Debug.LogError("Exception while executing " + action.Method.Name);
Debug.LogException(ex);
}
}
public static void GenerateTreeStage()
......
......@@ -34,6 +34,7 @@ public static GlobalBehaviour Instance
public static float GadgetLaserDistance => Instance._GadgetLaserDistance;
public static float GadgetPhysicalDistance => Instance._GadgetPhysicalDistance;
#region Unity Serialization
[SerializeField] private Color _hintAnimationStartColor;
[SerializeField] private Color _hintAnimationEndColor;
......@@ -51,23 +52,22 @@ public static GlobalBehaviour Instance
private void Awake()
{
Instance = this;
DontDestroyOnLoad(this);
}
if (Instance != this)
return;
private void Start()
{
DontDestroyOnLoad(this);
PostServerConnection();
}
//TODO: Move where appropiate
public int tryScrollListTimes = 2;
static public List<REST_JSON_API.Scroll> AvailableScrolls;
public static IEnumerator InitiateScrolls = IEnumeratorExtensions.yield_break;
private void PostServerConnection()
{
StartCoroutine(getScrollsfromServer());
StartCoroutine(InitiateScrolls = getScrollsfromServer());
IEnumerator getScrollsfromServer()
{
......@@ -76,6 +76,7 @@ IEnumerator getScrollsfromServer()
//Postman-Echo-Mock
//UnityWebRequest request = UnityWebRequest.Get("https://019a8ea5-843a-498b-8d0c-778669aef987.mock.pstmn.io/get");
System.DateTime requestTime = System.DateTime.UtcNow;
for (int i = 0; i < this.tryScrollListTimes; i++)
{
request = UnityWebRequest.Get(CommunicationEvents.ServerAdress + "/scroll/list");
......@@ -92,7 +93,7 @@ IEnumerator getScrollsfromServer()
else
break;
}
System.DateTime answerTime = System.DateTime.UtcNow;
string jsonString = null;
......@@ -104,6 +105,9 @@ IEnumerator getScrollsfromServer()
else
{
CommunicationEvents.ServerRunning = true;
while (!request.downloadHandler.isDone)
yield return null;
jsonString = request.downloadHandler.text;
}
......@@ -114,9 +118,14 @@ IEnumerator getScrollsfromServer()
Debug.Log("Using Fallback Scrolls: \n" + jsonString);
}
System.DateTime startTime = System.DateTime.UtcNow;
System.DateTime parseTime = System.DateTime.UtcNow;
AvailableScrolls = JsonConvert.DeserializeObject<List<REST_JSON_API.Scroll>>(jsonString);
Debug.Log("Scroll Parsing in: " + (System.DateTime.UtcNow - startTime).TotalMilliseconds + "ms");
Debug.Log(
$"Scroll Times:\n" +
$"Sum\t{(System.DateTime.UtcNow - requestTime).TotalMilliseconds}ms\n" +
$"Server\t{(answerTime - requestTime).TotalMilliseconds}ms\n" +
$"Download\t{(parseTime - answerTime).TotalMilliseconds}ms\n" +
$"Parsing\t{(System.DateTime.UtcNow - parseTime).TotalMilliseconds}ms");
}
}
}
......@@ -123,6 +123,7 @@ public abstract class Fact
/// <returns> array of Fact <see cref="Id"> Ids </see> on which this Fact depends.</returns>
/// <example><see cref="AngleFact"/> needs 3 <see cref="PointFact"/>s to be defined.</example>
[JsonIgnore]
public string[] DependentFactIds => _DependentFactIds ??= GetGetDependentFactIds();
private string[] _DependentFactIds;
......@@ -472,14 +473,11 @@ string _SendAdd(string path, string body)//, Action<string> uriCallback)
}
else
{
string answer = null;
while (string.IsNullOrEmpty(answer))
{
//yield return null;
answer = www.downloadHandler.text;
}
while (!www.downloadHandler.isDone)
//yield return null
;
FactReference res = JsonUtility.FromJson<FactReference>(answer);
FactReference res = JsonUtility.FromJson<FactReference>(www.downloadHandler.text);
if (CommunicationEvents.VerboseURI)
Debug.Log("Server added Fact:\n" + res.uri);
......@@ -515,8 +513,8 @@ public override bool Equivalent(Fact f1, Fact f2)
protected abstract bool EquivalentWrapped(T f1, T f2);
protected bool DependentFactsEquivalent(T f1, T f2)
=> f1.GetGetDependentFactIds()
.Zip(f2.GetGetDependentFactIds(),
=> f1.DependentFactIds
.Zip(f2.DependentFactIds,
(id1, id2) =>
id1 == id2
|| FactOrganizer.AllFacts[id1].Equivalent(FactOrganizer.AllFacts[id2])
......@@ -2419,9 +2417,7 @@ public static List<T> parseFactList<T>(MMTDeclaration decl)
protected override void RecalculateTransform() { }
protected override Fact _ReInitializeMe(Dictionary<string, string> old_to_new, FactOrganizer organizer)
{
throw new NotImplementedException();
}
=> new ListFact(lids.Select(id => old_to_new[id]).ToArray(), ListType, organizer);
}
......
......@@ -183,23 +183,29 @@ public class AttachedPositionFunction : FactWrappedCRTP<AttachedPositionFunction
{
public string fid;
public string func_calls_list_id;
public string[] func_calls_ids;
[JsonIgnore]
public string[] FuncCallIds => FunctionCallFactsList.lids;
//public string func_calls_list_id;
[JsonIgnore]
public Fact Fact => FactOrganizer.AllFacts[fid];
[JsonIgnore]
public ListFact FunctionCallFactsList => (ListFact) FactOrganizer.AllFacts[func_calls_list_id];
//[JsonIgnore]
//public ListFact FunctionCallFactsList => (ListFact) FactOrganizer.AllFacts[func_calls_list_id];
//[JsonIgnore]
//public string[] FuncCallIds => FunctionCallFactsList.lids;
[JsonIgnore]
public FunctionCallFact[] FunctionCallFacts
=> FuncCallIds.Select(f => FactOrganizer.AllFacts[f] as FunctionCallFact).ToArray();
=> func_calls_ids.Select(f => FactOrganizer.AllFacts[f] as FunctionCallFact).ToArray();
//=> FuncCallIds.Select(f => FactOrganizer.AllFacts[f] as FunctionCallFact).ToArray();
/// <summary>\copydoc Fact.Fact()</summary>
public AttachedPositionFunction() : base() { }
public AttachedPositionFunction() : base()
{
func_calls_ids = new string[0];
}
/// <summary>\copydoc Fact.Fact(FactOrganizer)</summary>
public AttachedPositionFunction(string fid, string[] funcids, FactOrganizer organizer) : base(organizer)
......@@ -209,25 +215,31 @@ public AttachedPositionFunction(string fid, string[] funcids, FactOrganizer orga
_URI = Fact.Id + "{" + string.Join(", ", FunctionCallFacts.Select(f => f.Id)) + "}";
}
/// <summary>\copydoc Fact.Fact(FactOrganizer)</summary>
public AttachedPositionFunction(string fid, string func_calls_list_id, FactOrganizer organizer) : base(organizer)
{
init(fid, func_calls_list_id);
//TODO: call MMT, set URI
_URI = Fact.Id + "{" + string.Join(", ", FunctionCallFacts.Select(f => f.Id)) + "}";
}
///// <summary>\copydoc Fact.Fact(FactOrganizer)</summary>
//public AttachedPositionFunction(string fid, string func_calls_list_id, FactOrganizer organizer) : base(organizer)
//{
// init(fid, func_calls_list_id);
// //TODO: call MMT, set URI
// _URI = Fact.Id + "{" + string.Join(", ", FunctionCallFacts.Select(f => f.Id)) + "}";
//}
private void init(string fid, string[] funcids, FactOrganizer organizer)
private void init(string fid, string[] func_calls_ids, FactOrganizer organizer)
{
this.fid = fid;
func_calls_list_id = organizer.Add(new ListFact(funcids, typeof(FunctionCallFact), organizer), out bool _, false, null, null);
this.func_calls_ids = func_calls_ids;
}
private void init(string fid, string func_calls_list_id)
{
this.fid = fid;
this.func_calls_list_id = func_calls_list_id;
}
//private void init(string fid, string[] funcids, FactOrganizer organizer)
//{
// this.fid = fid;
// func_calls_list_id = organizer.Add(new ListFact(funcids, typeof(FunctionCallFact), organizer), out bool _, false, null, null);
//}
//private void init(string fid, string func_calls_list_id)
//{
// this.fid = fid;
// this.func_calls_list_id = func_calls_list_id;
//}
protected AttachedPositionFunction(string fid, string[] funcids, string uri, FactOrganizer organizer) : base(organizer)
{
......@@ -235,11 +247,11 @@ protected AttachedPositionFunction(string fid, string[] funcids, string uri, Fac
_URI = uri;
}
protected AttachedPositionFunction(string fid, string func_calls_list_id, string uri, FactOrganizer organizer) : base(organizer)
{
init(fid, func_calls_list_id);
_URI = uri;
}
//protected AttachedPositionFunction(string fid, string func_calls_list_id, string uri, FactOrganizer organizer) : base(organizer)
//{
// init(fid, func_calls_list_id);
// _URI = uri;
//}
public new static AttachedPositionFunction parseFact(MMTDeclaration fact)
{// TODO Correctness
......@@ -248,7 +260,7 @@ protected AttachedPositionFunction(string fid, string func_calls_list_id, string
ParsingDictionary.parseTermsToId.TryAdd(defines.ToString(), fact.@ref.uri);
return new AttachedPositionFunction(default, default(string), fact.@ref.uri, StageStatic.stage.factState);
return new AttachedPositionFunction(default, default(string[]), fact.@ref.uri, StageStatic.stage.factState);
}
......@@ -256,7 +268,8 @@ public override bool HasDependentFacts
=> true;
protected override string[] GetGetDependentFactIds()
=> new string[] { fid, func_calls_list_id };
=> new string[] { fid }.ShallowCloneAppend(func_calls_ids);
//=> new string[] { fid, func_calls_list_id };
public override int GetHashCode()
=> Fact.GetHashCode() ^ FunctionCallFacts.GetHashCode();
......@@ -272,8 +285,8 @@ protected override void RecalculateTransform()
}
protected override Fact _ReInitializeMe(Dictionary<string, string> old_to_new, FactOrganizer organizer)
=> new AttachedPositionFunction(old_to_new[this.fid], old_to_new[func_calls_list_id], organizer);
// => new AttachedPositionFunction(old_to_new[this.fid], this.FuncCallIds.Select(id => old_to_new[id]).ToArray(), organizer);
// => new AttachedPositionFunction(old_to_new[this.fid], old_to_new[func_calls_list_id], organizer);
=> new AttachedPositionFunction(old_to_new[this.fid], this.func_calls_ids.Select(id => old_to_new[id]).ToArray(), organizer);
public override MMTDeclaration MakeMMTDeclaration()
{
......
......@@ -12,7 +12,6 @@ public class ShinyThings : MonoBehaviour
//Variables for Pushout-Highlighting
private static float timerDuration = 2.5f;
private static float lerpTime = GlobalBehaviour.AnimationLerpDuration;
private IEnumerator rain_wait;
private IEnumerator rain;
......@@ -83,7 +82,7 @@ void _ApplyMaterial(FactObject3D root, Material new_mat) =>
root.CoroutineCascadeForMeAndChildrenAllRenderer(
(_, renderer) =>
renderer.ProgrammMaterialChange(new[] {
(0f, lerpTime, new_mat),
(0f, GlobalBehaviour.AnimationLerpDuration, new_mat),
})
);
}
......@@ -134,7 +133,7 @@ IEnumerator _BlossomAndDie()
active_rainwork = Instantiate(RainPrefab, new Vector3(0, 40, 0), Quaternion.identity);
Color start = directionalLight.color; // may not be original one
for (IEnumerator<float> lerper = MathfExtensions.LerpInTime(0, 1, lerpTime)
for (IEnumerator<float> lerper = MathfExtensions.LerpInTime(0, 1, GlobalBehaviour.AnimationLerpDuration)
; lerper.MoveNext();)
{
directionalLight.color = Color.Lerp(start, darkColor, lerper.Current);
......@@ -144,7 +143,7 @@ IEnumerator _BlossomAndDie()
while (rain_wait.MoveNext())
yield return null;
for (IEnumerator<float> lerper = MathfExtensions.LerpInTime(0, 1, lerpTime)
for (IEnumerator<float> lerper = MathfExtensions.LerpInTime(0, 1, GlobalBehaviour.AnimationLerpDuration)
; lerper.MoveNext();)
{
directionalLight.color = Color.Lerp(darkColor, light_colour, lerper.Current);
......
......@@ -14,17 +14,19 @@ public class DisplayScrolls : MonoBehaviour
public Transform scrollscreenContent;
void Start()
void Awake()
{
BuildScrollGUI();
}
void BuildScrollGUI()
{
while (GlobalBehaviour.AvailableScrolls == null) ; // active wait for server, should be rare
while (GlobalBehaviour.InitiateScrolls.MoveNext()) ; // active wait for server, should be rare
AllowedScrolls = GlobalBehaviour.AvailableScrolls
.Where(s => StageStatic.stage.AllowedScrolls?.Contains(s.ScrollReference) ?? true)
AllowedScrolls = StageStatic.stage?.AllowedScrolls == null
? GlobalBehaviour.AvailableScrolls
: GlobalBehaviour.AvailableScrolls
.Where(s => StageStatic.stage.AllowedScrolls.Contains(s.ScrollReference))
.ToList();
//Build Selection-GUI of Scrolls
......
......@@ -19,6 +19,7 @@ public static ScrollDetails Instance
if (_Instance == null)
_Instance = value;
else
if (_Instance != value)
Destroy(value);
}
}
......@@ -102,9 +103,12 @@ public void SetScroll(Scroll scroll_to_set)
ParameterDisplays[i].gameObject.SetActive(false);
//set active scroll for ErrorMessagePopup
if (Popup != null)
{
Popup.ActiveScroll = ActiveScroll;
Popup.ParameterDisplays = ParameterDisplays;
}
}
public bool SetNextEmptyTo(FactObjectUI activator)
{
......
......@@ -41,12 +41,6 @@ public static bool LoadStage(string name, bool local, bool restore_session)
/// <param name="scene">sets <see cref="nextscene"/></param>
public static void LoadScene(string scene)
{
if(GlobalBehaviour.AvailableScrolls == null) // Game crashes otherwise
{
Debug.LogWarning("Wait for Server to finish Scroll/all!\nFind a better Way than this guard clause.,,");
return;
}
nextscene = scene;
SceneManager.LoadScene("LoadingScene");
// loads LoadingScreen, which will call LoaderCallback() in LoadingScreenPercentage
......
......@@ -8,4 +8,18 @@ public static T[] ShallowCloneAppend<T>(this T[] source, T[] append, bool front
append.CopyTo(ret, front ? 0 : source.Length);
return ret;
}
public static T[] ShallowCloneAppendNullChecked<T>(this T[] source, T[] append, bool front = false)
{
if (source == null && append == null)
return new T[0];
if (source == null)
return append.Clone() as T[];
if (append == null)
return source.Clone() as T[];
return ShallowCloneAppend<T>(source, append, front);
}
}
This diff is collapsed.
......@@ -46,7 +46,7 @@
"gadget_rank": -1,
"scroll_label": null,
"GadgetFlow": [],
"GadgetTime": 7.678122400000575
"GadgetTime": 0.87705790000018169
},
{
"Id": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact2",
......@@ -56,7 +56,7 @@
"gadget_rank": -1,
"scroll_label": null,
"GadgetFlow": [],
"GadgetTime": 7.678122400000575
"GadgetTime": 0.87705790000018169
},
{
"Id": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact3",
......@@ -66,7 +66,7 @@
"gadget_rank": -1,
"scroll_label": null,
"GadgetFlow": [],
"GadgetTime": 7.678122400000575
"GadgetTime": 0.87705790000018169
}
],
"marker": 3,
......@@ -94,7 +94,6 @@
},
"s_type": "PointFact",
"_URI": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1",
"DependentFactIds": [],
"Label": "A",
"hasCustomLabel": false,
"LabelId": 1
......@@ -123,7 +122,6 @@
},
"s_type": "PointFact",
"_URI": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact2",
"DependentFactIds": [],
"Label": "B",
"hasCustomLabel": false,
"LabelId": 2
......@@ -140,10 +138,6 @@
"sqrMagnitude": 1.0
},
"_URI": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact3",
"DependentFactIds": [
"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1",
"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact2"
],
"Label": "[AB]",
"hasCustomLabel": false,
"LabelId": 0
......
......@@ -64,7 +64,7 @@
"gadget_rank": -1,
"scroll_label": null,
"GadgetFlow": [],
"GadgetTime": 7.678122400000575
"GadgetTime": 0.87705790000018169
},
{
"Id": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact5",
......@@ -74,7 +74,7 @@
"gadget_rank": -1,
"scroll_label": null,
"GadgetFlow": [],
"GadgetTime": 7.678122400000575
"GadgetTime": 0.87705790000018169
},
{
"Id": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact6",
......@@ -84,7 +84,7 @@
"gadget_rank": -1,
"scroll_label": null,
"GadgetFlow": [],
"GadgetTime": 7.678122400000575
"GadgetTime": 0.87705790000018169
}
],
"marker": 3,
......@@ -112,7 +112,6 @@
},
"s_type": "PointFact",
"_URI": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact4",
"DependentFactIds": [],
"Label": "A",
"hasCustomLabel": false,
"LabelId": 1
......@@ -141,7 +140,6 @@
},
"s_type": "PointFact",
"_URI": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact5",
"DependentFactIds": [],
"Label": "B",
"hasCustomLabel": false,
"LabelId": 2
......@@ -158,10 +156,6 @@
"sqrMagnitude": 1.0
},
"_URI": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact6",
"DependentFactIds": [
"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact4",
"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact5"
],
"Label": "[AB]",
"hasCustomLabel": false,
"LabelId": 0
......@@ -183,8 +177,8 @@
"MaxHeight": "Infinity",
"ButtonIndx": 1,
"MaterialIndx": 0,
"IgnoreLayerMask": {
"value": 269858
"LayerHitMask": {
"value": 1581105
},
"SecondaryLayerMask": {
"value": 0
......@@ -199,8 +193,8 @@
"MaxHeight": 2.5,
"ButtonIndx": 2,
"MaterialIndx": 0,
"IgnoreLayerMask": {
"value": 391714
"LayerHitMask": {
"value": 1024
},
"SecondaryLayerMask": {
"value": 0
......@@ -215,8 +209,8 @@
"MaxHeight": "Infinity",
"ButtonIndx": 3,
"MaterialIndx": 1,
"IgnoreLayerMask": {
"value": 391718
"LayerHitMask": {
"value": 1024
},
"SecondaryLayerMask": {
"value": 0
......@@ -231,8 +225,8 @@
"MaxHeight": "Infinity",
"ButtonIndx": 4,
"MaterialIndx": 0,
"IgnoreLayerMask": {
"value": 391714
"LayerHitMask": {
"value": 1024
},
"SecondaryLayerMask": {
"value": 0
......@@ -247,8 +241,8 @@
"MaxHeight": "Infinity",
"ButtonIndx": 5,
"MaterialIndx": 0,
"IgnoreLayerMask": {
"value": 365090
"LayerHitMask": {
"value": 535569
},
"SecondaryLayerMask": {
"value": 0
......@@ -263,8 +257,8 @@
"MaxHeight": "Infinity",
"ButtonIndx": 6,
"MaterialIndx": 0,
"IgnoreLayerMask": {
"value": 391714
"LayerHitMask": {
"value": 1024
},
"SecondaryLayerMask": {
"value": 1
......@@ -279,8 +273,8 @@
"MaxHeight": "Infinity",
"ButtonIndx": 8,
"MaterialIndx": 0,
"IgnoreLayerMask": {
"value": 328243
"LayerHitMask": {
"value": 64512
},
"SecondaryLayerMask": {
"value": 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment