Skip to content

refactor(minigames): add safe area for mobile #32

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

Merged
yasersyafa merged 2 commits into from
Nov 29, 2025
Merged

refactor(minigames): add safe area for mobile #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea9d91c
refactor(minigames): add safe area for mobile
yasersyafa Sep 17, 2025
85d5ebd
refactor(video cutscene): adjust transcode video
yasersyafa Sep 17, 2025
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
11 changes: 10 additions & 1 deletion Assets/Cutscene Intro/Animations/Intro Rev 1.mp4.meta
View file
Open in desktop

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

11 changes: 10 additions & 1 deletion Assets/Minigame 1/UI/Minigame 1 Lose.mp4.meta
View file
Open in desktop

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

11 changes: 10 additions & 1 deletion Assets/Minigame 1/UI/Minigame 1 Win.mp4.meta
View file
Open in desktop

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

11 changes: 10 additions & 1 deletion Assets/Minigame 2/Animations/Minigame 2 Lose.mp4.meta
View file
Open in desktop

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

11 changes: 10 additions & 1 deletion Assets/Minigame 2/Animations/Minigame 2 Win.mp4.meta
View file
Open in desktop

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

11 changes: 10 additions & 1 deletion Assets/Minigame 3/Animations/Minigame 3 Lose.mp4.meta
View file
Open in desktop

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

11 changes: 10 additions & 1 deletion Assets/Minigame 3/Animations/Minigame 3 Win.mp4.meta
View file
Open in desktop

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

11 changes: 10 additions & 1 deletion Assets/Minigame 4/Animations/Minigame 4 Lose.mp4.meta
View file
Open in desktop

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

11 changes: 10 additions & 1 deletion Assets/Minigame 4/Animations/Minigame 4 Win.mp4.meta
View file
Open in desktop

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

11 changes: 10 additions & 1 deletion Assets/Minigame 5/Animations/Minigame 5 Lose.mp4.meta
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions Assets/Minigame 5/Animations/Minigame 5 Win.mp4.meta
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions Assets/Minigame 5/Prefab/Email_Window - Mobile.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RectTransform:
m_GameObject: {fileID: 6751201448766778992}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 7758192125044671624}
Expand Down Expand Up @@ -135,11 +135,11 @@ RectTransform:
m_Children: []
m_Father: {fileID: 6593298347547395276}
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: -92.9, y: 28.3}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 2, y: -2}
m_SizeDelta: {x: 11.0057, y: 11.0057}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0, y: 1}
--- !u!222 &3442860425668360241
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down
15 changes: 13 additions & 2 deletions Assets/Minigame 5/Scripts/PlayState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,21 @@ void SpawnTrojan()
for (int i = 0; i < trojanCount; i++)
{
// Instantiate the trojanPrefab as a child of trojanParent with default position and rotation
GameObject trojan = GameObject.Instantiate(minigameManager.trojanPrefab, minigameManager.trojanParent.transform);
GameObject trojan = Object.Instantiate(minigameManager.trojanPrefab, minigameManager.trojanParent.transform);
RectTransform trojanRect = trojan.GetComponent<RectTransform>();

// calculate safe area
Rect safe = Screen.safeArea;

float xMin = safe.xMin - 50;
float xMax = safe.xMax - 50;

float yMin = safe.yMin - 50;
float yMax = safe.yMax - 50;

// Randomize position within the range (-3, 3) for x and (3, -3) for y
Vector2 randomPosition = new Vector2(Random.Range(-200f, 200f), Random.Range(100f, -50f));
Vector2 randomPosition = new(Random.Range(-100f, 100f), Random.Range(100f, -50f));
// Vector2 randomPos = new(Random.Range(xMin, xMax), Random.Range(yMin, yMax));

// Set the position of the instantiated trojan
trojan.transform.localPosition = randomPosition; // Use localPosition since it's a child
Expand Down
11 changes: 10 additions & 1 deletion Assets/Minigame 6/Animations/Minigame 6 Lose.mp4.meta
View file
Open in desktop

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

11 changes: 10 additions & 1 deletion Assets/Minigame 6/Animations/Minigame 6 Win.mp4.meta
View file
Open in desktop

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

36 changes: 18 additions & 18 deletions Assets/Scenes/Mobile/Minigame6 - Mobile.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,13 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 453452440}
m_Father: {fileID: 491127552}
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: 299.99997, y: -58}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -50, y: 25}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 1, y: 0}
--- !u!114 &131556262
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -415,7 +415,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2e2162c3c556da841a54e3e62b4df25c, type: 3}
m_Name:
m_EditorClassIdentifier:
EffectStrength: 1.2
EffectStrength: 1.01
EffectDuration: 0.2
bounceEase: 25
--- !u!1 &238555482
Expand Down Expand Up @@ -546,13 +546,13 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 279206914}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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:
- {fileID: 1360234351}
m_Father: {fileID: 1775107834}
m_Father: {fileID: 491127552}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
Expand Down Expand Up @@ -784,8 +784,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1775107834}
- {fileID: 1882167248}
- {fileID: 131556261}
- {fileID: 110116032}
- {fileID: 1331143077}
- {fileID: 1751560931}
Expand Down Expand Up @@ -827,6 +825,9 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 279206915}
- {fileID: 1882167248}
- {fileID: 131556261}
- {fileID: 1052426584}
m_Father: {fileID: 453452440}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -1992,8 +1993,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 279206915}
m_Children: []
m_Father: {fileID: 453452440}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
Expand Down Expand Up @@ -2102,13 +2102,13 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 453452440}
m_Father: {fileID: 491127552}
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: -300, y: -58}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 25}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1882167249
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2227,7 +2227,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2e2162c3c556da841a54e3e62b4df25c, type: 3}
m_Name:
m_EditorClassIdentifier:
EffectStrength: 1.2
EffectStrength: 1.01
EffectDuration: 0.2
bounceEase: 25
--- !u!114 &2030807350 stripped
Expand Down
Loading