Skip to content

Commit f14ab63

Browse files
ciro-unityciro-unity
committed
Music playing
1 parent eff3338 commit f14ab63

29 files changed

+2742
-2065
lines changed

‎UOP1_Project/Assets/Addons/DOTween/Resources/DOTweenSettings.asset

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ MonoBehaviour:
3434
debugMode: 0
3535
debugStoreTargetId: 0
3636
showPreviewPanel: 1
37-
storeSettingsLocation: 0
37+
storeSettingsLocation: 1
3838
modules:
3939
showPanel: 0
4040
audioEnabled: 1
41-
physicsEnabled: 1
42-
physics2DEnabled: 1
43-
spriteEnabled: 1
41+
physicsEnabled: 0
42+
physics2DEnabled: 0
43+
spriteEnabled: 0
4444
uiEnabled: 1
4545
textMeshProEnabled: 0
4646
tk2DEnabled: 0

‎UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4860,6 +4860,11 @@ PrefabInstance:
48604860
propertyPath: m_Pivot.z
48614861
value: 0.21
48624862
objectReference: {fileID: 0}
4863+
- target: {fileID: 1477515282501204458, guid: a75f6395e1487b344a0ffafad66fc95a,
4864+
type: 3}
4865+
propertyPath: m_Materials.Array.size
4866+
value: 1
4867+
objectReference: {fileID: 0}
48634868
- target: {fileID: 2004471342811329788, guid: a75f6395e1487b344a0ffafad66fc95a,
48644869
type: 3}
48654870
propertyPath: m_RootOrder
@@ -5060,6 +5065,11 @@ PrefabInstance:
50605065
propertyPath: m_EnableGPUInstancing
50615066
value: 1
50625067
objectReference: {fileID: 0}
5068+
- target: {fileID: 1477515282501204458, guid: a75f6395e1487b344a0ffafad66fc95a,
5069+
type: 3}
5070+
propertyPath: m_Materials.Array.size
5071+
value: 1
5072+
objectReference: {fileID: 0}
50635073
- target: {fileID: 2004471342811329788, guid: a75f6395e1487b344a0ffafad66fc95a,
50645074
type: 3}
50655075
propertyPath: m_RootOrder

‎UOP1_Project/Assets/Art/Characters/PigChef/Effect/SlashEffect.prefab renamed to ‎UOP1_Project/Assets/Prefabs/Effects/SlashEffect.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ParticleSystem:
4848
ringBufferLoopRange: {x: 0, y: 1}
4949
looping: 1
5050
prewarm: 0
51-
playOnAwake: 1
51+
playOnAwake: 0
5252
useUnscaledTime: 0
5353
autoRandomSeed: 1
5454
useRigidbodyForVelocity: 1

‎UOP1_Project/Assets/Art/Characters/PigChef/Effect/SlashEffect.prefab.meta renamed to ‎UOP1_Project/Assets/Prefabs/Effects/SlashEffect.prefab.meta

File renamed without changes.

‎UOP1_Project/Assets/Prefabs/Gameplay/MusicPlayer.prefab

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &7961433267914593992
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 7961433267914593990}
12+
- component: {fileID: 7961433267914593993}
13+
m_Layer: 0
14+
m_Name: MusicPlayer
15+
m_TagString: Untagged
16+
m_Icon: {fileID: 0}
17+
m_NavMeshLayer: 0
18+
m_StaticEditorFlags: 0
19+
m_IsActive: 1
20+
--- !u!4 &7961433267914593990
21+
Transform:
22+
m_ObjectHideFlags: 0
23+
m_CorrespondingSourceObject: {fileID: 0}
24+
m_PrefabInstance: {fileID: 0}
25+
m_PrefabAsset: {fileID: 0}
26+
m_GameObject: {fileID: 7961433267914593992}
27+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
28+
m_LocalPosition: {x: 0, y: 0, z: 0}
29+
m_LocalScale: {x: 1, y: 1, z: 1}
30+
m_Children: []
31+
m_Father: {fileID: 0}
32+
m_RootOrder: 0
33+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
34+
--- !u!114 &7961433267914593993
35+
MonoBehaviour:
36+
m_ObjectHideFlags: 0
37+
m_CorrespondingSourceObject: {fileID: 0}
38+
m_PrefabInstance: {fileID: 0}
39+
m_PrefabAsset: {fileID: 0}
40+
m_GameObject: {fileID: 7961433267914593992}
41+
m_Enabled: 1
42+
m_EditorHideFlags: 0
43+
m_Script: {fileID: 11500000, guid: 6bac00fb906d5ce448625eccf4aa04ec, type: 3}
44+
m_Name:
45+
m_EditorClassIdentifier:
46+
_onSceneReady: {fileID: 11400000, guid: b729e40fc41dd8b4ea7aaf5c857f7186, type: 2}
47+
_playMusicOn: {fileID: 11400000, guid: 51854f522e1d88442a90b878b27ea839, type: 2}
48+
_thisSceneSO: {fileID: 0}
49+
_audioConfig: {fileID: 11400000, guid: 7dc92129d2e4ae84dabc197b593ba446, type: 2}

‎UOP1_Project/Assets/Prefabs/Gameplay/MusicPlayer.prefab.meta

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

‎UOP1_Project/Assets/Prefabs/Props/Door.prefab

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,42 +22,42 @@ PrefabInstance:
2222
m_Modifications:
2323
- target: {fileID: -8679921383154817045, guid: 9c8891bc8ed142f4c93999c69eb6f4dc,
2424
type: 3}
25-
propertyPath: m_LocalPosition.x
25+
propertyPath: m_RootOrder
2626
value: 0
2727
objectReference: {fileID: 0}
2828
- target: {fileID: -8679921383154817045, guid: 9c8891bc8ed142f4c93999c69eb6f4dc,
2929
type: 3}
30-
propertyPath: m_LocalPosition.y
30+
propertyPath: m_LocalPosition.x
3131
value: 0
3232
objectReference: {fileID: 0}
3333
- target: {fileID: -8679921383154817045, guid: 9c8891bc8ed142f4c93999c69eb6f4dc,
3434
type: 3}
35-
propertyPath: m_LocalPosition.z
35+
propertyPath: m_LocalPosition.y
3636
value: 0
3737
objectReference: {fileID: 0}
3838
- target: {fileID: -8679921383154817045, guid: 9c8891bc8ed142f4c93999c69eb6f4dc,
3939
type: 3}
40-
propertyPath: m_LocalRotation.x
40+
propertyPath: m_LocalPosition.z
4141
value: 0
4242
objectReference: {fileID: 0}
4343
- target: {fileID: -8679921383154817045, guid: 9c8891bc8ed142f4c93999c69eb6f4dc,
4444
type: 3}
45-
propertyPath: m_LocalRotation.y
46-
value: 0
45+
propertyPath: m_LocalRotation.w
46+
value: 1
4747
objectReference: {fileID: 0}
4848
- target: {fileID: -8679921383154817045, guid: 9c8891bc8ed142f4c93999c69eb6f4dc,
4949
type: 3}
50-
propertyPath: m_LocalRotation.z
50+
propertyPath: m_LocalRotation.x
5151
value: 0
5252
objectReference: {fileID: 0}
5353
- target: {fileID: -8679921383154817045, guid: 9c8891bc8ed142f4c93999c69eb6f4dc,
5454
type: 3}
55-
propertyPath: m_LocalRotation.w
56-
value: 1
55+
propertyPath: m_LocalRotation.y
56+
value: 0
5757
objectReference: {fileID: 0}
5858
- target: {fileID: -8679921383154817045, guid: 9c8891bc8ed142f4c93999c69eb6f4dc,
5959
type: 3}
60-
propertyPath: m_RootOrder
60+
propertyPath: m_LocalRotation.z
6161
value: 0
6262
objectReference: {fileID: 0}
6363
- target: {fileID: -8679921383154817045, guid: 9c8891bc8ed142f4c93999c69eb6f4dc,
@@ -88,7 +88,7 @@ PrefabInstance:
8888
- target: {fileID: 919132149155446097, guid: 9c8891bc8ed142f4c93999c69eb6f4dc,
8989
type: 3}
9090
propertyPath: m_StaticEditorFlags
91-
value: 4294967295
91+
value: 123
9292
objectReference: {fileID: 0}
9393
m_RemovedComponents: []
9494
m_SourcePrefab: {fileID: 100100000, guid: 9c8891bc8ed142f4c93999c69eb6f4dc, type: 3}

‎UOP1_Project/Assets/Prefabs/TownStructures/VillageHouse_Big.prefab

Lines changed: 104 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ PrefabInstance:
7272
m_Modification:
7373
m_TransformParent: {fileID: 0}
7474
m_Modifications:
75+
- target: {fileID: -8679921383154817045, guid: 736e23a0df4a27a46bd59ebce4bc3241,
76+
type: 3}
77+
propertyPath: m_RootOrder
78+
value: 0
79+
objectReference: {fileID: 0}
7580
- target: {fileID: -8679921383154817045, guid: 736e23a0df4a27a46bd59ebce4bc3241,
7681
type: 3}
7782
propertyPath: m_LocalPosition.x
@@ -87,6 +92,11 @@ PrefabInstance:
8792
propertyPath: m_LocalPosition.z
8893
value: 0
8994
objectReference: {fileID: 0}
95+
- target: {fileID: -8679921383154817045, guid: 736e23a0df4a27a46bd59ebce4bc3241,
96+
type: 3}
97+
propertyPath: m_LocalRotation.w
98+
value: 1
99+
objectReference: {fileID: 0}
90100
- target: {fileID: -8679921383154817045, guid: 736e23a0df4a27a46bd59ebce4bc3241,
91101
type: 3}
92102
propertyPath: m_LocalRotation.x
@@ -102,16 +112,6 @@ PrefabInstance:
102112
propertyPath: m_LocalRotation.z
103113
value: -0
104114
objectReference: {fileID: 0}
105-
- target: {fileID: -8679921383154817045, guid: 736e23a0df4a27a46bd59ebce4bc3241,
106-
type: 3}
107-
propertyPath: m_LocalRotation.w
108-
value: 1
109-
objectReference: {fileID: 0}
110-
- target: {fileID: -8679921383154817045, guid: 736e23a0df4a27a46bd59ebce4bc3241,
111-
type: 3}
112-
propertyPath: m_RootOrder
113-
value: 0
114-
objectReference: {fileID: 0}
115115
- target: {fileID: -8679921383154817045, guid: 736e23a0df4a27a46bd59ebce4bc3241,
116116
type: 3}
117117
propertyPath: m_LocalEulerAnglesHint.x
@@ -139,13 +139,13 @@ PrefabInstance:
139139
objectReference: {fileID: 0}
140140
- target: {fileID: 919132149155446097, guid: 736e23a0df4a27a46bd59ebce4bc3241,
141141
type: 3}
142-
propertyPath: m_StaticEditorFlags
143-
value: 4294967295
142+
propertyPath: m_Layer
143+
value: 11
144144
objectReference: {fileID: 0}
145145
- target: {fileID: 919132149155446097, guid: 736e23a0df4a27a46bd59ebce4bc3241,
146146
type: 3}
147-
propertyPath: m_Layer
148-
value: 11
147+
propertyPath: m_StaticEditorFlags
148+
value: 4294967295
149149
objectReference: {fileID: 0}
150150
m_RemovedComponents: []
151151
m_SourcePrefab: {fileID: 100100000, guid: 736e23a0df4a27a46bd59ebce4bc3241, type: 3}
@@ -155,3 +155,93 @@ GameObject:
155155
type: 3}
156156
m_PrefabInstance: {fileID: 3675138951147787715}
157157
m_PrefabAsset: {fileID: 0}
158+
--- !u!4 &3785853945849639464 stripped
159+
Transform:
160+
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 736e23a0df4a27a46bd59ebce4bc3241,
161+
type: 3}
162+
m_PrefabInstance: {fileID: 3675138951147787715}
163+
m_PrefabAsset: {fileID: 0}
164+
--- !u!1001 &5173613188804942660
165+
PrefabInstance:
166+
m_ObjectHideFlags: 0
167+
serializedVersion: 2
168+
m_Modification:
169+
m_TransformParent: {fileID: 3785853945849639464}
170+
m_Modifications:
171+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
172+
type: 3}
173+
propertyPath: m_RootOrder
174+
value: 0
175+
objectReference: {fileID: 0}
176+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
177+
type: 3}
178+
propertyPath: m_LocalScale.x
179+
value: 1.0791
180+
objectReference: {fileID: 0}
181+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
182+
type: 3}
183+
propertyPath: m_LocalScale.y
184+
value: 1.0791
185+
objectReference: {fileID: 0}
186+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
187+
type: 3}
188+
propertyPath: m_LocalScale.z
189+
value: 1.0791
190+
objectReference: {fileID: 0}
191+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
192+
type: 3}
193+
propertyPath: m_LocalPosition.x
194+
value: 0.55849
195+
objectReference: {fileID: 0}
196+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
197+
type: 3}
198+
propertyPath: m_LocalPosition.y
199+
value: -0.141
200+
objectReference: {fileID: 0}
201+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
202+
type: 3}
203+
propertyPath: m_LocalPosition.z
204+
value: 5.375
205+
objectReference: {fileID: 0}
206+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
207+
type: 3}
208+
propertyPath: m_LocalRotation.w
209+
value: 1
210+
objectReference: {fileID: 0}
211+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
212+
type: 3}
213+
propertyPath: m_LocalRotation.x
214+
value: 0
215+
objectReference: {fileID: 0}
216+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
217+
type: 3}
218+
propertyPath: m_LocalRotation.y
219+
value: 0
220+
objectReference: {fileID: 0}
221+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
222+
type: 3}
223+
propertyPath: m_LocalRotation.z
224+
value: 0
225+
objectReference: {fileID: 0}
226+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
227+
type: 3}
228+
propertyPath: m_LocalEulerAnglesHint.x
229+
value: 0
230+
objectReference: {fileID: 0}
231+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
232+
type: 3}
233+
propertyPath: m_LocalEulerAnglesHint.y
234+
value: 0
235+
objectReference: {fileID: 0}
236+
- target: {fileID: 6267067302269190673, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
237+
type: 3}
238+
propertyPath: m_LocalEulerAnglesHint.z
239+
value: 0
240+
objectReference: {fileID: 0}
241+
- target: {fileID: 6751678888415910059, guid: 4c22401c0ede54b4b85cd2d15c17c16d,
242+
type: 3}
243+
propertyPath: m_Name
244+
value: Door
245+
objectReference: {fileID: 0}
246+
m_RemovedComponents: []
247+
m_SourcePrefab: {fileID: 100100000, guid: 4c22401c0ede54b4b85cd2d15c17c16d, type: 3}

0 commit comments

Comments
 (0)