Skip to content

Commit 1f61041

Browse files
M-UnityDevM-UnityDev
committed
AnimationComplete!!!
1 parent 98e9f3e commit 1f61041

File tree

6 files changed

+40
-61
lines changed

6 files changed

+40
-61
lines changed

‎Source Code/M-Unity's Weird Website/Assets/[5MBD]/Scenes/[5MBD]Cutscene.unity‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,12 +1449,12 @@ Transform:
14491449
m_PrefabAsset: {fileID: 0}
14501450
m_GameObject: {fileID: 794364499}
14511451
serializedVersion: 2
1452-
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
1452+
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
14531453
m_LocalPosition: {x: 1.1588639, y: -0.51, z: -2}
14541454
m_LocalScale: {x: 105, y: 105, z: 98}
14551455
m_ConstrainProportionsScale: 0
14561456
m_Children: []
1457-
m_Father: {fileID: 543450653373069127}
1457+
m_Father: {fileID: 1784462996}
14581458
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
14591459
--- !u!23 &794364501
14601460
MeshRenderer:
@@ -7604,6 +7604,7 @@ Transform:
76047604
- {fileID: 198619017}
76057605
- {fileID: 342193741}
76067606
- {fileID: 106990129}
7607+
- {fileID: 794364500}
76077608
m_Father: {fileID: 543450653373069127}
76087609
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
76097610
--- !u!1 &1823332609 stripped
@@ -8187,7 +8188,7 @@ Transform:
81878188
m_GameObject: {fileID: 8567732728623375022}
81888189
serializedVersion: 2
81898190
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
8190-
m_LocalPosition: {x: 0.8691545, y: -0.6025659, z: -3.4756463}
8191+
m_LocalPosition: {x: 0.8, y: -0.6025659, z: -3.4756463}
81918192
m_LocalScale: {x: 50, y: 50, z: 50}
81928193
m_ConstrainProportionsScale: 0
81938194
m_Children: []
@@ -8340,7 +8341,6 @@ Transform:
83408341
- {fileID: 5993847947680867426}
83418342
- {fileID: 2185533848584901095}
83428343
- {fileID: 7154769223529955622}
8343-
- {fileID: 794364500}
83448344
- {fileID: 2371397202591663778}
83458345
- {fileID: 8288254109297410749}
83468346
- {fileID: 2318918794853627660}
@@ -8902,7 +8902,7 @@ Transform:
89028902
m_GameObject: {fileID: 9026109435229977073}
89038903
serializedVersion: 2
89048904
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
8905-
m_LocalPosition: {x: 0.84004575, y: -0.593, z: -2.8999999}
8905+
m_LocalPosition: {x: 0.762, y: -0.593, z: -2.8999999}
89068906
m_LocalScale: {x: 100, y: 100, z: 100}
89078907
m_ConstrainProportionsScale: 0
89088908
m_Children: []

‎Source Code/M-Unity's Weird Website/Assets/[5MBD]/Scripts/CutsceneDirector.cs‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ private IEnumerator CutScene()
3232
MenuCamera.SetActive(false);
3333
yield return new WaitForSeconds(1);
3434
Destroy(UICanvas);
35-
yield return new WaitForSeconds(2);
35+
yield return new WaitForSeconds(1);
3636
Dark.UnDark();
37-
yield return new WaitForSeconds(2);
37+
yield return new WaitForSeconds(3);
3838
Lights.SetActive(true);
3939
LaptopScreen.Change();
4040
yield return new WaitForSeconds(2);
@@ -59,23 +59,41 @@ private IEnumerator CutScene()
5959
Chair.transform.DORotate(new Vector3(90,0,0), 1).SetEase(Ease.InCubic);
6060
yield return new WaitForSeconds(0.75f);
6161
Chair.transform.DOMoveX(0.5f,2).SetEase(Ease.OutCubic);
62-
MUnity.RotatePart(AnimationDirector.BodyPart.Head,new Vector3(0,0,0),2, Ease.InOutCubic);
62+
MUnity.RotatePart(AnimationDirector.BodyPart.Head,new Vector3(0,0,0),1.5f, Ease.InOutCubic);
6363
MUnity.RotatePart(AnimationDirector.BodyPart.ArmRight,new Vector3(-70,0,0),1, Ease.InOutCubic);
6464
MUnity.RotatePart(AnimationDirector.BodyPart.ArmLeft,new Vector3(-70,0,0),1, Ease.InOutCubic);
65+
yield return new WaitForSeconds(1.5f);
66+
StartCoroutine(Typing(MUnity, 0.2f));
67+
yield return new WaitForSeconds(2);
68+
MUnity.RotatePart(AnimationDirector.BodyPart.Head, new Vector3(2, -60, 0), 1, Ease.InOutCubic);
69+
yield return new WaitForSeconds(1.5f);
70+
MUnity.RotatePart(AnimationDirector.BodyPart.Head, new Vector3(0, 0, 0), 1, Ease.InOutCubic);
6571
}
6672
private IEnumerator Walking(AnimationDirector Player, float Speed)
6773
{
68-
while(true)
74+
while (true)
75+
{
76+
Player.RotatePart(AnimationDirector.BodyPart.LegRight, new Vector3(-20, 0, 0), Speed, Ease.InFlash);
77+
Player.RotatePart(AnimationDirector.BodyPart.LegLeft, new Vector3(20, 0, 0), Speed, Ease.InFlash);
78+
Player.RotatePart(AnimationDirector.BodyPart.ArmRight, new Vector3(20, 0, 0), Speed, Ease.InFlash);
79+
Player.RotatePart(AnimationDirector.BodyPart.ArmLeft, new Vector3(-20, 0, 0), Speed, Ease.InFlash);
80+
yield return new WaitForSeconds(Speed);
81+
Player.RotatePart(AnimationDirector.BodyPart.LegRight, new Vector3(20, 0, 0), Speed, Ease.InFlash);
82+
Player.RotatePart(AnimationDirector.BodyPart.LegLeft, new Vector3(-20, 0, 0), Speed, Ease.InFlash);
83+
Player.RotatePart(AnimationDirector.BodyPart.ArmRight, new Vector3(-20, 0, 0), Speed, Ease.InFlash);
84+
Player.RotatePart(AnimationDirector.BodyPart.ArmLeft, new Vector3(20, 0, 0), Speed, Ease.InFlash);
85+
yield return new WaitForSeconds(Speed);
86+
}
87+
}
88+
private IEnumerator Typing(AnimationDirector Player, float Speed)
89+
{
90+
while (true)
6991
{
70-
Player.RotatePart(AnimationDirector.BodyPart.LegRight,new Vector3(-20,0,0), Speed, Ease.InFlash);
71-
Player.RotatePart(AnimationDirector.BodyPart.LegLeft,new Vector3(20,0,0), Speed, Ease.InFlash);
72-
Player.RotatePart(AnimationDirector.BodyPart.ArmRight,new Vector3(20,0,0), Speed, Ease.InFlash);
73-
Player.RotatePart(AnimationDirector.BodyPart.ArmLeft,new Vector3(-20,0,0), Speed, Ease.InFlash);
92+
Player.RotatePart(AnimationDirector.BodyPart.ArmRight, new Vector3(-80, 0, -30), Speed, Ease.InFlash);
93+
Player.RotatePart(AnimationDirector.BodyPart.ArmLeft, new Vector3(-60, 0, 0), Speed, Ease.InFlash);
7494
yield return new WaitForSeconds(Speed);
75-
Player.RotatePart(AnimationDirector.BodyPart.LegRight,new Vector3(20,0,0), Speed, Ease.InFlash);
76-
Player.RotatePart(AnimationDirector.BodyPart.LegLeft,new Vector3(-20,0,0), Speed, Ease.InFlash);
77-
Player.RotatePart(AnimationDirector.BodyPart.ArmRight,new Vector3(-20,0,0), Speed, Ease.InFlash);
78-
Player.RotatePart(AnimationDirector.BodyPart.ArmLeft,new Vector3(20,0,0), Speed, Ease.InFlash);
95+
Player.RotatePart(AnimationDirector.BodyPart.ArmRight, new Vector3(-60, 0, -30), Speed, Ease.InFlash);
96+
Player.RotatePart(AnimationDirector.BodyPart.ArmLeft, new Vector3(-80, 0, 0), Speed, Ease.InFlash);
7997
yield return new WaitForSeconds(Speed);
8098
}
8199
}

‎Source Code/M-Unity's Weird Website/Assets/[5MBD]/Scripts/DarkDirector.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ private void Awake()
1313
SpriteDark = GetComponent<SpriteRenderer>();
1414
if(IsDarkOnAwake) SpriteDark.color = Startcolor; UnDark();
1515
}
16-
public void Dark() => SpriteDark.DOColor(Startcolor,1).SetEase(Ease.InFlash);
17-
public void UnDark() => SpriteDark.DOColor(Endcolor,1).SetEase(Ease.InFlash);
16+
public void Dark() => SpriteDark.DOColor(Startcolor,1).SetEase(Ease.InCubic);
17+
public void UnDark() => SpriteDark.DOColor(Endcolor,1).SetEase(Ease.InCubic);
1818
}

‎Source Code/M-Unity's Weird Website/Assets/[5MBD]/Scripts/MainMenu.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
using UnityEngine;
23
using DG.Tweening;
34
using System.Collections;
@@ -15,10 +16,10 @@ private void Start()
1516
{
1617
DOTween.To(() => pos, x => pos = x, 0, 2).OnUpdate(() => {
1718
LogoText.offsetMin = new Vector2(LogoText.offsetMin.x, pos);
18-
}).SetEase(Ease.InFlash);
19+
}).SetEase(Ease.InOutCubic);
1920
DOTween.To(() => posbtn, x => posbtn = x, -128, 2).OnUpdate(() => {
2021
Buttons.anchoredPosition = new Vector2(Buttons.anchoredPosition.x, posbtn);
21-
}).SetEase(Ease.InFlash);
22+
}).SetEase(Ease.InOutCubic);
2223
}
2324
public void StartGame()
2425
{

‎Source Code/M-Unity's Weird Website/DOTween.Modules.csproj‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -558,22 +558,10 @@
558558
<HintPath>Library\PackageCache\com.unity.collections\Unity.Collections.LowLevel.ILSupport\Unity.Collections.LowLevel.ILSupport.dll</HintPath>
559559
<Private>False</Private>
560560
</Reference>
561-
<Reference Include="Trivial.CodeSecurity">
562-
<HintPath>Assets\RoslynCSharp\Plugin\Trivial.CodeSecurity.dll</HintPath>
563-
<Private>False</Private>
564-
</Reference>
565561
<Reference Include="nunit.framework">
566562
<HintPath>Library\PackageCache\com.unity.ext.nunit\net40\unity-custom\nunit.framework.dll</HintPath>
567563
<Private>False</Private>
568564
</Reference>
569-
<Reference Include="Trivial.Mono.Cecil">
570-
<HintPath>Assets\RoslynCSharp\Plugin\Trivial.Mono.Cecil.dll</HintPath>
571-
<Private>False</Private>
572-
</Reference>
573-
<Reference Include="System.Runtime.CompilerServices.Unsafe">
574-
<HintPath>Assets\RoslynCSharp\Plugin\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
575-
<Private>False</Private>
576-
</Reference>
577565
<Reference Include="unityplastic">
578566
<HintPath>Library\PackageCache\com.unity.collab-proxy\Lib\Editor\unityplastic.dll</HintPath>
579567
<Private>False</Private>
@@ -598,18 +586,6 @@
598586
<HintPath>Library\PackageCache\com.unity.visualscripting\Editor\VisualScripting.Core\Dependencies\DotNetZip\Unity.VisualScripting.IonicZip.dll</HintPath>
599587
<Private>False</Private>
600588
</Reference>
601-
<Reference Include="Trivial.Mono.Cecil.Pdb">
602-
<HintPath>Assets\RoslynCSharp\Plugin\Trivial.Mono.Cecil.Pdb.dll</HintPath>
603-
<Private>False</Private>
604-
</Reference>
605-
<Reference Include="System.Collections.Immutable">
606-
<HintPath>Assets\RoslynCSharp\Plugin\System.Collections.Immutable.dll</HintPath>
607-
<Private>False</Private>
608-
</Reference>
609-
<Reference Include="Trivial.Mono.Cecil.Mdb">
610-
<HintPath>Assets\RoslynCSharp\Plugin\Trivial.Mono.Cecil.Mdb.dll</HintPath>
611-
<Private>False</Private>
612-
</Reference>
613589
<Reference Include="DOTween">
614590
<HintPath>Assets\Plugins\Demigiant\DOTween\DOTween.dll</HintPath>
615591
<Private>False</Private>
@@ -618,18 +594,6 @@
618594
<HintPath>Library\PackageCache\com.unity.visualscripting\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll</HintPath>
619595
<Private>False</Private>
620596
</Reference>
621-
<Reference Include="System.Reflection.Metadata">
622-
<HintPath>Assets\RoslynCSharp\Plugin\System.Reflection.Metadata.dll</HintPath>
623-
<Private>False</Private>
624-
</Reference>
625-
<Reference Include="Microsoft.CodeAnalysis.CSharp">
626-
<HintPath>Assets\RoslynCSharp\Plugin\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
627-
<Private>False</Private>
628-
</Reference>
629-
<Reference Include="Trivial.ImGUI">
630-
<HintPath>Assets\RoslynCSharp\Plugin\Editor\Trivial.ImGUI.dll</HintPath>
631-
<Private>False</Private>
632-
</Reference>
633597
<Reference Include="Unity.VisualScripting.TextureAssets">
634598
<HintPath>Library\PackageCache\com.unity.visualscripting\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll</HintPath>
635599
<Private>False</Private>
@@ -638,10 +602,6 @@
638602
<HintPath>Library\PackageCache\com.unity.nuget.mono-cecil\Mono.Cecil.dll</HintPath>
639603
<Private>False</Private>
640604
</Reference>
641-
<Reference Include="Microsoft.CodeAnalysis">
642-
<HintPath>Assets\RoslynCSharp\Plugin\Microsoft.CodeAnalysis.dll</HintPath>
643-
<Private>False</Private>
644-
</Reference>
645605
<Reference Include="netstandard">
646606
<HintPath>C:\Program Files\Unity\Hub\Editor\6000.0.23f1\Editor\Data\NetStandard\ref\2.1.0\netstandard.dll</HintPath>
647607
<Private>False</Private>

‎Source Code/M-Unity's Weird Website/obj/Debug/DOTween.Modules.csproj.AssemblyReference.cache‎

-5.64 KB
Binary file not shown.

0 commit comments

Comments
 (0)