From 7d18b9b3cfe5282de905d76bb0d89d8910e83eaf Mon Sep 17 00:00:00 2001
From: maherfawaz <maherfawaz@outlook.com>
Date: Wed, 10 Apr 2024 16:10:21 -0400
Subject: [PATCH] Progress on decal
---
Assets/Prefabs/Player/Hamster Follow.prefab | 32 ++++
Assets/Prefabs/Player/Player.prefab | 44 ++++-
Assets/Scenes/Test Scenes/TestMovement.unity | 167 +++++++------------
3 files changed, 134 insertions(+), 109 deletions(-)
diff --git a/Assets/Prefabs/Player/Hamster Follow.prefab b/Assets/Prefabs/Player/Hamster Follow.prefab
index 59c4b2a..12d9614 100644
--- a/Assets/Prefabs/Player/Hamster Follow.prefab
+++ b/Assets/Prefabs/Player/Hamster Follow.prefab
@@ -449,6 +449,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: d1e303830a7134e3595ace6b6de5ef9a, type: 3}
insertIndex: -1
addedObject: {fileID: 5895874789041347619}
+ - targetCorrespondingSourceObject: {fileID: -4316292918090517792, guid: d1e303830a7134e3595ace6b6de5ef9a, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1404425010868753831}
m_SourcePrefab: {fileID: 100100000, guid: d1e303830a7134e3595ace6b6de5ef9a, type: 3}
--- !u!1 &2659668819930887437 stripped
GameObject:
@@ -573,3 +576,32 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1e303830a7134e3595ace6b6de5ef9a, type: 3}
m_PrefabInstance: {fileID: 2893672035897346140}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &7796031220613823164 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: -4316292918090517792, guid: d1e303830a7134e3595ace6b6de5ef9a, type: 3}
+ m_PrefabInstance: {fileID: 2893672035897346140}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1404425010868753831
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7796031220613823164}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
+ m_DrawDistance: 1000
+ m_FadeScale: 0.9
+ m_StartAngleFade: 180
+ m_EndAngleFade: 180
+ m_UVScale: {x: 1, y: 1}
+ m_UVBias: {x: 0, y: 0}
+ m_DecalLayerMask: 1
+ m_ScaleMode: 0
+ m_Offset: {x: 0, y: 0, z: 1.5}
+ m_Size: {x: 3, y: 1, z: 3}
+ m_FadeFactor: 1
diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab
index abc873b..017ad4f 100644
--- a/Assets/Prefabs/Player/Player.prefab
+++ b/Assets/Prefabs/Player/Player.prefab
@@ -17,6 +17,8 @@ GameObject:
- component: {fileID: 5813634793374795872}
- component: {fileID: 7137747041347675327}
- component: {fileID: 5292486849734085431}
+ - component: {fileID: 8188289217265313933}
+ - component: {fileID: 3509302768371155675}
m_Layer: 6
m_Name: Player
m_TagString: Player
@@ -123,7 +125,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 72c1bd8f5d995784d813632e242e4fe8, type: 3}
m_Name:
m_EditorClassIdentifier:
- acceleration: 300
+ acceleration: 100
airSpeedModifier: 0.3
maxSpeed: 15
speedDecayTime: 1
@@ -229,6 +231,46 @@ MonoBehaviour:
damageMultiplier: 1
damageDone: 0
--- !u!114 &5292486849734085431
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4099498095617253306}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 483303bbea85340c68e31c570d720d9c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ mainMusic:
+ Guid:
+ Data1: -1660532474
+ Data2: 1142351880
+ Data3: -1885633660
+ Data4: -378681346
+ Path: event:/MUS/Main Music
+ levelTwoThresh: 10000
+ levelThreeThresh: 25000
+ levelFourThresh: 50000
+ levelFiveThresh: 100000
+ levelSixThresh: 200000
+ currentChaosAmt: 0
+ gameManager: {fileID: 0}
+--- !u!114 &8188289217265313933
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4099498095617253306}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 64bd17d3301b64ff6beab6874734e116, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ damageMultiplier: 1
+ damageDone: 0
+--- !u!114 &3509302768371155675
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
diff --git a/Assets/Scenes/Test Scenes/TestMovement.unity b/Assets/Scenes/Test Scenes/TestMovement.unity
index c28d7b8..4519a3e 100644
--- a/Assets/Scenes/Test Scenes/TestMovement.unity
+++ b/Assets/Scenes/Test Scenes/TestMovement.unity
@@ -1304,11 +1304,6 @@ MonoBehaviour:
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
---- !u!4 &713984275 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- m_PrefabInstance: {fileID: 1187611123541258541}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &715722234
GameObject:
m_ObjectHideFlags: 0
@@ -2624,6 +2619,63 @@ Transform:
- {fileID: 377041513}
m_Father: {fileID: 1630477446}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1319273169
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 3.37
+ objectReference: {fileID: 0}
+ - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.72
+ objectReference: {fileID: 0}
+ - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.47
+ objectReference: {fileID: 0}
+ - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ propertyPath: m_Name
+ value: Player
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
--- !u!1 &1319361851
GameObject:
m_ObjectHideFlags: 0
@@ -4109,7 +4161,7 @@ PrefabInstance:
- target: {fileID: 8556696604401780655, guid: 4f0ddd8485d09574480818dc02b7ef2f, type: 3}
propertyPath: playerTrans
value:
- objectReference: {fileID: 713984275}
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -4184,107 +4236,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 57d00dc557cdd0b4caa26e8f408b5fe6, type: 3}
---- !u!1001 &1187611123541258541
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 22423270197361221, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: acceleration
- value: 100
- objectReference: {fileID: 0}
- - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_Name
- value: Player
- objectReference: {fileID: 0}
- - target: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8999556431791690087, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- propertyPath: m_LocalPosition.y
- value: 1.9
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents:
- - targetCorrespondingSourceObject: {fileID: 8859455617594005527, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1187611123541258543}
- m_SourcePrefab: {fileID: 100100000, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
---- !u!1 &1187611123541258542 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 8859455617594005527, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
- m_PrefabInstance: {fileID: 1187611123541258541}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &1187611123541258543
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1187611123541258542}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: -876546973899608171, guid: 9b4e681081e2b4c469111bb649e2f7ee, type: 3}
- m_DrawDistance: 1000
- m_FadeScale: 0.9
- m_StartAngleFade: 180
- m_EndAngleFade: 180
- m_UVScale: {x: 1, y: 1}
- m_UVBias: {x: 0, y: 0}
- m_DecalLayerMask: 1
- m_ScaleMode: 0
- m_Offset: {x: 0, y: 0, z: -39.178078}
- m_Size: {x: 2, y: 2, z: 100}
- m_FadeFactor: 1
--- !u!1001 &2510730070770546001
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4793,7 +4744,7 @@ SceneRoots:
- {fileID: 1050361552}
- {fileID: 640060685}
- {fileID: 1585779859}
- - {fileID: 1187611123541258541}
+ - {fileID: 1319273169}
- {fileID: 1936030956}
- {fileID: 2645743919560437174}
- {fileID: 689104400258981583}
--
GitLab