Skip to content

Commit 56639ea

Browse files
Fix cosmetics on emote wheel
1 parent 54f0d66 commit 56639ea

File tree

4 files changed

+40
-4
lines changed

4 files changed

+40
-4
lines changed

Classes/Wheel.cs

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,25 @@ public void Update()
385385
break;
386386
}
387387
}
388-
388+
if (Page == 7)
389+
{
390+
pageTitle = "COMMISSIONS 5";
391+
switch (selected)
392+
{
393+
case 0:
394+
emoteTitle = "OUT WEST";
395+
break;
396+
case -1:
397+
emoteTitle = "MY WORLD";
398+
break;
399+
case -2:
400+
emoteTitle = "JAKE BUG DANCE";
401+
break;
402+
case -3:
403+
emoteTitle = "MIKU MIKU BEAM";
404+
break;
405+
}
406+
}
389407
Base.transform.Find("Canvas/PageName").GetComponent<Text>().text = pageTitle;
390408
Base.transform.Find("Canvas/EmoteName").GetComponent<Text>().text = emoteTitle;
391409
}
@@ -660,6 +678,24 @@ public void Update()
660678
break;
661679
}
662680
}
681+
if (Page == 7)
682+
{
683+
switch (Selection)
684+
{
685+
case 0:
686+
Plugin.Emote("outwest", "outwest", -1f, true);
687+
break;
688+
case -1:
689+
Plugin.Emote("myworld", "Myworld", -1f, true);
690+
break;
691+
case -2:
692+
Plugin.Emote("Jake", "jake", -1f, true);
693+
break;
694+
case -3:
695+
Plugin.Emote("miku", "miku", -1f, true);
696+
break;
697+
}
698+
}
663699
prevRotation = -9999f;
664700
}
665701
}

Plugin.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static void DisableCosmetics()
9999
GorillaTagger.Instance.offlineVRRig.transform.Find("RigAnchor/rig/body/head/gorillaface").gameObject.layer = LayerMask.NameToLayer("Default");
100100
foreach (GameObject Cosmetic in GorillaTagger.Instance.offlineVRRig.cosmetics)
101101
{
102-
if (Cosmetic.activeSelf && Cosmetic.transform.parent == GorillaTagger.Instance.offlineVRRig.mainCamera.transform)
102+
if (Cosmetic.activeSelf && Cosmetic.transform.parent == GorillaTagger.Instance.offlineVRRig.mainCamera.transform.Find("HeadCosmetics"))
103103
{
104104
portedCosmetics.Add(Cosmetic);
105105
Cosmetic.transform.SetParent(GorillaTagger.Instance.offlineVRRig.headMesh.transform, false);
@@ -114,7 +114,7 @@ public static void EnableCosmetics()
114114
GorillaTagger.Instance.offlineVRRig.transform.Find("RigAnchor/rig/body/head/gorillaface").gameObject.layer = LayerMask.NameToLayer("MirrorOnly");
115115
foreach (GameObject Cosmetic in portedCosmetics)
116116
{
117-
Cosmetic.transform.SetParent(GorillaTagger.Instance.offlineVRRig.mainCamera.transform, false);
117+
Cosmetic.transform.SetParent(GorillaTagger.Instance.offlineVRRig.mainCamera.transform.Find("HeadCosmetics"), false);
118118
Cosmetic.transform.localPosition -= new Vector3(0f, 0.1333f, 0.1f);
119119
}
120120
portedCosmetics.Clear();

PluginInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ internal class PluginInfo
77
{
88
public const string GUID = "com.goldentrophy.gorillatag.fortniteemotewheel";
99
public const string Name = "FortniteEmoteWheel";
10-
public const string Version = "1.1.6";
10+
public const string Version = "1.2.1";
1111
}
1212
}

Resources/fn

1.57 MB
Binary file not shown.

0 commit comments

Comments
 (0)