Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Body namespace #25

Merged
merged 6 commits into from
Sep 27, 2022
Merged

Body namespace #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41e9712
refactor: blood glucose to body namespace
cirillom Sep 27, 2022
461663f
refactor: water to body namespace
cirillom Sep 27, 2022
bb2ebd5
refactor: weight to body namespace
cirillom Sep 27, 2022
3c1674a
refactor: heart to body namespace
cirillom Sep 27, 2022
fb533f0
refactor: heart to body namespace
cirillom Sep 27, 2022
aae90d2
refactor: character creator to body namespace
cirillom Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions unity-project/Assets/Scenes/CharacterSelection.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,13 +903,13 @@ MonoBehaviour:
m_GameObject: {fileID: 217245810}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6d7e21a932602b346bd16732ad6c01df, type: 3}
m_Script: {fileID: 11500000, guid: f4ed47aaa1507d84392f72f1bb8c4d6d, type: 3}
m_Name:
m_EditorClassIdentifier:
activityText: {fileID: 1673338836}
weightText: {fileID: 1540711096}
sleepText: {fileID: 781735418}
height: {fileID: 1180892471}
sleepText: {fileID: 1180892471}
heightText: {fileID: 25131603}
age: {fileID: 1172363413}
manPB: {fileID: 764844255}
manColor: {fileID: 486396718}
Expand Down Expand Up @@ -2701,7 +2701,7 @@ GameObject:
- component: {fileID: 1180892472}
- component: {fileID: 1180892471}
m_Layer: 5
m_Name: value
m_Name: heightText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down
230 changes: 134 additions & 96 deletions unity-project/Assets/Scenes/GameScene.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1946,49 +1946,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 158687749}
m_CullTransparentMesh: 1
--- !u!1 &194031579
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 194031581}
- component: {fileID: 194031580}
m_Layer: 0
m_Name: GlucoseController
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &194031580
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 194031579}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bd40574762f76af48a422ec6adc15582, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &194031581
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 194031579}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &204314677
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2499,7 +2456,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1725731995}
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: Water, Assembly-CSharp
m_MethodName: Hydrate
m_Mode: 4
Expand Down Expand Up @@ -2773,7 +2730,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &293531294
GameObject:
Expand Down Expand Up @@ -3440,7 +3397,6 @@ MonoBehaviour:
weightText: {fileID: 796537712}
bmiText: {fileID: 228638086}
restingHeartRateText: {fileID: 1085737332}
glycatedHemoglobinText: {fileID: 2047156592}
caloriesText: {fileID: 859486119}
popupHolder: {fileID: 1707670454}
popupTemplate: {fileID: 677918529221931768, guid: 37c9d7ee5aafdfb4c9344f22d9221804, type: 3}
Expand Down Expand Up @@ -6125,7 +6081,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &638958622
GameObject:
Expand Down Expand Up @@ -7051,7 +7007,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &787821399
MonoBehaviour:
Expand Down Expand Up @@ -7817,6 +7773,132 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 877183674}
m_CullTransparentMesh: 1
--- !u!1 &881363946
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 881363950}
- component: {fileID: 881363949}
- component: {fileID: 881363948}
- component: {fileID: 881363947}
- component: {fileID: 881363952}
- component: {fileID: 881363951}
- component: {fileID: 881363954}
- component: {fileID: 881363953}
m_Layer: 0
m_Name: BodyController
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &881363947
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881363946}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7e2a826751536e341b02ce18c7e94507, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &881363948
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881363946}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f845d26c5ad997f4a9a7b685f0d361c2, type: 3}
m_Name:
m_EditorClassIdentifier:
bgpText: {fileID: 2047156592}
--- !u!114 &881363949
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881363946}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c03ec489a5fcef54a93b4b89213a62a8, type: 3}
m_Name:
m_EditorClassIdentifier:
waterIndicator: {fileID: 442460072}
--- !u!4 &881363950
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881363946}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.0119433, y: -1.1276704, z: 27.518997}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &881363951
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881363946}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 20cad724eb4c4bd4699c42531e3c0904, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &881363952
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881363946}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 40effd9bf11c5634f9198525125ceba6, type: 3}
m_Name:
m_EditorClassIdentifier:
weightText: {fileID: 796537712}
bmiText: {fileID: 228638086}
--- !u!114 &881363953
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881363946}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6391f99d06e71734e90f0869ba5dd3a9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &881363954
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881363946}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0029d2a762a414145941fbed7a1d0a03, type: 3}
m_Name:
m_EditorClassIdentifier:
restingHeartRateText: {fileID: 1085737332}
--- !u!1 &910606087
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -10333,7 +10415,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1312690907
GameObject:
Expand Down Expand Up @@ -11328,7 +11410,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1418312675
MonoBehaviour:
Expand Down Expand Up @@ -12557,7 +12639,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1725231626
MonoBehaviour:
Expand All @@ -12575,50 +12657,6 @@ MonoBehaviour:
amountOfHoursToSleepText: {fileID: 355720586}
wakeUpHourAndMinuteText: {fileID: 1040212941}
sleepSelectorSlider: {fileID: 638958624}
--- !u!1 &1725731994
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1725731996}
- component: {fileID: 1725731995}
m_Layer: 0
m_Name: Water
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1725731995
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1725731994}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d670365a987b8944ebb4c83b0f362a94, type: 3}
m_Name:
m_EditorClassIdentifier:
waterIndicator: {fileID: 442460072}
--- !u!4 &1725731996
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1725731994}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1743064809
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -13366,9 +13404,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1852776582}
- component: {fileID: 1852776586}
- component: {fileID: 1852776585}
- component: {fileID: 1852776584}
- component: {fileID: 1852776586}
- component: {fileID: 1852776583}
m_Layer: 0
m_Name: FoodController
Expand Down
8 changes: 8 additions & 0 deletions unity-project/Assets/Scripts/Body.meta
View file
Open in desktop

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

Loading