From 954243270140f0dd7b9b7a45a1e0acb24398b9ca Mon Sep 17 00:00:00 2001 From: henrisel Date: Sun, 8 Feb 2026 10:31:16 +0200 Subject: [PATCH] fix colour in robert main image and moustache --- 3d-generation-pipeline/README.md | 2 -- Assets/_PROJECT/Images/Characters/robert.png | 4 ++-- Assets/_PROJECT/Images/Characters/robert.png.meta | 2 +- Assets/_PROJECT/Images/Characters/robert_moustache.png | 4 ++-- Assets/_PROJECT/Images/Characters/robert_moustache.png.meta | 2 +- .../Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab | 5 +++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index f1451fb5..fe675995 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -6,8 +6,6 @@ * archery range: * kui midagi laeb (wire aktiivne), siis particle'id võiks voolata mööda toru * highscore json tühjaks -* cafe: - * robert on plekiline, vunts õiget värvi :) * quest marker järjest järgmise tegevuse kohal: mikrofon, siis nupud * character billboard: * klaas on näha temast eespool diff --git a/Assets/_PROJECT/Images/Characters/robert.png b/Assets/_PROJECT/Images/Characters/robert.png index b1f31b5c..f95baa98 100644 --- a/Assets/_PROJECT/Images/Characters/robert.png +++ b/Assets/_PROJECT/Images/Characters/robert.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b16ffb96d8ac57d26ea2383f9d13a143480e524a2de01cbecb27d554d2e23d2b -size 333702 +oid sha256:bfaad06c85fe1efa54dac8cbc929ca94bfdd87a2ae89bd2e88a876b9f5461965 +size 323682 diff --git a/Assets/_PROJECT/Images/Characters/robert.png.meta b/Assets/_PROJECT/Images/Characters/robert.png.meta index 704146ed..e578a22f 100644 --- a/Assets/_PROJECT/Images/Characters/robert.png.meta +++ b/Assets/_PROJECT/Images/Characters/robert.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2c3b765a5860a8d4e81d47f2d7041678 +guid: d18cf7f31ce18e44088141b454e4ec0d TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/_PROJECT/Images/Characters/robert_moustache.png b/Assets/_PROJECT/Images/Characters/robert_moustache.png index 2fafaf84..a75d9e6a 100644 --- a/Assets/_PROJECT/Images/Characters/robert_moustache.png +++ b/Assets/_PROJECT/Images/Characters/robert_moustache.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e76a98a18a10ecf756327fd9d6d40c34466cb772a8065f843053e530195fe79 -size 22906 +oid sha256:d706fbac18df1f6f6cdb918f9162c67a1433a7c2451158d835436060e220b280 +size 31591 diff --git a/Assets/_PROJECT/Images/Characters/robert_moustache.png.meta b/Assets/_PROJECT/Images/Characters/robert_moustache.png.meta index 912e8074..d4ef813b 100644 --- a/Assets/_PROJECT/Images/Characters/robert_moustache.png.meta +++ b/Assets/_PROJECT/Images/Characters/robert_moustache.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5a603a6b2c8b06446a6507224855545d +guid: b2f575cfe732fe94a8459397962d3cf6 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab index ce621d9c..1b1ea95d 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab @@ -67,7 +67,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2c3b765a5860a8d4e81d47f2d7041678, type: 3} + m_Sprite: {fileID: 21300000, guid: d18cf7f31ce18e44088141b454e4ec0d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -219,6 +219,7 @@ MonoBehaviour: backRoom: {fileID: 0} plate: {fileID: 0} backRoomMovingTime: 5 + spawnedFoodDiameter: 0.5 ignorePlayerCollisionLayer: 2 --- !u!114 &7699707098595015193 MonoBehaviour: @@ -553,7 +554,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5a603a6b2c8b06446a6507224855545d, type: 3} + m_Sprite: {fileID: 21300000, guid: b2f575cfe732fe94a8459397962d3cf6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1