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

0.3.0.10

Browse Source
This commit is contained in:
SweetJJuya 2024-10-08 15:45:46 +09:00
parent b000128df3
commit 0f8f398c99
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs
View File

@ -1,3 +1,4 @@
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -6,6 +7,7 @@ using BlueWater.Tycoons;
using Mono.Cecil.Cil; using Mono.Cecil.Cil;
using Sirenix.OdinInspector; using Sirenix.OdinInspector;
using UnityEngine; using UnityEngine;
using Random = UnityEngine.Random;
namespace BlueWater.Uis namespace BlueWater.Uis
{ {
@ -29,13 +31,21 @@ namespace BlueWater.Uis
private TycoonCard _tycoonCard02Componet; private TycoonCard _tycoonCard02Componet;
private TycoonCard _tycoonCard03Componet; private TycoonCard _tycoonCard03Componet;
private void Awake()
{
EventManager.OnLevelUp += Test;
}
void Start() void Start()
{ {
uiCamera = TycoonCameraManager.Instance.UiCamera; uiCamera = TycoonCameraManager.Instance.UiCamera;
} }
private void OnDestroy()
{
EventManager.OnLevelUp -= Test;
}
[Button("카드 생성하기(레벨업)")] [Button("카드 생성하기(레벨업)")]
private void CreateCard() private void CreateCard()
{ {
@ -43,6 +53,7 @@ namespace BlueWater.Uis
VisualFeedbackManager.Instance.SetBaseTimeScale(0f); VisualFeedbackManager.Instance.SetBaseTimeScale(0f);
// 기존 카드가 있으면 삭제 // 기존 카드가 있으면 삭제
if (_currentCard01 != null) if (_currentCard01 != null)
{ {
@ -114,11 +125,15 @@ namespace BlueWater.Uis
_tycoonCard03Componet.Rotation_Start(); _tycoonCard03Componet.Rotation_Start();
} }
private void Test(LevelData levelData)
{
if (levelData.Idx == "1") return;
CreateCard();
}
public void SelectedCard(TycoonCard currTycoonCard) public void SelectedCard(TycoonCard currTycoonCard)
{ {
VisualFeedbackManager.Instance.ResetTimeScale();
switch (currTycoonCard.CardDataForIdx.Idx) //탐색 후 행동... switch (currTycoonCard.CardDataForIdx.Idx) //탐색 후 행동...
{ {
case "HeartPlus": case "HeartPlus":
@ -147,8 +162,10 @@ namespace BlueWater.Uis
// case "ChefNpc": return; break; // case "ChefNpc": return; break;
case "SpeedUp": case "SpeedUp":
TycoonManager.Instance.TycoonStatus.PlayerMoveSpeedMultiplier += 0.05f; break; TycoonManager.Instance.TycoonStatus.PlayerMoveSpeedMultiplier += 0.05f; break;
//case "ExpGetUp": return; break; case "ExpGetUp":
// case "GoldGetUp": return; break; TycoonManager.Instance.TycoonStatus.ExpMultiplier += 0.05f; break;
case "GoldGetUp":
TycoonManager.Instance.TycoonStatus.GoldMultiplier += 0.05f; break;
// case "CleanUp": return; break; // case "CleanUp": return; break;
// case "GaugeReset": return; break; // case "GaugeReset": return; break;
default: Debug.Log("Not Found Card : IDX" + currTycoonCard.CardDataForIdx.Idx); return; break; default: Debug.Log("Not Found Card : IDX" + currTycoonCard.CardDataForIdx.Idx); return; break;
@ -256,13 +273,7 @@ namespace BlueWater.Uis
Destroy(_currentCard03); Destroy(_currentCard03);
} }
} VisualFeedbackManager.Instance.ResetTimeScale();
}
private void Awake()
{
}
} }
} }

8
Assets/02.Scripts/VisualFeedbackManager.cs
View File

@ -10,8 +10,16 @@ namespace BlueWater
private float _baseTimeScale = 1f; private float _baseTimeScale = 1f;
private float _currentHitStopCoefficient = 1f; private float _currentHitStopCoefficient = 1f;
protected override void OnAwake()
{
base.OnAwake();
ResetTimeScale();
}
public void SetBaseTimeScale(float value) public void SetBaseTimeScale(float value)
{ {
print("테스트");
_baseTimeScale = value; _baseTimeScale = value;
UpdateTimeScale(); UpdateTimeScale();
} }