iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

02.Tycoon_video 영상용 씬 추가

Browse Source 
+ SPUM 캐릭터 프리팹 값 초기화
+ NavMesh 재설정
+ KitchenController sotPosition 변경
+ 손님용 TestMove 스크립트 추가
This commit is contained in:
NTG 2024-03-07 13:34:10 +09:00
parent cfd67e6d83
commit f35a8a441f
22 changed files with 262158 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
BlueWater/Assets/01.Scenes/02.Tycoon/NavMesh-NavMesh Surface.asset
View File

Binary file not shown.

8
BlueWater/Assets/01.Scenes/02.Tycoon_video.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0d447eb922ef42e478f53dc95229cb10
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

262064
BlueWater/Assets/01.Scenes/02.Tycoon_video.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
BlueWater/Assets/01.Scenes/02.Tycoon_video.unity.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f464a3dfd27f11147afa97dade2f0d96
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
BlueWater/Assets/01.Scenes/02.Tycoon_video/NavMesh-NavMesh Surface.asset Normal file
View File

Binary file not shown.

2
BlueWater/Assets/01.Scenes/02.Tycoon/NavMesh-NavMesh Surface.asset.meta → BlueWater/Assets/01.Scenes/02.Tycoon_video/NavMesh-NavMesh Surface.asset.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7f435cceb6d614cf0b149079d184c785
guid: 7bcc47d10bd48184cbe2b84632b11714
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 23800000

39
BlueWater/Assets/02.Scripts/TestMove.cs Normal file
View File

@ -0,0 +1,39 @@
using System;
using UnityEngine;
using UnityEngine.AI;
public class TestMove : MonoBehaviour
{
public NavMeshAgent agent;
public Animator animator;
private void Awake()
{
agent = GetComponent<NavMeshAgent>();
animator = transform.GetChild(0).GetComponent<Animator>();
}
private void Update()
{
if (agent.velocity != Vector3.zero)
{
animator.SetFloat("RunState", 0.5f);
}
else
{
animator.SetFloat("RunState", 0f);
}
var localScale = animator.transform.localScale;
if (agent.velocity.x >= 0)
{
localScale.x = -Mathf.Abs(localScale.x);
}
else
{
localScale.x = Mathf.Abs(localScale.x);
}
animator.transform.localScale = localScale;
}
}

2
BlueWater/Assets/02.Scripts/TestMove.cs.meta Normal file
View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 2cf70ce801c39d34d968c8c3e575f8d4

6
BlueWater/Assets/02.Scripts/Tycoon/KitchenController.cs
View File

@ -14,8 +14,10 @@ namespace BlueWaterProject
private bool isCooking;
public Image cookingProcess;
public GameObject sotUp;
private Vector3 sotUpOriginal = new Vector3(4.17999983f, 8.80000019f, 16.5300007f);
private Vector3 sotUpClose = new Vector3(4.17999983f, 7.05000019f, 14.7799997f);
// private Vector3 sotUpOriginal = new Vector3(4.17999983f, 8.80000019f, 16.5300007f);
// private Vector3 sotUpClose = new Vector3(4.17999983f, 7.05000019f, 14.7799997f);
private Vector3 sotUpOriginal = new Vector3(4.92f, 9.384f, 22.72f);
private Vector3 sotUpClose = new Vector3(4.92f, 7.634f, 20.97f);
public GameObject[] sotSteamEff;
private Dictionary<GlobalValue.FoodOnHand, int> ingredientsInPot = new Dictionary<GlobalValue.FoodOnHand, int>();
private Dictionary<GlobalValue.FoodOnHand, int> kingCrabRecipe = new Dictionary<GlobalValue.FoodOnHand, int>

6
BlueWater/Assets/Resources/SPUM/SPUM_Units/Coworker_TenTen.prefab
View File

@ -3410,8 +3410,8 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7216996033527228451}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalScale: {x: 400, y: 400, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3121891628484793615}
@ -3419,7 +3419,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7160616224672410

4
BlueWater/Assets/Resources/SPUM/SPUM_Units/Coworker_chinagirl.prefab
View File

@ -1784,7 +1784,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4353518573311716380}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -1793,7 +1793,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7306344069874382340

6
BlueWater/Assets/Resources/SPUM/SPUM_Units/Coworker_rabbit.prefab
View File

@ -365,8 +365,8 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 759619725461716301}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalScale: {x: 400, y: 400, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 9043762403789995937}
@ -374,7 +374,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7445863944613687420

4
BlueWater/Assets/Resources/SPUM/SPUM_Units/Customer_Soldier_1.prefab
View File

@ -2481,7 +2481,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6726189217562869509}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -2490,7 +2490,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4770403335970714203

6
BlueWater/Assets/Resources/SPUM/SPUM_Units/Customer_chinaman_1.prefab
View File

@ -1481,8 +1481,8 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3632535134098017587}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalScale: {x: 400, y: 400, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8169024056564542525}
@ -1490,7 +1490,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7868371418982005469

6
BlueWater/Assets/Resources/SPUM/SPUM_Units/Customer_knight_1.prefab
View File

@ -1041,8 +1041,8 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2053839934315755874}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalScale: {x: 400, y: 400, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6811099789877129208}
@ -1050,7 +1050,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2978481777000177860

6
BlueWater/Assets/Resources/SPUM/SPUM_Units/Customer_oldman_1.prefab
View File

@ -1121,8 +1121,8 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2272203490550931458}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalScale: {x: 400, y: 400, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4128702937346801744}
@ -1130,7 +1130,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1898645653888244624

4
BlueWater/Assets/Resources/SPUM/SPUM_Units/Customer_pirate_1.prefab
View File

@ -3998,7 +3998,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9003935997047606161}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -4007,7 +4007,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7658200149183157807

4
BlueWater/Assets/Resources/SPUM/SPUM_Units/Customer_soldier_2.prefab
View File

@ -857,7 +857,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1542274928734487852}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -866,7 +866,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2930329816836158445

6
BlueWater/Assets/Resources/SPUM/SPUM_Units/Customer_viking_1.prefab
View File

@ -6089,8 +6089,8 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8964244758495272006}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalScale: {x: 400, y: 400, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 9062444819660148886}
@ -6099,7 +6099,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &929039751545817037

4
BlueWater/Assets/Resources/SPUM/SPUM_Units/Customer_viking_2.prefab
View File

@ -2843,7 +2843,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5982590158510945126}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -2852,7 +2852,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1540836886559766261

4
BlueWater/Assets/Resources/SPUM/SPUM_Units/Customer_wildman_1.prefab
View File

@ -3805,7 +3805,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8865634168472192008}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -3814,7 +3814,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4667951893197619223

6
BlueWater/Assets/Resources/SPUM/SPUM_Units/Customer_wildman_2.prefab
View File

@ -3185,8 +3185,8 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7351404424697971984}
m_LocalRotation: {x: -0, y: 0.008726557, z: -0, w: 0.9999619}
m_LocalPosition: {x: 0, y: 0, z: 0.00015256465}
m_LocalScale: {x: 400, y: 400, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5570446165458847013}
@ -3194,7 +3194,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -170}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &594496329868731486