合并
This commit is contained in:
@@ -110,7 +110,7 @@ ScriptedImporter:
|
||||
y: 2172
|
||||
width: 2031
|
||||
height: 121
|
||||
spriteID: 6e6a3e7411e18674997c8735b867dd87
|
||||
spriteID: a428a8a5f3f249742a6da694bd87ef36
|
||||
spriteBone: []
|
||||
spriteOutline: []
|
||||
vertices: []
|
||||
@@ -365,7 +365,7 @@ ScriptedImporter:
|
||||
spriteName: "\u77E9\u5F62 1"
|
||||
isGroup: 0
|
||||
parentIndex: -1
|
||||
spriteID: 6e6a3e7411e18674997c8735b867dd87
|
||||
spriteID: a428a8a5f3f249742a6da694bd87ef36
|
||||
layerID: 25
|
||||
mosaicPosition: {x: 1551, y: 2172}
|
||||
flatten: 0
|
||||
|
||||
@@ -88,7 +88,7 @@ HeartModule: 将机体的燃料转化为电能/机械能，驱动机体和内部
|
||||
<<if $gameStage == 5>>
|
||||
me: 至少…他能重新听到音乐了。
|
||||
<<elseif $engineProblemKnown == false>>
|
||||
<HeartModule: #auto_next
|
||||
HeartModule: #auto_next
|
||||
HeartModule: 报告传输完毕。
|
||||
<<wait 1.5>>
|
||||
me: 没有受损…可以开始刻录。
|
||||
@@ -186,7 +186,7 @@ title: 刻录
|
||||
position: 728,79
|
||||
---
|
||||
|
||||
<<switch_fix_system_to "Gear">>
|
||||
<<switch_fix_system_to "Gear" "stone_day2_1.json">>
|
||||
<<set $engineProblemKnown = true>>
|
||||
<<open_gear_cover>>
|
||||
me: 如果我没有理解错这套东西的原理…<br>我应该可以把这个读取声音的探头，改造成一个刻出声音的钻头。
|
||||
|
||||
+355
-795
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,7 @@
|
||||
using System;
|
||||
using DG.Tweening;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UIElements;
|
||||
|
||||
namespace AibisDream
|
||||
{
|
||||
@@ -7,8 +9,7 @@ namespace AibisDream
|
||||
{
|
||||
#region 动件索引
|
||||
|
||||
[Header("可动组件索引")]
|
||||
public EngineGear[] engineGears;
|
||||
[Header("可动组件索引")] public EngineGear[] engineGears;
|
||||
public GameObject piston;
|
||||
|
||||
#endregion
|
||||
@@ -22,7 +23,13 @@ namespace AibisDream
|
||||
|
||||
private void Start()
|
||||
{
|
||||
// 赋予初始速度
|
||||
foreach (var gear in engineGears)
|
||||
{
|
||||
gear.Rotate(_engineSystem.engineConfig.gearSpeed);
|
||||
}
|
||||
_engineSystem.updateSpeedEvent.AddListener(OnSpeedUpdate);
|
||||
|
||||
}
|
||||
|
||||
private void OnSpeedUpdate(float originSpeed, float speedScale)
|
||||
@@ -30,17 +37,18 @@ namespace AibisDream
|
||||
// 处理齿轮速度
|
||||
foreach (var gear in engineGears)
|
||||
{
|
||||
gear.SetSpeedScale(speedScale * _engineSystem.engineConfig.gearSpeed);
|
||||
gear.SetSpeedScale(speedScale);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public struct EngineGear
|
||||
public class EngineGear
|
||||
{
|
||||
public Renderer renderer;
|
||||
public Transform gear;
|
||||
public float speedRadio;
|
||||
private static readonly int UVRotateSpeed = Shader.PropertyToID("_UVRotateSpeed");
|
||||
|
||||
private Tween _rotateTween;
|
||||
|
||||
/// <summary>
|
||||
/// 设置速度
|
||||
@@ -48,8 +56,23 @@ namespace AibisDream
|
||||
/// <param name="speedScale">基础速度</param>
|
||||
public void SetSpeedScale(float speedScale)
|
||||
{
|
||||
renderer.material.SetFloat(UVRotateSpeed, speedRadio * speedScale);
|
||||
if (_rotateTween != null)
|
||||
{
|
||||
_rotateTween.timeScale = speedScale;
|
||||
}
|
||||
// _rotateTween.timeScale = speedScale;
|
||||
}
|
||||
|
||||
public void Rotate(float initSpeed)
|
||||
{
|
||||
var duration = 1 / Mathf.Abs(initSpeed * speedRadio);
|
||||
|
||||
var target = speedRadio >= 0 ? new Vector3(0, 0, 360) : new Vector3(0, 0, -360);
|
||||
|
||||
Debug.Log("Rotate");
|
||||
_rotateTween = gear.DORotate(target, duration, RotateMode.LocalAxisAdd)
|
||||
.SetEase(Ease.Linear)
|
||||
.SetLoops(-1, LoopType.Incremental);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
using AibisDream.FixSystem;
|
||||
using DG.Tweening;
|
||||
using UnityEngine;
|
||||
|
||||
namespace AibisDream
|
||||
{
|
||||
public class StaticGear : MonoBehaviour
|
||||
{
|
||||
public float initSpeed;
|
||||
private Tween _rotateTween;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
FixSystemCenter.SystemDic.Get<EngineSystem>().updateSpeedEvent.AddListener(UpdateSpeedScale);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 开始旋转
|
||||
/// </summary>
|
||||
public void StartRotate()
|
||||
{
|
||||
_rotateTween = transform.DORotate(new Vector3(0, 0, 360), 1 / Mathf.Abs(initSpeed), RotateMode.LocalAxisAdd)
|
||||
.SetEase(Ease.Linear)
|
||||
.SetLoops(-1, LoopType.Incremental);
|
||||
}
|
||||
|
||||
private void UpdateSpeedScale(float originSpeed, float speed)
|
||||
{
|
||||
_rotateTween.timeScale = speed;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 79006d3d747c4b8482204874bbbf6ae3
|
||||
timeCreated: 1737104031
|
||||
@@ -6,7 +6,7 @@ namespace AibisDream
|
||||
{
|
||||
[SerializeField] protected GameObject choiceButton;
|
||||
|
||||
private void Start()
|
||||
protected override void OnAwake()
|
||||
{
|
||||
// 初始化选择按钮
|
||||
choiceButtonPrefab = choiceButton;
|
||||
|
||||
@@ -61,6 +61,12 @@ namespace AibisDream
|
||||
_dialogText = transform.Find(DialogText)?.gameObject.GetComponent<TypewriterByCharacter>();
|
||||
_nextArray = transform.Find(NextArray)?.gameObject;
|
||||
_choiceBox = transform.Find(ChoiceBox)?.gameObject;
|
||||
|
||||
OnAwake();
|
||||
}
|
||||
|
||||
protected virtual void OnAwake()
|
||||
{
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft9","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.69999993,"y":-0.919,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮A"},{"shaftName":"Pluggable Shaft8","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.18,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.588,"y":-0.901,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Pluggable Shaft7","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.09,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.21799946,"y":-0.413000017,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Pluggable Shaft6","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.18,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.84499979,"y":-0.350999951,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Pluggable Shaft5","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.98999882,"y":-0.585000038,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮A"},{"shaftName":"Pluggable Shaft4","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.27,"isGearBroken":true,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.17599964,"y":-0.04199993,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Pluggable Shaft3","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.9659996,"y":0.340000182,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Pluggable Shaft2","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.70999885,"y":0.348000079,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Pluggable Shaft1","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.39599943,"y":0.3350002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Driver Shaft","shaftType":0,"initialSpeed":1.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"isGearBroken":true,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.17799878,"y":0.4850002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Target Shaft","shaftType":1,"initialSpeed":0.0,"targetSpeed":0.3,"hasChildGear":true,"radius":0.27,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.14999962,"y":-0.921000063,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[{"shaftName":"Panel Shaft1","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.019,"y":0.717,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Panel Shaft2","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.27,"isGearBroken":true,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.011,"y":0.003,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/坏齿轮A"},{"shaftName":"Panel Shaft3","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.0,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.011,"y":-0.668,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}]}
|
||||
{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"","isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Pluggable Shaft2","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Pluggable Shaft1","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[]}
|
||||
@@ -1 +1 @@
|
||||
{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":null,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Pluggable Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Pluggable Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[{"shaftName":"Panel Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.015,"y":0.883,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.076,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":null,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.898,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"}]}
|
||||
{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"","isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Pluggable Shaft2","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Pluggable Shaft1","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[]}
|
||||
Reference in New Issue
Block a user