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

0.3.1.1 업데이트

Browse Source
This commit is contained in:
NTG_Lenovo 2024-10-10 17:42:20 +09:00
parent 37612b8dbe
commit dd3a023793
22 changed files with 832 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21428,14 +21428,19 @@ MonoBehaviour:
_spawnLocation: {fileID: 128638924}
_billInfos:
- IsEmpty: 1
IsMoving: 0
<Position>k__BackingField: {x: -290, y: -120, z: 0}
- IsEmpty: 1
IsMoving: 0
<Position>k__BackingField: {x: -170, y: -120, z: 0}
- IsEmpty: 1
IsMoving: 0
<Position>k__BackingField: {x: -50, y: -120, z: 0}
- IsEmpty: 1
IsMoving: 0
<Position>k__BackingField: {x: 70, y: -120, z: 0}
- IsEmpty: 1
IsMoving: 0
<Position>k__BackingField: {x: 190, y: -120, z: 0}
--- !u!1 &1858488034
GameObject:

8
Assets/01.Scenes/99.Tycoon43.unity
View File

@ -4813,6 +4813,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_goldAnimator: {fileID: 1308258170}
_goldText: {fileID: 677143483}
_animationTime: 1
--- !u!1 &440736213
GameObject:
m_ObjectHideFlags: 0
@ -8720,6 +8721,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_persistent: 0
<MainCamera>k__BackingField: {fileID: 873223991}
<UiCamera>k__BackingField: {fileID: 0}
<LiquidOverlayCamera>k__BackingField: {fileID: 1985878519}
cameraLocation: {fileID: 1634548838}
<BaseCamera>k__BackingField: {fileID: 545850352}
@ -17139,12 +17141,15 @@ MonoBehaviour:
<TycoonIngredientController>k__BackingField: {fileID: 1665075873}
_dailyBgm: TycoonDailyBgm1
<TycoonStatus>k__BackingField:
_maxLevel: 0
_currentLevel: 0
_maxPlayerHealth: 0
_currentPlayerHealth: 0
_playerMoveSpeedMultiplier: 0
_currentExp: 0
_expMultiplier: 0
_currentGold: 0
_goldMultiplier: 0
_currentLiquidAmountA: 0
_currentLiquidAmountB: 0
_currentLiquidAmountC: 0
@ -17181,7 +17186,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9dd1d4a57e5f2dc4ba2346bf6359f094, type: 3}
m_Name:
m_EditorClassIdentifier:
_stageDataSo: {fileID: 11400000, guid: 5fd0220da8e388e4c872a9fcc80d2c76, type: 2}
<StageDataSo>k__BackingField: {fileID: 11400000, guid: 5fd0220da8e388e4c872a9fcc80d2c76, type: 2}
_dailyCustomerVisitInfos: []
--- !u!114 &1665075873
MonoBehaviour:
@ -22437,6 +22442,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_panel: {fileID: 1983229437}
_fillImage: {fileID: 0}
_keyText: {fileID: 242229611}
_interactionText: {fileID: 1728335879}
--- !u!114 &2041095998 stripped

16
Assets/02.Scripts/Character/Npc/Customer.cs
View File

@ -370,11 +370,12 @@ namespace BlueWater.Npcs.Customers
CurrentTableSeat.CleanTable();
}
var gold = CurrentLevelData.Gold * TycoonManager.Instance.TycoonStatus.GoldMultiplier;
var exp = (int)(CurrentLevelData.Exp * TycoonManager.Instance.TycoonStatus.ExpMultiplier);
var gold = (int)(CurrentLevelData.Gold * TycoonManager.Instance.TycoonStatus.GoldMultiplier);
PayMoneyParticle.Play();
PayMoneyUi.PayMoney((int)gold);
TycoonManager.Instance.TycoonStatus.CurrentExp += CurrentLevelData.Exp;
TycoonManager.Instance.TycoonStatus.CurrentGold += CurrentLevelData.Gold;
TycoonManager.Instance.TycoonStatus.CurrentExp += exp;
TycoonManager.Instance.TycoonStatus.CurrentGold += gold;
}
// public void PayMoney(int foodPrice, int tipAmount)
@ -401,6 +402,7 @@ namespace BlueWater.Npcs.Customers
//TycoonManager.Instance.TycoonStageController.RegisterCustomerVisitInfo(customerVisitInfo);
AIMovement.StopMove();
BehaviorTree.DisableBehavior();
Destroy(gameObject);
}
@ -420,7 +422,11 @@ namespace BlueWater.Npcs.Customers
public void MoveSpawnPosition()
{
CurrentTableSeat.VacateSeat();
if (CurrentTableSeat)
{
CurrentTableSeat.VacateSeat();
CurrentTableSeat = null;
}
AIMovement.Move(_spawnTransform.position);
}

2
Assets/02.Scripts/Prop/Tycoon/Barrel.cs
View File

@ -91,7 +91,7 @@ namespace BlueWater.Tycoons
}
var consumeAmount = CurrentAmount - amount;
SetCurrentAmount(consumeAmount);
SetCurrentAmount(consumeAmount, true);
}
public bool TryConsume(int amount)

8
Assets/02.Scripts/ScriptableObject/CardDataTable.asset
View File

@ -18,8 +18,8 @@ MonoBehaviour:
<Idx>k__BackingField: HeartPlus
<Img>k__BackingField: HeartPlusImg
<ScriptText>k__BackingField: "\uD558\uD2B8 \uD55C\uCE78 \uCD94\uAC00"
<Max>k__BackingField: 5
<Ratio>k__BackingField: 5
<Max>k__BackingField: 3
<Ratio>k__BackingField: 10
<Sprite>k__BackingField: {fileID: 21300000, guid: d0b6eba4ac33ece44bccd11e57e415e8, type: 3}
- <Key>k__BackingField: HeartHeal
<Value>k__BackingField:
@ -27,7 +27,7 @@ MonoBehaviour:
<Img>k__BackingField: HeartHealImg
<ScriptText>k__BackingField: "\uD558\uD2B8 \uD55C\uCE78 \uD68C\uBCF5"
<Max>k__BackingField: 10
<Ratio>k__BackingField: 10
<Ratio>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 21300000, guid: 466393baecf741d449a05f3b63317368, type: 3}
- <Key>k__BackingField: HeartAllHeal
<Value>k__BackingField:
@ -35,7 +35,7 @@ MonoBehaviour:
<Img>k__BackingField: HeartAllHealImg
<ScriptText>k__BackingField: "\uD558\uD2B8 \uC804\uCCB4 \uD68C\uBCF5"
<Max>k__BackingField: 0
<Ratio>k__BackingField: 5
<Ratio>k__BackingField: 10
<Sprite>k__BackingField: {fileID: 21300000, guid: 7579ee4fd1c5ed34d939eeef18c625be, type: 3}
- <Key>k__BackingField: AddLiquidB
<Value>k__BackingField:

2
Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset
View File

@ -28,7 +28,7 @@ MonoBehaviour:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
<Sprite>k__BackingField: {fileID: 21300000, guid: 7f08919123d8bb84194bd4be22c0dee8, type: 3}
- <Key>k__BackingField: Cocktail001
<Value>k__BackingField:
<Idx>k__BackingField: Cocktail001

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

@ -87,19 +87,8 @@ namespace BlueWater.Tycoons
if (_currentLevel >= _maxLevel) return;
var previousExp = _currentExp;
var maxExp = TycoonManager.Instance.GetCurrentLevelData().RequiredExp;
var addedExp = (int)((value - previousExp) * _expMultiplier);
var newExp = previousExp + addedExp;
if (value >= maxExp)
{
_currentExp = newExp - maxExp;
}
else
{
_currentExp = newExp;
}
var addedExp = value - previousExp;
_currentExp = value;
EventManager.OnChangeExp?.Invoke(new ExpData(_currentLevel, previousExp, addedExp));
}
}
@ -121,7 +110,7 @@ namespace BlueWater.Tycoons
set
{
_currentGold = value;
EventManager.OnChangeGold?.Invoke(value);
EventManager.OnChangeGold?.Invoke(_currentGold);
}
}

4
Assets/02.Scripts/Ui/Tycoon/Bill.cs
View File

@ -32,6 +32,9 @@ namespace BlueWater
[SerializeField]
private TMP_Text _tableNumberText;
[SerializeField]
private GameObject _makingCocktailPivotObject;
[SerializeField]
private Color _startColor = Color.green;
@ -51,6 +54,7 @@ namespace BlueWater
_slider.value = 1f;
_orderImage.sprite = customer.OrderedCocktailData.Sprite;
_tableNumberText.text = customer.CurrentTableSeat.TableNumber.ToString();
_makingCocktailPivotObject.SetActive(false);
var sliderSequence = DOTween.Sequence();
sliderSequence.Append(_slider.DOValue(0f, customer.CurrentLevelData.HurryTime)

4
Assets/02.Scripts/Ui/Tycoon/ExpUi.cs
View File

@ -96,14 +96,14 @@ namespace BlueWater.Uis
yield return _tween.WaitForCompletion();
TycoonManager.Instance.TycoonStatus.CurrentLevel++;
currentLevel++;
currentLevelData = TycoonManager.Instance.LevelDataSo.GetDataByIdx(currentLevel.ToString());
currentLevelData = TycoonManager.Instance.GetCurrentLevelData();
requireExp = currentLevelData.RequiredExp;
_expSlider.value = 0f;
newExp = 0;
startExp = 0;
endExp = remainExp;
remainExp = endExp - requireExp;
elapsedTime = 0f;
}
else

8
Assets/02.Scripts/Ui/Tycoon/PayMoneyUi.cs
View File

@ -1,3 +1,4 @@
using System;
using DG.Tweening;
using Sirenix.OdinInspector;
using TMPro;
@ -16,8 +17,15 @@ namespace BlueWater.Uis
[SerializeField, Required]
private TMP_Text _goldText;
private void Start()
{
EventManager.OnChangeGold += PayMoney;
}
private void OnDestroy()
{
EventManager.OnChangeGold -= PayMoney;
_moveAnimation.DOKill();
}

BIN
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/FailedCocktail.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 300 KiB

143
Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/FailedCocktail.png.meta Normal file
View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 7f08919123d8bb84194bd4be22c0dee8
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: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 1024
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/Tycoon/Loading.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 56 KiB

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

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 2d88aaa71c840f643ae9292549f5b217
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: 1024
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:

176
Assets/05.Prefabs/Uis/Tycoons/Bill.prefab
View File

@ -351,6 +351,7 @@ RectTransform:
- {fileID: 6645972450045353238}
- {fileID: 4101085107370292335}
- {fileID: 7989580489010594267}
- {fileID: 6337954123549054090}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
@ -437,6 +438,7 @@ MonoBehaviour:
_orderImage: {fileID: 1094699508538862306}
_tableNumberImageObject: {fileID: 2596367034953283962}
_tableNumberText: {fileID: 882719813517343284}
_makingCocktailPivotObject: {fileID: 8887727100253185871}
_startColor: {r: 0, g: 1, b: 0, a: 1}
_endColor: {r: 1, g: 0, b: 0, a: 1}
--- !u!114 &5491020201375474307
@ -663,6 +665,104 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &6939558171657399220
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8523288493677748864}
- component: {fileID: 1554072011379340431}
- component: {fileID: 85948947277134488}
- component: {fileID: 1487526085746003340}
m_Layer: 5
m_Name: MakingStateImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8523288493677748864
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6939558171657399220}
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: 6337954123549054090}
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: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1554072011379340431
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6939558171657399220}
m_CullTransparentMesh: 1
--- !u!114 &85948947277134488
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6939558171657399220}
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: 2d88aaa71c840f643ae9292549f5b217, 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!95 &1487526085746003340
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6939558171657399220}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 3b2988dbee1272f49a12a9b19fff3ef3, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &7921971957933687573
GameObject:
m_ObjectHideFlags: 0
@ -699,3 +799,79 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8887727100253185871
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6337954123549054090}
- component: {fileID: 5739841026593938405}
- component: {fileID: 4729266705832386297}
m_Layer: 5
m_Name: MakingCocktailPivot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6337954123549054090
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8887727100253185871}
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:
- {fileID: 8523288493677748864}
m_Father: {fileID: 491169346809573176}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -55}
m_SizeDelta: {x: -90, y: 70}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5739841026593938405
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8887727100253185871}
m_CullTransparentMesh: 1
--- !u!114 &4729266705832386297
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8887727100253185871}
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: 2d88aaa71c840f643ae9292549f5b217, 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

2
Assets/07.Animations/Uis/Bill/Bill.controller
View File

@ -156,7 +156,7 @@ AnimatorStateMachine:
m_Position: {x: 490, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: -262726275448414841}
m_Position: {x: 500, y: 50, z: 0}
m_Position: {x: 510, y: 60, z: 0}
- serializedVersion: 1
m_State: {fileID: -7492876922963201345}
m_Position: {x: 250, y: 120, z: 0}

72
Assets/07.Animations/Uis/Bill/Loading.controller Normal file
View File

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Loading
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1413341799483793728}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &1067226796086571680
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MakingCocktail
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: cd405ad9681636e4f9b08290c5f56f9d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1413341799483793728
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1067226796086571680}
m_Position: {x: 386.38583, y: 116.45911, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1067226796086571680}

8
Assets/07.Animations/Uis/Bill/Loading.controller.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3b2988dbee1272f49a12a9b19fff3ef3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

231
Assets/07.Animations/Uis/Bill/MakingCocktail.anim Normal file
View File

@ -0,0 +1,231 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MakingCocktail
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: -80.064995}
outSlope: {x: 0, y: 0, z: -80.064995}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.7091656}
- serializedVersion: 3
time: 0.26666668
value: {x: 0, y: 0, z: -230.75134}
inSlope: {x: 0, y: 0, z: -655.39667}
outSlope: {x: 0, y: 0, z: -655.39667}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.76666665
value: {x: 0, y: 0, z: -358.91693}
inSlope: {x: 0, y: 0, z: -4.1819577}
outSlope: {x: 0, y: 0, z: -4.1819577}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 0, y: 0, z: -359.68362}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: -80.064995
outSlope: -80.064995
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.7091656
- serializedVersion: 3
time: 0.26666668
value: -230.75134
inSlope: -655.39667
outSlope: -655.39667
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.76666665
value: -358.91693
inSlope: -4.1819577
outSlope: -4.1819577
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -359.68362
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path:
classID: 224
script: {fileID: 0}
flags: 0
m_EulerEditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path:
classID: 224
script: {fileID: 0}
flags: 0
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []

8
Assets/07.Animations/Uis/Bill/MakingCocktail.anim.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cd405ad9681636e4f9b08290c5f56f9d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

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

Binary file not shown.

8
Assets/Resources/JSON/CardDataTable.json
View File

@ -3,22 +3,22 @@
"Idx": "HeartPlus",
"Img": "HeartPlusImg",
"ScriptText": "하트 한칸 추가",
"Max": 5,
"Ratio": 5
"Max": 3,
"Ratio": 10
},
{
"Idx": "HeartHeal",
"Img": "HeartHealImg",
"ScriptText": "하트 한칸 회복",
"Max": 10,
"Ratio": 10
"Ratio": 0
},
{
"Idx": "HeartAllHeal",
"Img": "HeartAllHealImg",
"ScriptText": "하트 전체 회복",
"Max": 0,
"Ratio": 5
"Ratio": 10
},
{
"Idx": "AddLiquidB",