Skip to content

Commit

Permalink
Some bug fixed and added an iframe
Browse files Browse the repository at this point in the history
  • Loading branch information
@MohamedMediouni1
MohamedMediouni1 committed Apr 18, 2024
1 parent 8d327b0 commit 186b561
Show file tree
Hide file tree
Showing 10 changed files with 422 additions and 112 deletions.
5 changes: 5 additions & 0 deletions Assets/Prefab/Cricle.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ MonoBehaviour:
damage: 2
HealthEnemy: 10
healthEnemy: 0
normalSprite: {fileID: 21300000, guid: 2efcebf740a582d48928dbbf65999a91, type: 3}
damageSprite: {fileID: 21300000, guid: 294241d1ceb77b34ba76362e925e84be, type: 3}
switchDuration: 2
numberflashes: 1
triggerCollider: {fileID: 0}
--- !u!58 &4447989192854877252
CircleCollider2D:
m_ObjectHideFlags: 0
Expand Down
160 changes: 83 additions & 77 deletions Assets/Scenes/InfiniteLevel.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,87 @@ MonoBehaviour:
m_CameraActivatedEvent:
m_PersistentCalls:
m_Calls: []
--- !u!1001 &862988331
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -2253911629886400664, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_Name
value: Border
objectReference: {fileID: 0}
- target: {fileID: 3626916397498700004, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_Color.a
value: 0.4745098
objectReference: {fileID: 0}
- target: {fileID: 3626916397498700004, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_Color.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3626916397498700004, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_Color.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3626916397498700004, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_Color.r
value: 0.31132078
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalScale.x
value: 28.962648
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalScale.y
value: 28.04475
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalPosition.x
value: -27.855
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalPosition.y
value: -15.6982
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: -8435245712485981826, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
--- !u!1 &950780660
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1405,81 +1486,6 @@ MonoBehaviour:
_data:
_json: '{"declarations":{"Kind":"Object","collection":{"$content":[],"$version":"A"},"$version":"A"}}'
_objectReferences: []
--- !u!1 &1152552286
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1152552287}
- component: {fileID: 1152552289}
- component: {fileID: 1152552288}
m_Layer: 0
m_Name: Border
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1152552287
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1152552286}
m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 10, y: 10, z: 0}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1698763251}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
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: 192, y: 108}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1152552288
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1152552286}
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: -2322861907171196785, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1152552289
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1152552286}
m_CullTransparentMesh: 1
--- !u!1 &1164034022
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2499,8 +2505,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1152552287}
m_Children: []
m_Father: {fileID: 848918908}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
Expand Down Expand Up @@ -2628,6 +2633,7 @@ SceneRoots:
- {fileID: 848918908}
- {fileID: 359879667}
- {fileID: 1617079787}
- {fileID: 862988331}
- {fileID: 1408220281}
- {fileID: 1098831159}
- {fileID: 1414797020}
Expand Down
90 changes: 87 additions & 3 deletions Assets/Scenes/Level1.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1387,8 +1387,10 @@ MonoBehaviour:
player: {fileID: 566547416}
normalSprite: {fileID: 21300000, guid: d0f98af95b872424dba65997edfea52e, type: 3}
damageSprite: {fileID: 21300000, guid: ed91acabae34a1044845194e21a052e6, type: 3}
switchDuration: 0.5
switchDuration: 2
numberflashes: 1
playerRB: {fileID: 566547419}
triggerCollider: {fileID: 566547418}
--- !u!114 &566547426
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1714,7 +1716,7 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
Expand Down Expand Up @@ -2658,7 +2660,7 @@ Transform:
m_GameObject: {fileID: 1408220279}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -13.66, y: 7.14, z: 0}
m_LocalPosition: {x: -1.59, y: -2.13, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -3136,6 +3138,87 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1549939620}
m_CullTransparentMesh: 1
--- !u!1001 &1591367992
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -2253911629886400664, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_Name
value: Border
objectReference: {fileID: 0}
- target: {fileID: 3626916397498700004, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_Color.a
value: 0.4745098
objectReference: {fileID: 0}
- target: {fileID: 3626916397498700004, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_Color.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3626916397498700004, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_Color.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3626916397498700004, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_Color.r
value: 0.31132078
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalScale.x
value: 28.962648
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalScale.y
value: 28.04475
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalPosition.x
value: -27.855
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalPosition.y
value: -15.6982
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7878350319992209165, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: -8435245712485981826, guid: b5ff923ebef78584d974be26b7bfa90a, type: 3}
--- !u!1 &1595578240
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3606,3 +3689,4 @@ SceneRoots:
- {fileID: 566547423}
- {fileID: 1037033357}
- {fileID: 528116449}
- {fileID: 1591367992}
Loading

0 comments on commit 186b561

Please sign in to comment.