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

0.3.5.5

Browse Source
This commit is contained in:
NTG_Lenovo 2024-12-02 20:43:08 +09:00
parent d615b18620
commit 5c2ab045d7
45 changed files with 1778 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
Assets/01.Scenes/01.Tycoon.unity
View File

@ -3425,7 +3425,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24.15
m_fontSize: 27.3
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -7211,7 +7211,7 @@ Transform:
m_GameObject: {fileID: 545850347}
serializedVersion: 2
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: 1.06, y: 7.4278765, z: -17.090446}
m_LocalPosition: {x: 1.4, y: 7.427876, z: -17.380447}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -8922,134 +8922,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &733323112
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 733323113}
- component: {fileID: 733323115}
- component: {fileID: 733323114}
m_Layer: 0
m_Name: BackgroundUiCamera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &733323113
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 733323112}
serializedVersion: 2
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: []
m_Father: {fileID: 873223992}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &733323114
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 733323112}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 1
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_AllowHDROutput: 1
m_UseScreenCoordOverride: 0
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
m_Quality: 3
m_FrameInfluence: 0.1
m_JitterScale: 1
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!20 &733323115
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 733323112}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 4
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.01
far clip plane: 300
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 524288
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &744781104
GameObject:
m_ObjectHideFlags: 0
@ -9406,7 +9278,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 41.4
m_fontSize: 46.85
m_fontSizeBase: 50
m_fontWeight: 400
m_enableAutoSizing: 1
@ -10017,7 +9889,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 34.5
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -10284,7 +10156,6 @@ MonoBehaviour:
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras:
- {fileID: 733323115}
- {fileID: 1985878519}
- {fileID: 1355183327}
m_RendererIndex: -1
@ -10390,11 +10261,10 @@ Transform:
m_GameObject: {fileID: 873223985}
serializedVersion: 2
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: 0.50000006, y: 8.188489, z: -15.430697}
m_LocalPosition: {x: 0.50000006, y: 8.188489, z: -17.370697}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 733323113}
- {fileID: 1355183324}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 9.569, y: 87.98, z: 0}
@ -10420,6 +10290,7 @@ MonoBehaviour:
_confinerCollider: {fileID: 1589932376}
_transparencySortAxis: {x: 0, y: 0, z: 0}
_cameraDistance: {x: 5, y: 10}
_initializedDistance: 7
_zoomPower: 0.5
_zoomLerpSpeed: 5
_zoomOutConfinerScale: {x: 1, y: 1, z: 0}
@ -10436,6 +10307,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dec61aec08a92c54282e06819b88a31c, type: 3}
m_Name:
m_EditorClassIdentifier:
_cameras:
- {fileID: 873223991}
- {fileID: 1355183327}
- {fileID: 1985878519}
_canvasRectTransforms:
- {fileID: 1861226431}
- {fileID: 532586500}
@ -10632,11 +10507,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15c02fef22ba8d0488bd2517167c117c, type: 3}
--- !u!4 &883069349 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1150836517969909917, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
m_PrefabInstance: {fileID: 1336734153}
m_PrefabAsset: {fileID: 0}
--- !u!1 &887608711
GameObject:
m_ObjectHideFlags: 0
@ -11866,7 +11736,7 @@ MonoBehaviour:
_spawnTransform: {fileID: 970735072}
_spawnLocation: {fileID: 218784750}
_pushDirection: {x: -3, y: -1, z: 0}
_pushPower: 50
_pushPower: 5
_pouringSfxName: Pouring
_succeedMakingCocktailSfxName: SucceedMakingCocktail
_failedMakingCocktailSfxName: FailedMakingCocktail
@ -19095,7 +18965,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 34.5
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -20015,7 +19885,7 @@ Transform:
m_GameObject: {fileID: 1589932375}
serializedVersion: 2
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: 0, y: 8.38, z: -15.27}
m_LocalPosition: {x: 0, y: 8.38, z: -17.21}
m_LocalScale: {x: 1, y: 1, z: 0}
m_ConstrainProportionsScale: 0
m_Children: []
@ -20179,7 +20049,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 34.5
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -21582,7 +21452,6 @@ MonoBehaviour:
- {fileID: 113068682}
- {fileID: 1540696676}
- {fileID: 1062518307}
- {fileID: 883069349}
- {fileID: 195540918}
- {fileID: 1909132787}
<Crews>k__BackingField: []
@ -22232,7 +22101,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 34.5
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -22319,7 +22188,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 90, y: -50}
m_SizeDelta: {x: 99.37, y: 60}
m_SizeDelta: {x: 100.44, y: 60}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1728335879
MonoBehaviour:
@ -22457,7 +22326,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1920, y: 1080}
m_SizeDelta: {x: 1080, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1730992468
MonoBehaviour:
@ -22509,7 +22378,7 @@ Canvas:
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 733323115}
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
@ -22744,7 +22613,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
version: 1073741824
data:
dataString: UEsDBBQAAAgIAABIIewzg0WLvAIAAPkFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI5wWFUmjZ2y7Qdg9tUemqh00PTjwhFo4d+aNAK/77jh1DApUiJZp5M/PmzUy+CJemhtwqfa85e1QMyM8e8d/kR691PsCOrpVc8U84Yt44s6UH0YB5oZYrtA99mFEVWM3zX3ItPDhBo5O8ULpasDXMlLEGzQUVBtCllfXREk1fPbKLAfv4/vTv3gG/cpAW9HdUPxkMI7A/HdwGrJO5oFUNzHNuQ4bTwThGjQfjgJTYUAQ1eXIlBDeRD7H7OvQ7o7Vx2A0CGKfYX2Di8SXwdWlD+Lgb/lwUBmzkqel+zjUK1eQlv1WjXkXNpqH3QYXzlUa314FXk/bxm3/SuAutqodj5WHia9iS55sXus+psR15u+b5OXUnt1RsaCbgrQT5pO61cpKh02rnQ52Bq3kn1am3WQn5psU1XC+Mrv4+qmE70EPofreyUD+0Cl631r8GzEqoIH9M6T3RMvUpQePw/mA/YX9MLIRWzxHjX+m6u2jRcce1seiKfKLVY5c4IWAgc4i69z1AenqZctrnIovA1Yvh7ExpCcEcCdYgqbD7JWa0lytw4evwuvDcUX9zkV30HU/pIiSYW3ySXLiWansatsb1NWGnj1//3v0QTKm2j2DKZ2cFlx21veMJBZ4pKZvN7Yp5DFs5XdC8E2ZhZ52GObU0VEM6uGCsG4pahgjphPC7HBoIjLAB/7x7fUuKdUUwkyclw+2dvQP9tePs/EJIQm/olGXF+GqYTW5us/4oG0GWwyhLJgwm0yEJJ8Qlyk3FstErqoTbJdteJJ6Lz/gCxlKnqQyTZ5pu7/lnpTqT57JQq1wDyOcmw6lZ0FgEfzBswTi2uQJruQx7Sb5SIlS+AZaeEqVB2MXOapq2WVJS8w9lvSUls/AfTIk3ny4SV/eDw9YXP0sGAkcH7JULqGjtXcmBHP4DUEsDBBQAAAgIAABIIez9o8lSawAAAHcAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz1DPUUVBKL0osyCgGCoA5pZkpIHa0kkGieaJlSlKaqZFhkpm5RZKucZJxalJyqnGSgVlKqpmloVIsUH1JZUGqX2JuKkRPQGJJRlpmXkpmXrqee1FmijvIaKXYWgBQSwECLQAUAAAICAAASCHsM4NFi7wCAAD5BQAACwAkAAAAAAAAAAAAAAAAAAAAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwECLQAUAAAICAAASCHs/aPJUmsAAAB3AAAACQAkAAAAAAAAAAAAAAAJAwAAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsFBgAAAAACAAIAuAAAAL8DAAAAAA==
dataString: UEsDBBQAAAgIAABIIexHw7YYvAIAAPoFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI5wUlpdCyt12g7R7aotJVD5senHhCLIwd+aNAK/77jh1DApUiJZp5M/PmzUy+CJemhsIqfa85e1QMyM8e8d/kR691PsCOrpRc8k84Yt44s5UH0YB5oZYrtKc+zKgNWM2LX3IlPDhBo5O8VHozZyuYKmMNmksqDKBLK+ujJZq+emQXA/bx/enfvQN+FSAt6O+ofjJII7CfJoPbAHayEHRTA/Ok25h0MhjFsJvBKCAldhRBTaJCCcFNJETsvg4NT2ltHLaDAMYpNhioeHwFfFXZED7qhj+XpQEbiWq6n3GNSjV5yW/VyLehZt3Q+6DC+UrD2+vAq0n7+M0/btylVpuHY+U08TVsxYv1C90X1NiOvl3z7Jy6k1sq1jQX8FaBfFL3WjnJ0Gm186HOwNWsk+rU27SCYt3iGq4XRld/n1XaTvQQut8tLdQPrYLXrfWvAbMUKsgfU3pPtEx8StA4vD/YT1ggEwuh1XPE+Fe66m5adNxxbSy6Ip9o9dgFTggYyAKi7n0PkJ5erpz2ucg8cPViODtVWkIwR4I1SCrsfoEZ7eUKXPg6vC48d9QfXWQXfcdbuggJ5hafJBeuhdqehq1xfU3Y6ePXv3c/BFOp7SOY6tlZwWVHbe94QoGnSspmc7tiHsOWTpe06IRZ2FmnYUYtDdWQDi4Y64ailiFCOiH8LocGAiNswD/vXt+KYl0RzORJyXB7Z+9Af+U4O78QktAbOmF5ObpK8/HNbd4f5kPICxjmyZjBeJKScEJcotxULBq9okq4XbLtReK5+IwvYCx1msoweabp9p5/blRn8lyWalloAPncZDg1CxqL4A+GzRnHNpdgLZdhL8lXRoQq1sCyU6IsCDvfWU2zNktGav6hrLdkZBp+hBnx5tNF4up+cNj64mfJQODogL1yARtae1dyIIf/UEsDBBQAAAgIAABIIeyfkg7JbAAAAHcAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz0jPVUVBKL0osyCgGChiCOKWZKSB2tJJBonmiZUpSmqmRYZKZuUWSrnGScWpScqpxkoFZSqqZpaFSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEgh7EfDthi8AgAA+gUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7J+SDslsAAAAdwAAAAkAJAAAAAAAAAAAAAAACQMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADAAwAAAAA=
file_cachedStartup: {fileID: 0}
cacheStartup: 0
showNavGraphs: 1
@ -25574,7 +25443,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 209.37, y: 0}
m_SizeDelta: {x: 210.44, y: 0}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1983229440
MonoBehaviour:
@ -28278,7 +28147,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
propertyPath: m_LocalPosition.x
value: 1.06
value: 1.4
objectReference: {fileID: 0}
- target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
propertyPath: m_LocalPosition.y
@ -28286,7 +28155,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
propertyPath: m_LocalPosition.z
value: -9.43
value: -9.72
objectReference: {fileID: 0}
- target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
propertyPath: m_LocalRotation.w

35
Assets/02.Scripts/AspectRatioController.cs
View File

@ -5,6 +5,9 @@ namespace BlueWater
{
public class AspectRatioController : MonoBehaviour
{
[SerializeField]
private List<Camera> _cameras = new();
[SerializeField]
private List<RectTransform> _canvasRectTransforms = new();
@ -33,23 +36,25 @@ namespace BlueWater
private void SetCamera()
{
Camera mainCamera = Camera.main;
Rect cameraRect = mainCamera.rect;
float scaleHeight = GetScaleHeight();
float scaleWidth = 1f / scaleHeight;
if (scaleHeight < 1f)
foreach (var element in _cameras)
{
cameraRect.height = scaleHeight;
cameraRect.y = (1f - scaleHeight) / 2f;
}
else
{
cameraRect.width = scaleWidth;
cameraRect.x = (1f - scaleWidth) / 2f;
}
Rect cameraRect = element.rect;
float scaleHeight = GetScaleHeight();
float scaleWidth = 1f / scaleHeight;
mainCamera.rect = cameraRect;
if (scaleHeight < 1f)
{
cameraRect.height = scaleHeight;
cameraRect.y = (1f - scaleHeight) / 2f;
}
else
{
cameraRect.width = scaleWidth;
cameraRect.x = (1f - scaleWidth) / 2f;
}
element.rect = cameraRect;
}
}
private void AdjustUI()

7
Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs
View File

@ -1,6 +1,7 @@
using System;
using BlueWater.Utility;
using UnityEngine;
using UnityEngine.Serialization;
namespace BlueWater.Tycoons
{
@ -28,6 +29,9 @@ namespace BlueWater.Tycoons
public class GarnishBarrel : Barrel
{
[SerializeField]
private SpriteRenderer _signImage;
[SerializeField]
private GarnishType _garnishType;
@ -37,6 +41,7 @@ namespace BlueWater.Tycoons
{
base.Start();
_signImage.sprite = IsActivated ? LiquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock;
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.InactiveIdle, true);
}
@ -124,6 +129,8 @@ namespace BlueWater.Tycoons
public override void Activate()
{
base.Activate();
_signImage.sprite = IsActivated ? LiquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock;
_currentLevel = GetCurrentLevel();
IdleAnimation();

20
Assets/02.Scripts/SceneController.cs
View File

@ -89,15 +89,21 @@ namespace BlueWater
asyncOperation.allowSceneActivation = true;
await Task.Delay((int)(_loadingWaitTime * 1000));
_fadeOut.Restart();
_loadingPanelFadeOut.Restart();
Task[] fadeOutTasks =
{
_fadeOut.AsyncWaitForCompletion(),
_loadingPanelFadeOut.AsyncWaitForCompletion()
};
await _loadingPanelFadeOut.AsyncWaitForCompletion();
_fadeOut.Restart();
await _fadeOut.AsyncWaitForCompletion();
// _fadeOut.Restart();
// _loadingPanelFadeOut.Restart();
// Task[] fadeOutTasks =
// {
// _fadeOut.AsyncWaitForCompletion(),
// _loadingPanelFadeOut.AsyncWaitForCompletion()
// };
await Task.WhenAll(fadeOutTasks);
//await Task.WhenAll(fadeOutTasks);
PopupUiController.ClearPopup();
VisualFeedbackManager.Instance.ResetTimeScale();

6
Assets/02.Scripts/ScriptableObject/LevelDataTable.asset
View File

@ -465,7 +465,7 @@ MonoBehaviour:
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 24
<EatingTime>k__BackingField: 5
<OpenUpgrade>k__BackingField:
<OpenUpgrade>k__BackingField: Upgrade7
<RewardBoxType>k__BackingField: 1
<RewardBoxPrice>k__BackingField: 5000
- <Key>k__BackingField: 36
@ -530,7 +530,7 @@ MonoBehaviour:
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 20
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField: Upgrade7
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 1
<RewardBoxPrice>k__BackingField: 6000
- <Key>k__BackingField: 41
@ -595,7 +595,7 @@ MonoBehaviour:
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 16
<EatingTime>k__BackingField: 3
<OpenUpgrade>k__BackingField: Upgrade8
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 1
<RewardBoxPrice>k__BackingField: 7000
- <Key>k__BackingField: 46

11
Assets/02.Scripts/Tycoon/CrewController.cs
View File

@ -32,7 +32,7 @@ namespace BlueWater.Tycoons
private Transform _servingCrewSpawnTransform;
[SerializeField]
private List<Transform> _bartenderCrewSpawnTransforms;
private List<Transform> _bartenderCrewSpawnTransforms = new(5);
[field: Title("실시간 데이터")]
[field: SerializeField]
@ -87,11 +87,14 @@ namespace BlueWater.Tycoons
public BartenderCrew CreateBartenderCrew()
{
var currentBartenderCount = BartenderCrews.Count;
var newCrew = Instantiate(_bartenderCrewPrefab, _bartenderCrewSpawnTransforms[currentBartenderCount].position, _bartenderCrewPrefab.transform.rotation);
int randomIndex = Random.Range(0, _bartenderCrewSpawnTransforms.Count);
Transform spawnTransform = _bartenderCrewSpawnTransforms[randomIndex];
_bartenderCrewSpawnTransforms.Remove(spawnTransform);
var newCrew = Instantiate(_bartenderCrewPrefab, spawnTransform.position, _bartenderCrewPrefab.transform.rotation);
Utils.RegisterList(BartenderCrews, newCrew);
Utils.RegisterList(Crews, newCrew);
newCrew.SetBartenderTable(_bartenderCrewSpawnTransforms[currentBartenderCount].GetComponentInParent<BartenderTable>());
newCrew.SetBartenderTable(spawnTransform.GetComponentInParent<BartenderTable>());
newCrew.Initialize();
EventManager.InvokeUpdateCrewUi(BartenderCrews.Count, ServerCrews.Count, CleanerCrews.Count);

4
Assets/02.Scripts/Tycoon/Garnish.cs
View File

@ -10,12 +10,12 @@ namespace BlueWater.Tycoons
private IObjectPool<Garnish> _managedPool;
public void Initialize(Vector3 spawnPosition, Quaternion rotation, Collider2D targetCollider, Vector3 pushForce, Color color)
public void Initialize(Vector3 spawnPosition, Quaternion rotation, Collider2D targetCollider, Vector3 pushForce, Sprite sprite)
{
transform.position = spawnPosition;
transform.rotation = rotation;
TargetCollider = targetCollider;
SpriteRenderer.color = color;
SpriteRenderer.sprite = sprite;
Rigidbody2D.linearVelocity = Vector2.zero;
CanInteraction = true;

6
Assets/02.Scripts/Tycoon/LiquidController.cs
View File

@ -267,8 +267,7 @@ namespace BlueWater
private void OnGetLiquidObject(Liquid liquid)
{
_instanceLiquidCount++;
var liquidColor = _currentBarrel.GetLiquidData().Color;
liquid.Initialize(_spawnTransform.position, Quaternion.identity, _reachedCollider, _pushDirection.normalized * _pushPower, liquidColor);
liquid.Initialize(_spawnTransform.position, Quaternion.identity, _reachedCollider, _pushDirection.normalized * _pushPower, _currentBarrel.GetLiquidData().Color);
_activeLiquidDatas.Add(liquid);
}
@ -295,8 +294,7 @@ namespace BlueWater
private void OnGetGarnishObject(Garnish garnish)
{
_instanceLiquidCount++;
var liquidColor = _currentBarrel.GetLiquidData().Color;
garnish.Initialize(_spawnTransform.position, Quaternion.identity, _reachedCollider, _pushDirection.normalized * _pushPower, liquidColor);
garnish.Initialize(_spawnTransform.position, Quaternion.identity, _reachedCollider, _pushDirection.normalized * _pushPower, _currentBarrel.GetLiquidData().Sprite);
_activeGarnishDatas.Add(garnish);
}

8
Assets/02.Scripts/Tycoon/TycoonCardController.cs
View File

@ -102,10 +102,10 @@ namespace BlueWater.Tycoons
_tycoonStatus.PlayerMoveSpeedMultiplier += 0.1f;
break;
case "ExpBoost":
_tycoonStatus.ExpMultiplier += 0.2f;
_tycoonStatus.ExpMultiplier += 0.1f;
break;
case "GoldBoost":
_tycoonStatus.GoldMultiplier += 0.2f;
_tycoonStatus.GoldMultiplier += 0.1f;
break;
case "AllCleanUp":
EventManager.InvokeCleaningAll();
@ -117,7 +117,7 @@ namespace BlueWater.Tycoons
_tycoonStatus.PlayerDashCooldownReduction += 1;
break;
case "TipBoost":
_tycoonStatus.TipMultiplier += 0.2f;
_tycoonStatus.TipMultiplier += 0.1f;
break;
case "EndGoldBoost":
_tycoonStatus.EndGoldMultiplier += 0.1f;
@ -133,7 +133,7 @@ namespace BlueWater.Tycoons
{
EventManager.InvokeAutoSupplyBarrels();
}
_tycoonStatus.BarrelAutoIncrease += 2;
_tycoonStatus.BarrelAutoIncrease += 1;
break;
case "ServerNpcUpgrade":
_tycoonStatus.ServerTipMultiplier += 0.1f;

3
Assets/02.Scripts/Tycoon/TycoonStatus.cs
View File

@ -373,6 +373,9 @@ namespace BlueWater.Tycoons
tycoonManager.CustomerTableController.ShowCustomerTable(6);
tycoonManager.TycoonIngredientController.GarnishBarrel2.Activate();
break;
case "Upgrade7":
tycoonManager.CustomerTableController.ShowCustomerTable(7);
break;
}
}

9
Assets/02.Scripts/TycoonCameraManager.cs
View File

@ -4,7 +4,6 @@ using Sirenix.OdinInspector;
using Unity.Cinemachine;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.Serialization;
namespace BlueWater
{
@ -48,6 +47,9 @@ namespace BlueWater
[SerializeField]
private Vector2 _cameraDistance = new(5f, 10f);
[SerializeField]
private float _initializedDistance = 7f;
[SerializeField, Range(0.01f, 1f)]
private float _zoomPower = 0.5f;
@ -93,8 +95,9 @@ namespace BlueWater
_zoomOutAction.performed += OnZoomChanged;
_zoomInAction.canceled += OnZoomChanged;
_zoomOutAction.canceled += OnZoomChanged;
_targetCameraDistance = _baseCameraComposer.CameraDistance;
_targetCameraDistance = _initializedDistance;
_baseCameraComposer.CameraDistance = _initializedDistance;
}
private void LateUpdate()

23
Assets/02.Scripts/Ui/Tycoon/ManualCocktailButton.cs
View File

@ -5,17 +5,26 @@ using UnityEngine.UI;
namespace BlueWater.Uis
{
public class ManualCocktailButton : MonoBehaviour, ISelectHandler
public class ManualCocktailButton : MonoBehaviour, ISelectHandler, IDeselectHandler
{
[field: SerializeField]
public Button Button { get; private set; }
[field: SerializeField]
public Image Image { get; private set; }
[field: SerializeField]
public Button Button { get; private set; }
public Image SelectedImage { get; private set; }
private Action<ManualCocktailButton> _onSelectedAction;
private ManualBook _manual; // 다른 스크립트가 붙은 오브젝트를 참조 (에디터에서 설정 가능)
private void Start()
{
if (EventSystem.current.currentSelectedGameObject == gameObject) return;
SelectedImage.enabled = false;
}
private void OnDestroy()
{
_onSelectedAction = null;
@ -23,9 +32,15 @@ namespace BlueWater.Uis
public void OnSelect(BaseEventData eventData)
{
SelectedImage.enabled = true;
_onSelectedAction?.Invoke(this);
}
public void OnDeselect(BaseEventData eventData)
{
SelectedImage.enabled = false;
}
public void SetImage(Sprite sprite) => Image.sprite = sprite;
public void AddSelectedAction(Action<ManualCocktailButton> selectedAction)

2
Assets/02.Scripts/Ui/Tycoon/UpgradePopupUi.cs
View File

@ -62,6 +62,8 @@ namespace BlueWater.Uis
_ => liqueurImage.sprite
};
liqueurImage.enabled = int.Parse(currentLevelData.Idx) != 35;
StartCoroutine(StartUpgradePopupCoroutine(currentLevelData));
}

BIN
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidA.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 217 KiB

After

Width:  |  Height:  |  Size: 152 KiB

BIN
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidB.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 242 KiB

After

Width:  |  Height:  |  Size: 170 KiB

BIN
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidC.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 236 KiB

After

Width:  |  Height:  |  Size: 155 KiB

BIN
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidD.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 213 KiB

After

Width:  |  Height:  |  Size: 144 KiB

BIN
Assets/03.Images/Tycoons/Cocktails/Liquids/LiquidE.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 243 KiB

After

Width:  |  Height:  |  Size: 163 KiB

BIN
Assets/03.Images/Tycoons/TableNumbers/Number8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

143
Assets/03.Images/Tycoons/TableNumbers/Number8.png.meta Normal file
View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 2e59433fdfb8d904193a78578799fe50
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/03.Images/Ui/SelectedButton.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB

143
Assets/03.Images/Ui/SelectedButton.png.meta Normal file
View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: ee589fb376657c8409ee578a30295ce4
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

10
Assets/05.Prefabs/GarnishObject.prefab
View File

@ -79,7 +79,7 @@ SpriteRenderer:
m_SortingLayerID: -403788685
m_SortingLayer: 1
m_SortingOrder: 12
m_Sprite: {fileID: 21300000, guid: c6fd44c44ec0c504c9d09e9c3e421708, type: 3}
m_Sprite: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -124,8 +124,8 @@ CircleCollider2D:
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, y: 0}
m_Radius: 0.1
m_Offset: {x: 0, y: 0.5}
m_Radius: 0.15
--- !u!50 &3470010340248184897
Rigidbody2D:
serializedVersion: 5
@ -138,11 +138,11 @@ Rigidbody2D:
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 10
m_Mass: 1
m_LinearDamping: 0
m_AngularDamping: 0
m_GravityScale: 6
m_Material: {fileID: 6200000, guid: 98be3277bd162b947a951461d0862c30, type: 2}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0

3
Assets/05.Prefabs/LiquidObject.prefab
View File

@ -138,7 +138,7 @@ Rigidbody2D:
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 10
m_Mass: 1
m_LinearDamping: 0
m_AngularDamping: 0
m_GravityScale: 6
@ -168,3 +168,4 @@ MonoBehaviour:
SpriteRenderer: {fileID: 3772201455671009312}
Rigidbody2D: {fileID: 3470010340248184897}
_distanceThreshold: 0.5
_autoDestroyTime: 2

2
Assets/05.Prefabs/Managers/SceneController.prefab
View File

@ -180,7 +180,7 @@ MonoBehaviour:
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_ScreenMatchMode: 1
m_MatchWidthOrHeight: 0.5
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96

1003
Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab
View File

File diff suppressed because it is too large Load Diff

8
Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab
View File

@ -80,6 +80,14 @@ PrefabInstance:
propertyPath: m_Size.x
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Size.z
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Center.z
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Sprite
value:

8
Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab
View File

@ -84,6 +84,14 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Size.z
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Center.z
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Sprite
value:

10
Assets/05.Prefabs/Props/Environment/Tycoon/LongTableBar.prefab
View File

@ -30,15 +30,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9659258
value: 0.9396927
objectReference: {fileID: 0}
- target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.x
value: 0.2588191
value: 0.3420201
objectReference: {fileID: 0}
- target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 30
value: 40
objectReference: {fileID: 0}
- target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_ConstrainProportionsScale
@ -88,6 +88,10 @@ PrefabInstance:
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 9c91c2a8c472b7442b3b35a3352da1ca, type: 3}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_DrawMode
value: 2
objectReference: {fileID: 0}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1

199
Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab
View File

@ -1,5 +1,180 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &53315982314087943
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3774544468100080203}
- component: {fileID: 7568071763441364114}
m_Layer: 8
m_Name: GarnishImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3774544468100080203
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 53315982314087943}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.01, y: 0.22, z: -0}
m_LocalScale: {x: 0.15, y: 0.15, z: 0.15}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 8876145828805270831}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7568071763441364114
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 53315982314087943}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 4
m_Sprite: {fileID: 21300000, guid: 1506abfb2ff26fa4aacdeb4b0efc9663, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &2950790416231040701
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8876145828805270831}
- component: {fileID: 5638515703643889331}
m_Layer: 8
m_Name: GarnishImageBackground
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8876145828805270831
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2950790416231040701}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.4, y: 0, z: 0}
m_LocalScale: {x: -0.8, y: 0.8, z: 0.8}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3774544468100080203}
m_Father: {fileID: 203741387490724426}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5638515703643889331
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2950790416231040701}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 3
m_Sprite: {fileID: 21300000, guid: d2ba40b4f14eca14e816e51ee69cf81a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &7343451337687172630
PrefabInstance:
m_ObjectHideFlags: 0
@ -8,18 +183,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40
@ -216,7 +379,10 @@ PrefabInstance:
- {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_RemovedGameObjects:
- {fileID: 8884531212319162473, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 8876145828805270831}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
@ -237,6 +403,11 @@ PrefabInstance:
insertIndex: -1
addedObject: {fileID: 183186261584935481}
m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
--- !u!4 &203741387490724426 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!1 &672328621937310823 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
@ -378,6 +549,8 @@ MonoBehaviour:
<IsStatue>k__BackingField: 0
<IsActivated>k__BackingField: 0
<IsAutoSupply>k__BackingField: 0
_signImage: {fileID: 7568071763441364114}
_garnishType: 0
--- !u!114 &3688680572007923171
MonoBehaviour:
m_ObjectHideFlags: 0

24
Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab
View File

@ -113,7 +113,7 @@ Transform:
m_GameObject: {fileID: 5773649549535946419}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.508, y: 0, z: 0}
m_LocalPosition: {x: -0.5, y: 0, z: 0}
m_LocalScale: {x: -1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -357,18 +357,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40
@ -415,11 +403,11 @@ PrefabInstance:
objectReference: {fileID: 21300000, guid: d98551edcbd98e542af000fc7aaaf794, type: 3}
- target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.x
value: -0.17
value: -0.3
objectReference: {fileID: 0}
- target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsActive
@ -674,7 +662,7 @@ MonoBehaviour:
physicsMovementRelativeTo: {fileID: 0}
updateTiming: 1
unscaledTime: 0
_animationName: IdleNormal
_animationName: Empty
loop: 0
timeScale: 1
--- !u!33 &183186261584935481
@ -708,7 +696,7 @@ MonoBehaviour:
<OutlineMaterial>k__BackingField: {fileID: 0}
<LocalizeStringEvent>k__BackingField: {fileID: 1653087204473300138}
<EnableInteraction>k__BackingField: 1
<InteractionRadius>k__BackingField: 0.8
<InteractionRadius>k__BackingField: 1
<InteractionMessage>k__BackingField:
IsOpened: 0
SpineController: {fileID: 3688680572007923171}
@ -726,8 +714,6 @@ MonoBehaviour:
<IsActivated>k__BackingField: 0
<IsAutoSupply>k__BackingField: 0
_liquidImage: {fileID: 6817574259189873408}
_fill: {fileID: 7052380446467937511}
_colorIntensity: 2
<IsMoldy>k__BackingField: 0
_playerHoldingTime: 3
--- !u!114 &3688680572007923171

8
Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab
View File

@ -68,7 +68,7 @@ MonoBehaviour:
m_text: 1000
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 1072195877514824051, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -286,15 +286,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.x
value: 1
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.y
value: 1
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.z
value: 1
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.x

199
Assets/05.Prefabs/Props/Furniture/Interactions/SlimeGarnish.prefab
View File

@ -1,5 +1,180 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2284906308842303576
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8893665596850653755}
- component: {fileID: 7499315364276866109}
m_Layer: 8
m_Name: GarnishImageBackground
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8893665596850653755
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2284906308842303576}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.5, y: 0, z: 0}
m_LocalScale: {x: -1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3094450970644478020}
m_Father: {fileID: 203741387490724426}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7499315364276866109
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2284906308842303576}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 3
m_Sprite: {fileID: 21300000, guid: d2ba40b4f14eca14e816e51ee69cf81a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &2595489033786271151
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3094450970644478020}
- component: {fileID: 5482427695418099457}
m_Layer: 8
m_Name: GarnishImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3094450970644478020
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2595489033786271151}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.01, y: 0.22, z: -0}
m_LocalScale: {x: 0.15, y: 0.15, z: 0.15}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 8893665596850653755}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5482427695418099457
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2595489033786271151}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 4
m_Sprite: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &7343451337687172630
PrefabInstance:
m_ObjectHideFlags: 0
@ -8,18 +183,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40
@ -192,7 +355,10 @@ PrefabInstance:
- {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_RemovedGameObjects:
- {fileID: 8884531212319162473, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
addedObject: {fileID: 8893665596850653755}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
insertIndex: -1
@ -213,6 +379,11 @@ PrefabInstance:
insertIndex: -1
addedObject: {fileID: 183186261584935481}
m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
--- !u!4 &203741387490724426 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
m_PrefabInstance: {fileID: 7343451337687172630}
m_PrefabAsset: {fileID: 0}
--- !u!1 &672328621937310823 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
@ -354,6 +525,8 @@ MonoBehaviour:
<IsStatue>k__BackingField: 0
<IsActivated>k__BackingField: 0
<IsAutoSupply>k__BackingField: 0
_signImage: {fileID: 5482427695418099457}
_garnishType: 0
--- !u!114 &3688680572007923171
MonoBehaviour:
m_ObjectHideFlags: 0

2
Assets/05.Prefabs/Uis/InteractionCanvas.prefab
View File

@ -86,7 +86,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
m_PresetInfoIsWorld: 1
--- !u!114 &5028824454365225125
MonoBehaviour:
m_ObjectHideFlags: 0

87
Assets/05.Prefabs/Uis/Tycoons/ManualCocktailButton.prefab
View File

@ -33,12 +33,13 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 423343075028179217}
- {fileID: 8010817879590752548}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 140, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &555777395799226202
CanvasRenderer:
@ -97,7 +98,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@ -109,7 +110,7 @@ MonoBehaviour:
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 21300000, guid: ee589fb376657c8409ee578a30295ce4, type: 3}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
@ -118,7 +119,7 @@ MonoBehaviour:
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 4734109970123610176}
m_TargetGraphic: {fileID: 2561490607785646214}
m_OnClick:
m_PersistentCalls:
m_Calls: []
@ -134,8 +135,84 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b470f74ac4a54bb4fae06d22ecef1c0e, type: 3}
m_Name:
m_EditorClassIdentifier:
<Image>k__BackingField: {fileID: 1754191685957469056}
<Button>k__BackingField: {fileID: 5439083395804682389}
<Image>k__BackingField: {fileID: 1754191685957469056}
<SelectedImage>k__BackingField: {fileID: 2561490607785646214}
--- !u!1 &2471807802985106218
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8010817879590752548}
- component: {fileID: 6221995006514514052}
- component: {fileID: 2561490607785646214}
m_Layer: 5
m_Name: Selected
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8010817879590752548
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2471807802985106218}
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: []
m_Father: {fileID: 7646053445687989879}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6221995006514514052
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2471807802985106218}
m_CullTransparentMesh: 1
--- !u!114 &2561490607785646214
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2471807802985106218}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: ee589fb376657c8409ee578a30295ce4, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4085502877294975030
GameObject:
m_ObjectHideFlags: 0

40
Assets/05.Prefabs/Uis/Tycoons/TycoonGameMenuCanvas.prefab
View File

@ -33,10 +33,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 6023463152304223989}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -60}
m_SizeDelta: {x: 179.24, y: 65.17}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &7007680036530545365
CanvasRenderer:
@ -432,23 +432,23 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 949839561363117171, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 949839561363117171, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 949839561363117171, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 179.24
objectReference: {fileID: 0}
- target: {fileID: 949839561363117171, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: 65.17
objectReference: {fileID: 0}
- target: {fileID: 949839561363117171, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -60
objectReference: {fileID: 0}
- target: {fileID: 1868574217747462661, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_IsActive
@ -480,7 +480,7 @@ PrefabInstance:
objectReference: {fileID: 8317783694176110988}
- target: {fileID: 3706005337972264669, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_AnchorMax.y
@ -532,23 +532,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 83.71
objectReference: {fileID: 0}
- target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: 65.17
objectReference: {fileID: 0}
- target: {fileID: 5989632971468279782, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -60
objectReference: {fileID: 0}
- target: {fileID: 6221531896277863998, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_text
@ -556,23 +556,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 83.71
objectReference: {fileID: 0}
- target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: 65.17
objectReference: {fileID: 0}
- target: {fileID: 6552600526867753564, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -60
objectReference: {fileID: 0}
- target: {fileID: 6620118968858819738, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_Navigation.m_SelectOnUp

8
Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab
View File

@ -5571,7 +5571,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -120}
m_AnchoredPosition: {x: 100, y: -150}
m_SizeDelta: {x: 700, y: 260}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5735658224767224140
@ -9561,8 +9561,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 170, y: -380}
m_SizeDelta: {x: 500, y: 0}
m_AnchoredPosition: {x: 220, y: -410}
m_SizeDelta: {x: 500, y: 600}
m_Pivot: {x: 0, y: 1}
--- !u!114 &6344500107423022425
MonoBehaviour:
@ -11325,7 +11325,7 @@ MonoBehaviour:
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_ScreenMatchMode: 1
m_MatchWidthOrHeight: 0.5
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96

10
Assets/13.Localization/Tables/StringDataTable_en.asset
View File

@ -75,11 +75,11 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 12185765163021
m_Localized: Increases EXP gain by 20%
m_Localized: Increases EXP gain by 10%
m_Metadata:
m_Items: []
- m_Id: 12185765163022
m_Localized: Increases gold earnings by 20%
m_Localized: Increases gold earnings by 10%
m_Metadata:
m_Items: []
- m_Id: 12185765163023
@ -95,7 +95,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 12185765163026
m_Localized: Increases tip earnings by 20%
m_Localized: Increases tip earnings by 10%
m_Metadata:
m_Items: []
- m_Id: 12185765163027
@ -111,11 +111,11 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 12185765163030
m_Localized: Auto-recharges +2ml of every alcohol ingredient per second
m_Localized: Auto-recharges +1ml of every alcohol ingredient per second
m_Metadata:
m_Items: []
- m_Id: 12185765163031
m_Localized: Increases server tip earnings by 20%
m_Localized: Increases server tip earnings by 10%
m_Metadata:
m_Items: []
- m_Id: 12185765163032

10
Assets/13.Localization/Tables/StringDataTable_es-ES.asset
View File

@ -75,11 +75,11 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 12185765163021
m_Localized: "Obtenci\xF3n de EXP +20%"
m_Localized: "Obtenci\xF3n de EXP +10%"
m_Metadata:
m_Items: []
- m_Id: 12185765163022
m_Localized: "Obtenci\xF3n de oro +20%"
m_Localized: "Obtenci\xF3n de oro +10%"
m_Metadata:
m_Items: []
- m_Id: 12185765163023
@ -95,7 +95,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 12185765163026
m_Localized: "Obtenci\xF3n de propina +20%"
m_Localized: "Obtenci\xF3n de propina +10%"
m_Metadata:
m_Items: []
- m_Id: 12185765163027
@ -111,11 +111,11 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 12185765163030
m_Localized: "Recarga autom\xE1tica de todos los ingredientes de c\xF3ctel +2ml/s"
m_Localized: "Recarga autom\xE1tica de todos los ingredientes de c\xF3ctel +1ml/s"
m_Metadata:
m_Items: []
- m_Id: 12185765163031
m_Localized: "Obtenci\xF3n de propina de los mozos +20%"
m_Localized: "Obtenci\xF3n de propina de los mozos +10%"
m_Metadata:
m_Items: []
- m_Id: 12185765163032

10
Assets/13.Localization/Tables/StringDataTable_ko.asset
View File

@ -75,11 +75,11 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 12185765163021
m_Localized: "\uACBD\uD5D8\uCE58 \uD68D\uB4DD\uB7C9 +20%"
m_Localized: "\uACBD\uD5D8\uCE58 \uD68D\uB4DD\uB7C9 +10%"
m_Metadata:
m_Items: []
- m_Id: 12185765163022
m_Localized: "\uACE8\uB4DC \uD68D\uB4DD\uB7C9 +20%"
m_Localized: "\uACE8\uB4DC \uD68D\uB4DD\uB7C9 +10%"
m_Metadata:
m_Items: []
- m_Id: 12185765163023
@ -95,7 +95,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 12185765163026
m_Localized: "\uD301 \uD68D\uB4DD\uB7C9 +20%"
m_Localized: "\uD301 \uD68D\uB4DD\uB7C9 +10%"
m_Metadata:
m_Items: []
- m_Id: 12185765163027
@ -113,12 +113,12 @@ MonoBehaviour:
m_Items: []
- m_Id: 12185765163030
m_Localized: "\uBAA8\uB4E0 \uCE75\uD14C\uC77C \uC7AC\uB8CC\uAC00 \uCD08\uB2F9
+2ml \uC790\uB3D9 \uCDA9\uC804"
+1ml \uC790\uB3D9 \uCDA9\uC804"
m_Metadata:
m_Items: []
- m_Id: 12185765163031
m_Localized: "\uC11C\uBE59 \uC885\uC5C5\uC6D0\uC758 \uD301 \uD68D\uB4DD\uB7C9
+20%"
+10%"
m_Metadata:
m_Items: []
- m_Id: 12185765163032

10
Assets/13.Localization/Tables/StringDataTable_zh-CN.asset
View File

@ -75,11 +75,11 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 12185765163021
m_Localized: "\u7ECF\u9A8C\u503C\u83B7\u5F97\u91CF\u589E\u52A0+20%"
m_Localized: "\u7ECF\u9A8C\u503C\u83B7\u5F97\u91CF\u589E\u52A0+10%"
m_Metadata:
m_Items: []
- m_Id: 12185765163022
m_Localized: "\u91D1\u5E01\u83B7\u5F97\u91CF\u589E\u52A0+20%"
m_Localized: "\u91D1\u5E01\u83B7\u5F97\u91CF\u589E\u52A0+10%"
m_Metadata:
m_Items: []
- m_Id: 12185765163023
@ -95,7 +95,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 12185765163026
m_Localized: "\u5C0F\u8D39\u83B7\u5F97\u91CF\u589E\u52A0+20%"
m_Localized: "\u5C0F\u8D39\u83B7\u5F97\u91CF\u589E\u52A0+10%"
m_Metadata:
m_Items: []
- m_Id: 12185765163027
@ -111,11 +111,11 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 12185765163030
m_Localized: "\u6240\u6709\u9E21\u5C3E\u9152\u6750\u6599\u6BCF\u79D2\u81EA\u52A8\u8865\u5145+2ml"
m_Localized: "\u6240\u6709\u9E21\u5C3E\u9152\u6750\u6599\u6BCF\u79D2\u81EA\u52A8\u8865\u5145+1ml"
m_Metadata:
m_Items: []
- m_Id: 12185765163031
m_Localized: "\u670D\u52A1\u5458\u7684\u5C0F\u8D39\u83B7\u5F97\u91CF\u589E\u52A0+20%"
m_Localized: "\u670D\u52A1\u5458\u7684\u5C0F\u8D39\u83B7\u5F97\u91CF\u589E\u52A0+10%"
m_Metadata:
m_Items: []
- m_Id: 12185765163032

BIN
Assets/Resources/Excel/LevelDataTable.xlsx
View File

Binary file not shown.

6
Assets/Resources/JSON/LevelDataTable.json
View File

@ -450,7 +450,7 @@
"WaitTime": 0,
"HurryTime": 24,
"EatingTime": 5,
"OpenUpgrade": "",
"OpenUpgrade": "Upgrade7",
"RewardBoxType": 1,
"RewardBoxPrice": 5000
},
@ -515,7 +515,7 @@
"WaitTime": 0,
"HurryTime": 20,
"EatingTime": 4,
"OpenUpgrade": "Upgrade7",
"OpenUpgrade": "",
"RewardBoxType": 1,
"RewardBoxPrice": 6000
},
@ -580,7 +580,7 @@
"WaitTime": 0,
"HurryTime": 16,
"EatingTime": 3,
"OpenUpgrade": "Upgrade8",
"OpenUpgrade": "",
"RewardBoxType": 1,
"RewardBoxPrice": 7000
},

2
ProjectSettings/ProjectSettings.asset
View File

@ -140,7 +140,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 0.3.5.3
bundleVersion: 0.3.5.5
preloadedAssets:
- {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
- {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}

2
ProjectSettings/TagManager.asset
View File

@ -28,7 +28,7 @@ TagManager:
- DamageableProps
- Liquid
- Garnish
- BackgroundUi
-
-
-
-