Merge branch 'develop' into 火山美术合入2.11
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using AibisDream.Framework;
|
||||
using Newtonsoft.Json;
|
||||
using UnityEngine;
|
||||
@@ -35,7 +35,6 @@ namespace AibisDream.FixSystem
|
||||
|
||||
[Header("CutText闪烁效果")] private float cutTextFlickerThreshold = 0.4f; // 开始闪烁的阈值
|
||||
private float cutTextFlickerInterval = 0.1f; // 闪烁间隔
|
||||
private float cutTextFlickerTimer = 0f; // 闪烁计时器
|
||||
private bool isCutTextFlickering = false; // 是否正在闪烁
|
||||
private Coroutine flickerCoroutine; // 闪烁协程引用
|
||||
|
||||
@@ -44,7 +43,6 @@ namespace AibisDream.FixSystem
|
||||
// 模块基本数据
|
||||
[SerializeField] public BodyModuleData data;
|
||||
public bool available = true;
|
||||
private bool _cutting;
|
||||
private bool _isOpen;
|
||||
|
||||
private void Awake()
|
||||
@@ -102,9 +100,9 @@ namespace AibisDream.FixSystem
|
||||
{
|
||||
}
|
||||
|
||||
public Vector3 GetSocketPos()
|
||||
public Transform GetSocketPos()
|
||||
{
|
||||
return _socketPos.position;
|
||||
return _socketPos;
|
||||
}
|
||||
|
||||
public void OpenPlugSlot()
|
||||
|
||||
Reference in New Issue
Block a user