Skip to content

Commit

Permalink
Couple of fixes, new additions.
Browse files Browse the repository at this point in the history
* Added Gene asset along with proper rotation.
* CellDivision's title informs that the animation can be paused/continued.
* QuizScene fixes, timer increased to 100s.
* WelcomScreen => WelcomeScene
  • Loading branch information
bqubique committed Aug 24, 2019
1 parent 8469963 commit 55bf087
Show file tree
Hide file tree
Showing 17 changed files with 531 additions and 260 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ Icon?
ehthumbs.db
Thumbs.db
Summer Project/New folder/Summer Project_Data/sharedassets1.assets.resS
*.apk
Binary file modified Summer Project/.vs/Summer Project/v16/Server/sqlite3/storage.ide
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Summer Project/Assets/Prefab/gene.blend
Binary file not shown.
127 changes: 127 additions & 0 deletions Summer Project/Assets/Prefab/gene.blend.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Summer Project/Assets/Prefab/gene.blend1
Binary file not shown.
7 changes: 7 additions & 0 deletions Summer Project/Assets/Prefab/gene.blend1.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions Summer Project/Assets/Scenes/CellDivisionScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -2422,7 +2422,10 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: (Turn head for additional information)
m_Text: '(Turn head for additional information)
(Gaze to Pause/Continue the
animation)'
--- !u!222 &1478129704
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3760,15 +3763,15 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1927026607}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -6.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 93170505}
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: -43.1, y: 128.1}
m_AnchoredPosition: {x: -1, y: 128.1}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1927026609
Expand Down
52 changes: 50 additions & 2 deletions Summer Project/Assets/Scenes/QuizScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -7839,7 +7839,7 @@ GameObject:
- component: {fileID: 652268747}
- component: {fileID: 652268742}
m_Layer: 5
m_Name: D
m_Name: FifteenthQD
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -18318,6 +18318,7 @@ GameObject:
- component: {fileID: 1480719498}
- component: {fileID: 1480719497}
- component: {fileID: 1480719496}
- component: {fileID: 1480719495}
- component: {fileID: 1480719494}
m_Layer: 5
m_Name: CellDivisionButton
Expand Down Expand Up @@ -18359,6 +18360,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
animator: {fileID: 0}
--- !u!114 &1480719495
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1480719492}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dd85d9c80668268499e6d8ce0e32906e, type: 3}
m_Name:
m_EditorClassIdentifier:
gazeTime: 2
--- !u!114 &1480719496
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -18372,7 +18386,41 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Delegates:
- eventID: 4
- eventID: 0
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1480719495}
m_MethodName: PointerEnter
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, Unity.ugui,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- eventID: 1
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1480719495}
m_MethodName: PointerExit
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, Unity.ugui,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- eventID: 2
callback:
m_PersistentCalls:
m_Calls:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &75956056
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2756,7 +2756,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Whatever
m_Text: Bio-VR
--- !u!222 &1790634847
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit 55bf087

Please sign in to comment.