Merge remote-tracking branch 'origin/work_branch' into savya
# Conflicts: # Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold SDF.asset # Assets/Darkmatter/Scenes/GamePlay.unity
This commit is contained in:
Savya Bikram Shah
File diff suppressed because one or more lines are too long
@@ -354,6 +354,7 @@ RectTransform:
|
||||
- {fileID: 1518670451}
|
||||
- {fileID: 1989194441}
|
||||
- {fileID: 153461769}
|
||||
- {fileID: 1340226039}
|
||||
m_Father: {fileID: 2069155641}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@@ -1394,8 +1395,6 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Features.GameplayFlow::Darkmatter.Features.GameplayFlow.GameplayFlowFeatureModule
|
||||
sceneRefs: {fileID: 396806867}
|
||||
nextButtonView: {fileID: 259035382}
|
||||
backButtonView: {fileID: 1130088203}
|
||||
--- !u!1 &1129540368
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1638,6 +1637,90 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Features.GameplayFlow::Darkmatter.Features.GameplayFlow.UI.BackButtonView
|
||||
backButton: {fileID: 1130088200}
|
||||
--- !u!1001 &1141121864
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1340226039}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1578469459646218, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ConfettiExplosionHalloween
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4822057081232402, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4822057081232402, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4822057081232402, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4822057081232402, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4822057081232402, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4822057081232402, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4822057081232402, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4822057081232402, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4822057081232402, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4822057081232402, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 199137177167099770, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 199137177167099770, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_Materials.Array.size
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 199970326979024200, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
--- !u!4 &1141121865 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4822057081232402, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
m_PrefabInstance: {fileID: 1141121864}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!198 &1141121866 stripped
|
||||
ParticleSystem:
|
||||
m_CorrespondingSourceObject: {fileID: 198799323246219528, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
m_PrefabInstance: {fileID: 1141121864}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!198 &1141121867 stripped
|
||||
ParticleSystem:
|
||||
m_CorrespondingSourceObject: {fileID: 198479350452278120, guid: 0d57e66d7df915b4aabb02005dd9f8b1, type: 3}
|
||||
m_PrefabInstance: {fileID: 1141121864}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1143672389
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2111,6 +2194,89 @@ MonoBehaviour:
|
||||
undoButton: {fileID: 2058063739}
|
||||
redoButton: {fileID: 0}
|
||||
clearButton: {fileID: 1982732273}
|
||||
--- !u!1 &1340226038
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1340226039}
|
||||
- component: {fileID: 1340226041}
|
||||
- component: {fileID: 1340226040}
|
||||
m_Layer: 5
|
||||
m_Name: Confetti
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1340226039
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1340226038}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1141121865}
|
||||
m_Father: {fileID: 201822947}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1340226040
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1340226038}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Coffee.UIParticle::Coffee.UIExtensions.UIParticle
|
||||
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_IsTrail: 0
|
||||
m_IgnoreCanvasScaler: 0
|
||||
m_AbsoluteMode: 0
|
||||
m_Scale3D: {x: 500, y: 500, z: 500}
|
||||
m_AnimatableProperties: []
|
||||
m_Particles:
|
||||
- {fileID: 1141121867}
|
||||
- {fileID: 1141121866}
|
||||
m_MeshSharing: 0
|
||||
m_GroupId: 0
|
||||
m_GroupMaxId: 0
|
||||
m_PositionMode: 0
|
||||
m_AutoScaling: 0
|
||||
m_AutoScalingMode: 2
|
||||
m_UseCustomView: 0
|
||||
m_CustomViewSize: 10
|
||||
m_TimeScaleMultiplier: 1
|
||||
--- !u!222 &1340226041
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1340226038}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1351490753
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2768,8 +2934,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: Artbook
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: dde468a43b0440f4a9d121fb1d8f290e, type: 2}
|
||||
m_sharedMaterial: {fileID: -1548830327015913602, guid: dde468a43b0440f4a9d121fb1d8f290e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
||||
Reference in New Issue
Block a user