fums/ofb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed cymbal bugs

Browse Source 
sound no longer breaks (separate game object for sound), ui updated
This commit is contained in:
Sam
2023-05-05 12:24:04 -07:00
parent d3dfe2acac
commit 6131bc7ca1
5 changed files with 306 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
Assets/Scenes/MushroomForest.unity
View File

@@ -1166,27 +1166,15 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4599587890505526274, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3}
propertyPath: cymbalBackground
value:
objectReference: {fileID: 1012187118}
- target: {fileID: 4891107602615669430, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3}
propertyPath: m_Name
value: GameUICanvas
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3}
insertIndex: -1
addedObject: {fileID: 1012187119}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3}
--- !u!224 &404810524 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1885684100209428912, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3}
m_PrefabInstance: {fileID: 404810523}
m_PrefabAsset: {fileID: 0}
--- !u!1 &440397384
GameObject:
m_ObjectHideFlags: 0
@@ -1768,83 +1756,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3}
--- !u!1 &1012187118
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1012187119}
- component: {fileID: 1012187121}
- component: {fileID: 1012187120}
m_Layer: 5
m_Name: cymbal_UI_background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1012187119
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1012187118}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1249842840}
m_Father: {fileID: 404810524}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -298.1, y: -60}
m_SizeDelta: {x: 65, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1012187120
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1012187118}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 63a3d46853315bc328c2f7cb7734498c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1012187121
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1012187118}
m_CullTransparentMesh: 1
--- !u!1 &1053911357
GameObject:
m_ObjectHideFlags: 0
@@ -5542,82 +5453,6 @@ Tilemap:
e31: 0
e32: 0
e33: 1
--- !u!1 &1249842839
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1249842840}
- component: {fileID: 1249842842}
- component: {fileID: 1249842841}
m_Layer: 5
m_Name: cymbal_UI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1249842840
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1249842839}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1012187119}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -32.5, y: -32.499992}
m_SizeDelta: {x: 61, y: 61}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1249842841
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1249842839}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 63a3d46853315bc328c2f7cb7734498c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1249842842
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1249842839}
m_CullTransparentMesh: 1
--- !u!1001 &1253957776
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5691,10 +5526,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3893791749692807526, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: cymbalSound
value:
objectReference: {fileID: 8300000, guid: f37bef8154eaa8adcbf8a6527c653b0b, type: 3}
- target: {fileID: 5885597207104481986, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
propertyPath: m_RootOrder
value: 6
@@ -9125,7 +8956,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 63
m_TileSpriteIndex: 46
m_TileSpriteIndex: 47
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -9145,7 +8976,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 57
m_TileSpriteIndex: 45
m_TileSpriteIndex: 46
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -9205,7 +9036,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 56
m_TileSpriteIndex: 44
m_TileSpriteIndex: 45
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -9225,7 +9056,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 55
m_TileSpriteIndex: 43
m_TileSpriteIndex: 44
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -9480,6 +9311,8 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 1924854431, guid: 6d23faee729f0597ca5ce6f9aa53adcd, type: 3}
- m_RefCount: 1
@@ -9488,8 +9321,6 @@ Tilemap:
m_Data: {fileID: 403321508, guid: 6d23faee729f0597ca5ce6f9aa53adcd, type: 3}
- m_RefCount: 1
m_Data: {fileID: 764218110, guid: 6d23faee729f0597ca5ce6f9aa53adcd, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: -2110219687, guid: 6d23faee729f0597ca5ce6f9aa53adcd, type: 3}
- m_RefCount: 1