diff --git a/Assets/Models/Character/Weapons/vWeaponsNew/material/AimEmmiter.mat b/Assets/Models/Character/Weapons/vWeaponsNew/material/AimEmmiter.mat index ba6343c4..65083fe6 100644 --- a/Assets/Models/Character/Weapons/vWeaponsNew/material/AimEmmiter.mat +++ b/Assets/Models/Character/Weapons/vWeaponsNew/material/AimEmmiter.mat @@ -126,7 +126,7 @@ Material: - _BaseColor: {r: 1, g: 0, b: 0.069148995, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 1, g: 0, b: 0.06914897, a: 1} + - _Color: {r: 1, g: 0, b: 0.069148995, a: 1} - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.3490566, g: 0.0115254605, b: 0.018418193, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Models/Character/Weapons/vWeaponsNew/material/orange.mat b/Assets/Models/Character/Weapons/vWeaponsNew/material/orange.mat index 2961a1dd..da255f78 100644 --- a/Assets/Models/Character/Weapons/vWeaponsNew/material/orange.mat +++ b/Assets/Models/Character/Weapons/vWeaponsNew/material/orange.mat @@ -121,7 +121,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.8088235, g: 0.3562075, b: 0, a: 1} - - _Color: {r: 0.8088235, g: 0.35620746, b: 0, a: 1} + - _Color: {r: 0.8088235, g: 0.3562075, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Models/Character/Weapons/vWeaponsNew/material/weaponMaterial2.mat b/Assets/Models/Character/Weapons/vWeaponsNew/material/weaponMaterial2.mat index 2f47db32..655415cc 100644 --- a/Assets/Models/Character/Weapons/vWeaponsNew/material/weaponMaterial2.mat +++ b/Assets/Models/Character/Weapons/vWeaponsNew/material/weaponMaterial2.mat @@ -120,7 +120,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.06617645, g: 0.06617645, b: 0.06617645, a: 1} - - _Color: {r: 0.06617643, g: 0.06617643, b: 0.06617643, a: 1} + - _Color: {r: 0.06617645, g: 0.06617645, b: 0.06617645, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/Main Scene.unity b/Assets/Scenes/Main Scene.unity index b04d38b9..cf2f7583 100644 --- a/Assets/Scenes/Main Scene.unity +++ b/Assets/Scenes/Main Scene.unity @@ -312,6 +312,71 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_RenderingLayers: 1 m_ShadowRenderingLayers: 1 +--- !u!1001 &390195575 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4526029354621542435, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4526029354621542435, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4526029354621542435, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4526029354621542435, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4526029354621542435, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4526029354621542435, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4526029354621542435, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4526029354621542435, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4526029354621542435, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4526029354621542435, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4653100570012753216, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_EnemyLayers.m_Bits + value: 512 + objectReference: {fileID: 0} + - target: {fileID: 6019937082457013135, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_Name + value: Nolan + objectReference: {fileID: 0} + - target: {fileID: 6517499069200797698, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} + propertyPath: m_DebugDrawLookRay + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 78cdc99d2fb73904586ae402e642e288, type: 3} --- !u!1 &390662298 GameObject: m_ObjectHideFlags: 0 @@ -357,7 +422,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 146720, guid: 092f8aa667b2004459042a82a4c9e41d, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 404034, guid: 092f8aa667b2004459042a82a4c9e41d, type: 3} propertyPath: m_LocalPosition.x @@ -401,27 +466,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 786398635910601919, guid: 092f8aa667b2004459042a82a4c9e41d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: 786398635910601919, guid: 092f8aa667b2004459042a82a4c9e41d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 2949936891288627786, guid: 092f8aa667b2004459042a82a4c9e41d, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2949936891288627786, guid: 092f8aa667b2004459042a82a4c9e41d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2949936891288836254, guid: 092f8aa667b2004459042a82a4c9e41d, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2949936891288836254, guid: 092f8aa667b2004459042a82a4c9e41d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5784434468645741687, guid: 092f8aa667b2004459042a82a4c9e41d, type: 3} propertyPath: cameraTransform @@ -1154,3 +1219,4 @@ SceneRoots: - {fileID: 1142785474} - {fileID: 401287878} - {fileID: 1932644107} + - {fileID: 390195575} diff --git a/Assets/TEST CUA TUAN/Free Wood Door Pack/Materials/Door_1_Materials/Door_1_Black.mat b/Assets/TEST CUA TUAN/Free Wood Door Pack/Materials/Door_1_Materials/Door_1_Black.mat index 0e375da2..ed859cf3 100644 --- a/Assets/TEST CUA TUAN/Free Wood Door Pack/Materials/Door_1_Materials/Door_1_Black.mat +++ b/Assets/TEST CUA TUAN/Free Wood Door Pack/Materials/Door_1_Materials/Door_1_Black.mat @@ -123,7 +123,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.051470563, g: 0.051470563, b: 0.051470563, a: 1} - - _Color: {r: 0.051470548, g: 0.051470548, b: 0.051470548, a: 1} + - _Color: {r: 0.051470563, g: 0.051470563, b: 0.051470563, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/TEST CUA TUAN/Free Wood Door Pack/Materials/Door_Knob_Material/Copper.mat b/Assets/TEST CUA TUAN/Free Wood Door Pack/Materials/Door_Knob_Material/Copper.mat index ba3af7a3..6dbf9920 100644 --- a/Assets/TEST CUA TUAN/Free Wood Door Pack/Materials/Door_Knob_Material/Copper.mat +++ b/Assets/TEST CUA TUAN/Free Wood Door Pack/Materials/Door_Knob_Material/Copper.mat @@ -122,7 +122,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.75, g: 0.6228195, b: 0.5404411, a: 1} - - _Color: {r: 0.75, g: 0.6228195, b: 0.54044104, a: 1} + - _Color: {r: 0.75, g: 0.6228195, b: 0.5404411, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Scene/IndoorSphereEmissive.mat b/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Scene/IndoorSphereEmissive.mat index 6ba45c8b..75f78293 100644 --- a/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Scene/IndoorSphereEmissive.mat +++ b/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Scene/IndoorSphereEmissive.mat @@ -133,7 +133,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0.26590908, b: 0.5735295, a: 1} - - _Color: {r: 0, g: 0.26590905, b: 0.5735295, a: 1} + - _Color: {r: 0, g: 0.26590908, b: 0.5735295, a: 1} - _EmissionColor: {r: 0, g: 0.45371014, b: 0.69886, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: []