Skip to content

Commit 4647198

Browse files
committed
added soundeffects
1 parent 3f32291 commit 4647198

File tree

496 files changed

+270407
-6111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

496 files changed

+270407
-6111
lines changed

Assets/DialogController.cs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
using UnityEngine;
2+
3+
public class DialogController : MonoBehaviour
4+
{
5+
public Transform spawnPoint;
6+
public Transform xrRig;
7+
public Transform avatar;
8+
9+
void Start()
10+
{
11+
ResetDialoge();
12+
}
13+
14+
public void Proceed()
15+
{
16+
// reset dialoge
17+
ResetDialoge();
18+
19+
// let avatar and xr rig spawn to spawn point
20+
xrRig.transform.SetPositionAndRotation(spawnPoint.position, spawnPoint.rotation);
21+
avatar.transform.SetPositionAndRotation(spawnPoint.position, spawnPoint.rotation);
22+
}
23+
24+
public void GoBack()
25+
{
26+
ResetDialoge();
27+
}
28+
29+
public void Talk()
30+
{
31+
StartDialoge();
32+
}
33+
34+
private void ResetDialoge()
35+
{
36+
// reset dialoge
37+
this.transform.Find("Dialog2").gameObject.SetActive(false);
38+
this.transform.Find("Dialog1").gameObject.SetActive(true);
39+
}
40+
41+
private void StartDialoge()
42+
{
43+
// reset dialoge
44+
this.transform.Find("Dialog1").gameObject.SetActive(false);
45+
this.transform.Find("Dialog2").gameObject.SetActive(true);
46+
}
47+
}

Assets/DialogController.cs.meta

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

Assets/EmaceArt/Slavic World Free/Material/EA03_LPNP-Slavika_Colorsheet_v1.mat

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: EA03_LPNP-Slavika_Colorsheet_v1
11-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords: _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
11+
m_Shader: {fileID: 4800000, guid: 7cd5de0b884b14f88ab763ef465e1799, type: 3}
12+
m_ShaderKeywords: _GLOSSYREFLECTIONS_OFF _SEGMENTED_ON _SPECULARHIGHLIGHTS_OFF
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
@@ -56,22 +56,39 @@ Material:
5656
m_Scale: {x: 1, y: 1}
5757
m_Offset: {x: 0, y: 0}
5858
m_Floats:
59+
- _AmbientCol: 0
5960
- _BumpScale: 1
61+
- _Clipped: 0
62+
- _ColBright: 0
63+
- _ColIntense: 1
6064
- _Cutoff: 0.5
6165
- _DetailNormalMapScale: 1
6266
- _DstBlend: 0
6367
- _GlossMapScale: 1
6468
- _Glossiness: 0
6569
- _GlossyReflections: 0
70+
- _Lumin: 0
71+
- _MaxLight: 1
6672
- _Metallic: 0
73+
- _MinLight: 0
6774
- _Mode: 0
6875
- _OcclusionStrength: 1
76+
- _Offset: 0
6977
- _Parallax: 0.02
78+
- _Segmented: 1
79+
- _ShnIntense: 0
80+
- _ShnOverlap: 0
81+
- _ShnRange: 0.15
82+
- _ShnSmooth: 0
7083
- _SmoothnessTextureChannel: 0
7184
- _SpecularHighlights: 0
7285
- _SrcBlend: 1
86+
- _Steps: 3
87+
- _StpSmooth: 0
7388
- _UVSec: 0
7489
- _ZWrite: 1
7590
m_Colors:
7691
- _Color: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1}
7792
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
93+
- _ShnColor: {r: 1, g: 1, b: 0, a: 1}
94+
m_BuildTextureStacks: []

Assets/EmaceArt/Slavic World Free/Prefabs/Items/Crockery/EA_Items_House_kettle_empty_01a_PRE.prefab

Lines changed: 145 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ GameObject:
1010
m_Component:
1111
- component: {fileID: 2253984036361834792}
1212
- component: {fileID: 2253984036374529416}
13+
- component: {fileID: 801818928}
14+
- component: {fileID: 801818929}
15+
- component: {fileID: 801818927}
1316
m_Layer: 0
1417
m_Name: EA_Items_House_kettle_empty_01a_PRE
1518
m_TagString: Untagged
@@ -61,6 +64,142 @@ LODGroup:
6164
renderers:
6265
- renderer: {fileID: 2253984036359410636}
6366
m_Enabled: 1
67+
--- !u!54 &801818928
68+
Rigidbody:
69+
m_ObjectHideFlags: 0
70+
m_CorrespondingSourceObject: {fileID: 0}
71+
m_PrefabInstance: {fileID: 0}
72+
m_PrefabAsset: {fileID: 0}
73+
m_GameObject: {fileID: 2253984036361342216}
74+
serializedVersion: 2
75+
m_Mass: 1
76+
m_Drag: 0
77+
m_AngularDrag: 0.05
78+
m_UseGravity: 1
79+
m_IsKinematic: 0
80+
m_Interpolate: 0
81+
m_Constraints: 0
82+
m_CollisionDetection: 0
83+
--- !u!64 &801818929
84+
MeshCollider:
85+
m_ObjectHideFlags: 0
86+
m_CorrespondingSourceObject: {fileID: 0}
87+
m_PrefabInstance: {fileID: 0}
88+
m_PrefabAsset: {fileID: 0}
89+
m_GameObject: {fileID: 2253984036361342216}
90+
m_Material: {fileID: 0}
91+
m_IsTrigger: 0
92+
m_Enabled: 1
93+
serializedVersion: 4
94+
m_Convex: 1
95+
m_CookingOptions: 30
96+
m_Mesh: {fileID: 4300004, guid: 64269ae04169bfa4faf3bb8f18263056, type: 3}
97+
--- !u!114 &801818927
98+
MonoBehaviour:
99+
m_ObjectHideFlags: 0
100+
m_CorrespondingSourceObject: {fileID: 0}
101+
m_PrefabInstance: {fileID: 0}
102+
m_PrefabAsset: {fileID: 0}
103+
m_GameObject: {fileID: 2253984036361342216}
104+
m_Enabled: 1
105+
m_EditorHideFlags: 0
106+
m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
107+
m_Name:
108+
m_EditorClassIdentifier:
109+
m_InteractionManager: {fileID: 0}
110+
m_Colliders: []
111+
m_InteractionLayerMask:
112+
serializedVersion: 2
113+
m_Bits: 4294967295
114+
m_CustomReticle: {fileID: 0}
115+
m_FirstHoverEntered:
116+
m_PersistentCalls:
117+
m_Calls: []
118+
m_LastHoverExited:
119+
m_PersistentCalls:
120+
m_Calls: []
121+
m_HoverEntered:
122+
m_PersistentCalls:
123+
m_Calls: []
124+
m_HoverExited:
125+
m_PersistentCalls:
126+
m_Calls: []
127+
m_SelectEntered:
128+
m_PersistentCalls:
129+
m_Calls: []
130+
m_SelectExited:
131+
m_PersistentCalls:
132+
m_Calls: []
133+
m_Activated:
134+
m_PersistentCalls:
135+
m_Calls: []
136+
m_Deactivated:
137+
m_PersistentCalls:
138+
m_Calls: []
139+
m_OnFirstHoverEntered:
140+
m_PersistentCalls:
141+
m_Calls: []
142+
m_OnLastHoverExited:
143+
m_PersistentCalls:
144+
m_Calls: []
145+
m_OnHoverEntered:
146+
m_PersistentCalls:
147+
m_Calls: []
148+
m_OnHoverExited:
149+
m_PersistentCalls:
150+
m_Calls: []
151+
m_OnSelectEntered:
152+
m_PersistentCalls:
153+
m_Calls: []
154+
m_OnSelectExited:
155+
m_PersistentCalls:
156+
m_Calls: []
157+
m_OnSelectCanceled:
158+
m_PersistentCalls:
159+
m_Calls: []
160+
m_OnActivate:
161+
m_PersistentCalls:
162+
m_Calls: []
163+
m_OnDeactivate:
164+
m_PersistentCalls:
165+
m_Calls: []
166+
m_AttachTransform: {fileID: 0}
167+
m_AttachEaseInTime: 0.15
168+
m_MovementType: 1
169+
m_VelocityDamping: 1
170+
m_VelocityScale: 1
171+
m_AngularVelocityDamping: 1
172+
m_AngularVelocityScale: 1
173+
m_TrackPosition: 1
174+
m_SmoothPosition: 0
175+
m_SmoothPositionAmount: 5
176+
m_TightenPosition: 0.5
177+
m_TrackRotation: 1
178+
m_SmoothRotation: 0
179+
m_SmoothRotationAmount: 5
180+
m_TightenRotation: 0.5
181+
m_ThrowOnDetach: 1
182+
m_ThrowSmoothingDuration: 0.25
183+
m_ThrowSmoothingCurve:
184+
serializedVersion: 2
185+
m_Curve:
186+
- serializedVersion: 3
187+
time: 1
188+
value: 1
189+
inSlope: 0
190+
outSlope: 0
191+
tangentMode: 0
192+
weightedMode: 0
193+
inWeight: 0
194+
outWeight: 0
195+
m_PreInfinity: 2
196+
m_PostInfinity: 2
197+
m_RotationOrder: 4
198+
m_ThrowVelocityScale: 1.5
199+
m_ThrowAngularVelocityScale: 1
200+
m_ForceGravityOnDetach: 0
201+
m_RetainTransformParent: 1
202+
m_AttachPointCompatibilityMode: 0
64203
--- !u!1 &2253984036361342218
65204
GameObject:
66205
m_ObjectHideFlags: 0
@@ -116,6 +255,7 @@ MeshRenderer:
116255
m_LightProbeUsage: 1
117256
m_ReflectionProbeUsage: 1
118257
m_RayTracingMode: 2
258+
m_RayTraceProcedural: 0
119259
m_RenderingLayerMask: 1
120260
m_RendererPriority: 0
121261
m_Materials:
@@ -140,6 +280,7 @@ MeshRenderer:
140280
m_SortingLayerID: 0
141281
m_SortingLayer: 0
142282
m_SortingOrder: 0
283+
m_AdditionalVertexStreams: {fileID: 0}
143284
--- !u!1 &2253984036361342220
144285
GameObject:
145286
m_ObjectHideFlags: 0
@@ -195,6 +336,7 @@ MeshRenderer:
195336
m_LightProbeUsage: 1
196337
m_ReflectionProbeUsage: 1
197338
m_RayTracingMode: 2
339+
m_RayTraceProcedural: 0
198340
m_RenderingLayerMask: 1
199341
m_RendererPriority: 0
200342
m_Materials:
@@ -219,6 +361,7 @@ MeshRenderer:
219361
m_SortingLayerID: 0
220362
m_SortingLayer: 0
221363
m_SortingOrder: 0
364+
m_AdditionalVertexStreams: {fileID: 0}
222365
--- !u!1 &2253984036361342222
223366
GameObject:
224367
m_ObjectHideFlags: 0
@@ -230,7 +373,6 @@ GameObject:
230373
- component: {fileID: 2253984036361834798}
231374
- component: {fileID: 2253984036358443276}
232375
- component: {fileID: 2253984036359410636}
233-
- component: {fileID: 8392686631482577799}
234376
m_Layer: 0
235377
m_Name: EA_Items_House_kettle_empty_01a_LOD2
236378
m_TagString: Untagged
@@ -275,6 +417,7 @@ MeshRenderer:
275417
m_LightProbeUsage: 1
276418
m_ReflectionProbeUsage: 1
277419
m_RayTracingMode: 2
420+
m_RayTraceProcedural: 0
278421
m_RenderingLayerMask: 1
279422
m_RendererPriority: 0
280423
m_Materials:
@@ -299,17 +442,4 @@ MeshRenderer:
299442
m_SortingLayerID: 0
300443
m_SortingLayer: 0
301444
m_SortingOrder: 0
302-
--- !u!64 &8392686631482577799
303-
MeshCollider:
304-
m_ObjectHideFlags: 0
305-
m_CorrespondingSourceObject: {fileID: 0}
306-
m_PrefabInstance: {fileID: 0}
307-
m_PrefabAsset: {fileID: 0}
308-
m_GameObject: {fileID: 2253984036361342222}
309-
m_Material: {fileID: 0}
310-
m_IsTrigger: 0
311-
m_Enabled: 1
312-
serializedVersion: 4
313-
m_Convex: 1
314-
m_CookingOptions: 30
315-
m_Mesh: {fileID: 4300000, guid: 64269ae04169bfa4faf3bb8f18263056, type: 3}
445+
m_AdditionalVertexStreams: {fileID: 0}

0 commit comments

Comments
 (0)