Merge branch 'develop' into 新开头整合5.26
This commit is contained in:
@@ -43,7 +43,6 @@ namespace AibisDream.FixSystem
|
||||
|
||||
// 模块基本数据
|
||||
[SerializeField] public BodyModuleData data;
|
||||
private float clickRadius = 0.05f;
|
||||
public bool available = true;
|
||||
private bool _cutting;
|
||||
|
||||
@@ -59,7 +58,7 @@ namespace AibisDream.FixSystem
|
||||
_bodyModuleSystem = transform.parent.parent.GetComponent<BodyModuleSystem>();
|
||||
|
||||
_targetSpriteRenderer = transform.Find("Module Pic").GetComponent<SpriteRenderer>();
|
||||
_originalMaterial = _targetSpriteRenderer.GetComponent<SpriteRenderer>().material;
|
||||
_originalMaterial = _targetSpriteRenderer.GetComponent<SpriteRenderer>().material;
|
||||
|
||||
_cutSpriteRenderer = transform.Find("Cut Pic")?.GetComponent<SpriteRenderer>();
|
||||
if (_cutSpriteRenderer != null)
|
||||
@@ -131,10 +130,6 @@ namespace AibisDream.FixSystem
|
||||
#endregion
|
||||
|
||||
#region 切割相关
|
||||
public SpriteRenderer GetSpriteRenderer()
|
||||
{
|
||||
return _targetSpriteRenderer;
|
||||
}
|
||||
|
||||
public void OnCuttingDown()
|
||||
{
|
||||
@@ -143,6 +138,9 @@ namespace AibisDream.FixSystem
|
||||
DialogController.Instance?.StartDialogNode($"{data.moduleName}CutDown");
|
||||
EnumEventSystem.Global.Send(EventEnum.CutEnd);
|
||||
Destroy(gameObject);
|
||||
DialogController.Instance?.StartDialogNode($"{data.moduleName}CutDown");
|
||||
EnumEventSystem.Global.Send(EventEnum.CutEnd);
|
||||
Destroy(gameObject);
|
||||
}
|
||||
public void SetCutTextVisible(bool visible)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user