tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fearure/Yarn_FP' of http://114.67.212.218:8011/aibis-dream/aibis-dream into fearure/Yarn_FP

Browse Source
This commit is contained in:
Ovid
2025-01-26 02:48:32 +08:00
parent ad6e1b7707 95f4864e66
commit d41c41185f
36 changed files with 1901 additions and 1856 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Resources/Prefabs/Gear System/Gear.prefab
+63
View File
@@ -12,6 +12,8 @@ GameObject:
- component: {fileID: 6708275724089666452}
- component: {fileID: -8692931752727397524}
- component: {fileID: 3319742319015225169}
- component: {fileID: 4734111553029855686}
- component: {fileID: 8364027758844539556}
m_Layer: 0
m_Name: Gear
m_TagString: Moveable
@@ -135,8 +137,69 @@ MonoBehaviour:
m_EditorClassIdentifier:
radius: 0
gearSprite: {fileID: 0}
gearProp:
isBroken: 0
isDisc: 0
isConstant: 0
speed: 0
targetShaft: {fileID: 0}
--- !u!50 &4734111553029855686
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5285827322175967477}
m_BodyType: 1
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 0.1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 0.1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!114 &8364027758844539556
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5285827322175967477}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Delegates:
- eventID: 0
callback:
m_PersistentCalls:
m_Calls: []
- eventID: 1
callback:
m_PersistentCalls:
m_Calls: []
- eventID: 13
callback:
m_PersistentCalls:
m_Calls: []
- eventID: 14
callback:
m_PersistentCalls:
m_Calls: []
- eventID: 5
callback:
m_PersistentCalls:
m_Calls: []
Assets/Resources/Shader/PeipeiFixScene.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7bb31685ad654644f97f10b4f639a0b7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/PeipeiFixScene/Global Volume Profile.asset → Assets/Resources/Shader/PeipeiFixScene/Global Volume Profile.asset
View File
Assets/Scenes/PeipeiFixScene/Global Volume Profile.asset.meta → Assets/Resources/Shader/PeipeiFixScene/Global Volume Profile.asset.meta
View File
Assets/Scenes/PeipeiFixScene/全局混乱 Profile.asset → Assets/Resources/Shader/PeipeiFixScene/全局混乱 Profile.asset
View File
Assets/Scenes/PeipeiFixScene/全局混乱 Profile.asset.meta → Assets/Resources/Shader/PeipeiFixScene/全局混乱 Profile.asset.meta
View File
Assets/Resources/Yarn/FP_Shitou1/EventNode.yarn
+11
View File
@@ -40,6 +40,17 @@ position: -1092,115
<<endif>>
===
title: AllGearsRunning
---
<<if $gameStage == 2 && $gearPopupCount == 1>>
<<jump 齿轮恢复后>>
<<elseif $gameStage == 2 && $gearPopupCount == 2>>
<<jump 齿轮第二次放回>>
<<elseif $gameStage == 2 && $curGearProp == "NewGear">>
<<jump 更换镍铬齿轮>>
<<endif>>
===
title: 插入冷却液
position: -809,327
---
Assets/Resources/Yarn/FP_Shitou1/Shitou_Start.yarn
+3
View File
@@ -45,6 +45,9 @@ position: 205,199
//选择的透析剂
<<declare $selection = 0>>
// 齿轮掉出来了
<<declare $gearPopupCount = 0>>
//【功能相关】
Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn
+57 -20
View File
@@ -56,7 +56,7 @@ me: 总之，找到他的<b><size=100%><color=\#D9BC26>动力模块</color></b>
title: 主维修界面
position: 384,81
position: 385,81
---
<<MessageBoxSetNull>>
<<MessageBoxSetText 等待信号输入……>>
@@ -78,7 +78,7 @@ position: 384,81
title: 进入阶段3
group: 出口
position: 385,382
position: 408,1551
---
<<set $gameStage = 3>>
<<jump Center>>
@@ -261,7 +261,7 @@ title: 检查_肝
tags:
colorID: 8
group: 插入触发
position: -158,370
position: -159,365
---
<<MessageBoxSetNull>>
<<MessageBoxSetText 正在建立连接…>>
@@ -296,7 +296,7 @@ position: -158,370
title: 变速箱
position: 728,79
position: 371,414
---
<<switch_fix_system_to "Engine">>
@@ -376,10 +376,7 @@ me:拉动左边的拉绳，就可以提升涡轮部分的转速了
===
title: 调速后测速
tags:
colorID: 8
group: 插入触发
position: -158,370
position: 383,723
---
shitou: 哇~好快啊，从来没有过的感觉！
<<hide_dialog>>
@@ -398,11 +395,20 @@ me: 听起来像是变速箱里的声音……我这就看看。
<<task_moveIn TaskManager>>
->打开变速箱盖
<<switch_fix_system_to Gear>>
<<hide_dialog>>
<<switch_fix_system_to Gear "stone_day1_1.json">>
<<open_gear_cover>>
<<hide_dialog>>
<<wait 1>>
<<shake_camera 0.2 0.3 20>>
//region 弹飞齿轮
<<popup_gear "Pluggable Shaft1">>
<<popup_gear "Pluggable Shaft2">>
<<popup_gear "Pluggable Shaft3">>
<<set $gearPopupCount = 1>>
<<wait 2>>
//endregion
me: 哎呀……有几个齿轮松脱了。
<<complete_task TaskManager 检查变速箱的异响>>
@@ -434,10 +440,20 @@ me: 无论如何，我先把这些脱落的齿轮装回去吧。
//shitou: 噢？你说的是*那些*齿轮吗？
//me: 什么是*那些*齿轮？
//shitou: 嘿嘿。快把它放回去，让我演示给你看！
->放回去
<<hide_dialog>>
<<load_gear_panel "replace_gear.json">>
<<open_gear_panel>>
===
title: 齿轮恢复后
position: 393,982
---
<<close_gear_panel>>
<<hide_dialog>>
<<wait 1>>
// <<close_gear_panel>>
<<complete_task TaskManager 恢复变速箱的齿轮>>
<<task_moveOut TaskManager>>
<<wait 0.5>>
@@ -478,12 +494,29 @@ shitou: 哇，感觉充满力量！要来了！
<<random_play_interaction tv_in>>
<<shake_camera 0.4 0.3 20>>
<<step_on_gas 0.2 0.5>>
<<wait 1>>
//region 弹飞齿轮
<<popup_gear "Pluggable Shaft1">>
<<popup_gear "Pluggable Shaft2">>
<<popup_gear "Pluggable Shaft3">>
<<set $gearPopupCount = 2>>
<<wait 2>>
//endregion
shitou: 哎呀，医生！我又动不了了！
me: 这就是我说的问题。刚才已经发生过一次了……
me: 我先给你安回去吧…但你别再加速了。不然还得飞出来。
你将齿轮装了回去。（自动）#auto_next
<<close_gear_cover>>
->放回去
<<hide_dialog>>
<<load_gear_panel "replace_gear.json">>
<<open_gear_panel>>
===
title: 齿轮第二次放回
---
<<set $gearPopupCount = 0>>
<<close_gear_cover>>
<<wait 1>>
<<fade_in 1>>
<<switch_fix_system_to "Clinic">>
@@ -535,22 +568,24 @@ shitou: 它曾经对我来说很重要，但是每个人都该往前看，不是
shitou: 它已经，为我留下了足够的记忆！我的记忆模块里已经留下了几百首歌的旋律！
shitou: 我——依然会记得怎么唱这些歌的，所以……没关系！我的生活足够美好咯，在园区里头穿梭，风吹在脸上，安逸滴很！
shitou: 所以，是的。医生，帮我换掉这些唱片齿轮吧！
shitou: 啊！对了……这些捏铬齿轮…不会很贵吧……
shitou: 啊！对了……这些镍铬齿轮…不会很贵吧……
me: 啊…那倒不贵。不过是一些铁块罢了。
shitou: 哈哈哈！那太好了，那还等什么？医生，我们来吧。
<<fade_in 1>>
<<switch_fix_system_to "Gear">>
<<switch_fix_system_to "Gear" "stone_day1_2.json">>
<<fade_out 1>>
<<open_gear_cover>>
me: 让我找找…镍铬齿轮…
<<open_gear_panel>>
<<hide_dialog>>
<<add_task TaskManager 更换镍铬齿轮>>
<<task_moveIn TaskManager>>
===
<<hide_dialog>>
<<wait 0.5>>
->将镍铬齿轮替换上去
title: 更换镍铬齿轮
position: 402,1263
---
<<hide_dialog>>
<<wait 1>>
<<close_gear_panel>>
@@ -563,9 +598,11 @@ me: 让我找找…镍铬齿轮…
me: 好了…再播…跑一次吧。
<<step_on_gas 0.7 2>>
引擎咆哮着加速，安然无恙，但是没有了音乐。#auto_next
<<wait 2>>
shitou: 呜呼！医生~我感觉~我像在飞一样！
<<jump 分析检查结果>>
<<close_gear_cover>>
<<jump 进入阶段3>>
===
Assets/Resources/Yarn/FP_Shitou2/Stage2_调速测试_disposed.yarn
+5 -5
View File
@@ -60,7 +60,7 @@ position: 384,81
title: 进入阶段3
group: 出口
position: 385,382
position: 385,938
---
<<set $gameStage = 3>>
<<jump Center>>
@@ -262,7 +262,7 @@ position: -158,370
title: 齿轮置换
position: 728,79
position: -861,940
---
<<hide_dialog>>
@@ -304,7 +304,7 @@ shitou: 那我可擅长了，来试试吧！把那根绳拉到底！
title:调速后测速
position: 728,79
position: -419,937
---
显然，由于齿轮的力矩比变化，现在速度的上升比以前更慢了。
@@ -350,8 +350,8 @@ me: 无论如何…调速是完成了。<br>让我们出来确认一下吧。
<<set $engineDone = true>>
<<hide_dialog>>
<<set $gameStage = 3>>
<<jump Center>>
<<jump 进入阶段3>>
===
Assets/Resources/Yarn/FP_Shitou2/Stage3_中间对话_disposed.yarn
+1 -1
View File
@@ -9,7 +9,7 @@ position: 210,-342
title: 中间对话
position: 210,-129
position: 212,-57
---
<<fade_in 1>>
<<switch_fix_system_to "Clinic">>
Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn
+4 -5
View File
@@ -197,16 +197,15 @@ title: 刻录
position: 728,79
---
<<switch_fix_system_to "Engine">>
<<switch_fix_system_to "Gear">>
<<set $engineProblemKnown = true>>
//？？如果玩家在这里拉绳，是不是就听到音乐了？
me: 如果我没有理解错这套东西的原理…<br>我应该可以把这个读取声音的探头，改造成一个刻出声音的钻头。
shitou: 哇！医生，你太厉害了~什么都会！
->改造钻头
你将探头小心地取下，换成一个坚硬的钻头。
me: 然后…让我把它接在你的播放模块上。这样你唱的声音就会被传输到这里……
shitou: 我好紧张，感觉~像演唱会一样！
<<hide_dialog>>
@@ -223,7 +222,7 @@ shitou: ……
title: 刻录调速
position: 728,79
position: 729,302
---
齿轮开始转动#auto_next
@@ -478,7 +477,7 @@ me: 结束了，让我们出去听听吧。
title: 进入阶段5
position: 213,321
position: 729,530
---
<<set $gameStage = 5>>
Assets/Scenes/ExpressFixScene.unity
+1508 -1460
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/Persistence.unity
+18 -116
View File
@@ -1084,7 +1084,6 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1584263514}
- {fileID: 494300779}
- {fileID: 1936621685}
m_Father: {fileID: 1009826577}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5535,50 +5534,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 492978121}
m_CullTransparentMesh: 1
--- !u!1 &494300778
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 494300779}
- component: {fileID: 494300780}
m_Layer: 0
m_Name: Command Option View
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &494300779
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 494300778}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 72512886}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &494300780
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 494300778}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e61040b961ba1446ad453ee17f4a737, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &500438199
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8104,15 +8059,15 @@ MonoBehaviour:
- {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2}
- {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2}
- {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2}
- {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
- {fileID: 11400000, guid: 68a9c1b8c5230454bb9498fd2ab5714b, type: 2}
- {fileID: 11400000, guid: ada4bdc2db5594e4f860c90b3a4b9da8, type: 2}
- {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2}
- {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2}
- {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
runMode: 2
firstTalkSo: {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2}
testTalkSo: {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2}
saveFileName: "PeipeiDay1_\u8BB0\u5FC6\u68C0\u67E5"
testTalkSo: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2}
saveFileName: StoneDay1_2
--- !u!4 &719228339
Transform:
m_ObjectHideFlags: 0
@@ -11182,73 +11137,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1090155682}
m_CullTransparentMesh: 1
--- !u!1 &1095691305
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1095691306}
- component: {fileID: 1095691307}
- component: {fileID: 1095691308}
m_Layer: 0
m_Name: Advance Input
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1095691306
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1095691305}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1936621685}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1095691307
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1095691305}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 097b95c9f69f04f2d8c08a817e7786af, type: 3}
m_Name:
m_EditorClassIdentifier:
dialogueView: {fileID: 1584263515}
continueActionType: 1
continueActionKeyCode: 32
continueActionButtonName: Jump
continueActionOnButtonRelease: 0
--- !u!114 &1095691308
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1095691305}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 097b95c9f69f04f2d8c08a817e7786af, type: 3}
m_Name:
m_EditorClassIdentifier:
dialogueView: {fileID: 1584263515}
continueActionType: 1
continueActionKeyCode: 323
continueActionButtonName: Jump
continueActionOnButtonRelease: 0
--- !u!1 &1108164745
GameObject:
m_ObjectHideFlags: 0
@@ -18406,7 +18294,6 @@ Transform:
m_Children:
- {fileID: 331068879}
- {fileID: 667130562}
- {fileID: 1095691306}
m_Father: {fileID: 72512886}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1936621686
@@ -20134,6 +20021,7 @@ GameObject:
- component: {fileID: 2038437602}
- component: {fileID: 2038437604}
- component: {fileID: 2038437603}
- component: {fileID: 2038437605}
m_Layer: 5
m_Name: Obj
m_TagString: Untagged
@@ -20198,6 +20086,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2038437601}
m_CullTransparentMesh: 1
--- !u!114 &2038437605
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2038437601}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &2065230354
GameObject:
m_ObjectHideFlags: 0
Assets/Scripts/Framework/OtherKit/MonoCenter.cs
+6
View File
@@ -46,6 +46,12 @@ namespace AibisDream.Framework
{
public void OnUpdate()
{
if (Input.GetKeyDown(KeyCode.K))
{
GearYarnCommand.PopupGearByName("Pluggable Shaft3");
GearYarnCommand.PopupGearByName("Pluggable Shaft2");
GearYarnCommand.PopupGearByName("Pluggable Shaft1");
}
}
}
Assets/Scripts/MiniGame/Engine/EngineSystem.cs
+2 -6
View File
@@ -23,10 +23,6 @@ namespace AibisDream
public float targetSpeed=0.95f;
[HideInInspector] public UnityEvent<float, float> updateSpeedEvent = new();
[SerializeField] private float coverMoveDuration = 5f;
[SerializeField] private float coverMoveDistance = 2.8f;
private void Awake()
{
FixSystemCenter.SystemDic.Register(this);
@@ -43,10 +39,10 @@ namespace AibisDream
_centerGear.StartRotate();
}
public IEnumerator StepOnGas(float targetSpeed, float duration)
public IEnumerator StepOnGas(float target, float duration)
{
// 逐渐加速
yield return DOTween.To(() => curSpeed, x => { curSpeed = x; }, targetSpeed, duration).WaitForCompletion();
yield return DOTween.To(() => curSpeed, x => { curSpeed = x; }, target, duration).WaitForCompletion();
}
public void AddAirPress(float speedDelta)
Assets/Scripts/MiniGame/Gear/Gear.cs
+60 -13
View File
@@ -1,16 +1,20 @@
using AibisDream.FixSystem;
using AibisDream.Framework;
using AibisDream.Utility;
using DG.Tweening;
using UnityEngine;
using UnityEngine.EventSystems;
using Random = UnityEngine.Random;
namespace AibisDream
{
public class Gear : MonoBehaviour, IMoveable
public class Gear : MonoBehaviour, IInteraction
{
private const int ShakeAngle = 15;
public float radius;
public Sprite gearSprite;
public string gearProp;
public bool isBroken;
public bool isDisc;
public bool isConstant;
@@ -23,17 +27,21 @@ namespace AibisDream
private GearSystem _gearSystem;
private CircleCollider2D _circleCollider;
private SpriteRenderer _spriteRenderer;
private EventTriggerEx _trigger;
#endregion
public Shaft targetShaft;
public bool IsBlock { get; }
private void Awake()
{
_circleCollider = GetComponent<CircleCollider2D>();
_spriteRenderer = GetComponent<SpriteRenderer>();
_trigger = GetComponent<EventTriggerEx>();
_trigger.Register(EventTriggerType.Drag, OnDrag);
_trigger.Register(EventTriggerType.BeginDrag, StartMove);
_trigger.Register(EventTriggerType.EndDrag, StopMove);
}
private void Start()
@@ -77,7 +85,7 @@ namespace AibisDream
.SetEase(Ease.Linear)
.SetLoops(-1, LoopType.Incremental);
}
_rotationTweener.timeScale = speedScale;
}
@@ -88,18 +96,23 @@ namespace AibisDream
#region 移动相关
public void StartMove()
private void StartMove(BaseEventData eventData)
{
if (isConstant) return;
// 这里是一些阻碍拖动的情况
if (!IsActive) return;
// 正常情况下不会出错
if (eventData is not PointerEventData pointerData) return;
transform.position = CommonUtil.GetMouseWorldPos(pointerData.position, transform);
targetShaft?.PlugOutGear();
transform.DOPause();
}
public void StopMove()
public void StopMove(BaseEventData eventData)
{
if (isConstant) return;
// 正常情况下不会出错
if (eventData is not PointerEventData pointerData) return;
if (targetShaft)
{
transform.position = targetShaft.transform.position;
@@ -107,11 +120,14 @@ namespace AibisDream
}
}
public void Move(Vector2 targetPos)
private void OnDrag(BaseEventData eventData)
{
if (isConstant) return;
// 这里是一些阻碍拖动的情况
if (!IsActive) return;
// 正常情况下不会出错
if (eventData is not PointerEventData pointerData) return;
transform.position = targetPos;
transform.position = CommonUtil.GetMouseWorldPos(pointerData.position, transform);
var tempShaft = _gearSystem.CheckClosestShaft(transform.position, radius);
if (!tempShaft) return;
@@ -121,6 +137,37 @@ namespace AibisDream
}
}
public void Popup()
{
// 先激活刚体
var rb = GetComponent<Rigidbody2D>();
rb.bodyType = RigidbodyType2D.Dynamic;
rb.mass = 0.5f;
rb.gravityScale = 1f;
// 施加一个随机方向的力
var randomDirection = Random.insideUnitCircle.normalized;
rb.AddForce(randomDirection * 3, ForceMode2D.Impulse);
// 一段时间后销毁
_ = CommonUtil.Delay(2000, () => { Destroy(gameObject); });
}
private void OnDestroy()
{
transform.DOKill();
}
#endregion
#region 交互锁定相关
public bool IsActive => !isConstant;
public bool IsAvailable => _gearSystem.isAvailable;
public GameObject GetGameObject()
{
return gameObject;
}
#endregion
}
}
Assets/Scripts/MiniGame/Gear/GearSystem.cs
+72 -13
View File
@@ -21,7 +21,7 @@ namespace AibisDream
private SpriteRenderer _cover;
private Transform _coverStick;
private Transform _needle;
private ShaftGraph _shaftGraph;
#endregion
@@ -35,9 +35,10 @@ namespace AibisDream
public Vector3 needleEmptyPos;
public Vector3[] needlePosArr;
public float needleDuration;
private bool _isTargetReached;
private bool _isDiscReady;
public bool isAvailable;
public float initSpeed = 1;
@@ -55,23 +56,37 @@ namespace AibisDream
_coverStick = transform.Find("Cover Stick");
_panel = transform.Find("Empty Shafts Panel");
_needle = transform.Find("Needle");
// 注册相机
var virtualCam = transform.Find("Gear Camera").GetComponent<ICinemachineCamera>();
CameraKit.Instance.RegisterCamera(CameraEnum.Gear, virtualCam);
}
private void Start()
{
InitShaftGraph();
LinkEngineSpeed();
}
private void InitShaftGraph()
{
var shafts = transform.Find("Shafts").GetComponentsInChildren<Shaft>();
var panelShafts = _panel.GetComponentsInChildren<Shaft>();
_shaftGraph = new ShaftGraph(shafts, panelShafts);
}
private void LinkEngineSpeed()
{
var engine = FixSystemCenter.SystemDic.Get<EngineSystem>();
_shaftGraph.StartRotate(initSpeed);
engine.updateSpeedEvent.AddListener(_shaftGraph.Accelerate);
}
_panel.gameObject.SetActive(false);
private void UnlinkEngineSpeed()
{
var engine = FixSystemCenter.SystemDic.Get<EngineSystem>();
_shaftGraph.StartRotate(initSpeed);
engine.updateSpeedEvent.RemoveListener(_shaftGraph.Accelerate);
}
private void OnDestroy()
@@ -112,6 +127,18 @@ namespace AibisDream
_shaftGraph?.ChangeVertex(shaftId);
}
/// <summary>
/// 按轴名称弹出齿轮
/// </summary>
/// <param name="shaftName">轴名称</param>
/// <returns></returns>
public void PopupGearByShaftName(string shaftName)
{
var shafts = transform.Find("Shafts").GetComponentsInChildren<Shaft>();
var target = Array.Find(shafts, shaft => shaft.gameObject.name == shaftName);
target.PopupGear();
}
#region 胜利状况判断
public void CheckGearSystemState()
@@ -124,9 +151,13 @@ namespace AibisDream
{
AudioManager.PauseLoop3Audio();
}
DialogController.Instance.StartDialogNode("齿轮系统状态变化");
if (_shaftGraph.AllRunning())
{
DialogController.Instance?.StartDialogNode("AllGearsRunning");
}
}
public void ReachTargetSpeed()
{
if (!_isTargetReached)
@@ -157,10 +188,12 @@ namespace AibisDream
sq.Join(_cover.transform.DOLocalMove(coverUpPos, 1.5f));
sq.Join(_cover.DOFade(0, 1.5f));
yield return sq.WaitForCompletion();
isAvailable = true;
}
public IEnumerator CloseCover()
{
isAvailable = false;
AudioManager.PauseLoopAudio();
AudioManager.PauseLoop2Audio();
AudioManager.PauseLoop3Audio();
@@ -184,7 +217,7 @@ namespace AibisDream
yield return _panel.DOLocalMove(panelClosePos, 1f).WaitForCompletion();
_panel.gameObject.SetActive(false);
}
public IEnumerator MoveNeedle(int discIdx)
{
Vector3 target;
@@ -196,7 +229,7 @@ namespace AibisDream
{
target = needlePosArr[discIdx - 1];
}
yield return _needle.DORotate(target, needleDuration).WaitForCompletion();
}
@@ -282,7 +315,9 @@ namespace AibisDream
#if UNITY_EDITOR
if (!EditorApplication.isPlaying) return;
#endif
UnlinkEngineSpeed();
_shaftGraph = new ShaftGraph(shafts, panelShafts);
LinkEngineSpeed();
}
public override void SaveLevel()
@@ -290,11 +325,6 @@ namespace AibisDream
if (string.IsNullOrEmpty(CurDataKey)) return;
SaveByKey(CurDataKey);
if (!_keyOptions.Contains(CurDataKey))
{
// 重新读取key
_keyOptions = ConfigUtil.Instance.GetFileNames(DataPath);
}
}
private void SaveByKey(string key)
@@ -323,6 +353,35 @@ namespace AibisDream
Instantiate(shaftPrefab, shaftRoot);
}
public void LoadPanelShaft(string dataKey)
{
// 查询
if (!ConfigUtil.Instance.TryLoadConfig<GearSystemData>(DataPath + dataKey, out var data))
{
Debug.Log("没有找到配置项");
return;
}
// 删除面板上的齿轮
var panelShafts = transform.Find("Empty Shafts Panel").GetComponentsInChildren<Shaft>();
foreach (var shaftItem in panelShafts)
{
Destroy(shaftItem);
}
// 读取数据
var panelShaftRoot = transform.Find("Empty Shafts Panel");
var newPanelShafts = new Shaft[data.panelShaftArray.Length];
for (int i = 0; i < data.panelShaftArray.Length; i++)
{
var newShaft = Instantiate(shaftPrefab, panelShaftRoot).GetComponent<Shaft>();
newShaft.Load(data.panelShaftArray[i]);
newPanelShafts[i] = newShaft;
}
_shaftGraph.UpdatePanel(newPanelShafts);
}
#endregion
}
Assets/Scripts/MiniGame/Gear/GearYarnCommand.cs
+14 -1
View File
@@ -1,12 +1,13 @@
using System.Collections;
using AibisDream.FixSystem;
using UnityEngine;
using Yarn.Unity;
namespace AibisDream
{
public static class GearYarnCommand
{
private static GearSystem GearSystem => FixSystemCenter.SystemDic.Get<GearSystem>();
[YarnCommand("move_needle")]
public static IEnumerator MoveNeedle()
{
@@ -37,5 +38,17 @@ namespace AibisDream
{
return FixSystemCenter.SystemDic.Get<GearSystem>().OpenCover();
}
[YarnCommand("popup_gear")]
public static void PopupGearByName(string shaftName)
{
GearSystem.PopupGearByShaftName(shaftName);
}
[YarnCommand("load_gear_panel")]
public static void LoadPanelShaft(string configKey)
{
GearSystem.LoadPanelShaft(configKey);
}
}
}
Assets/Scripts/MiniGame/Gear/Shaft.cs
+23 -1
View File
@@ -15,6 +15,7 @@ namespace AibisDream
// 初始齿轮
[SerializeField] private bool hasGear;
[SerializeField] private string gearProp;
[SerializeField] private bool isInitGearBroken;
[SerializeField] private bool isInitGearDisc;
[SerializeField] private float initRadius;
@@ -76,6 +77,7 @@ namespace AibisDream
var gear = Instantiate(_gearSystem.gearPrefab, transform).GetComponent<Gear>();
gear.radius = radius;
gear.gearSprite = sprite;
gear.gearProp = gearProp;
gear.isBroken = isBroken;
gear.targetShaft = this;
gear.isDisc = isDisc;
@@ -115,6 +117,9 @@ namespace AibisDream
{
DialogController.Instance?.SetVariable("$discIdx", discIdx);
}
// 传当前插入齿轮的Prop
DialogController.Instance?.SetVariable("$curGearProp", childGear.gearProp);
}
public void PlugOutGear()
@@ -165,7 +170,6 @@ namespace AibisDream
// 只有目标轴判断
if (shaftType != ShaftType.Target) return;
//
if (targetSpeed <= Mathf.Abs(speed * _speedScale))
{
_gearSystem.ReachTargetSpeed();
@@ -185,6 +189,21 @@ namespace AibisDream
return childGear;
}
public void PopupGear()
{
// Constant无法弹出
// if (shaftType != ShaftType.Pluggable) return;
// 没有齿轮无法弹出
if (!childGear) return;
// 播放齿轮移除动画并更新速度
var gear = childGear;
PlugOutGear();
gear.Popup();
}
/// <summary>
/// 判断两个轴是否齿轮相接
/// </summary>
@@ -267,6 +286,7 @@ namespace AibisDream
shaftType = levelData.shaftType;
hasGear = levelData.hasChildGear;
gearProp = levelData.gearProp;
isInitGearBroken = levelData.isGearBroken;
isInitGearDisc = levelData.isDisc;
discIdx = levelData.discIdx;
@@ -283,6 +303,7 @@ namespace AibisDream
GearPic = initSprite,
shaftType = shaftType,
hasChildGear = hasGear,
gearProp = gearProp,
isGearBroken = isInitGearBroken,
isDisc = isInitGearDisc,
discIdx = discIdx,
@@ -312,6 +333,7 @@ namespace AibisDream
public float targetSpeed;
public bool hasChildGear;
public float radius;
public string gearProp;
public bool isGearBroken;
public bool isDisc;
public int discIdx;
Assets/Scripts/MiniGame/Gear/ShaftGraph.cs
+20 -1
View File
@@ -10,7 +10,7 @@ namespace AibisDream
private readonly int _vertexSize;
// 顶点Map
private readonly Shaft[] _vertexArray;
private readonly Shaft[] _panelShafts;
private Shaft[] _panelShafts;
// 邻接表
private float[,] _edgeTable;
// 遍历记录
@@ -43,6 +43,25 @@ namespace AibisDream
UpdateSpeed();
}
/// <summary>
/// 更新轴
/// </summary>
/// <param name="panelShafts"></param>
public void UpdatePanel(Shaft[] panelShafts)
{
_panelShafts = panelShafts;
Array.ForEach(panelShafts, shaft => shaft.InitShaft());
}
/// <summary>
/// 是否所有齿轮都在运行
/// </summary>
/// <returns></returns>
public bool AllRunning()
{
return _vertexArray.All(shaft => Mathf.Abs(shaft.speed) > 0.01f);
}
/// <summary>
/// 初始化速度
/// </summary>
Assets/Scripts/UI/Cursor/CursorManager.cs
+2 -2
View File
@@ -107,7 +107,7 @@ namespace AibisDream
{
if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space))
{
if (!isInMenu)
if (_isTalking && !isInMenu)
{
DialogController.Instance.JumpLine();
}
@@ -152,7 +152,7 @@ namespace AibisDream
private void OnOptionSelect(DialogLine line)
{
StopDelayCursor();
StartCoroutine(DelayAction(() =>
_switchCoroutine = StartCoroutine(DelayAction(() =>
{
_isTalking = false;
_cursor.sprite = defaultCursor;
Assets/StreamingAssets/LevelData/GearSystem/new.json
-200
View File
@@ -1,200 +0,0 @@
{
"shaftLevelDataArray": [
{
"shaftName": "Empty Pluggable Shaft3",
"shaftType": 3,
"initialSpeed": 0.0,
"targetSpeed": 0.0,
"hasChildGear": false,
"radius": 0.15,
"shaftPos": {
"x": -1.118,
"y": -0.256,
"z": 0.0
},
"gearPicPath": "Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"
},
{
"shaftName": "Empty Pluggable Shaft2",
"shaftType": 3,
"initialSpeed": 0.0,
"targetSpeed": 0.0,
"hasChildGear": false,
"radius": 0.15,
"shaftPos": {
"x": -1.087,
"y": -0.693,
"z": 0.0
},
"gearPicPath": "Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"
},
{
"shaftName": "Empty Pluggable Shaft1",
"shaftType": 3,
"initialSpeed": 0.0,
"targetSpeed": 0.0,
"hasChildGear": false,
"radius": 0.15,
"shaftPos": {
"x": -1.135,
"y": 0.182,
"z": 0.0
},
"gearPicPath": "Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"
},
{
"shaftName": "Pluggable Shaft9",
"shaftType": 3,
"initialSpeed": 0.0,
"targetSpeed": 0.0,
"hasChildGear": true,
"radius": 0.18,
"shaftPos": {
"x": -1.71000111,
"y": -0.9590002,
"z": 0.0
},
"gearPicPath": "Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮A"
},
{
"shaftName": "Pluggable Shaft8",
"shaftType": 3,
"initialSpeed": 0.0,
"targetSpeed": 0.0,
"hasChildGear": false,
"radius": 0.18,
"shaftPos": {
"x": -2.59800124,
"y": -0.941000164,
"z": 0.0
},
"gearPicPath": "Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"
},
{
"shaftName": "Pluggable Shaft7",
"shaftType": 3,
"initialSpeed": 0.0,
"targetSpeed": 0.0,
"hasChildGear": false,
"radius": 0.09,
"shaftPos": {
"x": -2.22800064,
"y": -0.453000158,
"z": 0.0
},
"gearPicPath": "Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"
},
{
"shaftName": "Pluggable Shaft6",
"shaftType": 3,
"initialSpeed": 0.0,
"targetSpeed": 0.0,
"hasChildGear": true,
"radius": 0.18,
"shaftPos": {
"x": -1.855001,
"y": -0.3910001,
"z": 0.0
},
"gearPicPath": "Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"
},
{
"shaftName": "Pluggable Shaft5",
"shaftType": 3,
"initialSpeed": 0.0,
"targetSpeed": 0.0,
"hasChildGear": true,
"radius": 0.09,
"shaftPos": {
"x": -2.0,
"y": -0.6250002,
"z": 0.0
},
"gearPicPath": "Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮A"
},
{
"shaftName": "Pluggable Shaft4",
"shaftType": 3,
"initialSpeed": 0.0,
"targetSpeed": 0.0,
"hasChildGear": true,
"radius": 0.27,
"shaftPos": {
"x": -2.18600082,
"y": -0.08200007,
"z": 0.0
},
"gearPicPath": "Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮A"
},
{
"shaftName": "Pluggable Shaft3",
"shaftType": 3,
"initialSpeed": 0.0,
"targetSpeed": 0.0,
"hasChildGear": true,
"radius": 0.18,
"shaftPos": {
"x": -1.97600079,
"y": 0.300000042,
"z": 0.0
},
"gearPicPath": "Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"
},
{
"shaftName": "Pluggable Shaft2",
"shaftType": 3,
"initialSpeed": 0.0,
"targetSpeed": 0.0,
"hasChildGear": false,
"radius": 0.09,
"shaftPos": {
"x": -1.70600092,
"y": 0.307999939,
"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,
"shaftPos": {
"x": -2.40600061,
"y": 0.295000046,
"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,
"shaftPos": {
"x": -2.188,
"y": 0.445000023,
"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,
"shaftPos": {
"x": -2.1600008,
"y": -0.9610002,
"z": 0.0
},
"gearPicPath": "Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"
}
]
}
Assets/StreamingAssets/LevelData/GearSystem/repair.json
+1
View File
@@ -0,0 +1 @@
{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"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,"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,"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,"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.4,"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":false,"radius":0.3,"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":false,"radius":0.4,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.898,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"}]}
Assets/StreamingAssets/LevelData/GearSystem/stone2.json.meta → Assets/StreamingAssets/LevelData/GearSystem/repair.json.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 53e1685c71c4ab64a8fcc123703b42e1
guid: 5fa7513c14ce84147a88bc67e1e2082b
DefaultImporter:
externalObjects: {}
userData:
Assets/StreamingAssets/LevelData/GearSystem/replace_gear.json
+1
View File
@@ -0,0 +1 @@
{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"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,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.498,"y":-0.502,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Pluggable Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"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,"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,"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,"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,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.898,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"}]}
Assets/StreamingAssets/LevelData/GearSystem/new.json.meta → Assets/StreamingAssets/LevelData/GearSystem/replace_gear.json.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 726877e95eebeea4db75ffd9d783b78e
guid: e081524d86aeb75458b61dd0ae76051a
DefaultImporter:
externalObjects: {}
userData:
Assets/StreamingAssets/LevelData/GearSystem/stone1.json
-1
View File
@@ -1 +0,0 @@
{"shaftLevelDataArray":[{"shaftName":"Target","shaftType":1,"initialSpeed":0.0,"targetSpeed":0.3,"hasChildGear":true,"radius":1.0,"shaftPos":{"x":6.629,"y":0.684,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Driver","shaftType":0,"initialSpeed":1.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"shaftPos":{"x":4.64,"y":3.33,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮A"},{"shaftName":"Constant","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"shaftPos":{"x":5.973,"y":2.457,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮B"},{"shaftName":"Pluggable","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"shaftPos":{"x":5.516,"y":3.867,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Empty","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.5,"shaftPos":{"x":6.56,"y":4.334,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}]}
Assets/StreamingAssets/LevelData/GearSystem/stone2.json
-1
View File
@@ -1 +0,0 @@
{"shaftLevelDataArray":[{"shaftName":"Empty Pluggable Shaft3","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.15,"shaftPos":{"x":-1.118,"y":-0.256,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Empty Pluggable Shaft2","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.15,"shaftPos":{"x":-1.087,"y":-0.693,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Empty Pluggable Shaft1","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.15,"shaftPos":{"x":-1.135,"y":0.182,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft9","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":-1.71000111,"y":-0.9590002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Pluggable Shaft8","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.18,"shaftPos":{"x":-2.59800124,"y":-0.941000164,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft7","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.09,"shaftPos":{"x":-2.22800064,"y":-0.453000158,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft6","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":-1.855001,"y":-0.3910001,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft5","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"shaftPos":{"x":-2.0,"y":-0.6250002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Pluggable Shaft4","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.27,"shaftPos":{"x":-2.18600082,"y":-0.08200007,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Pluggable Shaft3","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":-1.97600079,"y":0.300000042,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft2","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.09,"shaftPos":{"x":-1.70600092,"y":0.307999939,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft1","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":-2.40600061,"y":0.295000046,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Driver Shaft","shaftType":0,"initialSpeed":1.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"shaftPos":{"x":-2.188,"y":0.445000023,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Target Shaft","shaftType":1,"initialSpeed":0.0,"targetSpeed":0.3,"hasChildGear":true,"radius":0.27,"shaftPos":{"x":-2.1600008,"y":-0.9610002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"}]}
Assets/StreamingAssets/LevelData/GearSystem/stone_day1_1.json
+1
View File
@@ -0,0 +1 @@
{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"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,"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,"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,"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":false,"radius":0.5,"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":false,"radius":0.3,"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":false,"radius":0.4,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.898,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"}]}
Assets/StreamingAssets/LevelData/GearSystem/stone1.json.meta → Assets/StreamingAssets/LevelData/GearSystem/stone_day1_1.json.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1401bb776a2e10a41a5f1a9473fa90bc
guid: 36bdc4de73170b14aae371506f5a406a
DefaultImporter:
externalObjects: {}
userData:
Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json
+1
View File
@@ -0,0 +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":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/身体维修界面-扫描/心脏齿轮D"},{"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/身体维修界面-扫描/心脏齿轮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.4,"gearProp":"NewGear","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":false,"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":false,"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/变速箱唱片齿轮"}]}
Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 71d9408746a90254e8141e2af220c4cd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/StreamingAssets/LevelData/GearSystem/temp.json
+1 -1
View File
@@ -1 +1 @@
{"shaftLevelDataArray":[],"panelShaftArray":[]}
{"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/变速箱唱片齿轮"}]}
Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json
+8 -5
View File
@@ -1,5 +1,8 @@
{
"fixDataContainer": {
"ClueData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"punchTapeFavorites": []
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": "石头",
"faceName": "大笑",
@@ -9,21 +12,19 @@
}
},
"floatDict": {
"$curAirLevel": 2.0,
"$gameStage": 2.0,
"$coolingCount": 0.0,
"$failTime": 0.0,
"$selection": 0.0,
"$PlugCount": 0.0,
"$gearStage": 0.0,
"$Yarn.Internal.Visiting.调速popup_过速": 0.0,
"$Yarn.Internal.Visiting.调速popup_掉速": 0.0,
"$Yarn.Internal.Visiting.调速popup_调整进气档位": 0.0
"$Yarn.Internal.Visiting.调速popup_掉速": 0.0
},
"stringDict": {
"$StartNode": "",
"$EndNode": "",
"$currentSocket": "",
"$curBottleName": ""
"$currentSocket": ""
},
"boolDict": {
"$isFinishedClueBoard": false,
@@ -31,9 +32,11 @@
"$lungProblemKnown": false,
"$fuelProblemKnown": false,
"$engineProblemKnown": false,
"$engineDone": false,
"$bloodProblemKnown": false,
"$bloodRenewedKnown": false,
"$bloodQuestioned": false,
"$gearPopup": false,
"$PlugAll": false
},
"curSceneKey": "ExpressFixScene",
Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5f7754e5bde65fc43b3ebb14a6411306
guid: 66c9cce3379267c4e9c200d61e5d1117
DefaultImporter:
externalObjects: {}
userData: