# Conflicts:
#	Assets/04.Materials/Ink.mat
This commit is contained in:
SweetJJuya 2024-11-19 16:58:37 +09:00
commit bda714eb94
46 changed files with 3993 additions and 482 deletions

View File

@ -7514,11 +7514,7 @@ PrefabInstance:
value: 82.81
objectReference: {fileID: 0}
- target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_LocalPosition.y
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
@ -7538,11 +7534,7 @@ PrefabInstance:
value: 82.81
objectReference: {fileID: 0}
- target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_LocalPosition.y
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
@ -7686,11 +7678,7 @@ PrefabInstance:
value: 175.73
objectReference: {fileID: 0}
- target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_LocalPosition.y
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}

File diff suppressed because it is too large Load Diff

View File

@ -68,8 +68,8 @@ namespace BlueWater.Npcs.Customers
[field: SerializeField]
public InteractionCanvas InteractionCanvas { get; private set; }
[field: SerializeField]
public BalloonUi BalloonUi { get; private set; }
// [field: SerializeField]
// public BalloonUi BalloonUi { get; private set; }
[SerializeField]
private PayMoneyUi _payMoneyUiObject;
@ -96,6 +96,12 @@ namespace BlueWater.Npcs.Customers
[SerializeField]
private Vomiting _vomiting;
[SerializeField]
private Color _startColor = Color.green;
[SerializeField]
private Color _endColor = Color.red;
[field: Title("실시간 데이터")]
[field: SerializeField]
public LevelData CurrentLevelData { get; private set; }
@ -210,7 +216,7 @@ namespace BlueWater.Npcs.Customers
MeshRenderer = VisualLook.GetComponent<MeshRenderer>();
BarkTrigger = transform.Find("DialogueSystem").GetComponent<BarkTrigger>();
InteractionCanvas = transform.GetComponentInChildren<InteractionCanvas>();
BalloonUi = InteractionCanvas.transform.GetComponentInChildren<BalloonUi>();
// BalloonUi = InteractionCanvas.transform.GetComponentInChildren<BalloonUi>();
SpineController = GetComponent<SpineController>();
AIMovement = GetComponent<AiMovement>();
@ -282,7 +288,7 @@ namespace BlueWater.Npcs.Customers
public void ServedItem(CocktailData cocktailData)
{
BalloonUi.ReceiveItem(cocktailData);
CurrentTableSeat.MenuBalloonUi.ReceiveItem(cocktailData);
if (IsOrderedCorrected)
{
CurrentTableSeat.SetFood();
@ -419,7 +425,7 @@ namespace BlueWater.Npcs.Customers
public bool IsWaitTimeOver()
{
var isWaitTimeOver = BalloonUi.IsWaitTimeOver();
var isWaitTimeOver = CurrentTableSeat.MenuBalloonUi.IsWaitTimeOver();
if (isWaitTimeOver)
{
EventManager.InvokeOrderResult(this, false);
@ -499,7 +505,7 @@ namespace BlueWater.Npcs.Customers
IsOrderedCorrected = false;
OrderedCocktailData = TycoonManager.Instance.TycoonIngredientController.GetRandomCocktailData();
var hurryTime = CurrentLevelData.HurryTime + TycoonManager.Instance.TycoonStatus.CustomerHurryTimeIncrease;
BalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, hurryTime);
CurrentTableSeat.MenuBalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, hurryTime, startColor: _startColor, endColor: _endColor);
_customerInteractionType = CustomerInteractionType.ServedCocktail;
RegisterPlayerInteraction();
@ -546,7 +552,7 @@ namespace BlueWater.Npcs.Customers
{
if (!IsOrderedCocktail()) return;
BalloonUi.ResetGauge();
CurrentTableSeat.MenuBalloonUi.ResetGauge();
CurrentBill.ResetGauge();
}

View File

@ -244,6 +244,7 @@ namespace BlueWater.Players.Tycoons
{
dashCooldown = DashCooldown;
}
EventManager.InvokeDashCooldown(dashCooldown);
StartCoroutine(Utils.CoolDownCoroutine(dashCooldown, () => IsDashCoolDownActive = false));
}

View File

@ -109,6 +109,12 @@ namespace BlueWater
}
// 플레이어
public static Action<float> OnDashCooldown;
public static void InvokeDashCooldown(float cooldown)
{
OnDashCooldown?.Invoke(cooldown);
}
// 레벨업 이벤트
public static Action<LevelData> OnLevelUp;
public static void InvokeLevelUp(LevelData levelData)

View File

@ -152,6 +152,64 @@ namespace BlueWater
}
return action;
}
public string GetBoundKey(InputActionMaps actionMapName, string actionName)
{
if (IsNullCurrentPlayerInput()) return null;
var actionMap = _currentPlayerInput.actions.FindActionMap(actionMapName.ToString(), true);
if (actionMap == null)
{
Debug.LogError($"Action Map '{actionMapName}' not found!");
return null;
}
var action = actionMap.FindAction(actionName, true);
if (action == null)
{
Debug.LogError($"Action '{actionName}' not found in Action Map '{actionMapName}'!");
return null;
}
// 첫 번째 바인딩에서 키 이름 가져오기
foreach (var binding in action.bindings)
{
if (!string.IsNullOrEmpty(binding.path))
{
// 키 이름만 추출
var key = InputControlPath.ToHumanReadableString(binding.path, InputControlPath.HumanReadableStringOptions.OmitDevice);
return key;
}
}
Debug.LogWarning($"No bindings found for action '{actionName}' in Action Map '{actionMapName}'.");
return null;
}
public string GetBoundKey(InputAction inputAction)
{
if (IsNullCurrentPlayerInput()) return null;
if (inputAction == null)
{
Debug.LogError($"Action not found'!");
return null;
}
// 첫 번째 바인딩에서 키 이름 가져오기
foreach (var binding in inputAction.bindings)
{
if (!string.IsNullOrEmpty(binding.path))
{
// 키 이름만 추출
var key = InputControlPath.ToHumanReadableString(binding.path, InputControlPath.HumanReadableStringOptions.OmitDevice);
return key;
}
}
Debug.LogWarning($"No bindings found for action '{inputAction}'");
return null;
}
public bool IsCurrentActionMap(InputActionMaps inputActionMaps)
{

View File

@ -12,6 +12,9 @@ namespace BlueWater.Tycoons
[Serializable]
public class TableSeat : InteractionFurniture, ICrewInteraction
{
[field: SerializeField]
public BalloonUi MenuBalloonUi { get; private set; }
[SerializeField]
private PayMoneyUi _payMoneyUiObject;
@ -39,6 +42,12 @@ namespace BlueWater.Tycoons
[field: SerializeField]
public int TableNumber;
[SerializeField]
private Sprite _fullBeerGlass;
[SerializeField]
private Sprite _emptyBeerGlass;
[SerializeField]
private float _playerHoldingTime = 3f;
@ -49,8 +58,6 @@ namespace BlueWater.Tycoons
private string _cleaningSfxName = "CleaningTable";
private LevelData _currentLevelData;
private Sprite _fullBeerGlass;
private Sprite _emptyBeerGlass;
private Coroutine _findCleanerCrewInstance;
private bool _isPlayerInteracting;
private bool _isCrewInteracting;
@ -69,9 +76,6 @@ namespace BlueWater.Tycoons
base.Start();
EventManager.OnCleaningAll += Cleaning;
_fullBeerGlass = DataManager.Instance.SpriteDataSo.FullBeerGlass;
_emptyBeerGlass = DataManager.Instance.SpriteDataSo.EmptyBeerGlass;
}
private void Update()

View File

@ -17,8 +17,8 @@ namespace BlueWater
protected override void OnAwake()
{
_fadeIn = _fadeImage.DOFade(1f, 2f).From(0f).SetUpdate(true).SetAutoKill(false).Pause().OnComplete(MoveCombatScene);
_fadeOut = _fadeImage.DOFade(0f, 2f).From(1f).SetUpdate(true).SetAutoKill(false).Pause().SetDelay(3f).OnComplete(EventManager.InvokeInitializedPlayerInput);
_fadeIn = _fadeImage.DOFade(1f, 1f).From(0f).SetUpdate(true).SetAutoKill(false).Pause().OnComplete(MoveCombatScene);
_fadeOut = _fadeImage.DOFade(0f, 0.5f).From(1f).SetUpdate(true).SetAutoKill(false).Pause().SetDelay(3f).OnComplete(EventManager.InvokeInitializedPlayerInput);
_fadeImage.color = new Color(0, 0, 0, 0);
}
@ -34,7 +34,7 @@ namespace BlueWater
SceneManager.sceneLoaded -= OnSceneLoaded;
_fadeIn.Kill();
_fadeIn.Kill();
_fadeOut.Kill();
}
public void FadeIn()
@ -50,6 +50,8 @@ namespace BlueWater
private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
{
PopupUiController.ClearPopup();
if (scene.name == "01.Tycoon")
{
if (_isMovedCombatScene)

View File

@ -20,8 +20,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 100
<WaitTime>k__BackingField: 25
<HurryTime>k__BackingField: 25
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 50
<EatingTime>k__BackingField: 15
<OpenUpgrade>k__BackingField: Upgrade0
<RewardBoxType>k__BackingField: 0
@ -33,8 +33,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 200
<WaitTime>k__BackingField: 25
<HurryTime>k__BackingField: 25
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 50
<EatingTime>k__BackingField: 15
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -46,8 +46,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 200
<WaitTime>k__BackingField: 25
<HurryTime>k__BackingField: 25
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 50
<EatingTime>k__BackingField: 15
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -59,8 +59,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 200
<WaitTime>k__BackingField: 25
<HurryTime>k__BackingField: 25
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 50
<EatingTime>k__BackingField: 15
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -72,8 +72,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 200
<WaitTime>k__BackingField: 25
<HurryTime>k__BackingField: 25
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 50
<EatingTime>k__BackingField: 15
<OpenUpgrade>k__BackingField: Upgrade1
<RewardBoxType>k__BackingField: 1
@ -85,8 +85,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 300
<WaitTime>k__BackingField: 23
<HurryTime>k__BackingField: 23
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 46
<EatingTime>k__BackingField: 13
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -98,8 +98,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 300
<WaitTime>k__BackingField: 23
<HurryTime>k__BackingField: 23
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 46
<EatingTime>k__BackingField: 13
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -111,8 +111,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 300
<WaitTime>k__BackingField: 23
<HurryTime>k__BackingField: 23
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 46
<EatingTime>k__BackingField: 13
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -124,8 +124,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 300
<WaitTime>k__BackingField: 23
<HurryTime>k__BackingField: 23
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 46
<EatingTime>k__BackingField: 13
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -137,8 +137,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 300
<WaitTime>k__BackingField: 23
<HurryTime>k__BackingField: 23
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 46
<EatingTime>k__BackingField: 13
<OpenUpgrade>k__BackingField: Upgrade2
<RewardBoxType>k__BackingField: 1
@ -150,8 +150,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 400
<WaitTime>k__BackingField: 20
<HurryTime>k__BackingField: 20
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 40
<EatingTime>k__BackingField: 10
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -163,8 +163,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 400
<WaitTime>k__BackingField: 20
<HurryTime>k__BackingField: 20
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 40
<EatingTime>k__BackingField: 10
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -176,8 +176,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 400
<WaitTime>k__BackingField: 20
<HurryTime>k__BackingField: 20
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 40
<EatingTime>k__BackingField: 10
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -189,8 +189,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 400
<WaitTime>k__BackingField: 20
<HurryTime>k__BackingField: 20
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 40
<EatingTime>k__BackingField: 10
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -202,8 +202,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 400
<WaitTime>k__BackingField: 20
<HurryTime>k__BackingField: 20
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 40
<EatingTime>k__BackingField: 10
<OpenUpgrade>k__BackingField: Upgrade3
<RewardBoxType>k__BackingField: 1
@ -215,8 +215,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 500
<WaitTime>k__BackingField: 18
<HurryTime>k__BackingField: 18
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 36
<EatingTime>k__BackingField: 8
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -228,8 +228,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 500
<WaitTime>k__BackingField: 18
<HurryTime>k__BackingField: 18
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 36
<EatingTime>k__BackingField: 8
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -241,8 +241,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 500
<WaitTime>k__BackingField: 18
<HurryTime>k__BackingField: 18
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 36
<EatingTime>k__BackingField: 8
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -254,8 +254,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 500
<WaitTime>k__BackingField: 18
<HurryTime>k__BackingField: 18
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 36
<EatingTime>k__BackingField: 8
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -267,8 +267,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 500
<WaitTime>k__BackingField: 18
<HurryTime>k__BackingField: 18
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 36
<EatingTime>k__BackingField: 8
<OpenUpgrade>k__BackingField: Upgrade4
<RewardBoxType>k__BackingField: 1
@ -280,8 +280,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 600
<WaitTime>k__BackingField: 16
<HurryTime>k__BackingField: 16
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 32
<EatingTime>k__BackingField: 6
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -293,8 +293,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 600
<WaitTime>k__BackingField: 16
<HurryTime>k__BackingField: 16
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 32
<EatingTime>k__BackingField: 6
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -306,8 +306,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 600
<WaitTime>k__BackingField: 16
<HurryTime>k__BackingField: 16
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 32
<EatingTime>k__BackingField: 6
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -319,8 +319,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 600
<WaitTime>k__BackingField: 16
<HurryTime>k__BackingField: 16
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 32
<EatingTime>k__BackingField: 6
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -332,8 +332,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 600
<WaitTime>k__BackingField: 16
<HurryTime>k__BackingField: 16
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 32
<EatingTime>k__BackingField: 6
<OpenUpgrade>k__BackingField: Upgrade5
<RewardBoxType>k__BackingField: 1
@ -345,8 +345,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 700
<WaitTime>k__BackingField: 14
<HurryTime>k__BackingField: 14
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 28
<EatingTime>k__BackingField: 6
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -358,8 +358,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 700
<WaitTime>k__BackingField: 14
<HurryTime>k__BackingField: 14
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 28
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -371,8 +371,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 700
<WaitTime>k__BackingField: 14
<HurryTime>k__BackingField: 14
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 28
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -384,8 +384,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 700
<WaitTime>k__BackingField: 14
<HurryTime>k__BackingField: 14
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 28
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -397,8 +397,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 700
<WaitTime>k__BackingField: 14
<HurryTime>k__BackingField: 14
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 28
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField: Upgrade6
<RewardBoxType>k__BackingField: 1
@ -410,8 +410,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 800
<WaitTime>k__BackingField: 12
<HurryTime>k__BackingField: 12
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 24
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -423,8 +423,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 800
<WaitTime>k__BackingField: 12
<HurryTime>k__BackingField: 12
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 24
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -436,8 +436,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 800
<WaitTime>k__BackingField: 12
<HurryTime>k__BackingField: 12
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 24
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -449,8 +449,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 800
<WaitTime>k__BackingField: 12
<HurryTime>k__BackingField: 12
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 24
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -462,8 +462,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 800
<WaitTime>k__BackingField: 12
<HurryTime>k__BackingField: 12
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 24
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 1
@ -475,8 +475,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 10
<HurryTime>k__BackingField: 10
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 20
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -488,8 +488,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 10
<HurryTime>k__BackingField: 10
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 20
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -501,8 +501,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 10
<HurryTime>k__BackingField: 10
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 20
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -514,8 +514,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 10
<HurryTime>k__BackingField: 10
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 20
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -527,8 +527,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 10
<HurryTime>k__BackingField: 10
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 20
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 1
@ -540,8 +540,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 8
<HurryTime>k__BackingField: 8
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 16
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -553,8 +553,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 8
<HurryTime>k__BackingField: 8
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 16
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -566,8 +566,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 8
<HurryTime>k__BackingField: 8
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 16
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -579,8 +579,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 8
<HurryTime>k__BackingField: 8
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 16
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -592,8 +592,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 8
<HurryTime>k__BackingField: 8
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 16
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 1
@ -605,8 +605,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 6
<HurryTime>k__BackingField: 6
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 12
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -618,8 +618,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 6
<HurryTime>k__BackingField: 6
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 12
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -631,8 +631,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 6
<HurryTime>k__BackingField: 6
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 12
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -644,8 +644,8 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 6
<HurryTime>k__BackingField: 6
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 12
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:
<RewardBoxType>k__BackingField: 0
@ -657,7 +657,7 @@ MonoBehaviour:
<Gold>k__BackingField: 100
<Exp>k__BackingField: 100
<RequiredExp>k__BackingField: 900
<WaitTime>k__BackingField: 6
<WaitTime>k__BackingField: 0
<HurryTime>k__BackingField: 6
<EatingTime>k__BackingField: 4
<OpenUpgrade>k__BackingField:

View File

@ -11,12 +11,6 @@ namespace BlueWater
[field: SerializeField]
public Sprite Gold02 { get; private set; }
[field: SerializeField]
public Sprite EmptyBeerGlass { get; private set; }
[field: SerializeField]
public Sprite FullBeerGlass { get; private set; }
[field: SerializeField]
public Sprite BarrelLock { get; private set; }

View File

@ -1,64 +1,109 @@
using System;
using System.Collections;
using BlueWater;
using BlueWater.Audios;
using BlueWater.Uis;
using TMPro;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.InputSystem;
using UnityEngine.UI;
public class TitleOptions : MonoBehaviour
public class TitleOptions : PopupUi
{
[SerializeField]
private GameObject _panel;
[SerializeField]
private Slider _masterVolume;
[SerializeField]
private Slider _bgmVolume;
[SerializeField]
private Slider _sfxVolume;
[SerializeField]
private TMP_Dropdown _languageDropdown;
private AudioManager _audioManager;
public InputAction CancelAction { get; private set; }
private InputAction _interactionEAction;
private InputAction _closeOptionsAction;
public Action CloseOptions;
private void Start()
{
CancelAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel);
_interactionEAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE);
_closeOptionsAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel);
_audioManager = AudioManager.Instance;
var masterVolume = ES3.Load("MasterVolume", 1f);
SetMasterVolume(masterVolume);
var bgmVolume = ES3.Load("BgmVolume", 1f);
SetBgmVolume(bgmVolume);
var sfxVolume = ES3.Load("SfxVolume", 1f);
SetSfxVolume(sfxVolume);
StartCoroutine(nameof(InitializeLanguage));
}
private void OnDestroy()
{
if (_interactionEAction != null)
{
_interactionEAction.performed -= OnInteractionE;
}
if (_closeOptionsAction != null)
{
_closeOptionsAction.performed -= OnCloseOptions;
}
}
public override void Open()
{
PopupUiController.RegisterPopup(this);
_panel.SetActive(true);
IsOpened = true;
}
public override void Close()
{
_panel.SetActive(false);
PopupUiController.UnregisterPopup(this);
IsOpened = false;
}
public override void EnableInput()
{
_interactionEAction.performed += OnInteractionE;
_closeOptionsAction.performed += OnCloseOptions;
}
public override void DisableInput()
{
_interactionEAction.performed -= OnInteractionE;
_closeOptionsAction.performed -= OnCloseOptions;
}
public void SetMasterVolume(float value)
{
_audioManager.SetMasterVolume(value);
_masterVolume.value = value;
ES3.Save("MasterVolume", value);
}
public void SetBgmVolume(float value)
{
_audioManager.SetBgmVolume(value);
_bgmVolume.value = value;
ES3.Save("BgmVolume", value);
}
public void SetSfxVolume(float value)
{
_audioManager.SetSfxVolume(value);
@ -69,7 +114,7 @@ public class TitleOptions : MonoBehaviour
private IEnumerator InitializeLanguage()
{
yield return new WaitUntil(() => LocalizationManager.Instance.IsInitialized);
var languageIndex = LocalizationManager.Instance.GetCurrentLocaleIndex();
_languageDropdown.value = languageIndex;
}
@ -79,14 +124,18 @@ public class TitleOptions : MonoBehaviour
_languageDropdown.value = localeType;
LocalizationManager.Instance.ChangeLocale((LocaleType)localeType);
}
public void ShowUi()
public void OnInteractionE(InputAction.CallbackContext context)
{
_panel.SetActive(true);
var current = EventSystem.current.currentSelectedGameObject;
if (!current) return;
var currenButton = current.GetComponent<Button>();
currenButton.onClick.Invoke();
}
public void HideUi()
public void OnCloseOptions(InputAction.CallbackContext context)
{
_panel.SetActive(false);
CloseOptions?.Invoke();
}
}
}

View File

@ -1,4 +1,3 @@
using System;
using BlueWater.Audios;
using BlueWater.Uis;
using TMPro;
@ -26,10 +25,16 @@ namespace BlueWater.Titles
private Button _startGameButton;
[SerializeField]
private Button _settingButton;
private Button _resumeGameButton;
[SerializeField]
private Button _exitButton;
private Button _optionsButton;
[SerializeField]
private Button _lobbyButton;
[SerializeField]
private Button _quitGameButton;
[SerializeField]
private bool _isTitleScene = true;
@ -39,8 +44,7 @@ namespace BlueWater.Titles
[SerializeField]
private string _dailyBgm = "DailyBgm1";
private PlayerInputKeyManager _playerInputKeyManager;
private SceneController _sceneController;
private InputAction _interactionEAction;
private InputAction _openAction;
@ -48,17 +52,11 @@ namespace BlueWater.Titles
private bool _isQuitting;
private bool _onButtonClicked;
private void Awake()
{
PopupUiController.ClearPopup();
}
private void Start()
{
_playerInputKeyManager = PlayerInputKeyManager.Instance;
_interactionEAction = _playerInputKeyManager.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE);
_openAction = _playerInputKeyManager.GetAction(InputActionMaps.Tycoon, TycoonActions.Options);
_closeAction = _playerInputKeyManager.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel);
_interactionEAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE);
_openAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.Options);
_closeAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel);
if (_isTitleScene)
{
@ -74,13 +72,16 @@ namespace BlueWater.Titles
_openAction.performed += OnOpen;
}
_startGameButton.onClick.AddListener(() => { _onButtonClicked = true; });
_settingButton.onClick.AddListener(() => { _onButtonClicked = true; });
_exitButton.onClick.AddListener(() => { _onButtonClicked = true; });
_startGameButton?.onClick.AddListener(() => { _onButtonClicked = true; });
_resumeGameButton?.onClick.AddListener(() => { _onButtonClicked = true; });
_optionsButton?.onClick.AddListener(() => { _onButtonClicked = true; });
_lobbyButton?.onClick.AddListener(() => { _onButtonClicked = true; });
_quitGameButton?.onClick.AddListener(() => { _onButtonClicked = true; });
_playerInputKeyManager.AddOnActionKeyboard(OnKeyboard);
_playerInputKeyManager.AddOnActionMouse(OnMouse);
PlayerInputKeyManager.Instance.AddOnActionKeyboard(OnKeyboard);
PlayerInputKeyManager.Instance.AddOnActionMouse(OnMouse);
titleOptions.CloseOptions = HideSettingUi;
_versionText.text = GetVersion();
}
@ -88,16 +89,27 @@ namespace BlueWater.Titles
{
if (_isTitleScene)
{
_startGameButton.onClick.RemoveListener(_sceneController.FadeIn);
if (_startGameButton != null && _sceneController != null)
{
_startGameButton.onClick.RemoveListener(_sceneController.FadeIn);
}
}
_playerInputKeyManager.RemoveOnActionKeyboard(OnKeyboard);
_playerInputKeyManager.RemoveOnActionMouse(OnMouse);
_interactionEAction.performed -= OnInteractionE;
_openAction.performed -= OnOpen;
_closeAction.performed -= OnClose;
titleOptions.CancelAction.performed -= OnSettingCancel;
PlayerInputKeyManager.Instance.RemoveOnActionKeyboard(OnKeyboard);
PlayerInputKeyManager.Instance.RemoveOnActionMouse(OnMouse);
if (_interactionEAction != null)
{
_interactionEAction.performed -= OnInteractionE;
}
if (_openAction != null)
{
_openAction.performed -= OnOpen;
}
if (_closeAction != null)
{
_closeAction.performed -= OnClose;
}
}
public void OnOpen(InputAction.CallbackContext context)
@ -107,34 +119,15 @@ namespace BlueWater.Titles
public override void Open()
{
if (_isTitleScene)
if (!_isTitleScene)
{
_playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.TycoonUi);
PopupUiController.RegisterPopup(this);
_panel.SetActive(true);
IsOpened = true;
}
else
{
if (!PopupUiController.IsPopupListEmpty())
{
foreach (var element in PopupUiController.PopupUis)
{
print(element.gameObject.name);
}
return;
}
_openAction.performed -= OnOpen;
VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f);
_playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.TycoonUi);
PopupUiController.RegisterPopup(this);
_panel.SetActive(true);
IsOpened = true;
_closeAction.performed += OnClose;
}
_interactionEAction.performed += OnInteractionE;
PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi);
PopupUiController.RegisterPopup(this);
_panel.SetActive(true);
IsOpened = true;
}
public void OnClose(InputAction.CallbackContext context)
@ -143,6 +136,32 @@ namespace BlueWater.Titles
}
public override void Close()
{
if (!_isTitleScene)
{
_panel.SetActive(false);
PopupUiController.UnregisterPopup(this);
PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon);
IsOpened = false;
VisualFeedbackManager.Instance.ResetTimeScale();
}
}
public override void EnableInput()
{
if (_isTitleScene)
{
}
else
{
_closeAction.performed += OnClose;
}
_interactionEAction.performed += OnInteractionE;
}
public override void DisableInput()
{
if (_isTitleScene)
{
@ -151,20 +170,21 @@ namespace BlueWater.Titles
else
{
_closeAction.performed -= OnClose;
_panel.SetActive(false);
PopupUiController.UnregisterPopup(this);
_playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.Tycoon);
IsOpened = false;
VisualFeedbackManager.Instance.ResetTimeScale();
_openAction.performed += OnOpen;
}
_interactionEAction.performed -= OnInteractionE;
}
private void OnKeyboard()
{
EventSystem.current.SetSelectedGameObject(_startGameButton.gameObject);
if (_isTitleScene)
{
EventSystem.current.SetSelectedGameObject(_startGameButton.gameObject);
}
else
{
EventSystem.current.SetSelectedGameObject(_resumeGameButton.gameObject);
}
}
private void OnMouse()
@ -201,26 +221,17 @@ namespace BlueWater.Titles
Application.Quit();
#endif
}
public void OnSettingCancel(InputAction.CallbackContext context)
{
HideSettingUi();
}
public void ShowSettingUi()
{
_interactionEAction.performed -= OnInteractionE;
_titleMenuUiPanel.SetActive(false);
titleOptions.ShowUi();
titleOptions.CancelAction.performed += OnSettingCancel;
titleOptions.Open();
}
public void HideSettingUi()
{
titleOptions.CancelAction.performed -= OnSettingCancel;
titleOptions.HideUi();
titleOptions.Close();
_titleMenuUiPanel.SetActive(true);
_interactionEAction.performed += OnInteractionE;
}
public void MoveLobbyScene()

View File

@ -31,7 +31,8 @@ namespace BlueWater.Uis
[SerializeField, DisableIf("@true")]
private bool _isItemReceived;
private Tween _tween;
private Tween _fillTween;
private Tween _colorTween;
private CocktailData _orderCocktailData;
private void Awake()
@ -39,11 +40,6 @@ namespace BlueWater.Uis
InitializeComponents();
}
private void OnDestroy()
{
_tween.Kill();
}
[Button("컴포넌트 초기화")]
private void InitializeComponents()
{
@ -89,7 +85,7 @@ namespace BlueWater.Uis
SetEmpty();
}
public void OrderItem(string itemIdx, float waitTime, float hurryTime)
public void OrderItem(string itemIdx, float waitTime, float hurryTime, bool isReverse = false, Color? startColor = null, Color? endColor = null)
{
_orderCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(itemIdx);
_isOrdered = true;
@ -97,10 +93,10 @@ namespace BlueWater.Uis
_isItemReceived = false;
SetItemImage(_orderCocktailData);
SetTween(waitTime, hurryTime);
SetTween(waitTime, hurryTime, isReverse, startColor, endColor);
}
public void OrderItem(Sprite sprite, float waitTime, float hurryTime)
public void OrderItem(Sprite sprite, float waitTime, float hurryTime, bool isReverse = false, Color? startColor = null, Color? endColor = null)
{
_isOrdered = true;
_isWaitTimeOver = false;
@ -108,29 +104,42 @@ namespace BlueWater.Uis
SetItemSprite(sprite);
ShowUi();
SetTween(waitTime, hurryTime);
SetTween(waitTime, hurryTime, isReverse, startColor, endColor);
}
public void SetTween(float waitTime, float hurryTime)
public void SetTween(float waitTime, float hurryTime, bool isReverse = false, Color? startColor = null, Color? endColor = null)
{
_tween?.Kill();
_tween = _fillImage.DOFillAmount(1f, hurryTime)
.From(0f)
float startValue = isReverse ? 1f : 0f;
float endValue = isReverse ? 0f : 1f;
_fillTween?.Kill();
_fillTween = _fillImage.DOFillAmount(endValue, hurryTime)
.From(startValue)
.SetEase(Ease.Linear)
.SetDelay(waitTime)
.OnComplete(OnTweenComplete)
.SetAutoKill(false);
.SetAutoKill(true);
if (startColor != null && endColor != null)
{
_colorTween?.Kill();
_colorTween = _fillImage.DOColor((Color)endColor, hurryTime)
.From((Color)startColor)
.SetEase(Ease.Linear)
.SetDelay(waitTime)
.SetAutoKill(true);
}
}
public void ResetGauge()
{
if (_tween == null)
if (_fillTween == null)
{
Debug.LogError("BalloonUi 게이지 리셋 오류");
return;
}
_tween.Restart();
_fillTween.Restart();
}
public void PayMoney(int waitTime, int hurryTime)
@ -141,7 +150,7 @@ namespace BlueWater.Uis
SetItemSprite(DataManager.Instance.SpriteDataSo.Gold01);
ShowUi();
_tween = _fillImage.DOFillAmount(1f, hurryTime)
_fillTween = _fillImage.DOFillAmount(1f, hurryTime)
.From(0f)
.SetEase(Ease.Linear)
.SetDelay(waitTime)
@ -160,7 +169,7 @@ namespace BlueWater.Uis
public void ReceiveItem(IPickup pickupItem)
{
_tween.Kill();
_fillTween.Kill();
HideUi();
_isItemReceived = true;
}

View File

@ -79,8 +79,8 @@ namespace BlueWater
public void SetTween(int waitTime, int hurryTime)
{
_sliderTween = _slider.DOValue(0f, hurryTime)
.From(1f)
_sliderTween = _slider.DOValue(1f, hurryTime)
.From(0f)
.SetEase(Ease.Linear)
.SetDelay(waitTime)
.SetAutoKill(true);
@ -95,7 +95,7 @@ namespace BlueWater
private void OnSliderValueChanged(float value)
{
_filledImage.color = Color.Lerp(_endColor, _startColor, value);
_filledImage.color = Color.Lerp(_startColor, _endColor, value);
}
public void Move(BillInfo billInfo)

View File

@ -0,0 +1,68 @@
using DG.Tweening;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
namespace BlueWater.Uis
{
public class DashUi : MonoBehaviour
{
[SerializeField]
private Image _filled;
[SerializeField]
private Image _flash;
[SerializeField]
private TMP_Text _dashKeyText;
[SerializeField]
private float _fadeInOutDuration = 0.2f;
private Tween _dashCooldownTween;
private Tween _flashFadeTween;
private string _dashKeyBinding;
private void Awake()
{
EventManager.OnDashCooldown += DashCooldown;
}
private void Start()
{
_filled.fillAmount = 1f;
_flashFadeTween = _flash.DOFade(1f, _fadeInOutDuration)
.From(0f)
.SetLoops(2, LoopType.Yoyo)
.SetEase(Ease.Linear)
.SetAutoKill(false)
.Pause();
_dashKeyBinding = PlayerInputKeyManager.Instance.GetBoundKey(InputActionMaps.Tycoon, TycoonActions.Dash);
SetKeyText(_dashKeyBinding);
}
private void OnDestroy()
{
EventManager.OnDashCooldown -= DashCooldown;
_dashCooldownTween.Kill();
_flashFadeTween.Kill();
}
private void SetKeyText(string bindingKey)
{
_dashKeyText.text = bindingKey;
}
public void DashCooldown(float cooldown)
{
_dashCooldownTween = _filled.DOFillAmount(1f, cooldown)
.From(0f)
.SetEase(Ease.Linear)
.OnComplete(() => _flashFadeTween.Restart())
.SetAutoKill(true);
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 4689fc0e69f4c504196472d1c89361a8

View File

@ -1,91 +1,91 @@
using System.Collections.Generic;
using BlueWater.Npcs.Customers;
using BlueWater.Tycoons;
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Uis
{
public class IndicatorUi : MonoBehaviour
{
[SerializeField, Required]
private GameObject _uiIndicator;
[SerializeField]
private Vector2 _widthPadding;
[SerializeField]
private Vector2 _heightPadding;
private RectTransform _canvasRectTransform;
private Camera _mainCamera;
private Dictionary<Customer, GameObject> _customerindicators = new();
private int _screenWidth;
private int _screenHeight;
private void Start()
{
_canvasRectTransform = GetComponent<RectTransform>();
_mainCamera = TycoonCameraManager.Instance.MainCamera;
//EventManager.OnCreateCustomer += AddUiIndicator;
}
private void OnDestroy()
{
//EventManager.OnCreateCustomer -= AddUiIndicator;
}
private void LateUpdate()
{
_screenWidth = Screen.width;
_screenHeight = Screen.height;
foreach (var element in _customerindicators)
{
var customer = element.Key;
var indicator = element.Value;
if (!customer)
{
_customerindicators.Remove(customer);
Destroy(indicator.gameObject);
return;
}
var target = customer.BalloonUi.transform;
var screenPosition = _mainCamera.WorldToScreenPoint(target.position);
if (!target.gameObject.activeSelf)
{
indicator.SetActive(false);
continue;
}
if (screenPosition.z > 0 && screenPosition.x > 0 && screenPosition.x < _screenWidth && screenPosition.y > 0 && screenPosition.y < _screenHeight)
{
indicator.SetActive(false);
}
else
{
indicator.SetActive(true);
var clampedScreenPosition = screenPosition;
clampedScreenPosition.x = Mathf.Clamp(screenPosition.x, 0f + _widthPadding.x, _screenWidth - _widthPadding.y);
clampedScreenPosition.y = Mathf.Clamp(screenPosition.y, 0f + _heightPadding.x, _screenHeight - _heightPadding.y);
RectTransformUtility.ScreenPointToLocalPointInRectangle(_canvasRectTransform, clampedScreenPosition, _mainCamera, out var localPoint);
indicator.transform.localPosition = localPoint;
var cameraCenterPosition = new Vector3(_screenWidth * 0.5f, _screenHeight * 0.5f, screenPosition.z);
var direction = (screenPosition - cameraCenterPosition).normalized;
var angle = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg;
indicator.transform.localRotation = Quaternion.Euler(0f, 0f, angle - 90f);
}
}
}
private void AddUiIndicator(Customer customer)
{
var newUiIndicator = Instantiate(_uiIndicator, transform);
newUiIndicator.SetActive(false);
_customerindicators.Add(customer, newUiIndicator);
}
}
}
// using System.Collections.Generic;
// using BlueWater.Npcs.Customers;
// using BlueWater.Tycoons;
// using Sirenix.OdinInspector;
// using UnityEngine;
//
// namespace BlueWater.Uis
// {
// public class IndicatorUi : MonoBehaviour
// {
// [SerializeField, Required]
// private GameObject _uiIndicator;
//
// [SerializeField]
// private Vector2 _widthPadding;
//
// [SerializeField]
// private Vector2 _heightPadding;
//
// private RectTransform _canvasRectTransform;
// private Camera _mainCamera;
// private Dictionary<Customer, GameObject> _customerindicators = new();
// private int _screenWidth;
// private int _screenHeight;
//
// private void Start()
// {
// _canvasRectTransform = GetComponent<RectTransform>();
// _mainCamera = TycoonCameraManager.Instance.MainCamera;
//
// //EventManager.OnCreateCustomer += AddUiIndicator;
// }
//
// private void OnDestroy()
// {
// //EventManager.OnCreateCustomer -= AddUiIndicator;
// }
//
// private void LateUpdate()
// {
// _screenWidth = Screen.width;
// _screenHeight = Screen.height;
//
// foreach (var element in _customerindicators)
// {
// var customer = element.Key;
// var indicator = element.Value;
// if (!customer)
// {
// _customerindicators.Remove(customer);
// Destroy(indicator.gameObject);
// return;
// }
// var target = customer.BalloonUi.transform;
// var screenPosition = _mainCamera.WorldToScreenPoint(target.position);
//
// if (!target.gameObject.activeSelf)
// {
// indicator.SetActive(false);
// continue;
// }
//
// if (screenPosition.z > 0 && screenPosition.x > 0 && screenPosition.x < _screenWidth && screenPosition.y > 0 && screenPosition.y < _screenHeight)
// {
// indicator.SetActive(false);
// }
// else
// {
// indicator.SetActive(true);
// var clampedScreenPosition = screenPosition;
// clampedScreenPosition.x = Mathf.Clamp(screenPosition.x, 0f + _widthPadding.x, _screenWidth - _widthPadding.y);
// clampedScreenPosition.y = Mathf.Clamp(screenPosition.y, 0f + _heightPadding.x, _screenHeight - _heightPadding.y);
// RectTransformUtility.ScreenPointToLocalPointInRectangle(_canvasRectTransform, clampedScreenPosition, _mainCamera, out var localPoint);
// indicator.transform.localPosition = localPoint;
//
// var cameraCenterPosition = new Vector3(_screenWidth * 0.5f, _screenHeight * 0.5f, screenPosition.z);
// var direction = (screenPosition - cameraCenterPosition).normalized;
// var angle = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg;
// indicator.transform.localRotation = Quaternion.Euler(0f, 0f, angle - 90f);
// }
// }
// }
//
// private void AddUiIndicator(Customer customer)
// {
// var newUiIndicator = Instantiate(_uiIndicator, transform);
// newUiIndicator.SetActive(false);
// _customerindicators.Add(customer, newUiIndicator);
// }
// }
// }

View File

@ -1,4 +1,3 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@ -21,6 +20,9 @@ namespace BlueWater.Uis
[SerializeField]
private GameObject _panel;
[SerializeField]
private TMP_Text _openManualKeyText;
[SerializeField]
private Transform _cocktailButtons;
@ -51,16 +53,20 @@ namespace BlueWater.Uis
private List<ManualCocktailButton> _button;
private Coroutine _changedLocaleInstance;
private ManualCocktailButton _selectedManualCocktailButton;
private InputAction _openManualBookAction;
private InputAction _pressQAction;
private InputAction _cancelAction;
private string _openManualKeyBinding;
private void Start()
{
_openManualBookAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.OpenManualBook);
_pressQAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.PressQ);
_cancelAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel);
_openManualKeyBinding = PlayerInputKeyManager.Instance.GetBoundKey(_openManualBookAction);
SetKeyText(_openManualKeyBinding);
_openManualBookAction.performed += OnOpen;
@ -213,6 +219,11 @@ namespace BlueWater.Uis
_pressQAction.performed -= OnClose;
_cancelAction.performed -= OnClose;
}
private void SetKeyText(string bindingKey)
{
_openManualKeyText.text = bindingKey;
}
private void Update_Cocktails() //해금된 칵테일의 활성 표시 유무
{

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3484bcfbb75f8d54bb1f209c301f86ee
guid: 40f70d2d9885b81438020deea9904c0f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

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

View File

@ -27,7 +27,7 @@ Transform:
m_GameObject: {fileID: 321954324799972663}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.2}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -55,9 +55,10 @@ MonoBehaviour:
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
<LocalizeStringEvent>k__BackingField: {fileID: 0}
<EnableInteraction>k__BackingField: 1
<InteractionRadius>k__BackingField: 0.6
<InteractionRadius>k__BackingField: 0.7
<InteractionMessage>k__BackingField:
IsOpened: 0
<MenuBalloonUi>k__BackingField: {fileID: 33491772595899250}
_payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3}
_offset: {x: 0, y: 1.5, z: 0}
<IsOccupied>k__BackingField: 0
@ -67,8 +68,11 @@ MonoBehaviour:
<Food>k__BackingField: {fileID: 8752266548893034047}
TableDirection: {x: -1, y: 0, z: 0}
TableNumber: 0
_fullBeerGlass: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3}
_emptyBeerGlass: {fileID: 21300000, guid: 7c1658b7a58af9249803946e883a2258, type: 3}
_playerHoldingTime: 3
_crewHoldingTime: 9
_cleaningSfxName: CleaningTable
--- !u!114 &3964937737965122596
MonoBehaviour:
m_ObjectHideFlags: 0
@ -135,7 +139,7 @@ Transform:
m_GameObject: {fileID: 1352874222752200122}
serializedVersion: 2
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: 0.22, y: 0.312, z: 0.058}
m_LocalPosition: {x: 0.265, y: 0.275, z: 0.23}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_Children: []
@ -222,7 +226,7 @@ Transform:
m_GameObject: {fileID: 2118957188813578234}
serializedVersion: 2
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: -0.22, y: 0.31199998, z: 0.058000024}
m_LocalPosition: {x: -0.179, y: 0.19, z: 0.16}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_Children: []
@ -309,7 +313,7 @@ Transform:
m_GameObject: {fileID: 3743511312082143294}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.235, z: 0}
m_LocalPosition: {x: 0, y: 0.115, z: 0}
m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
m_ConstrainProportionsScale: 1
m_Children: []
@ -397,7 +401,7 @@ Transform:
m_GameObject: {fileID: 5899113663160612507}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.2}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -425,9 +429,10 @@ MonoBehaviour:
<OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
<LocalizeStringEvent>k__BackingField: {fileID: 0}
<EnableInteraction>k__BackingField: 1
<InteractionRadius>k__BackingField: 0.6
<InteractionRadius>k__BackingField: 0.7
<InteractionMessage>k__BackingField:
IsOpened: 0
<MenuBalloonUi>k__BackingField: {fileID: 2583013143388010830}
_payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3}
_offset: {x: 0, y: 1.5, z: 0}
<IsOccupied>k__BackingField: 0
@ -437,8 +442,11 @@ MonoBehaviour:
<Food>k__BackingField: {fileID: 4724775134085759924}
TableDirection: {x: 1, y: 0, z: 0}
TableNumber: 0
_fullBeerGlass: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3}
_emptyBeerGlass: {fileID: 21300000, guid: 40f70d2d9885b81438020deea9904c0f, type: 3}
_playerHoldingTime: 3
_crewHoldingTime: 9
_cleaningSfxName: CleaningTable
--- !u!114 &4593866383055317665
MonoBehaviour:
m_ObjectHideFlags: 0
@ -537,7 +545,7 @@ Transform:
m_GameObject: {fileID: 7008066670828516977}
serializedVersion: 2
m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927}
m_LocalPosition: {x: 0.22, y: 0, z: 0.058000013}
m_LocalPosition: {x: 0.22, y: 0, z: 0.1}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 0
m_Children: []
@ -599,7 +607,7 @@ Transform:
m_GameObject: {fileID: 7591088015737457221}
serializedVersion: 2
m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927}
m_LocalPosition: {x: -0.22, y: 0, z: 0.058000013}
m_LocalPosition: {x: -0.22, y: 0, z: 0.1}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 0
m_Children: []
@ -636,6 +644,272 @@ Transform:
m_Children: []
m_Father: {fileID: 7272068659984017056}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &873700564209760516
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 297355777426450409}
m_Modifications:
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_SizeDelta.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_SizeDelta.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalScale.x
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalScale.y
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalScale.z
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.45
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2941398232897783445, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_Name
value: MenuBalloonUi
objectReference: {fileID: 0}
- target: {fileID: 4609128235759643923, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8549903804392921738, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
--- !u!114 &33491772595899250 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 889177932113506934, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
m_PrefabInstance: {fileID: 873700564209760516}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &257426657215236219 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
m_PrefabInstance: {fileID: 873700564209760516}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3426758121118452536
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4062855172287724115}
m_Modifications:
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_SizeDelta.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_SizeDelta.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalScale.x
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalScale.y
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalScale.z
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.2
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.45
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2941398232897783445, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_Name
value: MenuBalloonUi
objectReference: {fileID: 0}
- target: {fileID: 4609128235759643923, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8549903804392921738, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
--- !u!224 &2322969535150520903 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
m_PrefabInstance: {fileID: 3426758121118452536}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2583013143388010830 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 889177932113506934, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
m_PrefabInstance: {fileID: 3426758121118452536}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &4945635487706215153
PrefabInstance:
m_ObjectHideFlags: 0
@ -676,10 +950,34 @@ PrefabInstance:
propertyPath: m_FillOrigin
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2964810709115633174, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_LocalScale.x
value: 0.6666667
objectReference: {fileID: 0}
- target: {fileID: 2964810709115633174, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_LocalScale.y
value: 0.6666667
objectReference: {fileID: 0}
- target: {fileID: 2964810709115633174, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_LocalScale.z
value: 0.6666667
objectReference: {fileID: 0}
- target: {fileID: 2971245722111912602, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: b93d1d9adc811a74fb4192ade70fd3cc, type: 3}
- target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_LocalScale.x
value: 0.6666667
objectReference: {fileID: 0}
- target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_LocalScale.y
value: 0.6666667
objectReference: {fileID: 0}
- target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_LocalScale.z
value: 0.6666667
objectReference: {fileID: 0}
- target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.25
@ -774,7 +1072,10 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
insertIndex: 1
addedObject: {fileID: 257426657215236219}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
--- !u!224 &297355777426450409 stripped
@ -852,7 +1153,7 @@ PrefabInstance:
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3}
objectReference: {fileID: 21300000, guid: bc4b1b16bd2ea7e4eb17eaf33c65951a, type: 3}
- target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_SortingOrder
value: 1
@ -863,7 +1164,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Name
value: CustomerTable3
value: CustomerTable
objectReference: {fileID: 0}
- target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_IsActive
@ -871,15 +1172,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.x
value: 1
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.y
value: 1
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.z
value: 1
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalPosition.x
@ -1032,17 +1333,41 @@ PrefabInstance:
propertyPath: m_FillOrigin
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2964810709115633174, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_LocalScale.x
value: 0.6666667
objectReference: {fileID: 0}
- target: {fileID: 2964810709115633174, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_LocalScale.y
value: 0.6666667
objectReference: {fileID: 0}
- target: {fileID: 2964810709115633174, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_LocalScale.z
value: 0.6666667
objectReference: {fileID: 0}
- target: {fileID: 2971245722111912602, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: b93d1d9adc811a74fb4192ade70fd3cc, type: 3}
- target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_LocalScale.x
value: 0.6666667
objectReference: {fileID: 0}
- target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_LocalScale.y
value: 0.6666667
objectReference: {fileID: 0}
- target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_LocalScale.z
value: 0.6666667
objectReference: {fileID: 0}
- target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.25
objectReference: {fileID: 0}
- target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_AnchoredPosition.y
value: 1.1
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_Pivot.x
@ -1130,7 +1455,10 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
insertIndex: 1
addedObject: {fileID: 2322969535150520903}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
--- !u!114 &1675779991655778469 stripped

View File

@ -0,0 +1,167 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &4130534282591498878
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_Name
value: MenuBalloonUi
objectReference: {fileID: 0}
- target: {fileID: 1505211282054036597, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2b940926419a5dd44af7663f4b5c31b6, type: 3}
- target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_FillAmount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_FillMethod
value: 4
objectReference: {fileID: 0}
- target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_FillOrigin
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_SizeDelta.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_SizeDelta.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.2
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchoredPosition.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4586681201290156434, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: a41f2edf0c6ec134fabd09dccc16d34a, type: 3}
- target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_SizeDelta.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_SizeDelta.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_LocalPosition.z
value: 0.00000023841858
objectReference: {fileID: 0}
- target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.05
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}

View File

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

View File

@ -0,0 +1,320 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &249317892450259276
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4417059956531144164}
- component: {fileID: 5189939095282011000}
- component: {fileID: 1491349371811006708}
m_Layer: 19
m_Name: Background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4417059956531144164
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 249317892450259276}
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: 2472143638630082580}
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 &5189939095282011000
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 249317892450259276}
m_CullTransparentMesh: 1
--- !u!114 &1491349371811006708
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 249317892450259276}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a41f2edf0c6ec134fabd09dccc16d34a, 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 &410106872850796187
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8341219880361789620}
- component: {fileID: 4744022902879271135}
- component: {fileID: 6420120053108935114}
m_Layer: 19
m_Name: FoodImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8341219880361789620
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410106872850796187}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.00000023841858}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2472143638630082580}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0.05}
m_SizeDelta: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4744022902879271135
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410106872850796187}
m_CullTransparentMesh: 1
--- !u!114 &6420120053108935114
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410106872850796187}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
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 &2941398232897783445
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1131127152402510207}
- component: {fileID: 889177932113506934}
m_Layer: 19
m_Name: MenuBalloonUi
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1131127152402510207
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2941398232897783445}
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: 1
m_Children:
- {fileID: 2472143638630082580}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.2, y: 1.5}
m_SizeDelta: {x: 1, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &889177932113506934
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2941398232897783445}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3}
m_Name:
m_EditorClassIdentifier:
_fillImage: {fileID: 3836460704259562449}
_itemImage: {fileID: 6420120053108935114}
_panel: {fileID: 4609128235759643923}
_isOrdered: 0
_isWaitTimeOver: 0
_isItemReceived: 0
--- !u!1 &4609128235759643923
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2472143638630082580}
m_Layer: 19
m_Name: Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2472143638630082580
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4609128235759643923}
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: 8549903804392921738}
- {fileID: 4417059956531144164}
- {fileID: 8341219880361789620}
m_Father: {fileID: 1131127152402510207}
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!1 &5580711947596628469
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8549903804392921738}
- component: {fileID: 8438734531649324286}
- component: {fileID: 3836460704259562449}
m_Layer: 19
m_Name: FillImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8549903804392921738
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5580711947596628469}
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: 2472143638630082580}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.000000009313226, y: 0}
m_SizeDelta: {x: 0.099999964, y: 0.10000001}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8438734531649324286
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5580711947596628469}
m_CullTransparentMesh: 1
--- !u!114 &3836460704259562449
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5580711947596628469}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 2b940926419a5dd44af7663f4b5c31b6, type: 3}
m_Type: 3
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 0
m_FillClockwise: 1
m_FillOrigin: 2
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 659c0c56362b31b47ac12feb1a51d0b3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,439 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1783093215036953515
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3406864863717099403}
- component: {fileID: 7007680036530545365}
- component: {fileID: 9207469817372238632}
- component: {fileID: 7135868163081440694}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3406864863717099403
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1783093215036953515}
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: 1
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_Pivot: {x: 0, y: 0.5}
--- !u!222 &7007680036530545365
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1783093215036953515}
m_CullTransparentMesh: 1
--- !u!114 &9207469817372238632
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1783093215036953515}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC885\uB8CC"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 45
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 36
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &7135868163081440694
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1783093215036953515}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
m_Name:
m_EditorClassIdentifier:
m_StringReference:
m_TableReference:
m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7
m_TableEntryReference:
m_KeyId: 652745837969408
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_FormatArguments: []
m_UpdateString:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 9207469817372238632}
m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro
m_MethodName: set_text
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 1
references:
version: 2
RefIds: []
--- !u!1 &6636453121499202241
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2282892633984535475}
- component: {fileID: 5393267343056684930}
- component: {fileID: 1004229113393079187}
- component: {fileID: 6327958462794368542}
m_Layer: 5
m_Name: SelectedImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2282892633984535475
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6636453121499202241}
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: 6023463152304223989}
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 &5393267343056684930
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6636453121499202241}
m_CullTransparentMesh: 1
--- !u!114 &1004229113393079187
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6636453121499202241}
m_Enabled: 0
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: 5a6a33286645736499caef60e479872d, 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!114 &6327958462794368542
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6636453121499202241}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &7743520951332944107
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6023463152304223989}
- component: {fileID: 1841050712205587428}
- component: {fileID: 4330707241455583970}
- component: {fileID: 9048322436433618005}
- component: {fileID: 3360581519817642802}
- component: {fileID: 2507619975434679060}
m_Layer: 5
m_Name: QuitGameButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6023463152304223989
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7743520951332944107}
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: 2282892633984535475}
- {fileID: 3406864863717099403}
m_Father: {fileID: 4307839890443455075}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -440}
m_SizeDelta: {x: 82.81, y: 120}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1841050712205587428
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7743520951332944107}
m_CullTransparentMesh: 1
--- !u!114 &4330707241455583970
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7743520951332944107}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 4
m_WrapAround: 0
m_SelectOnUp: {fileID: 8544529456743054919}
m_SelectOnDown: {fileID: 8317783694176110988}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
m_PressedColor: {r: 1, g: 1, b: 1, a: 1}
m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 9207469817372238632}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1794702731584971318}
m_TargetAssemblyTypeName: BlueWater.Titles.TycoonTitle, Assembly-CSharp
m_MethodName: QuitGame
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &9048322436433618005
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7743520951332944107}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5ca384211ab6ab4cbf2a58b976108c8, type: 3}
m_Name:
m_EditorClassIdentifier:
_targetButton: {fileID: 4330707241455583970}
_selectedImage: {fileID: 1004229113393079187}
_highlightedColor: {r: 1, g: 1, b: 1, a: 0.19607843}
--- !u!114 &3360581519817642802
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7743520951332944107}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 1
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &2507619975434679060
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7743520951332944107}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1001 &2932361312694498582
PrefabInstance:
m_ObjectHideFlags: 0
@ -100,10 +534,30 @@ PrefabInstance:
propertyPath: m_StringReference.m_TableEntryReference.m_KeyId
value: 2961027900911616
objectReference: {fileID: 0}
- target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: _exitButton
value:
objectReference: {fileID: 4330707241455583970}
- target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: _lobbyButton
value:
objectReference: {fileID: 8544529456743054919}
- target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: _isTitleScene
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: _quitGameButton
value:
objectReference: {fileID: 4330707241455583970}
- target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: _startGameButton
value:
objectReference: {fileID: 0}
- target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: _resumeGameButton
value:
objectReference: {fileID: 8317783694176110988}
- target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@ -304,6 +758,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6620118968858819738, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_Navigation.m_SelectOnUp
value:
objectReference: {fileID: 4330707241455583970}
- target: {fileID: 6620118968858819738, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
@ -348,6 +806,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -460
objectReference: {fileID: 0}
- target: {fileID: 6783990415546059601, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_Navigation.m_SelectOnUp
value:
objectReference: {fileID: 5137543705323593814}
- target: {fileID: 6783990415546059601, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_Navigation.m_SelectOnDown
value:
objectReference: {fileID: 4330707241455583970}
- target: {fileID: 6783990415546059601, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: MoveLobbyScene
@ -558,7 +1024,10 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 1403243596108480373, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
insertIndex: -1
addedObject: {fileID: 6023463152304223989}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
--- !u!114 &1794702731584971318 stripped
@ -572,3 +1041,41 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ea8c10e9f7ec1834ca9d8152c4c0cdae, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &4307839890443455075 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1403243596108480373, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
m_PrefabInstance: {fileID: 2932361312694498582}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5137543705323593814 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8069869802901706048, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
m_PrefabInstance: {fileID: 2932361312694498582}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &8317783694176110988 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6620118968858819738, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
m_PrefabInstance: {fileID: 2932361312694498582}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &8544529456743054919 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6783990415546059601, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
m_PrefabInstance: {fileID: 2932361312694498582}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:

View File

@ -1124,7 +1124,7 @@ GameObject:
- component: {fileID: 5599562783423079371}
- component: {fileID: 4742968242575636212}
m_Layer: 5
m_Name: ExitButton
m_Name: QuitGameButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -7377,6 +7377,7 @@ GameObject:
- component: {fileID: 8176578426720088375}
- component: {fileID: 374304938684502356}
- component: {fileID: 8241840109796323035}
- component: {fileID: 3654003405128029727}
m_Layer: 5
m_Name: BackGroundImage
m_TagString: Untagged
@ -7441,6 +7442,19 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &3654003405128029727
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6990643379758234813}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bf906d99280c73d45a290761969d7bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
material: {fileID: 2100000, guid: 10f8236f36b04a54aaf175b5763f7ef6, type: 2}
--- !u!1 &7055048572422567791
GameObject:
m_ObjectHideFlags: 0
@ -8428,8 +8442,10 @@ MonoBehaviour:
_titleMenuUiPanel: {fileID: 7860688818721824856}
titleOptions: {fileID: 9207272460605448926}
_startGameButton: {fileID: 6620118968858819738}
_settingButton: {fileID: 8069869802901706048}
_exitButton: {fileID: 6783990415546059601}
_resumeGameButton: {fileID: 0}
_optionsButton: {fileID: 8069869802901706048}
_lobbyButton: {fileID: 0}
_quitGameButton: {fileID: 6783990415546059601}
_isTitleScene: 1
_versionText: {fileID: 408792858244141541}
_dailyBgm: TycoonTitleBgm02

View File

@ -5,8 +5,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 100,
"WaitTime": 25,
"HurryTime": 25,
"WaitTime": 0,
"HurryTime": 50,
"EatingTime": 15,
"OpenUpgrade": "Upgrade0",
"RewardBoxType": 0,
@ -18,8 +18,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 200,
"WaitTime": 25,
"HurryTime": 25,
"WaitTime": 0,
"HurryTime": 50,
"EatingTime": 15,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -31,8 +31,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 200,
"WaitTime": 25,
"HurryTime": 25,
"WaitTime": 0,
"HurryTime": 50,
"EatingTime": 15,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -44,8 +44,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 200,
"WaitTime": 25,
"HurryTime": 25,
"WaitTime": 0,
"HurryTime": 50,
"EatingTime": 15,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -57,8 +57,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 200,
"WaitTime": 25,
"HurryTime": 25,
"WaitTime": 0,
"HurryTime": 50,
"EatingTime": 15,
"OpenUpgrade": "Upgrade1",
"RewardBoxType": 1,
@ -70,8 +70,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 300,
"WaitTime": 23,
"HurryTime": 23,
"WaitTime": 0,
"HurryTime": 46,
"EatingTime": 13,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -83,8 +83,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 300,
"WaitTime": 23,
"HurryTime": 23,
"WaitTime": 0,
"HurryTime": 46,
"EatingTime": 13,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -96,8 +96,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 300,
"WaitTime": 23,
"HurryTime": 23,
"WaitTime": 0,
"HurryTime": 46,
"EatingTime": 13,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -109,8 +109,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 300,
"WaitTime": 23,
"HurryTime": 23,
"WaitTime": 0,
"HurryTime": 46,
"EatingTime": 13,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -122,8 +122,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 300,
"WaitTime": 23,
"HurryTime": 23,
"WaitTime": 0,
"HurryTime": 46,
"EatingTime": 13,
"OpenUpgrade": "Upgrade2",
"RewardBoxType": 1,
@ -135,8 +135,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 400,
"WaitTime": 20,
"HurryTime": 20,
"WaitTime": 0,
"HurryTime": 40,
"EatingTime": 10,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -148,8 +148,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 400,
"WaitTime": 20,
"HurryTime": 20,
"WaitTime": 0,
"HurryTime": 40,
"EatingTime": 10,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -161,8 +161,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 400,
"WaitTime": 20,
"HurryTime": 20,
"WaitTime": 0,
"HurryTime": 40,
"EatingTime": 10,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -174,8 +174,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 400,
"WaitTime": 20,
"HurryTime": 20,
"WaitTime": 0,
"HurryTime": 40,
"EatingTime": 10,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -187,8 +187,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 400,
"WaitTime": 20,
"HurryTime": 20,
"WaitTime": 0,
"HurryTime": 40,
"EatingTime": 10,
"OpenUpgrade": "Upgrade3",
"RewardBoxType": 1,
@ -200,8 +200,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 500,
"WaitTime": 18,
"HurryTime": 18,
"WaitTime": 0,
"HurryTime": 36,
"EatingTime": 8,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -213,8 +213,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 500,
"WaitTime": 18,
"HurryTime": 18,
"WaitTime": 0,
"HurryTime": 36,
"EatingTime": 8,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -226,8 +226,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 500,
"WaitTime": 18,
"HurryTime": 18,
"WaitTime": 0,
"HurryTime": 36,
"EatingTime": 8,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -239,8 +239,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 500,
"WaitTime": 18,
"HurryTime": 18,
"WaitTime": 0,
"HurryTime": 36,
"EatingTime": 8,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -252,8 +252,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 500,
"WaitTime": 18,
"HurryTime": 18,
"WaitTime": 0,
"HurryTime": 36,
"EatingTime": 8,
"OpenUpgrade": "Upgrade4",
"RewardBoxType": 1,
@ -265,8 +265,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 600,
"WaitTime": 16,
"HurryTime": 16,
"WaitTime": 0,
"HurryTime": 32,
"EatingTime": 6,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -278,8 +278,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 600,
"WaitTime": 16,
"HurryTime": 16,
"WaitTime": 0,
"HurryTime": 32,
"EatingTime": 6,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -291,8 +291,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 600,
"WaitTime": 16,
"HurryTime": 16,
"WaitTime": 0,
"HurryTime": 32,
"EatingTime": 6,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -304,8 +304,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 600,
"WaitTime": 16,
"HurryTime": 16,
"WaitTime": 0,
"HurryTime": 32,
"EatingTime": 6,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -317,8 +317,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 600,
"WaitTime": 16,
"HurryTime": 16,
"WaitTime": 0,
"HurryTime": 32,
"EatingTime": 6,
"OpenUpgrade": "Upgrade5",
"RewardBoxType": 1,
@ -330,8 +330,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 700,
"WaitTime": 14,
"HurryTime": 14,
"WaitTime": 0,
"HurryTime": 28,
"EatingTime": 6,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -343,8 +343,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 700,
"WaitTime": 14,
"HurryTime": 14,
"WaitTime": 0,
"HurryTime": 28,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -356,8 +356,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 700,
"WaitTime": 14,
"HurryTime": 14,
"WaitTime": 0,
"HurryTime": 28,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -369,8 +369,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 700,
"WaitTime": 14,
"HurryTime": 14,
"WaitTime": 0,
"HurryTime": 28,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -382,8 +382,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 700,
"WaitTime": 14,
"HurryTime": 14,
"WaitTime": 0,
"HurryTime": 28,
"EatingTime": 4,
"OpenUpgrade": "Upgrade6",
"RewardBoxType": 1,
@ -395,8 +395,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 800,
"WaitTime": 12,
"HurryTime": 12,
"WaitTime": 0,
"HurryTime": 24,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -408,8 +408,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 800,
"WaitTime": 12,
"HurryTime": 12,
"WaitTime": 0,
"HurryTime": 24,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -421,8 +421,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 800,
"WaitTime": 12,
"HurryTime": 12,
"WaitTime": 0,
"HurryTime": 24,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -434,8 +434,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 800,
"WaitTime": 12,
"HurryTime": 12,
"WaitTime": 0,
"HurryTime": 24,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -447,8 +447,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 800,
"WaitTime": 12,
"HurryTime": 12,
"WaitTime": 0,
"HurryTime": 24,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 1,
@ -460,8 +460,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 10,
"HurryTime": 10,
"WaitTime": 0,
"HurryTime": 20,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -473,8 +473,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 10,
"HurryTime": 10,
"WaitTime": 0,
"HurryTime": 20,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -486,8 +486,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 10,
"HurryTime": 10,
"WaitTime": 0,
"HurryTime": 20,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -499,8 +499,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 10,
"HurryTime": 10,
"WaitTime": 0,
"HurryTime": 20,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -512,8 +512,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 10,
"HurryTime": 10,
"WaitTime": 0,
"HurryTime": 20,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 1,
@ -525,8 +525,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 8,
"HurryTime": 8,
"WaitTime": 0,
"HurryTime": 16,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -538,8 +538,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 8,
"HurryTime": 8,
"WaitTime": 0,
"HurryTime": 16,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -551,8 +551,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 8,
"HurryTime": 8,
"WaitTime": 0,
"HurryTime": 16,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -564,8 +564,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 8,
"HurryTime": 8,
"WaitTime": 0,
"HurryTime": 16,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -577,8 +577,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 8,
"HurryTime": 8,
"WaitTime": 0,
"HurryTime": 16,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 1,
@ -590,8 +590,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 6,
"HurryTime": 6,
"WaitTime": 0,
"HurryTime": 12,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -603,8 +603,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 6,
"HurryTime": 6,
"WaitTime": 0,
"HurryTime": 12,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -616,8 +616,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 6,
"HurryTime": 6,
"WaitTime": 0,
"HurryTime": 12,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -629,8 +629,8 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 6,
"HurryTime": 6,
"WaitTime": 0,
"HurryTime": 12,
"EatingTime": 4,
"OpenUpgrade": "",
"RewardBoxType": 0,
@ -642,7 +642,7 @@
"Gold": 100,
"Exp": 100,
"RequiredExp": 900,
"WaitTime": 6,
"WaitTime": 0,
"HurryTime": 6,
"EatingTime": 4,
"OpenUpgrade": "",

View File

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