Commit 2206e6f6 authored by Gerard Gascón's avatar Gerard Gascón
Browse files

Menu

parent 0afd388d
Loading
Loading
Loading
Loading
+4691 −0

File added.

Preview size limit exceeded, changes collapsed.

+7 −0
Original line number Diff line number Diff line
fileFormatVersion: 2
guid: c104073a7b42b32438c45e58a9b099fd
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
+210 −9
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ RectTransform:
  m_Children:
  - {fileID: 812780872}
  m_Father: {fileID: 1370797025}
  m_RootOrder: 2
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@@ -939,6 +939,191 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &297793552
GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
  - component: {fileID: 297793553}
  - component: {fileID: 297793556}
  - component: {fileID: 297793555}
  - component: {fileID: 297793554}
  m_Layer: 5
  m_Name: OrbEffect
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!224 &297793553
RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 297793552}
  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: 1370797025}
  m_RootOrder: 1
  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: -52.98004, y: -30.540009}
  m_SizeDelta: {x: 129, y: 129}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &297793554
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 297793552}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 4d0390bd8b8ffd640b34fe25065ff1df, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  updateType: 0
  isSpeedBased: 0
  hasOnStart: 0
  hasOnPlay: 0
  hasOnUpdate: 0
  hasOnStepComplete: 0
  hasOnComplete: 0
  hasOnTweenCreated: 0
  hasOnRewind: 0
  onStart:
    m_PersistentCalls:
      m_Calls: []
  onPlay:
    m_PersistentCalls:
      m_Calls: []
  onUpdate:
    m_PersistentCalls:
      m_Calls: []
  onStepComplete:
    m_PersistentCalls:
      m_Calls: []
  onComplete:
    m_PersistentCalls:
      m_Calls: []
  onTweenCreated:
    m_PersistentCalls:
      m_Calls: []
  onRewind:
    m_PersistentCalls:
      m_Calls: []
  targetIsSelf: 1
  targetGO: {fileID: 0}
  tweenTargetIsTargetGO: 1
  delay: 0
  duration: 0.2
  easeType: 3
  easeCurve:
    serializedVersion: 2
    m_Curve:
    - serializedVersion: 3
      time: 0
      value: 0
      inSlope: 0
      outSlope: 0
      tangentMode: 0
      weightedMode: 0
      inWeight: 0
      outWeight: 0
    - serializedVersion: 3
      time: 1
      value: 1
      inSlope: 0
      outSlope: 0
      tangentMode: 0
      weightedMode: 0
      inWeight: 0
      outWeight: 0
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
  loopType: 1
  loops: 6
  id: 
  isRelative: 0
  isFrom: 0
  isIndependentUpdate: 0
  autoKill: 0
  autoGenerate: 1
  isActive: 1
  isValid: 1
  target: {fileID: 297793555}
  animationType: 6
  targetType: 3
  forcedTargetType: 0
  autoPlay: 0
  useTargetAsV3: 0
  endValueFloat: 0
  endValueV3: {x: 0, y: 0, z: 0}
  endValueV2: {x: 0, y: 0}
  endValueColor: {r: 1, g: 1, b: 1, a: 1}
  endValueString: 
  endValueRect:
    serializedVersion: 2
    x: 0
    y: 0
    width: 0
    height: 0
  endValueTransform: {fileID: 0}
  optionalBool0: 0
  optionalBool1: 0
  optionalFloat0: 0
  optionalInt0: 0
  optionalRotationMode: 0
  optionalScrambleMode: 0
  optionalShakeRandomnessMode: 0
  optionalString: 
--- !u!114 &297793555
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 297793552}
  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: 0}
  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: -1609888811, guid: 1ef1fd4fbc853144eab181587d5215bb, 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 &297793556
CanvasRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 297793552}
  m_CullTransparentMesh: 1
--- !u!1 &330676469
GameObject:
  m_ObjectHideFlags: 0
@@ -1406,10 +1591,10 @@ Camera:
  m_FocalLength: 50
  m_NormalizedViewPortRect:
    serializedVersion: 2
    x: 0
    y: 0.11260443
    width: 1.0001326
    height: 0.7751407
    x: 0.07075263
    y: 0
    width: 0.85809964
    height: 0.999636
  near clip plane: 0.3
  far clip plane: 1000
  field of view: 60
@@ -1662,6 +1847,16 @@ MonoBehaviour:
  - {fileID: -1525447582, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: -1485784765, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  orb: {fileID: 289659549}
  effectTween: {fileID: 297793554}
  effectSprites:
  - {fileID: -682186426, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: -1609888811, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: 744122819, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: 1331039647, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: 1878816271, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: -1185485329, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: 1202495537, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: -635847680, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
--- !u!1 &665049830
GameObject:
  m_ObjectHideFlags: 0
@@ -2448,9 +2643,14 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  speed: 10
  acceleration: 0.05
  airAcceleration: 0.1
  iceAcceleration: 0.1
  flipSmooth: 0.05
  jumpForce: 35
  gradualJumpMultiplier: 0.5
  iceMask:
    serializedVersion: 2
    m_Bits: 0
  groundMask:
    serializedVersion: 2
    m_Bits: 8
@@ -2610,7 +2810,7 @@ RectTransform:
  - {fileID: 1916131742}
  - {fileID: 757602103}
  m_Father: {fileID: 1370797025}
  m_RootOrder: 1
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@@ -14418,7 +14618,7 @@ BoxCollider2D:
  m_Offset: {x: 0, y: -0.24}
  m_SpriteTilingProperty:
    border: {x: 0, y: 0, z: 0, w: 0}
    pivot: {x: 0.5, y: 0.5}
    pivot: {x: 0.5, y: 0}
    oldSize: {x: 6, y: 1.5625}
    newSize: {x: 6, y: 1.5625}
    adaptiveTilingThreshold: 0.5
@@ -14444,7 +14644,7 @@ BoxCollider2D:
  m_Offset: {x: 0, y: 0.11919844}
  m_SpriteTilingProperty:
    border: {x: 0, y: 0, z: 0, w: 0}
    pivot: {x: 0.5, y: 0.5}
    pivot: {x: 0.5, y: 0}
    oldSize: {x: 6, y: 1.5625}
    newSize: {x: 6, y: 1.5625}
    adaptiveTilingThreshold: 0.5
@@ -14504,6 +14704,7 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 289659548}
  - {fileID: 297793553}
  - {fileID: 909280805}
  - {fileID: 183667943}
  m_Father: {fileID: 620965871}
@@ -14511,7 +14712,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 1}
  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 19.999878, y: 0}
  m_AnchoredPosition: {x: 19.999908, y: 0}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 1, y: 1}
--- !u!1 &1477198635
+201 −5
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ RectTransform:
  m_Children:
  - {fileID: 812780872}
  m_Father: {fileID: 1370797025}
  m_RootOrder: 2
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1677,10 +1677,10 @@ Camera:
  m_FocalLength: 50
  m_NormalizedViewPortRect:
    serializedVersion: 2
    x: 0.28634554
    x: 0.07075263
    y: 0
    width: 0.43249375
    height: 0.5030876
    width: 0.85809964
    height: 0.999636
  near clip plane: 0.3
  far clip plane: 1000
  field of view: 60
@@ -1933,6 +1933,16 @@ MonoBehaviour:
  - {fileID: -1525447582, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: -1485784765, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  orb: {fileID: 289659549}
  effectTween: {fileID: 1035798853}
  effectSprites:
  - {fileID: -682186426, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: -1609888811, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: 744122819, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: 1331039647, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: 1878816271, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: -1185485329, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: 1202495537, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
  - {fileID: -635847680, guid: 1ef1fd4fbc853144eab181587d5215bb, type: 3}
--- !u!1 &665049830
GameObject:
  m_ObjectHideFlags: 0
@@ -2901,7 +2911,7 @@ RectTransform:
  - {fileID: 1916131742}
  - {fileID: 757602103}
  m_Father: {fileID: 1370797025}
  m_RootOrder: 1
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3201,6 +3211,191 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1035798852
GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
  - component: {fileID: 1035798856}
  - component: {fileID: 1035798855}
  - component: {fileID: 1035798854}
  - component: {fileID: 1035798853}
  m_Layer: 5
  m_Name: OrbEffect
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!114 &1035798853
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1035798852}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 4d0390bd8b8ffd640b34fe25065ff1df, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  updateType: 0
  isSpeedBased: 0
  hasOnStart: 0
  hasOnPlay: 0
  hasOnUpdate: 0
  hasOnStepComplete: 0
  hasOnComplete: 0
  hasOnTweenCreated: 0
  hasOnRewind: 0
  onStart:
    m_PersistentCalls:
      m_Calls: []
  onPlay:
    m_PersistentCalls:
      m_Calls: []
  onUpdate:
    m_PersistentCalls:
      m_Calls: []
  onStepComplete:
    m_PersistentCalls:
      m_Calls: []
  onComplete:
    m_PersistentCalls:
      m_Calls: []
  onTweenCreated:
    m_PersistentCalls:
      m_Calls: []
  onRewind:
    m_PersistentCalls:
      m_Calls: []
  targetIsSelf: 1
  targetGO: {fileID: 0}
  tweenTargetIsTargetGO: 1
  delay: 0
  duration: 0.2
  easeType: 3
  easeCurve:
    serializedVersion: 2
    m_Curve:
    - serializedVersion: 3
      time: 0
      value: 0
      inSlope: 0
      outSlope: 0
      tangentMode: 0
      weightedMode: 0
      inWeight: 0
      outWeight: 0
    - serializedVersion: 3
      time: 1
      value: 1
      inSlope: 0
      outSlope: 0
      tangentMode: 0
      weightedMode: 0
      inWeight: 0
      outWeight: 0
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
  loopType: 1
  loops: 6
  id: 
  isRelative: 0
  isFrom: 0
  isIndependentUpdate: 0
  autoKill: 0
  autoGenerate: 1
  isActive: 1
  isValid: 1
  target: {fileID: 1035798854}
  animationType: 6
  targetType: 3
  forcedTargetType: 0
  autoPlay: 0
  useTargetAsV3: 0
  endValueFloat: 0
  endValueV3: {x: 0, y: 0, z: 0}
  endValueV2: {x: 0, y: 0}
  endValueColor: {r: 1, g: 1, b: 1, a: 1}
  endValueString: 
  endValueRect:
    serializedVersion: 2
    x: 0
    y: 0
    width: 0
    height: 0
  endValueTransform: {fileID: 0}
  optionalBool0: 0
  optionalBool1: 0
  optionalFloat0: 0
  optionalInt0: 0
  optionalRotationMode: 0
  optionalScrambleMode: 0
  optionalShakeRandomnessMode: 0
  optionalString: 
--- !u!114 &1035798854
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1035798852}
  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: 0}
  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: -1609888811, guid: 1ef1fd4fbc853144eab181587d5215bb, 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 &1035798855
CanvasRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1035798852}
  m_CullTransparentMesh: 1
--- !u!224 &1035798856
RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1035798852}
  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: 1370797025}
  m_RootOrder: 1
  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: -52.98004, y: -30.540009}
  m_SizeDelta: {x: 129, y: 129}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1042319006
GameObject:
  m_ObjectHideFlags: 0
@@ -14825,6 +15020,7 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 289659548}
  - {fileID: 1035798856}
  - {fileID: 909280805}
  - {fileID: 183667943}
  m_Father: {fileID: 620965871}
+10 −11
Original line number Diff line number Diff line
@@ -9,15 +9,15 @@ using Random = UnityEngine.Random;

[System.Serializable]
public enum OrbTypes {
	None,
	Blue,
	Red,
	Purple,
	InvertedControls,
	HighGravity,
	LowGravity,
	DarkRoom,
	Freeze
	None = 0,
	Blue = 1,
	Red = 2,
	Purple = 3,
	InvertedControls = 4,
	HighGravity = 5,
	LowGravity = 6,
	DarkRoom = 7,
	Freeze = 8
};

public class GameManager : MonoBehaviour {
@@ -36,9 +36,8 @@ public class GameManager : MonoBehaviour {

	public OrbTypes SelectRandomEffect() {
		OrbTypes selected;
		Array values = Enum.GetValues(typeof(OrbTypes));
		do {
			selected = (OrbTypes)values.GetValue(Random.Range(1, values.Length));
			selected = (OrbTypes)Random.Range(1, 9);
		} while (selected == currentType || selected == _lastType);
		
		ChangeEventCall(selected);
Loading