Skip to content

Commit 98b5056

Browse files
committed
add 2x1x1 animation to indium lecture
1 parent 9951538 commit 98b5056

9 files changed

Lines changed: 463 additions & 34 deletions

File tree

Assets/Modules/ElementStructures/Element Structures.unity

Lines changed: 201 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8396,6 +8396,55 @@ MonoBehaviour:
83968396
showGizmo: 1
83978397
gizmoSize: 0.1
83988398
gizmoColor: {r: 1, g: 0, b: 0, a: 0.5}
8399+
--- !u!1 &658539992
8400+
GameObject:
8401+
m_ObjectHideFlags: 0
8402+
m_CorrespondingSourceObject: {fileID: 0}
8403+
m_PrefabInstance: {fileID: 0}
8404+
m_PrefabAsset: {fileID: 0}
8405+
serializedVersion: 6
8406+
m_Component:
8407+
- component: {fileID: 658539993}
8408+
- component: {fileID: 658539994}
8409+
m_Layer: 0
8410+
m_Name: Destroy90DegAngles
8411+
m_TagString: Untagged
8412+
m_Icon: {fileID: 0}
8413+
m_NavMeshLayer: 0
8414+
m_StaticEditorFlags: 0
8415+
m_IsActive: 1
8416+
--- !u!4 &658539993
8417+
Transform:
8418+
m_ObjectHideFlags: 0
8419+
m_CorrespondingSourceObject: {fileID: 0}
8420+
m_PrefabInstance: {fileID: 0}
8421+
m_PrefabAsset: {fileID: 0}
8422+
m_GameObject: {fileID: 658539992}
8423+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8424+
m_LocalPosition: {x: 0, y: 0, z: 0}
8425+
m_LocalScale: {x: 1, y: 1, z: 1}
8426+
m_Children: []
8427+
m_Father: {fileID: 5516788629581231192}
8428+
m_RootOrder: 27
8429+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8430+
--- !u!114 &658539994
8431+
MonoBehaviour:
8432+
m_ObjectHideFlags: 0
8433+
m_CorrespondingSourceObject: {fileID: 0}
8434+
m_PrefabInstance: {fileID: 0}
8435+
m_PrefabAsset: {fileID: 0}
8436+
m_GameObject: {fileID: 658539992}
8437+
m_Enabled: 1
8438+
m_EditorHideFlags: 0
8439+
m_Script: {fileID: 11500000, guid: 3a04a593c665cbf40b885808f8ffe309, type: 3}
8440+
m_Name:
8441+
m_EditorClassIdentifier:
8442+
playOnStart: 0
8443+
indefiniteDuration: 0
8444+
duration: 2
8445+
animSequence: {fileID: 0}
8446+
selfDestruct: 0
8447+
structureBuilder: {fileID: 133654971}
83998448
--- !u!1 &660181848
84008449
GameObject:
84018450
m_ObjectHideFlags: 0
@@ -12424,6 +12473,72 @@ MeshRenderer:
1242412473
m_SortingLayer: 0
1242512474
m_SortingOrder: 0
1242612475
m_AdditionalVertexStreams: {fileID: 0}
12476+
--- !u!1 &959968815
12477+
GameObject:
12478+
m_ObjectHideFlags: 0
12479+
m_CorrespondingSourceObject: {fileID: 0}
12480+
m_PrefabInstance: {fileID: 0}
12481+
m_PrefabAsset: {fileID: 0}
12482+
serializedVersion: 6
12483+
m_Component:
12484+
- component: {fileID: 959968816}
12485+
- component: {fileID: 959968817}
12486+
m_Layer: 0
12487+
m_Name: SwitchTo2x1x1View
12488+
m_TagString: Untagged
12489+
m_Icon: {fileID: 0}
12490+
m_NavMeshLayer: 0
12491+
m_StaticEditorFlags: 0
12492+
m_IsActive: 1
12493+
--- !u!4 &959968816
12494+
Transform:
12495+
m_ObjectHideFlags: 0
12496+
m_CorrespondingSourceObject: {fileID: 0}
12497+
m_PrefabInstance: {fileID: 0}
12498+
m_PrefabAsset: {fileID: 0}
12499+
m_GameObject: {fileID: 959968815}
12500+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
12501+
m_LocalPosition: {x: 0, y: 0, z: 0}
12502+
m_LocalScale: {x: 1, y: 1, z: 1}
12503+
m_Children: []
12504+
m_Father: {fileID: 5516788629581231192}
12505+
m_RootOrder: 29
12506+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12507+
--- !u!114 &959968817
12508+
MonoBehaviour:
12509+
m_ObjectHideFlags: 0
12510+
m_CorrespondingSourceObject: {fileID: 0}
12511+
m_PrefabInstance: {fileID: 0}
12512+
m_PrefabAsset: {fileID: 0}
12513+
m_GameObject: {fileID: 959968815}
12514+
m_Enabled: 1
12515+
m_EditorHideFlags: 0
12516+
m_Script: {fileID: 11500000, guid: 08b758901e273fb4fa56175ebde2ff58, type: 3}
12517+
m_Name:
12518+
m_EditorClassIdentifier:
12519+
playOnStart: 0
12520+
indefiniteDuration: 0
12521+
duration: 2
12522+
animSequence: {fileID: 0}
12523+
selfDestruct: 0
12524+
structureBuilder: {fileID: 133654971}
12525+
unitCellHighlightPositions:
12526+
- {x: 0, y: 0.25, z: 0}
12527+
- {x: 0.25, y: 0.25, z: 0.25}
12528+
- {x: 0.5, y: 0.25, z: 0}
12529+
- {x: 0.25, y: 0.25, z: -0.25}
12530+
- {x: 0, y: 0.25, z: 0}
12531+
- {x: 0, y: -0.25, z: 0}
12532+
- {x: 0.25, y: -0.25, z: 0.25}
12533+
- {x: 0.25, y: 0.25, z: 0.25}
12534+
- {x: 0.25, y: -0.25, z: 0.25}
12535+
- {x: 0.5, y: -0.25, z: 0}
12536+
- {x: 0.5, y: 0.25, z: 0}
12537+
- {x: 0.5, y: -0.25, z: 0}
12538+
- {x: 0.25, y: -0.25, z: -0.25}
12539+
- {x: 0.25, y: 0.25, z: -0.25}
12540+
- {x: 0.25, y: -0.25, z: -0.25}
12541+
- {x: 0, y: -0.25, z: 0}
1242712542
--- !u!95 &962167921 stripped
1242812543
Animator:
1242912544
m_CorrespondingSourceObject: {fileID: 4191118299638486128, guid: 2b0e5eb2be375428e97a2c12d8f0f51c, type: 3}
@@ -16397,7 +16512,6 @@ MonoBehaviour:
1639716512
animSequence: {fileID: 0}
1639816513
selfDestruct: 0
1639916514
structureBuilder: {fileID: 133654971}
16400-
structureBase: {fileID: 936844115}
1640116515
anglePrefab: {fileID: 8850024353605666476, guid: 4c7f736c8747475479223ded8df92a81, type: 3}
1640216516
--- !u!1 &1654319187
1640316517
GameObject:
@@ -16449,6 +16563,56 @@ Transform:
1644916563
m_Father: {fileID: 5069879808787311079}
1645016564
m_RootOrder: 31
1645116565
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16566+
--- !u!1 &1659195168
16567+
GameObject:
16568+
m_ObjectHideFlags: 0
16569+
m_CorrespondingSourceObject: {fileID: 0}
16570+
m_PrefabInstance: {fileID: 0}
16571+
m_PrefabAsset: {fileID: 0}
16572+
serializedVersion: 6
16573+
m_Component:
16574+
- component: {fileID: 1659195169}
16575+
- component: {fileID: 1659195170}
16576+
m_Layer: 0
16577+
m_Name: DepictCopper
16578+
m_TagString: Untagged
16579+
m_Icon: {fileID: 0}
16580+
m_NavMeshLayer: 0
16581+
m_StaticEditorFlags: 0
16582+
m_IsActive: 1
16583+
--- !u!4 &1659195169
16584+
Transform:
16585+
m_ObjectHideFlags: 0
16586+
m_CorrespondingSourceObject: {fileID: 0}
16587+
m_PrefabInstance: {fileID: 0}
16588+
m_PrefabAsset: {fileID: 0}
16589+
m_GameObject: {fileID: 1659195168}
16590+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
16591+
m_LocalPosition: {x: 0, y: 0, z: 0}
16592+
m_LocalScale: {x: 1, y: 1, z: 1}
16593+
m_Children: []
16594+
m_Father: {fileID: 5516788629581231192}
16595+
m_RootOrder: 28
16596+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16597+
--- !u!114 &1659195170
16598+
MonoBehaviour:
16599+
m_ObjectHideFlags: 0
16600+
m_CorrespondingSourceObject: {fileID: 0}
16601+
m_PrefabInstance: {fileID: 0}
16602+
m_PrefabAsset: {fileID: 0}
16603+
m_GameObject: {fileID: 1659195168}
16604+
m_Enabled: 1
16605+
m_EditorHideFlags: 0
16606+
m_Script: {fileID: 11500000, guid: 94432fbcc9309884e8dcb6d729f8b294, type: 3}
16607+
m_Name:
16608+
m_EditorClassIdentifier:
16609+
playOnStart: 0
16610+
indefiniteDuration: 0
16611+
duration: 2
16612+
animSequence: {fileID: 0}
16613+
selfDestruct: 0
16614+
element: {fileID: 2063022606}
16615+
structureBase: {fileID: 936844115}
1645216616
--- !u!1 &1676120725
1645316617
GameObject:
1645416618
m_ObjectHideFlags: 0
@@ -18536,6 +18700,17 @@ MonoBehaviour:
1853618700
timing: 0
1853718701
lectureAnimSequence: {fileID: 616306708}
1853818702
resetIndex: 0
18703+
--- !u!114 &2063022606 stripped
18704+
MonoBehaviour:
18705+
m_CorrespondingSourceObject: {fileID: 8504095590781948165, guid: 2b0e5eb2be375428e97a2c12d8f0f51c, type: 3}
18706+
m_PrefabInstance: {fileID: 6923397188796341106}
18707+
m_PrefabAsset: {fileID: 0}
18708+
m_GameObject: {fileID: 0}
18709+
m_Enabled: 1
18710+
m_EditorHideFlags: 0
18711+
m_Script: {fileID: 11500000, guid: afcd300057b054b04ad120d97b8e63e5, type: 3}
18712+
m_Name:
18713+
m_EditorClassIdentifier:
1853918714
--- !u!1 &2066186235
1854018715
GameObject:
1854118716
m_ObjectHideFlags: 0
@@ -19296,6 +19471,13 @@ MonoBehaviour:
1929619471
m_Calls: []
1929719472
animator: {fileID: 0}
1929819473
timing: 4
19474+
- actionType: 0
19475+
animation: {fileID: 658539994}
19476+
onPlay:
19477+
m_PersistentCalls:
19478+
m_Calls: []
19479+
animator: {fileID: 0}
19480+
timing: 4
1929919481
- actionType: 0
1930019482
animation: {fileID: 1914561132}
1930119483
onPlay:
@@ -19320,21 +19502,21 @@ MonoBehaviour:
1932019502
m_PersistentCalls:
1932119503
m_Calls: []
1932219504
animator: {fileID: 0}
19323-
timing: 3
19505+
timing: 4
1932419506
- actionType: 0
1932519507
animation: {fileID: 673725283}
1932619508
onPlay:
1932719509
m_PersistentCalls:
1932819510
m_Calls: []
1932919511
animator: {fileID: 0}
19330-
timing: 4
19512+
timing: 6
1933119513
- actionType: 0
1933219514
animation: {fileID: 237156600}
1933319515
onPlay:
1933419516
m_PersistentCalls:
1933519517
m_Calls: []
1933619518
animator: {fileID: 0}
19337-
timing: 5
19519+
timing: 8
1933819520
realDuration: 0
1933919521
- audioEN: {fileID: 8300000, guid: 716e56a336cc3574b8915fa83f07f138, type: 3}
1934019522
audioDE: {fileID: 8300000, guid: b18a288188d42d54db23fdabf818bd64, type: 3}
@@ -19347,7 +19529,7 @@ MonoBehaviour:
1934719529
- m_Target: {fileID: 881861620}
1934819530
m_TargetAssemblyTypeName: Veridium_Interaction.XRGrabInteractable_Lockable,
1934919531
Assembly-CSharp
19350-
m_MethodName: Unlock
19532+
m_MethodName: Lock
1935119533
m_Mode: 1
1935219534
m_Arguments:
1935319535
m_ObjectArgument: {fileID: 0}
@@ -19359,30 +19541,24 @@ MonoBehaviour:
1935919541
m_CallState: 2
1936019542
animator: {fileID: 0}
1936119543
timing: 0
19544+
- actionType: 0
19545+
animation: {fileID: 1659195170}
19546+
onPlay:
19547+
m_PersistentCalls:
19548+
m_Calls: []
19549+
animator: {fileID: 0}
19550+
timing: 4
1936219551
realDuration: 0
1936319552
- audioEN: {fileID: 8300000, guid: 38c98cd59d0080d46be08e4460b8f13b, type: 3}
1936419553
audioDE: {fileID: 8300000, guid: b18a288188d42d54db23fdabf818bd64, type: 3}
1936519554
animations:
19366-
- actionType: 1
19367-
animation: {fileID: 0}
19555+
- actionType: 0
19556+
animation: {fileID: 959968817}
1936819557
onPlay:
1936919558
m_PersistentCalls:
19370-
m_Calls:
19371-
- m_Target: {fileID: 881861620}
19372-
m_TargetAssemblyTypeName: Veridium_Interaction.XRGrabInteractable_Lockable,
19373-
Assembly-CSharp
19374-
m_MethodName: Unlock
19375-
m_Mode: 1
19376-
m_Arguments:
19377-
m_ObjectArgument: {fileID: 0}
19378-
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
19379-
m_IntArgument: 0
19380-
m_FloatArgument: 0
19381-
m_StringArgument:
19382-
m_BoolArgument: 0
19383-
m_CallState: 2
19559+
m_Calls: []
1938419560
animator: {fileID: 0}
19385-
timing: 0
19561+
timing: 12
1938619562
realDuration: 0
1938719563
- audioEN: {fileID: 8300000, guid: 273a2d54ae7aeee40b59fb7ba7340ca8, type: 3}
1938819564
audioDE: {fileID: 8300000, guid: b18a288188d42d54db23fdabf818bd64, type: 3}
@@ -22610,6 +22786,9 @@ Transform:
2261022786
- {fileID: 145282918}
2261122787
- {fileID: 1914561131}
2261222788
- {fileID: 1648615815}
22789+
- {fileID: 658539993}
22790+
- {fileID: 1659195169}
22791+
- {fileID: 959968816}
2261322792
m_Father: {fileID: 548511508}
2261422793
m_RootOrder: 3
2261522794
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Modules/ElementStructures/Materials/GlowingGreen.mat

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: GlowingGreen
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12-
m_ShaderKeywords: _EMISSION
13-
m_LightmapFlags: 2
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: 2000
16+
m_CustomRenderQueue: 3000
1717
stringTagMap:
18-
RenderType: Opaque
19-
disabledShaderPasses: []
18+
RenderType: Transparent
19+
disabledShaderPasses:
20+
- SHADOWCASTER
2021
m_SavedProperties:
2122
serializedVersion: 3
2223
m_TexEnvs:
@@ -86,27 +87,30 @@ Material:
8687
- _Cutoff: 0.5
8788
- _DetailAlbedoMapScale: 1
8889
- _DetailNormalMapScale: 1
89-
- _DstBlend: 0
90+
- _DstBlend: 10
9091
- _EnvironmentReflections: 1
9192
- _GlossMapScale: 0
9293
- _Glossiness: 0
9394
- _GlossyReflections: 0
9495
- _Metallic: 0
96+
- _Mode: 0
9597
- _OcclusionStrength: 1
9698
- _Parallax: 0.005
9799
- _QueueOffset: 0
98100
- _ReceiveShadows: 1
101+
- _SampleGI: 0
99102
- _Smoothness: 0.5
100103
- _SmoothnessTextureChannel: 0
101104
- _SpecularHighlights: 1
102-
- _SrcBlend: 1
103-
- _Surface: 0
105+
- _SrcBlend: 5
106+
- _Surface: 1
107+
- _UVSec: 0
104108
- _WorkflowMode: 1
105-
- _ZWrite: 1
109+
- _ZWrite: 0
106110
m_Colors:
107-
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
111+
- _BaseColor: {r: 0, g: 1, b: 0.08237815, a: 0.49803922}
108112
- _Color: {r: 1, g: 1, b: 1, a: 1}
109-
- _EmissionColor: {r: 0.048704028, g: 1, b: 0, a: 1}
113+
- _EmissionColor: {r: 0.010784314, g: 0.061764706, b: 0, a: 1}
110114
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
111115
m_BuildTextureStacks: []
112116
--- !u!114 &8692445081988365046

0 commit comments

Comments
 (0)