Soullies/ichni_Official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
SoulliesOfficial
2025-09-05 10:14:45 -04:00
parent 4031b29245
commit d4fcca7740
65 changed files with 838 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/Game/Animations/Camera/CameraFieldOfView.cs
View File

@@ -39,7 +39,7 @@ namespace Ichni.RhythmGame
if (fieldOfView.returnType == FlexibleReturnType.MiddleExecuting)
{
targetGameCamera.perspectiveAngle = fieldOfView.value;
targetGameCamera.gameCamera.fieldOfView = fieldOfView.value;
targetGameCamera.cam.fieldOfView = fieldOfView.value;
}
}

9
Assets/Scripts/Game/GameElements/GameCamera/GameCamera.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using DG.Tweening;
using Ichni.RhythmGame.Beatmap;
using Ichni.UI;
using UniRx;
@@ -13,7 +14,7 @@ namespace Ichni.RhythmGame
{
public partial class GameCamera : GameElement, IHaveTransformSubmodule, IHaveTimeDurationSubmodule
{
[FormerlySerializedAs("camera")] public new Camera gameCamera;
public Camera cam;
public Transform rotationPoint;
public Transform positionPoint;
public Transform cameraTransform;
@@ -40,7 +41,7 @@ namespace Ichni.RhythmGame
gameCamera.parentElement = parentElement;
gameCamera.cameraViewType = cameraViewType;
gameCamera.gameCamera.orthographic = cameraViewType == CameraViewType.Orthographic;
gameCamera.cam.orthographic = cameraViewType == CameraViewType.Orthographic;
gameCamera.perspectiveAngle = perspectiveAngle;
gameCamera.orthographicSize = orthographicSize;
gameCamera.cameraTransform = gameCamera.transform;
@@ -55,7 +56,7 @@ namespace Ichni.RhythmGame
//gameCamera.perspectiveOffset = 11f * ratioDifference;
}
gameCamera.gameCamera.fieldOfView = perspectiveAngle + gameCamera.perspectiveOffset;
gameCamera.cam.fieldOfView = perspectiveAngle + gameCamera.perspectiveOffset;
return gameCamera;
}
@@ -63,7 +64,7 @@ namespace Ichni.RhythmGame
{
base.AfterInitialize();
//gameCamera.GetComponent<UniversalAdditionalCameraData>().cameraStack.Add(cameraManager.uiCamera);
GameManager.instance.backgroundController.backgroundCanvas.worldCamera = gameCamera;
GameManager.instance.backgroundController.backgroundCanvas.worldCamera = cam;
}
public override void SetDefaultSubmodules()

2
Assets/Scripts/Game/GameElements/GameCamera/GameCameraExtension.cs
View File

@@ -24,7 +24,7 @@ namespace Ichni.RhythmGame
public void ApplyExtension()
{
gameCamera.gameCamera.farClipPlane = farClipRange;
gameCamera.cam.farClipPlane = farClipRange;
}
}

2
Assets/Scripts/Game/GameElements/GeneralEffects/CameraOffsetEffect.cs
View File

@@ -14,7 +14,7 @@ namespace Ichni.RhythmGame
public Vector3 offsetValue;
public AnimationCurve offsetCurve;
Transform gameCameraTransform => GameManager.instance.cameraManager.gameCamera.gameCamera.transform;
Transform gameCameraTransform => GameManager.instance.cameraManager.gameCamera.cam.transform;
Tweener offsetTweener;
public CameraOffsetEffect(float duration, Vector3 offsetValue, AnimationCurve offsetCurve)

11
Assets/Scripts/Game/GameElements/GeneralEffects/CameraTiltEffect.cs
View File

@@ -12,8 +12,9 @@ namespace Ichni.RhythmGame
public Vector3 tiltValue;
public AnimationCurve tiltCurve;
Transform gameCameraTransform => GameManager.instance.cameraManager.gameCamera.gameCamera.transform;
GameCamera gameCamera=> GameManager.instance.cameraManager.gameCamera;
Tweener tiltTweener;
Tweener tiltBackTweener;
public CameraTiltEffect(float duration, Vector3 tiltValue, AnimationCurve tiltCurve)
{
@@ -26,17 +27,17 @@ namespace Ichni.RhythmGame
public override void Recover()
{
tiltTweener?.Kill(true);
gameCameraTransform.localEulerAngles = Vector3.zero;
tiltBackTweener?.Kill(true);
gameCamera.cam.transform.localEulerAngles = Vector3.zero;
}
public override void PreExecute()
{
tiltTweener = gameCameraTransform.DOBlendableLocalRotateBy(tiltValue, duration, RotateMode.FastBeyond360).SetEase(tiltCurve).Play();
tiltTweener = gameCamera.cam.transform.DOBlendableLocalRotateBy(tiltValue, duration, RotateMode.FastBeyond360).SetEase(tiltCurve).Play();
}
public override void Adjust()
{
}
public override EffectBase_BM ConvertToBM()
@@ -47,7 +48,7 @@ namespace Ichni.RhythmGame
public override void Disrupt()
{
tiltTweener?.Kill();
gameCameraTransform.DOLocalRotate(Vector3.zero, 0.4f).Play();
tiltBackTweener = gameCamera.cam.transform.DOLocalRotate(Vector3.zero, 0.4f).SetEase(Ease.OutSine).Play();
}
}

4
Assets/Scripts/Game/GameElements/Notes/JudgeSubmodules/TouchAreaJudgeUnit.cs
View File

@@ -48,7 +48,7 @@ namespace Ichni.RhythmGame
float distance = Vector2.Distance(inputScreenPosition, noteScreenPosition);
if (distance <= areaRadius * CurrentScreenRatio())
if (distance <= areaRadius)
{
if (inputUnit is InputUnitSwipe swipe && note is Flick flick)
{
@@ -86,7 +86,7 @@ namespace Ichni.RhythmGame
public override NoteJudgeUnit ConvertToGameType(NoteBase attachedNote)
{
#if UNITY_EDITOR || UNITY_STANDALONE
#if UNITY_STANDALONE
return new FullScreenNearTimeJudgeUnit(attachedNote);
#elif UNITY_ANDROID || UNITY_IOS
return new TouchAreaJudgeUnit(attachedNote, areaRadius);

2
Assets/Scripts/Game/GameElements/Notes/NoteObjects/Flick.cs
View File

@@ -144,7 +144,7 @@ namespace Ichni.RhythmGame
return true;
}
Camera gameCamera = GameManager.instance.cameraManager.gameCamera.gameCamera;
Camera gameCamera = GameManager.instance.cameraManager.gameCamera.cam;
foreach (Vector2 localDir in availableFlickDirections)
{

8
Assets/Scripts/Game/GameElements/Notes/NoteObjects/Hold.cs
View File

@@ -345,9 +345,15 @@ namespace Ichni.RhythmGame
if (!isFirstJudged && GameManager.instance.songTime > exactJudgeTime + judgeIntervals.afterMiss)
{
Miss(exactJudgeTime + judgeIntervals.afterMiss);
isFirstJudged = true;
isFinalJudged = true;
foreach (EffectBase e in noteVisual.effectSubmodule.effectCollection["StartHold"])
{
e.Disrupt();
}
Miss(exactJudgeTime + judgeIntervals.afterMiss);
RemoveFromCheckingList();
}
}

2
Assets/Scripts/Game/GameElements/Notes/NoteObjects/NoteBase.cs
View File

@@ -292,7 +292,7 @@ namespace Ichni.RhythmGame
{
public Vector2 GetScreenPosition()
{
return GameManager.instance.cameraManager.gameCamera.gameCamera.WorldToScreenPoint(noteVisual.noteVisualPosition);
return GameManager.instance.cameraManager.gameCamera.cam.WorldToScreenPoint(noteVisual.noteVisualPosition);
}
protected virtual void SetJudgeArea()

5
Assets/Scripts/Game/GameElements/Track/TrackPoints/TrackPercentPoint.cs
View File

@@ -50,11 +50,8 @@ namespace Ichni.RhythmGame
if (trackPercent.returnType == FlexibleReturnType.MiddleExecuting)
{
float finalValue = trackPercent.value;
if (finalValue > 1 && finalValue > Mathf.Floor(finalValue)) finalValue -= Mathf.Floor(finalValue);
if (isBeyond1)
{
finalValue -= Mathf.Floor(finalValue);
}
trackPositioner.SetPercent(finalValue);
}

3
Assets/Scripts/Manager/BasePrefabsCollection.cs
View File

@@ -55,6 +55,9 @@ public partial class BasePrefabsCollection : SerializedScriptableObject
public GameObject directionalSwipeInputMark;
public GameObject genericSwipeInputMark;
public GameObject inputEndMark;
public GameObject inputCanceledMark;
}
public partial class BasePrefabsCollection

124
Assets/Scripts/Manager/GameInputManager.cs
View File

@@ -9,6 +9,7 @@ using Lean.Pool;
using Sirenix.OdinInspector;
using TMPro;
using UnityEngine.InputSystem.Controls;
using UnityEngine.InputSystem.EnhancedTouch;
using UnityEngine.UI;
using Touch = UnityEngine.InputSystem.EnhancedTouch.Touch;
using TouchPhase = UnityEngine.InputSystem.TouchPhase;
@@ -17,7 +18,7 @@ using TouchPhase = UnityEngine.InputSystem.TouchPhase;
/// 为节奏游戏设计的输入管理器，处理多点触控并分发三种主要事件。
/// 【重要】此版本内置了编辑器内的鼠标模拟功能，无需手机即可测试。
/// </summary>
public class GameInputManager : SerializedMonoBehaviour
public class GameInputManager : MonoBehaviour
{
// =====================================================================
// 可配置参数 (Configurable Parameters)
@@ -41,7 +42,7 @@ public class GameInputManager : SerializedMonoBehaviour
public Vector2 StartPosition;
public float StartTime;
public Vector2 LastSwipeDirection = Vector2.zero;
public bool IsTapCandidate = true;
public bool isFirstSwipe = true;
}
private readonly Dictionary<int, TouchState> _activeTouches = new Dictionary<int, TouchState>();
@@ -55,7 +56,7 @@ public class GameInputManager : SerializedMonoBehaviour
private void Awake()
{
#if UNITY_EDITOR || UNITY_STANDALONE
#if UNITY_STANDALONE
DOTween.SetTweensCapacity(200, 200);
gameInput = new GameInput();
gameInput.Game.Enable();
@@ -65,6 +66,8 @@ public class GameInputManager : SerializedMonoBehaviour
Debug.Log("已加载自定义按键绑定");
}
RegisterActionsInputs();
#else
Debug.Log("已启用真实触摸输入");
#endif
}
@@ -76,10 +79,19 @@ public class GameInputManager : SerializedMonoBehaviour
}
// 使用预处理指令区分平台
#if UNITY_EDITOR || UNITY_STANDALONE
#if UNITY_STANDALONE
HandleHolding();
#else
ProcessRealTouchInput();
#endif
}
private void OnDisable()
{
#if UNITY_STANDALONE
#else
#endif
}
@@ -103,21 +115,24 @@ public class GameInputManager : SerializedMonoBehaviour
GameManager.instance.noteJudgeManager.SetNewInputUnitTouch(id, position);
}
private void OnSwipe(int id, Vector2 position, bool isGeneric, Vector2 direction)
private void OnSwipe(int id, Vector2 position, bool isGeneric, bool isFirst, Vector2 direction)
{
if (SettingsManager.instance.gameSettings.debugMode)
{
GenerateSwipeMark(id, position, isGeneric, direction);
GenerateSwipeMark(id, position, isGeneric, isFirst, direction);
if(isFirst) Debug.Log($"划动开始 - ID: {id}, 位置: {position}, 方向: {direction}");
else Debug.Log($"划动更新 - ID: {id}, 位置: {position}, 方向: {direction}");
}
GameManager.instance.noteJudgeManager.SetNewInputUnitSwipe(id, position, isGeneric, direction);
GameManager.instance.noteJudgeManager.SetNewInputUnitSwipe(id, position, isGeneric, isFirst, direction);
}
// =====================================================================
// 核心处理逻辑 (Core Processing Logic)
// =====================================================================
#if UNITY_EDITOR || UNITY_STANDALONE
#if UNITY_STANDALONE
/// <summary>
/// 【仅在编辑器中运行】处理鼠标输入并模拟触摸事件。
/// </summary>
@@ -171,7 +186,7 @@ public class GameInputManager : SerializedMonoBehaviour
}
#endif
#if UNITY_EDITOR || UNITY_STANDALONE
#if UNITY_STANDALONE
public bool holdingTouch0;
public bool holdingTouch1;
@@ -269,22 +284,6 @@ public class GameInputManager : SerializedMonoBehaviour
holdingSwipe0 = false;
}
};
/*gameInput.Game.Swipe1.performed += ctx =>
{
if (ctx.performed)
{
holdingSwipe1 = true;
}
};
gameInput.Game.Swipe1.canceled += ctx =>
{
if (ctx.canceled)
{
holdingSwipe1 = false;
}
};*/
}
private void HandleHolding()
@@ -318,12 +317,6 @@ public class GameInputManager : SerializedMonoBehaviour
Vector2 inputPosition = new Vector2(Screen.width * 0.5f, 200f);
OnSwipe(0, inputPosition, true, Vector2.zero);
}
/*if (holdingSwipe1)
{
Vector2 inputPosition = new Vector2(600 + Screen.width * 0.5f, 200f);
OnSwipe(3, inputPosition, true, Vector2.zero);
}*/
}
#endif
@@ -357,6 +350,8 @@ public class GameInputManager : SerializedMonoBehaviour
TouchId = touchId,
StartPosition = position,
StartTime = Time.time,
LastSwipeDirection = Vector2.zero,
isFirstSwipe = true
};
_activeTouches[touchId] = newState;
OnTap(touchId, position);
@@ -367,7 +362,8 @@ public class GameInputManager : SerializedMonoBehaviour
if (_activeTouches.TryGetValue(touchId, out TouchState movedState))
{
OnTouch(touchId, position);
DetectSwipe(movedState, position);
DetectSwipe(movedState, _activeTouches[touchId].isFirstSwipe, position);
//_activeTouches[touchId].isFirstSwipe = false;
}
break;
@@ -382,6 +378,10 @@ public class GameInputManager : SerializedMonoBehaviour
if (_activeTouches.ContainsKey(touchId))
{
_activeTouches.Remove(touchId);
if (SettingsManager.instance.gameSettings.debugMode)
{
GenerateEndMark(position);
}
}
break;
@@ -389,6 +389,10 @@ public class GameInputManager : SerializedMonoBehaviour
if (_activeTouches.ContainsKey(touchId))
{
_activeTouches.Remove(touchId);
if (SettingsManager.instance.gameSettings.debugMode)
{
GenerateCanceledMark(position);
}
}
break;
}
@@ -397,7 +401,7 @@ public class GameInputManager : SerializedMonoBehaviour
/// <summary>
/// 检测划动逻辑 (无需修改)
/// </summary>
private void DetectSwipe(TouchState state, Vector2 currentPosition)
private void DetectSwipe(TouchState state, bool isFirst, Vector2 currentPosition)
{
Vector2 swipeVector = currentPosition - state.StartPosition;
if (swipeVector.magnitude < minSwipeDistance) return;
@@ -407,7 +411,7 @@ public class GameInputManager : SerializedMonoBehaviour
// 检查是否是新的划动方向
if (Vector2.Dot(direction, state.LastSwipeDirection) <= swipeAngleThreshold)
{
OnSwipe(state.TouchId, state.StartPosition, false, direction);
OnSwipe(state.TouchId, state.StartPosition, false, isFirst, direction);
state.LastSwipeDirection = direction;
state.StartPosition = currentPosition;
state.StartTime = Time.time;
@@ -461,13 +465,13 @@ public class GameInputManager : SerializedMonoBehaviour
ss.Play();
}
private void GenerateSwipeMark(int id, Vector2 pos, bool isGeneric, Vector2 direction)
private void GenerateSwipeMark(int id, Vector2 pos, bool isGeneric, bool isFirst, Vector2 direction)
{
GameObject markPrefab = isGeneric
? GameManager.instance.basePrefabs.genericSwipeInputMark
: GameManager.instance.basePrefabs.directionalSwipeInputMark;
RectTransform mark = LeanPool.Spawn(markPrefab, GameManager.instance.judgeHintCanvas.transform). GetComponent<RectTransform>();
RectTransform mark = LeanPool.Spawn(markPrefab, GameManager.instance.judgeHintCanvas.transform).GetComponent<RectTransform>();
RectTransform canvasRect = GameManager.instance.judgeHintCanvas.GetComponent<RectTransform>();
if (RectTransformUtility.ScreenPointToLocalPointInRectangle(canvasRect, pos, null, out Vector2 uiPosition))
@@ -479,7 +483,7 @@ public class GameInputManager : SerializedMonoBehaviour
Sequence ss = DOTween.Sequence();
ss.OnStart(() =>
{
mark.GetComponent<Image>().color = Color.white;
mark.GetComponent<Image>().color = isFirst ? Color.red : Color.white;
mark.localScale = Vector3.zero;
});
ss.Join(mark.GetComponent<Image>().DOFade(0, 0.25f));
@@ -488,4 +492,50 @@ public class GameInputManager : SerializedMonoBehaviour
ss.SetUpdate(true);
ss.Play();
}
private void GenerateEndMark(Vector2 pos)
{
RectTransform canvasRect = GameManager.instance.judgeHintCanvas.GetComponent<RectTransform>();
RectTransform mark = LeanPool.Spawn(GameManager.instance.basePrefabs.inputEndMark, canvasRect).GetComponent<RectTransform>();
if (RectTransformUtility.ScreenPointToLocalPointInRectangle(canvasRect, pos, null, out Vector2 uiPosition))
{
mark.anchoredPosition = uiPosition;
}
Sequence ss = DOTween.Sequence();
ss.OnStart(() =>
{
mark.GetComponent<Image>().color = Color.white;
mark.localScale = Vector3.one * 5f;
});
ss.Join(mark.GetComponent<Image>().DOFade(0, 0.25f));
ss.Join(mark.DOScale(0, 0.25f));
ss.OnComplete(() => LeanPool.Despawn(mark.gameObject));
ss.SetUpdate(true);
ss.Play();
}
private void GenerateCanceledMark(Vector2 pos)
{
RectTransform canvasRect = GameManager.instance.judgeHintCanvas.GetComponent<RectTransform>();
RectTransform mark = LeanPool.Spawn(GameManager.instance.basePrefabs.inputCanceledMark, canvasRect).GetComponent<RectTransform>();
if (RectTransformUtility.ScreenPointToLocalPointInRectangle(canvasRect, pos, null, out Vector2 uiPosition))
{
mark.anchoredPosition = uiPosition;
}
Sequence ss = DOTween.Sequence();
ss.OnStart(() =>
{
mark.GetComponent<Image>().color = Color.white;
mark.localScale = Vector3.one * 5f;
});
ss.Join(mark.GetComponent<Image>().DOFade(0, 0.25f));
ss.Join(mark.DOScale(0, 0.25f));
ss.OnComplete(() => LeanPool.Despawn(mark.gameObject));
ss.SetUpdate(true);
ss.Play();
}
}

9
Assets/Scripts/Manager/NoteJudgeManager.cs
View File

@@ -188,9 +188,9 @@ namespace Ichni
}
}
public void SetNewInputUnitSwipe(int fingerId, Vector2 inputPosition, bool isGeneric, Vector2 delta)
public void SetNewInputUnitSwipe(int fingerId, Vector2 inputPosition, bool isGeneric, bool isFirst, Vector2 delta)
{
InputUnitSwipe inputUnitSwipe = new InputUnitSwipe(fingerId, inputPosition, isGeneric, delta);
InputUnitSwipe inputUnitSwipe = new InputUnitSwipe(fingerId, inputPosition, isGeneric, isFirst, delta);
if(!inputUnitSwipeList.Exists(x => x.fingerId == fingerId))
{
inputUnitSwipeList.Add(inputUnitSwipe);
@@ -304,12 +304,13 @@ namespace Ichni
{
public Vector2 swipeDirection;
public bool isGeneric;
public InputUnitSwipe(int fingerId, Vector2 inputPosition, bool isGeneric, Vector2 swipeDirection)
public bool isFirst;
public InputUnitSwipe(int fingerId, Vector2 inputPosition, bool isGeneric, bool isFirst, Vector2 swipeDirection)
{
this.fingerId = fingerId;
this.inputPosition = inputPosition;
this.isGeneric = isGeneric;
this.isFirst = isFirst;
this.swipeDirection = swipeDirection.normalized;
}
}

8
Assets/Scripts/Manager/PostProcessingManager.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@@ -22,6 +23,13 @@ namespace Ichni
SetPixelateStrength(Screen.width, Screen.height);
}
private void OnDisable()
{
FindAndCacheFeatureWithReflection();
SetFeatureActive(false);
SetPixelateStrength(Screen.width, Screen.height);
}
private void FindAndCacheFeatureWithReflection()
{
var pipelineAsset = GraphicsSettings.currentRenderPipeline as UniversalRenderPipelineAsset;

4
Assets/Scripts/SpaceConverter.cs
View File

@@ -12,7 +12,7 @@ namespace Ichni
public static Vector2 WorldPointToScreenPoint(Vector3 worldPoint)
{
// Camera.main 世界摄像机
Vector2 screenPoint = GameManager.instance.cameraManager.gameCamera.gameCamera.WorldToScreenPoint(worldPoint);
Vector2 screenPoint = GameManager.instance.cameraManager.gameCamera.cam.WorldToScreenPoint(worldPoint);
return screenPoint;
}
@@ -26,7 +26,7 @@ namespace Ichni
{
// Camera.main 世界摄像机
Vector3 position = new Vector3(screenPoint.x, screenPoint.y, planeZ);
Vector3 worldPoint = GameManager.instance.cameraManager.gameCamera.gameCamera.ScreenToWorldPoint(position);
Vector3 worldPoint = GameManager.instance.cameraManager.gameCamera.cam.ScreenToWorldPoint(position);
return worldPoint;
}