From 3fcff0598af8b9495193467e2cede92dbdede021 Mon Sep 17 00:00:00 2001
From: Ding Yuntian <1491671119@qq.com>
Date: Thu, 12 Dec 2024 01:07:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=B3=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Art/Background/诊所场景（冷却液限定）.psb | 4 +-
.../诊所场景（冷却液限定）.psb.meta | 46 +-
.../Resources/Art/Fix/Stone/身体维修界面.psb | 4 +-
.../Art/Fix/Stone/身体维修界面.psb.meta | 201 +-
Assets/Scenes/ExpressFixScene.unity | 1621 ++++++++++-------
Assets/Scripts/FixSystemNew/BodyModule.meta | 3 +
.../{ => BodyModule}/BaseSocket.cs | 0
.../{ => BodyModule}/BaseSocket.cs.meta | 0
.../{ => BodyModule}/BodyModule.cs | 0
.../{ => BodyModule}/BodyModule.cs.meta | 0
.../{ => BodyModule}/BodyModuleSystem.cs | 9 +-
.../{ => BodyModule}/BodyModuleSystem.cs.meta | 0
.../FixSystemNew/{ => BodyModule}/Cable.cs | 0
.../{ => BodyModule}/Cable.cs.meta | 0
.../{ => BodyModule}/CableSystem.cs | 9 +
.../{ => BodyModule}/CableSystem.cs.meta | 0
.../{ => BodyModule}/OscilloscopeSystem.cs | 4 +-
.../OscilloscopeSystem.cs.meta | 0
.../FixSystemNew/{ => BodyModule}/Plug.cs | 5 +-
.../{ => BodyModule}/Plug.cs.meta | 0
.../FixSystemNew/{ => BodyModule}/ScanLine.cs | 7 +-
.../{ => BodyModule}/ScanLine.cs.meta | 0
.../{ => BodyModule}/WaveSlider.cs | 0
.../{ => BodyModule}/WaveSlider.cs.meta | 0
.../{ => BodyModule}/WaveformLine.cs | 0
.../{ => BodyModule}/WaveformLine.cs.meta | 0
.../FixSystemNew/CoolingMachine/BottleSlot.cs | 44 +
.../CoolingMachine/BottleSlot.cs.meta} | 2 +-
.../CoolingMachine/CoolingBottle.cs | 69 +-
.../CoolingMachine/CoolingMachineViewer.cs | 128 +-
.../FixSystemNew/CoolingMachine/LockSlider.cs | 91 +
.../CoolingMachine/LockSlider.cs.meta} | 2 +-
.../FixSystemNew/CoolingMachine/PumpButton.cs | 47 +
.../CoolingMachine/PumpButton.cs.meta | 3 +
.../Scripts/FixSystemNew/FixSystemCenter.cs | 46 +-
.../Scripts/FixSystemNew/FixYarnCommandEx.cs | 3 +-
.../Scripts/FixSystemNew/StateTransition.meta | 8 +
.../FixSystemNew/StateTransition/FixState.cs | 175 ++
.../StateTransition/FixState.cs.meta | 3 +
Assets/Scripts/Framework/Core/Core.cs | 2 -
Assets/Scripts/Framework/LifeCycle.meta | 12 -
.../Framework/LifeCycle/LifeCycleManager.cs | 51 -
.../Framework/LifeCycle/ModuleLifeCycle.cs | 28 -
.../Scripts/Framework/Moveable/IMoveable.cs | 2 +
.../Framework/Moveable/MoveableSystem.cs | 1 +
.../Scripts/Framework/OtherKit/CameraKit.cs | 48 +
.../Framework/OtherKit/CameraKit.cs.meta | 3 +
.../Scripts/Framework/OtherKit/MonoCenter.cs | 13 +
Assets/Scripts/MiniGame/Engine/AirGate.cs | 3 +-
.../Scripts/MiniGame/Engine/EngineSystem.cs | 75 +-
.../Scripts/MiniGame/Engine/SpeedDashboard.cs | 9 +-
.../Scripts/MiniGame/Engine/StoneLifeCycle.cs | 29 -
.../MiniGame/Engine/StoneLifeCycle.cs.meta | 11 -
Assets/Scripts/MiniGame/Gear/Gear.cs | 2 +
Assets/Scripts/MiniGame/Gear/GearSystem.cs | 2 +
55 files changed, 1861 insertions(+), 964 deletions(-)
create mode 100644 Assets/Scripts/FixSystemNew/BodyModule.meta
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/BaseSocket.cs (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/BaseSocket.cs.meta (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/BodyModule.cs (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/BodyModule.cs.meta (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/BodyModuleSystem.cs (97%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/BodyModuleSystem.cs.meta (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/Cable.cs (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/Cable.cs.meta (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/CableSystem.cs (90%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/CableSystem.cs.meta (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/OscilloscopeSystem.cs (97%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/OscilloscopeSystem.cs.meta (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/Plug.cs (97%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/Plug.cs.meta (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/ScanLine.cs (92%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/ScanLine.cs.meta (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/WaveSlider.cs (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/WaveSlider.cs.meta (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/WaveformLine.cs (100%)
rename Assets/Scripts/FixSystemNew/{ => BodyModule}/WaveformLine.cs.meta (100%)
create mode 100644 Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs
rename Assets/Scripts/{Framework/LifeCycle/ModuleLifeCycle.cs.meta => FixSystemNew/CoolingMachine/BottleSlot.cs.meta} (83%)
create mode 100644 Assets/Scripts/FixSystemNew/CoolingMachine/LockSlider.cs
rename Assets/Scripts/{Framework/LifeCycle/LifeCycleManager.cs.meta => FixSystemNew/CoolingMachine/LockSlider.cs.meta} (83%)
create mode 100644 Assets/Scripts/FixSystemNew/CoolingMachine/PumpButton.cs
create mode 100644 Assets/Scripts/FixSystemNew/CoolingMachine/PumpButton.cs.meta
create mode 100644 Assets/Scripts/FixSystemNew/StateTransition.meta
create mode 100644 Assets/Scripts/FixSystemNew/StateTransition/FixState.cs
create mode 100644 Assets/Scripts/FixSystemNew/StateTransition/FixState.cs.meta
delete mode 100644 Assets/Scripts/Framework/LifeCycle.meta
delete mode 100644 Assets/Scripts/Framework/LifeCycle/LifeCycleManager.cs
delete mode 100644 Assets/Scripts/Framework/LifeCycle/ModuleLifeCycle.cs
create mode 100644 Assets/Scripts/Framework/OtherKit/CameraKit.cs
create mode 100644 Assets/Scripts/Framework/OtherKit/CameraKit.cs.meta
delete mode 100644 Assets/Scripts/MiniGame/Engine/StoneLifeCycle.cs
delete mode 100644 Assets/Scripts/MiniGame/Engine/StoneLifeCycle.cs.meta
diff --git a/Assets/Resources/Art/Background/诊所场景（冷却液限定）.psb b/Assets/Resources/Art/Background/诊所场景（冷却液限定）.psb
index d879bfefc..39f6e60bf 100644
--- a/Assets/Resources/Art/Background/诊所场景（冷却液限定）.psb
+++ b/Assets/Resources/Art/Background/诊所场景（冷却液限定）.psb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3e0cd57393d7b5877534412696fe32ec48c27f9d9f50257054de0f14fcc40ca2
-size 318889979
+oid sha256:fd3967a2322d08f7ec4c0ee2f6e384f2032dc888c727275aa6cb667400094790
+size 318889309
diff --git a/Assets/Resources/Art/Background/诊所场景（冷却液限定）.psb.meta b/Assets/Resources/Art/Background/诊所场景（冷却液限定）.psb.meta
index b8999bcff..6c4e8ef12 100644
--- a/Assets/Resources/Art/Background/诊所场景（冷却液限定）.psb.meta
+++ b/Assets/Resources/Art/Background/诊所场景（冷却液限定）.psb.meta
@@ -185,10 +185,10 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 10388
- y: 2030
- width: 274
- height: 542
+ x: 10702
+ y: 1913
+ width: 255
+ height: 652
spriteID: f44a89b11daa5f944a53f0a3e9846c91
spriteBone: []
spriteOutline: []
@@ -197,8 +197,8 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 10386, y: 2029}
- spritePosition: {x: 2634, y: 85}
+ uvTransform: {x: 10703, y: 1912}
+ spritePosition: {x: 3513, y: 451}
- name: "\u7D2B\u8272\u6DB2\u4F53"
originalName:
pivot: {x: 0.5, y: 0.5}
@@ -332,8 +332,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 10705
- y: 2592
+ x: 10572
+ y: 2574
width: 66
height: 18
spriteID: c3b65b5680b2e334c96f379c048f9095
@@ -344,7 +344,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 10705, y: 2592}
+ uvTransform: {x: 10572, y: 2574}
spritePosition: {x: 5366, y: 915}
- name: "\u5EA6\u91CF\u6761"
originalName:
@@ -353,8 +353,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 10889
- y: 1913
+ x: 10572
+ y: 2030
width: 68
height: 451
spriteID: e734de0bb608069449b0649d3a6a3c58
@@ -365,7 +365,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 10889, y: 1913}
+ uvTransform: {x: 10572, y: 2030}
spritePosition: {x: 5365, y: 509}
- name: "\u6309\u94AE"
originalName:
@@ -374,8 +374,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 10705
- y: 2507
+ x: 10572
+ y: 2489
width: 77
height: 77
spriteID: 3e0192877d7f51b4280acd4f96550414
@@ -386,7 +386,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 10705, y: 2507}
+ uvTransform: {x: 10572, y: 2489}
spritePosition: {x: 5535, y: 1199}
- name: "\u6CF5\u673A"
originalName:
@@ -437,8 +437,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 10705
- y: 1913
+ x: 10388
+ y: 2030
width: 176
height: 586
spriteID: 4fbc81290db7fb94fac68096de3e268d
@@ -449,7 +449,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 10705, y: 1913}
+ uvTransform: {x: 10388, y: 2030}
spritePosition: {x: 4813, y: 376}
- name: "\u6CF5\u673A\u4E0A\u7684\u74F6\u5B50"
originalName:
@@ -819,7 +819,7 @@ ScriptedImporter:
parentIndex: 9
spriteID: f44a89b11daa5f944a53f0a3e9846c91
layerID: 2052
- mosaicPosition: {x: 10388, y: 2030}
+ mosaicPosition: {x: 10705, y: 1913}
flatten: 0
isImported: 1
isVisible: 1
@@ -899,7 +899,7 @@ ScriptedImporter:
parentIndex: 13
spriteID: c3b65b5680b2e334c96f379c048f9095
layerID: 2001
- mosaicPosition: {x: 10705, y: 2592}
+ mosaicPosition: {x: 10572, y: 2574}
flatten: 0
isImported: 1
isVisible: 1
@@ -909,7 +909,7 @@ ScriptedImporter:
parentIndex: 13
spriteID: e734de0bb608069449b0649d3a6a3c58
layerID: 1997
- mosaicPosition: {x: 10889, y: 1913}
+ mosaicPosition: {x: 10572, y: 2030}
flatten: 0
isImported: 1
isVisible: 1
@@ -919,7 +919,7 @@ ScriptedImporter:
parentIndex: 13
spriteID: 3e0192877d7f51b4280acd4f96550414
layerID: 2049
- mosaicPosition: {x: 10705, y: 2507}
+ mosaicPosition: {x: 10572, y: 2489}
flatten: 0
isImported: 1
isVisible: 1
@@ -949,7 +949,7 @@ ScriptedImporter:
parentIndex: 13
spriteID: 4fbc81290db7fb94fac68096de3e268d
layerID: 1959
- mosaicPosition: {x: 10705, y: 1913}
+ mosaicPosition: {x: 10388, y: 2030}
flatten: 0
isImported: 1
isVisible: 1
diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb
index f93a7f8e9..d740561e3 100644
--- a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb
+++ b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d7abda47fb28949e75afc12e5691845f5f379b2a164ccbd08bfbd6ec6ddfb275
-size 26700401
+oid sha256:74452e0ba89e834af790db7db5f26df41919cf2f53947756fc5954212723936d
+size 26671022
diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta
index 308d7de53..65e415f18 100644
--- a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta
+++ b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta
@@ -143,7 +143,7 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 166
+ x: 4
y: 8026
width: 161
height: 112
@@ -155,7 +155,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 164, y: 8025}
+ uvTransform: {x: 2, y: 8025}
spritePosition: {x: 3462, y: 1270}
- name: "\u6ED1\u5757"
originalName:
@@ -269,8 +269,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 4067
- y: 5660
+ x: 3941
+ y: 6558
width: 25
height: 25
spriteID: 3f9ee51ee22d4434f8d77faf45d9acd2
@@ -281,7 +281,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 4065, y: 5659}
+ uvTransform: {x: 3939, y: 6557}
spritePosition: {x: 1374, y: 1055}
- name: "\u692D\u5706 1"
originalName:
@@ -290,8 +290,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3913
- y: 5673
+ x: 3903
+ y: 5661
width: 26
height: 26
spriteID: 289d20330e2397a45ad29088f4f1a6e0
@@ -302,19 +302,19 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3911, y: 5672}
+ uvTransform: {x: 3901, y: 5660}
spritePosition: {x: 1349, y: 1048}
- name: "\u6307\u9488"
originalName:
- pivot: {x: 0.5, y: 0.5}
- alignment: 0
+ pivot: {x: 1, y: 0}
+ alignment: 8
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 4067
- y: 5609
- width: 20
- height: 43
+ x: 3941
+ y: 6530
+ width: 44
+ height: 21
spriteID: 9f9deb0f2cb514d4d828fd62fa70dde3
spriteBone: []
spriteOutline: []
@@ -323,9 +323,9 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 4067, y: 5609}
- spritePosition: {x: 1294, y: 1305}
- - name: "\u56FA\u5B9A\u8F6C\u901F\u8868"
+ uvTransform: {x: 3941, y: 6529}
+ spritePosition: {x: 1269, y: 1306}
+ - name: "\u8F6C\u901F\u8868"
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
@@ -336,27 +336,6 @@ ScriptedImporter:
y: 6345
width: 176
height: 176
- spriteID: 2c7aa826be00a514ebafbfe2253d1ff9
- spriteBone: []
- spriteOutline: []
- vertices: []
- spritePhysicsOutline: []
- indices:
- edges: []
- tessellationDetail: 0
- uvTransform: {x: 3812, y: 6345}
- spritePosition: {x: 1832, y: 992}
- - name: "\u8F6C\u901F\u8868"
- originalName:
- pivot: {x: 0.5, y: 0.5}
- alignment: 0
- border: {x: 0, y: 0, z: 0, w: 0}
- rect:
- serializedVersion: 2
- x: 3615
- y: 5499
- width: 176
- height: 176
spriteID: b7e297a8275fe3147a264e080dc035dd
spriteBone: []
spriteOutline: []
@@ -365,7 +344,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3615, y: 5499}
+ uvTransform: {x: 3812, y: 6345}
spritePosition: {x: 1226, y: 1218}
- name: "\u53D8\u901F\u7BB1\u63D2\u5B54"
originalName:
@@ -374,8 +353,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3973
- y: 5609
+ x: 3812
+ y: 6529
width: 86
height: 86
spriteID: 98e19cabc64e47d46aea9ab2c329fca9
@@ -386,7 +365,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3973, y: 5609}
+ uvTransform: {x: 3812, y: 6529}
spritePosition: {x: 1182, y: 1058}
- name: "\u76D6\u5B50\u6746"
originalName:
@@ -458,8 +437,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 4
- y: 8025
+ x: 3789
+ y: 5498
width: 154
height: 154
spriteID: c562151c266172245900603e7959a8da
@@ -470,7 +449,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 4, y: 8026}
+ uvTransform: {x: 3789, y: 5499}
spritePosition: {x: 1454, y: 1050}
- name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EB"
originalName:
@@ -480,7 +459,7 @@ ScriptedImporter:
rect:
serializedVersion: 2
x: 3953
- y: 7243
+ y: 7105
width: 128
height: 130
spriteID: 93418b50b51ddd441a424a24b868b51a
@@ -491,7 +470,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3953, y: 7243}
+ uvTransform: {x: 3953, y: 7105}
spritePosition: {x: 1406, y: 946}
- name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EC"
originalName:
@@ -500,7 +479,7 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3799
+ x: 3615
y: 5499
width: 166
height: 166
@@ -512,7 +491,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3799, y: 5499}
+ uvTransform: {x: 3615, y: 5499}
spritePosition: {x: 1476, y: 824}
- name: "\u53D8\u901F\u7BB1\u5531\u7247\u9F7F\u8F6E"
originalName:
@@ -521,8 +500,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3953
- y: 7105
+ x: 3951
+ y: 5499
width: 130
height: 130
spriteID: 15bb5a4be7f4d1746b0822dc05b92b5f
@@ -533,7 +512,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3953, y: 7105}
+ uvTransform: {x: 3951, y: 5499}
spritePosition: {x: 1318, y: 859}
- name: "\u53D8\u901F\u7BB1\u8F93\u51FA\u9F7F\u8F6E"
originalName:
@@ -542,8 +521,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 4067
- y: 5693
+ x: 3903
+ y: 5695
width: 0
height: 0
spriteID: 7e7562128bf69d7418af6bd34587198a
@@ -554,7 +533,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3905, y: 5533}
+ uvTransform: {x: 3741, y: 5535}
spritePosition: {x: 1782, y: 1048}
- name: "\u53D8\u901F\u7BB1"
originalName:
@@ -605,8 +584,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3812
- y: 6529
+ x: 3996
+ y: 6345
width: 86
height: 86
spriteID: 393fed26529755c43b3adf65c5215b60
@@ -617,7 +596,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3812, y: 6529}
+ uvTransform: {x: 3996, y: 6345}
spritePosition: {x: 982, y: 1386}
- name: "\u5FC3\u810F\u76D6\u5B50"
originalName:
@@ -647,8 +626,8 @@ ScriptedImporter:
border: {x: 0, y: 8, z: 0, w: 8}
rect:
serializedVersion: 2
- x: 3996
- y: 6345
+ x: 3953
+ y: 7353
width: 16
height: 243
spriteID: 955abee622701d34c92da4721f082368
@@ -659,7 +638,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3996, y: 6345}
+ uvTransform: {x: 3953, y: 7353}
spritePosition: {x: 1287, y: 1618}
- name: "\u8FDB\u6C14\u5EA6\u91CF"
originalName:
@@ -668,8 +647,8 @@ ScriptedImporter:
border: {x: 0, y: 8, z: 0, w: 9}
rect:
serializedVersion: 2
- x: 4020
- y: 6345
+ x: 3977
+ y: 7353
width: 16
height: 243
spriteID: 0c11f41444c477f4fac3222cb5b79a98
@@ -680,7 +659,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 4020, y: 6345}
+ uvTransform: {x: 3977, y: 7353}
spritePosition: {x: 1204, y: 1618}
- name: "\u6C14\u95E8\u62C9\u6746"
originalName:
@@ -689,8 +668,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3799
- y: 5673
+ x: 3789
+ y: 5661
width: 106
height: 28
spriteID: ed1ecfe628602a44285fa18ebac88553
@@ -701,7 +680,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3799, y: 5673}
+ uvTransform: {x: 3789, y: 5661}
spritePosition: {x: 1031, y: 1666}
- name: "\u62C9\u6746\u6C60"
originalName:
@@ -731,8 +710,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 4075
- y: 5693
+ x: 3911
+ y: 5695
width: 0
height: 0
spriteID: 446346ef83ab15c43a3d115b695a489a
@@ -743,7 +722,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3889, y: 5507}
+ uvTransform: {x: 3725, y: 5509}
spritePosition: {x: 1459, y: 1570}
- name: "\u5FC3\u810F\u9F7F\u8F6EB"
originalName:
@@ -752,8 +731,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 4083
- y: 5693
+ x: 3919
+ y: 5695
width: 0
height: 0
spriteID: b20eafea4b8b8c94c89d9e5d54ae683f
@@ -764,7 +743,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3877, y: 5486}
+ uvTransform: {x: 3713, y: 5488}
spritePosition: {x: 1344, y: 1445}
- name: "\u5FC3\u810F\u9F7F\u8F6EC"
originalName:
@@ -773,8 +752,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 4091
- y: 5693
+ x: 3927
+ y: 5695
width: 0
height: 0
spriteID: 4937081512344314a989a0d438fd73d3
@@ -785,7 +764,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3931, y: 5534}
+ uvTransform: {x: 3767, y: 5536}
spritePosition: {x: 1295, y: 1611}
- name: "\u5FC3\u810F\u9F7F\u8F6ED"
originalName:
@@ -815,8 +794,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 4067
- y: 5701
+ x: 3903
+ y: 5703
width: 0
height: 0
spriteID: a4d40b2ba111122448c31f2ea4fd4d4d
@@ -827,7 +806,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3937, y: 5571}
+ uvTransform: {x: 3773, y: 5573}
spritePosition: {x: 1541, y: 1536}
- name: "\u5FC3\u810F"
originalName:
@@ -878,8 +857,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3973
- y: 5499
+ x: 3966
+ y: 6112
width: 100
height: 102
spriteID: 2b82d9f9ac606bc46a69f1f1f2bc2fac
@@ -890,7 +869,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3973, y: 5499}
+ uvTransform: {x: 3966, y: 6112}
spritePosition: {x: 1990, y: 1443}
- name: "\u80BA"
originalName:
@@ -921,7 +900,7 @@ ScriptedImporter:
rect:
serializedVersion: 2
x: 3966
- y: 6112
+ y: 6222
width: 100
height: 102
spriteID: 7df889ef25dabad46bcacf053c71d0e6
@@ -932,7 +911,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3966, y: 6112}
+ uvTransform: {x: 3966, y: 6222}
spritePosition: {x: 1068, y: 192}
- name: "\u80C3"
originalName:
@@ -962,8 +941,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3966
- y: 6222
+ x: 3953
+ y: 7243
width: 100
height: 102
spriteID: a7f4162658d13014eb7749886a9e8c79
@@ -974,7 +953,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3966, y: 6222}
+ uvTransform: {x: 3953, y: 7243}
spritePosition: {x: 1783, y: 446}
- name: "\u809D"
originalName:
@@ -1138,7 +1117,7 @@ ScriptedImporter:
parentIndex: -1
spriteID: 27fd3ef65dfd55c45bf19c14e2ba4aaf
layerID: 463
- mosaicPosition: {x: 166, y: 8026}
+ mosaicPosition: {x: 4, y: 8026}
flatten: 0
isImported: 1
isVisible: 1
@@ -1208,7 +1187,7 @@ ScriptedImporter:
parentIndex: 8
spriteID: 3f9ee51ee22d4434f8d77faf45d9acd2
layerID: 459
- mosaicPosition: {x: 4067, y: 5660}
+ mosaicPosition: {x: 3941, y: 6558}
flatten: 0
isImported: 1
isVisible: 1
@@ -1218,7 +1197,7 @@ ScriptedImporter:
parentIndex: 8
spriteID: 289d20330e2397a45ad29088f4f1a6e0
layerID: 458
- mosaicPosition: {x: 3913, y: 5673}
+ mosaicPosition: {x: 3903, y: 5661}
flatten: 0
isImported: 1
isVisible: 1
@@ -1228,7 +1207,7 @@ ScriptedImporter:
parentIndex: 8
spriteID: 9f9deb0f2cb514d4d828fd62fa70dde3
layerID: 229
- mosaicPosition: {x: 4067, y: 5609}
+ mosaicPosition: {x: 3941, y: 6529}
flatten: 0
isImported: 1
isVisible: 1
@@ -1240,15 +1219,15 @@ ScriptedImporter:
layerID: 482
mosaicPosition: {x: 3812, y: 6345}
flatten: 0
- isImported: 1
- isVisible: 1
+ isImported: 0
+ isVisible: 0
- name: "\u8F6C\u901F\u8868"
spriteName: "\u8F6C\u901F\u8868"
isGroup: 0
parentIndex: 8
spriteID: b7e297a8275fe3147a264e080dc035dd
layerID: 417
- mosaicPosition: {x: 3615, y: 5499}
+ mosaicPosition: {x: 3812, y: 6345}
flatten: 0
isImported: 1
isVisible: 1
@@ -1258,7 +1237,7 @@ ScriptedImporter:
parentIndex: 8
spriteID: 98e19cabc64e47d46aea9ab2c329fca9
layerID: 260
- mosaicPosition: {x: 3973, y: 5609}
+ mosaicPosition: {x: 3812, y: 6529}
flatten: 0
isImported: 1
isVisible: 1
@@ -1298,7 +1277,7 @@ ScriptedImporter:
parentIndex: 8
spriteID: c562151c266172245900603e7959a8da
layerID: 287
- mosaicPosition: {x: 4, y: 8026}
+ mosaicPosition: {x: 3789, y: 5499}
flatten: 0
isImported: 1
isVisible: 1
@@ -1308,7 +1287,7 @@ ScriptedImporter:
parentIndex: 8
spriteID: 93418b50b51ddd441a424a24b868b51a
layerID: 274
- mosaicPosition: {x: 3953, y: 7243}
+ mosaicPosition: {x: 3953, y: 7105}
flatten: 0
isImported: 1
isVisible: 1
@@ -1318,7 +1297,7 @@ ScriptedImporter:
parentIndex: 8
spriteID: d5e68dcab5349504f950128fdb66696c
layerID: 280
- mosaicPosition: {x: 3799, y: 5499}
+ mosaicPosition: {x: 3615, y: 5499}
flatten: 0
isImported: 1
isVisible: 1
@@ -1328,7 +1307,7 @@ ScriptedImporter:
parentIndex: 8
spriteID: 15bb5a4be7f4d1746b0822dc05b92b5f
layerID: 279
- mosaicPosition: {x: 3953, y: 7105}
+ mosaicPosition: {x: 3951, y: 5499}
flatten: 0
isImported: 1
isVisible: 1
@@ -1338,7 +1317,7 @@ ScriptedImporter:
parentIndex: 8
spriteID: 7e7562128bf69d7418af6bd34587198a
layerID: 281
- mosaicPosition: {x: 4067, y: 5693}
+ mosaicPosition: {x: 3903, y: 5695}
flatten: 0
isImported: 1
isVisible: 1
@@ -1378,7 +1357,7 @@ ScriptedImporter:
parentIndex: 25
spriteID: 393fed26529755c43b3adf65c5215b60
layerID: 307
- mosaicPosition: {x: 3812, y: 6529}
+ mosaicPosition: {x: 3996, y: 6345}
flatten: 0
isImported: 1
isVisible: 1
@@ -1398,7 +1377,7 @@ ScriptedImporter:
parentIndex: 25
spriteID: 955abee622701d34c92da4721f082368
layerID: 421
- mosaicPosition: {x: 3996, y: 6345}
+ mosaicPosition: {x: 3953, y: 7353}
flatten: 0
isImported: 1
isVisible: 1
@@ -1408,7 +1387,7 @@ ScriptedImporter:
parentIndex: 25
spriteID: 0c11f41444c477f4fac3222cb5b79a98
layerID: 420
- mosaicPosition: {x: 4020, y: 6345}
+ mosaicPosition: {x: 3977, y: 7353}
flatten: 0
isImported: 1
isVisible: 1
@@ -1418,7 +1397,7 @@ ScriptedImporter:
parentIndex: 25
spriteID: ed1ecfe628602a44285fa18ebac88553
layerID: 295
- mosaicPosition: {x: 3799, y: 5673}
+ mosaicPosition: {x: 3789, y: 5661}
flatten: 0
isImported: 1
isVisible: 1
@@ -1438,7 +1417,7 @@ ScriptedImporter:
parentIndex: 25
spriteID: 446346ef83ab15c43a3d115b695a489a
layerID: 446
- mosaicPosition: {x: 4075, y: 5693}
+ mosaicPosition: {x: 3911, y: 5695}
flatten: 0
isImported: 1
isVisible: 1
@@ -1448,7 +1427,7 @@ ScriptedImporter:
parentIndex: 25
spriteID: b20eafea4b8b8c94c89d9e5d54ae683f
layerID: 445
- mosaicPosition: {x: 4083, y: 5693}
+ mosaicPosition: {x: 3919, y: 5695}
flatten: 0
isImported: 1
isVisible: 1
@@ -1458,7 +1437,7 @@ ScriptedImporter:
parentIndex: 25
spriteID: 4937081512344314a989a0d438fd73d3
layerID: 444
- mosaicPosition: {x: 4091, y: 5693}
+ mosaicPosition: {x: 3927, y: 5695}
flatten: 0
isImported: 1
isVisible: 1
@@ -1478,7 +1457,7 @@ ScriptedImporter:
parentIndex: 25
spriteID: a4d40b2ba111122448c31f2ea4fd4d4d
layerID: 439
- mosaicPosition: {x: 4067, y: 5701}
+ mosaicPosition: {x: 3903, y: 5703}
flatten: 0
isImported: 1
isVisible: 1
@@ -1508,7 +1487,7 @@ ScriptedImporter:
parentIndex: -1
spriteID: 2b82d9f9ac606bc46a69f1f1f2bc2fac
layerID: 238
- mosaicPosition: {x: 3973, y: 5499}
+ mosaicPosition: {x: 3966, y: 6112}
flatten: 0
isImported: 1
isVisible: 1
@@ -1528,7 +1507,7 @@ ScriptedImporter:
parentIndex: -1
spriteID: 7df889ef25dabad46bcacf053c71d0e6
layerID: 236
- mosaicPosition: {x: 3966, y: 6112}
+ mosaicPosition: {x: 3966, y: 6222}
flatten: 0
isImported: 1
isVisible: 1
@@ -1548,7 +1527,7 @@ ScriptedImporter:
parentIndex: -1
spriteID: a7f4162658d13014eb7749886a9e8c79
layerID: 237
- mosaicPosition: {x: 3966, y: 6222}
+ mosaicPosition: {x: 3953, y: 7243}
flatten: 0
isImported: 1
isVisible: 1
diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity
index 67064fbc6..c4f572847 100644
--- a/Assets/Scenes/ExpressFixScene.unity
+++ b/Assets/Scenes/ExpressFixScene.unity
@@ -123,6 +123,71 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &4705209
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4705210}
+ m_Layer: 0
+ m_Name: LockOffPos
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4705210
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4705209}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 2.3, y: 3.6, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 327320697}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &16515557
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 16515558}
+ m_Layer: 0
+ m_Name: "\u9759\u6001\u90E8\u5206"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &16515558
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 16515557}
+ 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:
+ - {fileID: 7418097130150250632}
+ - {fileID: 9096231273272382107}
+ - {fileID: 5386643589775558611}
+ m_Father: {fileID: 828586554184600027}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &18238394
GameObject:
m_ObjectHideFlags: 0
@@ -153,7 +218,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 1964529542}
+ m_Father: {fileID: 1112213369}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &18238396
SpriteRenderer:
@@ -291,333 +356,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!21 &72752440
-Material:
- serializedVersion: 8
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: AllIn1SpriteShader/AllIn1SpriteShader
- m_Shader: {fileID: 4800000, guid: a36b7719ff0465b42ab1407d67672c5f, type: 3}
- m_Parent: {fileID: 0}
- m_ModifiedSerializedProperties: 0
- m_ValidKeywords: []
- m_InvalidKeywords: []
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: 3000
- stringTagMap: {}
- disabledShaderPasses: []
- m_LockedProperties:
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _ColorRampTex:
- m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _ColorRampTexGradient:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _ColorSwapTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DistortTex:
- m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _FadeBurnTex:
- m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _FadeTex:
- m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _GlowTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _MainTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _OutlineDistortTex:
- m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _OutlineTex:
- m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _OverlayTex:
- m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _ShineMask:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Ints: []
- m_Floats:
- - _Alpha: 1
- - _AlphaCutoffValue: 0.25
- - _AlphaOutlineBlend: 1
- - _AlphaOutlineGlow: 5
- - _AlphaOutlineMinAlpha: 0
- - _AlphaOutlinePower: 1
- - _AlphaRoundThreshold: 0.5
- - _BillboardY: 0
- - _BlurHD: 0
- - _BlurIntensity: 10
- - _Brightness: 0
- - _ChromAberrAlpha: 0.4
- - _ChromAberrAmount: 1
- - _ClipUvDown: 0
- - _ClipUvLeft: 0
- - _ClipUvRight: 0
- - _ClipUvUp: 0
- - _ColorChangeLuminosity: 0
- - _ColorChangeTolerance: 0.25
- - _ColorChangeTolerance2: 0.25
- - _ColorChangeTolerance3: 0.25
- - _ColorRampBlend: 1
- - _ColorRampLuminosity: 0
- - _ColorRampOutline: 0
- - _ColorSwapBlend: 1
- - _ColorSwapBlueLuminosity: 0.5
- - _ColorSwapGreenLuminosity: 0.5
- - _ColorSwapRedLuminosity: 0.5
- - _Contrast: 1
- - _CullingOption: 0
- - _DistortAmount: 0.5
- - _DistortTexXSpeed: 5
- - _DistortTexYSpeed: 5
- - _EditorDrawers: 6
- - _FadeAmount: -0.1
- - _FadeBurnGlow: 2
- - _FadeBurnTransition: 0.075
- - _FadeBurnWidth: 0.025
- - _FishEyeUvAmount: 0.35
- - _FlickerAlpha: 0
- - _FlickerFreq: 0.2
- - _FlickerPercent: 0.05
- - _GhostBlend: 1
- - _GhostColorBoost: 1
- - _GhostTransparency: 0
- - _GlitchAmount: 3
- - _GlitchSize: 1
- - _Glow: 10
- - _GlowGlobal: 1
- - _GradBlend: 1
- - _GradBoostX: 1.2
- - _GradBoostY: 1.2
- - _GradIsRadial: 0
- - _GrassManualAnim: 1
- - _GrassManualToggle: 0
- - _GrassRadialBend: 0.1
- - _GrassSpeed: 2
- - _GrassWind: 20
- - _GreyscaleBlend: 1
- - _GreyscaleLuminosity: 0
- - _GreyscaleOutline: 0
- - _HandDrawnAmount: 10
- - _HandDrawnSpeed: 5
- - _HitEffectBlend: 1
- - _HitEffectGlow: 5
- - _HologramBlend: 1
- - _HologramMaxAlpha: 0.75
- - _HologramMinAlpha: 0.1
- - _HologramStripesAmount: 0.1
- - _HologramStripesSpeed: 4.5
- - _HologramUnmodAmount: 0
- - _HsvBright: 1
- - _HsvSaturation: 1
- - _HsvShift: 180
- - _InnerOutlineAlpha: 1
- - _InnerOutlineGlow: 4
- - _InnerOutlineThickness: 1
- - _MaxXUV: 1
- - _MaxYUV: 1
- - _MinXUV: 0
- - _MinYUV: 0
- - _MotionBlurAngle: 0.1
- - _MotionBlurDist: 1.25
- - _MyDstMode: 10
- - _MySrcMode: 5
- - _NegativeAmount: 1
- - _OffsetUvX: 0
- - _OffsetUvY: 0
- - _OnlyInnerOutline: 0
- - _OnlyOutline: 0
- - _OutlineAlpha: 1
- - _OutlineDistortAmount: 0.5
- - _OutlineDistortTexXSpeed: 5
- - _OutlineDistortTexYSpeed: 5
- - _OutlineGlow: 1.5
- - _OutlinePixelWidth: 1
- - _OutlineTexXSpeed: 10
- - _OutlineTexYSpeed: 0
- - _OutlineWidth: 0.004
- - _OverlayBlend: 1
- - _OverlayGlow: 1
- - _OverlayTextureScrollXSpeed: 0.25
- - _OverlayTextureScrollYSpeed: 0.25
- - _PinchUvAmount: 0.35
- - _PixelateSize: 32
- - _PosterizeGamma: 0.75
- - _PosterizeNumColors: 8
- - _PosterizeOutline: 0
- - _RadialClip: 45
- - _RadialClip2: 0
- - _RadialStartAngle: 90
- - _RandomSeed: 0
- - _RectSize: 1
- - _RotateUvAmount: 0
- - _RoundWaveSpeed: 2
- - _RoundWaveStrength: 0.7
- - _ShadowAlpha: 0.5
- - _ShadowX: 0.1
- - _ShadowY: -0.05
- - _ShakeUvSpeed: 2.5
- - _ShakeUvX: 1.5
- - _ShakeUvY: 1
- - _ShineGlow: 1
- - _ShineLocation: 0.5
- - _ShineRotate: 0
- - _ShineWidth: 0.1
- - _TextureScrollXSpeed: 1
- - _TextureScrollYSpeed: 0
- - _TwistUvAmount: 1
- - _TwistUvPosX: 0.5
- - _TwistUvPosY: 0.5
- - _TwistUvRadius: 0.75
- - _WarpScale: 0.5
- - _WarpSpeed: 8
- - _WarpStrength: 0.025
- - _WaveAmount: 7
- - _WaveSpeed: 10
- - _WaveStrength: 7.5
- - _WaveX: 0
- - _WaveY: 0.5
- - _ZTestMode: 4
- - _ZWrite: 0
- - _ZoomUvAmount: 0.5
- m_Colors:
- - _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1}
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- - _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1}
- - _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1}
- - _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1}
- - _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1}
- - _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1}
- - _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1}
- - _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1}
- - _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1}
- - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1}
- - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1}
- - _GlowColor: {r: 1, g: 1, b: 1, a: 1}
- - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1}
- - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1}
- - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1}
- - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1}
- - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1}
- - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1}
- - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1}
- - _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1}
- - _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
- - _OverlayColor: {r: 1, g: 1, b: 1, a: 1}
- - _ShadowColor: {r: 0, g: 0, b: 0, a: 1}
- - _ShineColor: {r: 1, g: 1, b: 1, a: 1}
- m_BuildTextureStacks: []
---- !u!1 &115460344
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 115460345}
- - component: {fileID: 115460346}
- m_Layer: 0
- m_Name: Speed
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &115460345
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 115460344}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -2.743, y: 1.765, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 2064668201}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &115460346
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 115460344}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 5
- m_Sprite: {fileID: -7322283717058934520, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 1, y: 1}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &129808764
GameObject:
m_ObjectHideFlags: 0
@@ -702,6 +440,104 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &141279503
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 141279504}
+ m_Layer: 0
+ m_Name: OffPos
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &141279504
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 141279503}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 2.7000003, y: 3.85, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 327320697}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &154381820
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4070921155132268514, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ propertyPath: m_Name
+ value: Body Module System
+ objectReference: {fileID: 0}
+ - target: {fileID: 4911887232694427234, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 1679862002}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 3739177437028557049, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 0}
+ - targetCorrespondingSourceObject: {fileID: 2411966172391820548, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 0}
+ m_SourcePrefab: {fileID: 100100000, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
--- !u!1 &199118572
GameObject:
m_ObjectHideFlags: 0
@@ -858,7 +694,7 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &285714351
+--- !u!1 &327320696
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -866,82 +702,35 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 285714352}
- - component: {fileID: 285714353}
+ - component: {fileID: 327320697}
m_Layer: 0
- m_Name: Heart Cover
+ m_Name: "\u9501\u5B9A\u7EC4\u4EF6"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &285714352
+ m_IsActive: 1
+--- !u!4 &327320697
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 285714351}
+ m_GameObject: {fileID: 327320696}
serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -0.75, y: 0.26000008, z: 0}
+ 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: 1964529542}
+ m_Children:
+ - {fileID: 4487910944894817467}
+ - {fileID: 180504364300219169}
+ - {fileID: 757500007}
+ - {fileID: 141279504}
+ - {fileID: 1924873797}
+ - {fileID: 4705210}
+ m_Father: {fileID: 828586554184600027}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &285714353
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 285714351}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 4
- m_Sprite: {fileID: -8759480157694563036, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 1, y: 1}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &360323324
GameObject:
m_ObjectHideFlags: 0
@@ -1093,6 +882,96 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &439450633
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 439450634}
+ - component: {fileID: 439450635}
+ - component: {fileID: 439450636}
+ m_Layer: 0
+ m_Name: "\u74F6\u5B50\u63D2\u69FD\u70B9\u4F4D"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &439450634
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 439450633}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 2.3, y: 2.05, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 828586554184600027}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &439450635
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 439450633}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_ForceSendLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ForceReceiveLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ContactCaptureLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_CallbackLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_IsTrigger: 1
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 0.5, y: 0.5}
+ m_EdgeRadius: 0
+--- !u!114 &439450636
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 439450633}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: bdcb57f53aa757b45a44803a2441d888, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &463110380
GameObject:
m_ObjectHideFlags: 0
@@ -1119,8 +998,8 @@ Transform:
m_GameObject: {fileID: 463110380}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -4.2, y: 0.418, z: 0}
- m_LocalScale: {x: 0.046136577, y: 0.5301, z: 1}
+ m_LocalPosition: {x: -7.8, y: 0.406, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 885292092}
@@ -1165,9 +1044,9 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 6
- m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
- m_Color: {r: 1, g: 0, b: 0, a: 1}
+ m_SortingOrder: 13
+ m_Sprite: {fileID: 6060358678230944431, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -1501,7 +1380,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 0
+ m_SortingOrder: 20
m_Sprite: {fileID: -938042225230554273, guid: 3aee1fa72f2d3d7409533ba8197f66fc, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1561,6 +1440,37 @@ MonoBehaviour:
m_EditorClassIdentifier:
gearPrefab: {fileID: 5285827322175967477, guid: 1711cb9f16070e0488096c259d4eee3d, type: 3}
shaftPrefab: {fileID: 6363828760380717502, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3}
+--- !u!1 &757500006
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 757500007}
+ m_Layer: 0
+ m_Name: OnPos
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &757500007
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 757500006}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 2.7000003, y: 3.42, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 327320697}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &796145091
GameObject:
m_ObjectHideFlags: 0
@@ -1670,12 +1580,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 843199596}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.734, y: 0.238, z: 0}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -0.73, y: 0.26, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 1704466888}
+ m_Father: {fileID: 1112213369}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &843199598
SpriteRenderer:
@@ -1717,7 +1627,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 3
+ m_SortingOrder: 10
m_Sprite: {fileID: -8759480157694563036, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1872,8 +1782,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 73c497ccb39448718a07911a5e674d5f, type: 3}
m_Name:
m_EditorClassIdentifier:
- leftPosX: -4.2
- rightPosX: 0
+ leftRot: 0
+ rightRot: 137
--- !u!1 &900787527
GameObject:
m_ObjectHideFlags: 0
@@ -1900,8 +1810,8 @@ Transform:
m_GameObject: {fileID: 900787527}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -2.034, y: 0.599, z: 0}
- m_LocalScale: {x: 4.6604624, y: 1, z: 1}
+ m_LocalPosition: {x: -7.792, y: 0.406, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 885292092}
@@ -1946,92 +1856,8 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 5
- m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 1, y: 1}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!1 &906083738
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 906083739}
- - component: {fileID: 906083740}
- m_Layer: 0
- m_Name: Oil Gate
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &906083739
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 906083738}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -3.12, y: 1.34, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 2064668201}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &906083740
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 906083738}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 3
- m_Sprite: {fileID: 6738774341365589705, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
+ m_SortingOrder: 12
+ m_Sprite: {fileID: 8711814398124419752, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -2318,7 +2144,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &1112213369
Transform:
m_ObjectHideFlags: 0
@@ -2328,16 +2154,17 @@ Transform:
m_GameObject: {fileID: 1112213368}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: -12, z: 0}
+ m_LocalPosition: {x: -2.124, y: 2.323, z: 0}
m_LocalScale: {x: 0.93, y: 0.93, z: 0.93}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 1964529542}
+ - {fileID: 18238395}
- {fileID: 1691014403}
- {fileID: 863998405}
- {fileID: 885292092}
- {fileID: 1537489913}
- {fileID: 551825977}
+ - {fileID: 843199597}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1112213371
@@ -2370,6 +2197,9 @@ MonoBehaviour:
curAirMax: 0
curAirLevel: 0
inAirRange: 0
+ coverMoveDuration: 2
+ coverMoveDistance: 2.8
+ isActive: 0
--- !u!1 &1119304932
GameObject:
m_ObjectHideFlags: 0
@@ -3030,7 +2860,7 @@ Transform:
m_GameObject: {fileID: 1537489912}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.93, y: -1.779, z: 0}
+ m_LocalPosition: {x: -0.899, y: -1.804, z: 0}
m_LocalScale: {x: 0.92499995, y: 0.625, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -3088,7 +2918,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 3
+ m_SortingOrder: 2
m_Sprite: {fileID: 6738774341365589705, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -3145,6 +2975,249 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 0.925, y: 0.625}
m_EdgeRadius: 0
+--- !u!21 &1679862002
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: AllIn1SpriteShader/AllIn1SpriteShader
+ m_Shader: {fileID: 4800000, guid: a36b7719ff0465b42ab1407d67672c5f, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _ColorRampTex:
+ m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ColorRampTexGradient:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ColorSwapTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DistortTex:
+ m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _FadeBurnTex:
+ m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _FadeTex:
+ m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _GlowTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OutlineDistortTex:
+ m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OutlineTex:
+ m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OverlayTex:
+ m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ShineMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _Alpha: 1
+ - _AlphaCutoffValue: 0.25
+ - _AlphaOutlineBlend: 1
+ - _AlphaOutlineGlow: 5
+ - _AlphaOutlineMinAlpha: 0
+ - _AlphaOutlinePower: 1
+ - _AlphaRoundThreshold: 0.5
+ - _BillboardY: 0
+ - _BlurHD: 0
+ - _BlurIntensity: 10
+ - _Brightness: 0
+ - _ChromAberrAlpha: 0.4
+ - _ChromAberrAmount: 1
+ - _ClipUvDown: 0
+ - _ClipUvLeft: 0
+ - _ClipUvRight: 0
+ - _ClipUvUp: 0
+ - _ColorChangeLuminosity: 0
+ - _ColorChangeTolerance: 0.25
+ - _ColorChangeTolerance2: 0.25
+ - _ColorChangeTolerance3: 0.25
+ - _ColorRampBlend: 1
+ - _ColorRampLuminosity: 0
+ - _ColorRampOutline: 0
+ - _ColorSwapBlend: 1
+ - _ColorSwapBlueLuminosity: 0.5
+ - _ColorSwapGreenLuminosity: 0.5
+ - _ColorSwapRedLuminosity: 0.5
+ - _Contrast: 1
+ - _CullingOption: 0
+ - _DistortAmount: 0.5
+ - _DistortTexXSpeed: 5
+ - _DistortTexYSpeed: 5
+ - _EditorDrawers: 6
+ - _FadeAmount: -0.1
+ - _FadeBurnGlow: 2
+ - _FadeBurnTransition: 0.075
+ - _FadeBurnWidth: 0.025
+ - _FishEyeUvAmount: 0.35
+ - _FlickerAlpha: 0
+ - _FlickerFreq: 0.2
+ - _FlickerPercent: 0.05
+ - _GhostBlend: 1
+ - _GhostColorBoost: 1
+ - _GhostTransparency: 0
+ - _GlitchAmount: 3
+ - _GlitchSize: 1
+ - _Glow: 10
+ - _GlowGlobal: 1
+ - _GradBlend: 1
+ - _GradBoostX: 1.2
+ - _GradBoostY: 1.2
+ - _GradIsRadial: 0
+ - _GrassManualAnim: 1
+ - _GrassManualToggle: 0
+ - _GrassRadialBend: 0.1
+ - _GrassSpeed: 2
+ - _GrassWind: 20
+ - _GreyscaleBlend: 1
+ - _GreyscaleLuminosity: 0
+ - _GreyscaleOutline: 0
+ - _HandDrawnAmount: 10
+ - _HandDrawnSpeed: 5
+ - _HitEffectBlend: 1
+ - _HitEffectGlow: 5
+ - _HologramBlend: 1
+ - _HologramMaxAlpha: 0.75
+ - _HologramMinAlpha: 0.1
+ - _HologramStripesAmount: 0.1
+ - _HologramStripesSpeed: 4.5
+ - _HologramUnmodAmount: 0
+ - _HsvBright: 1
+ - _HsvSaturation: 1
+ - _HsvShift: 180
+ - _InnerOutlineAlpha: 1
+ - _InnerOutlineGlow: 4
+ - _InnerOutlineThickness: 1
+ - _MaxXUV: 1
+ - _MaxYUV: 1
+ - _MinXUV: 0
+ - _MinYUV: 0
+ - _MotionBlurAngle: 0.1
+ - _MotionBlurDist: 1.25
+ - _MyDstMode: 10
+ - _MySrcMode: 5
+ - _NegativeAmount: 1
+ - _OffsetUvX: 0
+ - _OffsetUvY: 0
+ - _OnlyInnerOutline: 0
+ - _OnlyOutline: 0
+ - _OutlineAlpha: 1
+ - _OutlineDistortAmount: 0.5
+ - _OutlineDistortTexXSpeed: 5
+ - _OutlineDistortTexYSpeed: 5
+ - _OutlineGlow: 1.5
+ - _OutlinePixelWidth: 1
+ - _OutlineTexXSpeed: 10
+ - _OutlineTexYSpeed: 0
+ - _OutlineWidth: 0.004
+ - _OverlayBlend: 1
+ - _OverlayGlow: 1
+ - _OverlayTextureScrollXSpeed: 0.25
+ - _OverlayTextureScrollYSpeed: 0.25
+ - _PinchUvAmount: 0.35
+ - _PixelateSize: 32
+ - _PosterizeGamma: 0.75
+ - _PosterizeNumColors: 8
+ - _PosterizeOutline: 0
+ - _RadialClip: 45
+ - _RadialClip2: 0
+ - _RadialStartAngle: 90
+ - _RandomSeed: 0
+ - _RectSize: 1
+ - _RotateUvAmount: 0
+ - _RoundWaveSpeed: 2
+ - _RoundWaveStrength: 0.7
+ - _ShadowAlpha: 0.5
+ - _ShadowX: 0.1
+ - _ShadowY: -0.05
+ - _ShakeUvSpeed: 2.5
+ - _ShakeUvX: 1.5
+ - _ShakeUvY: 1
+ - _ShineGlow: 1
+ - _ShineLocation: 0.5
+ - _ShineRotate: 0
+ - _ShineWidth: 0.1
+ - _TextureScrollXSpeed: 1
+ - _TextureScrollYSpeed: 0
+ - _TwistUvAmount: 1
+ - _TwistUvPosX: 0.5
+ - _TwistUvPosY: 0.5
+ - _TwistUvRadius: 0.75
+ - _WarpScale: 0.5
+ - _WarpSpeed: 8
+ - _WarpStrength: 0.025
+ - _WaveAmount: 7
+ - _WaveSpeed: 10
+ - _WaveStrength: 7.5
+ - _WaveX: 0
+ - _WaveY: 0.5
+ - _ZTestMode: 4
+ - _ZWrite: 0
+ - _ZoomUvAmount: 0.5
+ m_Colors:
+ - _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1}
+ - _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1}
+ - _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1}
+ - _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1}
+ - _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1}
+ - _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1}
+ - _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1}
+ - _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1}
+ - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1}
+ - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1}
+ - _GlowColor: {r: 1, g: 1, b: 1, a: 1}
+ - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1}
+ - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1}
+ - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1}
+ - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1}
+ - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1}
+ - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1}
+ - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1}
+ - _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1}
+ - _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
+ - _OverlayColor: {r: 1, g: 1, b: 1, a: 1}
+ - _ShadowColor: {r: 0, g: 0, b: 0, a: 1}
+ - _ShineColor: {r: 1, g: 1, b: 1, a: 1}
+ m_BuildTextureStacks: []
--- !u!1 &1691014402
GameObject:
m_ObjectHideFlags: 0
@@ -3275,8 +3348,7 @@ Transform:
m_LocalPosition: {x: 0.24, y: 2.48, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 843199597}
+ m_Children: []
m_Father: {fileID: 919129558}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1704466889
@@ -3331,6 +3403,37 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &1924873796
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1924873797}
+ m_Layer: 0
+ m_Name: LockOnPos
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1924873797
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1924873796}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 2.3, y: 2.3, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 327320697}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1933921924
GameObject:
m_ObjectHideFlags: 0
@@ -3522,39 +3625,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &1964529541
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1964529542}
- m_Layer: 0
- m_Name: Moveable Parts
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1964529542
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1964529541}
- 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:
- - {fileID: 285714352}
- - {fileID: 18238395}
- m_Father: {fileID: 1112213369}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2003869746
GameObject:
m_ObjectHideFlags: 0
@@ -3862,7 +3932,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 1
+ m_SortingOrder: 21
m_Sprite: {fileID: -7311558830570425663, guid: 3aee1fa72f2d3d7409533ba8197f66fc, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -4062,8 +4132,6 @@ Transform:
m_Children:
- {fileID: 1195425275}
- {fileID: 129808765}
- - {fileID: 906083739}
- - {fileID: 115460345}
m_Father: {fileID: 919129558}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2064668202
@@ -4118,6 +4186,89 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &2080237102
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2080237103}
+ - component: {fileID: 2080237104}
+ m_Layer: 0
+ m_Name: Mask
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2080237103
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2080237102}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 1.864, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2111273594}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!331 &2080237104
+SpriteMask:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2080237102}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 0
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 1601057693275450947, guid: 3aee1fa72f2d3d7409533ba8197f66fc, type: 3}
+ m_MaskAlphaCutoff: 0.2
+ m_FrontSortingLayerID: 0
+ m_BackSortingLayerID: 0
+ m_FrontSortingLayer: 0
+ m_BackSortingLayer: 0
+ m_FrontSortingOrder: 0
+ m_BackSortingOrder: 0
+ m_IsCustomRangeActive: 0
+ m_SpriteSortPoint: 0
--- !u!1 &2111273593
GameObject:
m_ObjectHideFlags: 0
@@ -4129,9 +4280,10 @@ GameObject:
- component: {fileID: 2111273594}
- component: {fileID: 2111273596}
- component: {fileID: 2111273595}
+ - component: {fileID: 2111273597}
m_Layer: 0
m_Name: "\u74F6\u5B50"
- m_TagString: Untagged
+ m_TagString: Moveable
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -4144,13 +4296,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2111273593}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 2.682, y: 0.947, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5312432496625332801}
- {fileID: 2980465453537152575}
+ - {fileID: 2080237103}
m_Father: {fileID: 2054442378}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &2111273595
@@ -4179,7 +4332,7 @@ Rigidbody2D:
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
- m_Constraints: 0
+ m_Constraints: 4
--- !u!114 &2111273596
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4192,7 +4345,56 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2853398a0a3c4f888658abdaad9470b6, type: 3}
m_Name:
m_EditorClassIdentifier:
- isEmpty: 0
+ coolingMachine: {fileID: 0}
+ isSnapped: 0
+ isInMachine: 0
+ isLocked: 0
+ isEmpty: 1
+--- !u!61 &2111273597
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2111273593}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_ForceSendLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ForceReceiveLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ContactCaptureLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_CallbackLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: -0.00000011920929, y: 0.004260063}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 0.9413445, y: 2.344141}
+ m_EdgeRadius: 0
--- !u!1 &2133683124
GameObject:
m_ObjectHideFlags: 0
@@ -4347,11 +4549,11 @@ Transform:
m_GameObject: {fileID: 6589555252518027929}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 2.2957964, y: 2.3333335, z: 0}
+ m_LocalPosition: {x: 2.2999997, y: 2.3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 828586554184600027}
+ m_Father: {fileID: 327320697}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &191366705643661215
Transform:
@@ -4467,14 +4669,12 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 7418097130150250632}
- {fileID: 3682244214461663057}
- - {fileID: 4487910944894817467}
- {fileID: 8414396821830070043}
- - {fileID: 5386643589775558611}
- {fileID: 4009310477240567182}
- - {fileID: 9096231273272382107}
- - {fileID: 180504364300219169}
+ - {fileID: 16515558}
+ - {fileID: 327320697}
+ - {fileID: 439450634}
m_Father: {fileID: 2054442378}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &863036553668573841
@@ -4609,6 +4809,7 @@ GameObject:
- component: {fileID: 828586554184600027}
- component: {fileID: 1842467266174571347}
- component: {fileID: 1842467266174571348}
+ - component: {fileID: 1842467266174571349}
m_Layer: 0
m_Name: "\u6CF5\u673A"
m_TagString: Untagged
@@ -4689,13 +4890,42 @@ PolygonCollider2D:
m_Paths:
- - {x: 1.4451244, y: 4.251529}
- {x: 1.4533315, y: 3.4608834}
- - {x: 2.912904, y: 3.4391508}
+ - {x: 1.6929269, y: 3.449083}
+ - {x: 1.6938729, y: 4.009481}
+ - {x: 2.9055474, y: 4.0129366}
- {x: 2.9174256, y: 0.74822974}
- - {x: 1.4369173, y: 0.7450461}
- - {x: 1.4369168, y: 0.034941614}
+ - {x: 1.7249322, y: 0.7861914}
+ - {x: 1.7112169, y: 0.0075110793}
- {x: 5.5106735, y: 0.03494209}
+ - {x: 5.260628, y: 3.4930263}
+ - {x: 3.994928, y: 3.4754455}
+ - {x: 3.9873772, y: 3.9959219}
+ - {x: 5.226743, y: 4.00507}
- {x: 5.2365985, y: 4.258193}
m_UseDelaunayMesh: 0
+--- !u!114 &1842467266174571349
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1842467266174571346}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ee76855b985a9f24da38f7dca33c4bfc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ bottleSlot: {fileID: 439450633}
+ bottle: {fileID: 0}
+ lockSlider: {fileID: 8136471760956159661}
+ pumpHead: {fileID: 3682244214461663057}
+ pumpDuration: 3
+ resetDuration: 0.5
+ pumpHeadUpY: 6.42
+ pumpHeadDownY: 4.6
+ isMachineEmpty: 0
+ isLocked: 0
+ inLiquidChange: 0
--- !u!212 &2057194000637336332
SpriteRenderer:
m_ObjectHideFlags: 0
@@ -4980,7 +5210,7 @@ Transform:
m_GameObject: {fileID: 2877846582482915974}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 5.923364, y: 1.6715915, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -5048,9 +5278,11 @@ GameObject:
m_Component:
- component: {fileID: 4487910944894817467}
- component: {fileID: 8136471760956159659}
+ - component: {fileID: 8136471760956159660}
+ - component: {fileID: 8136471760956159661}
m_Layer: 0
m_Name: "\u62C9\u6746"
- m_TagString: Untagged
+ m_TagString: Moveable
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -5179,11 +5411,11 @@ Transform:
m_GameObject: {fileID: 3466281097952513800}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 2.6981983, y: 3.490991, z: 0}
+ m_LocalPosition: {x: 2.7000003, y: 3.42, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 828586554184600027}
+ m_Father: {fileID: 327320697}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4828155583552779808
SpriteRenderer:
@@ -5225,7 +5457,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 40
+ m_SortingOrder: 45
m_Sprite: {fileID: -2220616809648194718, guid: 3aee1fa72f2d3d7409533ba8197f66fc, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -5316,6 +5548,8 @@ GameObject:
m_Component:
- component: {fileID: 4009310477240567182}
- component: {fileID: 5191909197628152607}
+ - component: {fileID: 5191909197628152608}
+ - component: {fileID: 5191909197628152609}
m_Layer: 0
m_Name: "\u6309\u94AE"
m_TagString: Untagged
@@ -5392,6 +5626,63 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!61 &5191909197628152608
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5023043844602672530}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_ForceSendLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ForceReceiveLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ContactCaptureLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_CallbackLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 0.23123123, y: 0.23123123}
+ newSize: {x: 0.23123123, y: 0.23123123}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 0.23123123, y: 0.23123123}
+ m_EdgeRadius: 0
+--- !u!114 &5191909197628152609
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5023043844602672530}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c1098201b6934115ac7c06afa1564dab, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!4 &5312432496625332801
Transform:
m_ObjectHideFlags: 0
@@ -5401,7 +5692,7 @@ Transform:
m_GameObject: {fileID: 6403103170585791749}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 5.9248652, y: 1.589009, z: 0}
+ m_LocalPosition: {x: 0, y: -0.097, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -5420,7 +5711,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 828586554184600027}
+ m_Father: {fileID: 16515558}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5585569517215346401
SpriteRenderer:
@@ -5625,73 +5916,6 @@ Transform:
m_Children: []
m_Father: {fileID: 2796397495792737473}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &6045551082333026152
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4070921155132268514, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_Name
- value: Body Module System
- objectReference: {fileID: 0}
- - target: {fileID: 4911887232694427234, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 72752440}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents:
- - targetCorrespondingSourceObject: {fileID: 3739177437028557049, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- insertIndex: -1
- addedObject: {fileID: 0}
- - targetCorrespondingSourceObject: {fileID: 2411966172391820548, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- insertIndex: -1
- addedObject: {fileID: 0}
- m_SourcePrefab: {fileID: 100100000, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
--- !u!1 &6188005705891487802
GameObject:
m_ObjectHideFlags: 0
@@ -5784,6 +6008,8 @@ GameObject:
m_Component:
- component: {fileID: 180504364300219169}
- component: {fileID: 5718060344529872988}
+ - component: {fileID: 6589555252518027931}
+ - component: {fileID: 6589555252518027930}
m_Layer: 0
m_Name: "\u6D3B\u52A8\u5361\u6263"
m_TagString: Untagged
@@ -5791,6 +6017,78 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
+--- !u!61 &6589555252518027930
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6589555252518027929}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_ForceSendLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ForceReceiveLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ContactCaptureLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_CallbackLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: -0.0029857159, y: -0.037011877}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 1.2612612, y: 0.4864865}
+ newSize: {x: 1.2612612, y: 0.4864865}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 0.81114626, y: 0.41246274}
+ m_EdgeRadius: 0
+--- !u!50 &6589555252518027931
+Rigidbody2D:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6589555252518027929}
+ m_BodyType: 1
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDrag: 0
+ m_AngularDrag: 0.05
+ m_GravityScale: 0
+ 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: 5
--- !u!212 &6787340064695156039
SpriteRenderer:
m_ObjectHideFlags: 0
@@ -5841,7 +6139,7 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
+ m_MaskInteraction: 2
m_SpriteSortPoint: 0
--- !u!1 &6840890590042570231
GameObject:
@@ -5874,6 +6172,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2853398a0a3c4f888658abdaad9470b6, type: 3}
m_Name:
m_EditorClassIdentifier:
+ coolingMachine: {fileID: 0}
+ isSnapped: 0
+ isInMachine: 0
+ isLocked: 0
isEmpty: 0
--- !u!61 &6840890590042570233
BoxCollider2D:
@@ -6037,7 +6339,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 828586554184600027}
+ m_Father: {fileID: 16515558}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7455993280175988788
GameObject:
@@ -6108,6 +6410,67 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!61 &8136471760956159660
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3466281097952513800}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_ForceSendLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ForceReceiveLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ContactCaptureLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_CallbackLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 0.37237236, y: 0.0990991}
+ newSize: {x: 0.37237236, y: 0.0990991}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 0.37237236, y: 0.0990991}
+ m_EdgeRadius: 0
+--- !u!114 &8136471760956159661
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3466281097952513800}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9f15b93b1e22b11459ca121bedee9ba7, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ onPos: {fileID: 757500007}
+ offPos: {fileID: 141279504}
+ lockOnPos: {fileID: 1924873797}
+ lockOffPos: {fileID: 4705210}
--- !u!1 &8170432770828219786
GameObject:
m_ObjectHideFlags: 0
@@ -6576,7 +6939,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 828586554184600027}
+ m_Father: {fileID: 16515558}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &9120680128332441425
GameObject:
@@ -6667,6 +7030,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 8556345213791081418, guid: 13f00ab6092291d49a9312e52873d80b, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -6677,7 +7044,7 @@ SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 7026926953013077400}
- - {fileID: 6045551082333026152}
+ - {fileID: 154381820}
- {fileID: 1410382569}
- {fileID: 657112469}
- {fileID: 1112213369}
diff --git a/Assets/Scripts/FixSystemNew/BodyModule.meta b/Assets/Scripts/FixSystemNew/BodyModule.meta
new file mode 100644
index 000000000..9caa23bb9
--- /dev/null
+++ b/Assets/Scripts/FixSystemNew/BodyModule.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 97a19921a1af4dd291a2e5fd307c02df
+timeCreated: 1733904654
\ No newline at end of file
diff --git a/Assets/Scripts/FixSystemNew/BaseSocket.cs b/Assets/Scripts/FixSystemNew/BodyModule/BaseSocket.cs
similarity index 100%
rename from Assets/Scripts/FixSystemNew/BaseSocket.cs
rename to Assets/Scripts/FixSystemNew/BodyModule/BaseSocket.cs
diff --git a/Assets/Scripts/FixSystemNew/BaseSocket.cs.meta b/Assets/Scripts/FixSystemNew/BodyModule/BaseSocket.cs.meta
similarity index 100%
rename from Assets/Scripts/FixSystemNew/BaseSocket.cs.meta
rename to Assets/Scripts/FixSystemNew/BodyModule/BaseSocket.cs.meta
diff --git a/Assets/Scripts/FixSystemNew/BodyModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs
similarity index 100%
rename from Assets/Scripts/FixSystemNew/BodyModule.cs
rename to Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs
diff --git a/Assets/Scripts/FixSystemNew/BodyModule.cs.meta b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs.meta
similarity index 100%
rename from Assets/Scripts/FixSystemNew/BodyModule.cs.meta
rename to Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs.meta
diff --git a/Assets/Scripts/FixSystemNew/BodyModuleSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs
similarity index 97%
rename from Assets/Scripts/FixSystemNew/BodyModuleSystem.cs
rename to Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs
index 0341f7428..a905fe38e 100644
--- a/Assets/Scripts/FixSystemNew/BodyModuleSystem.cs
+++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs
@@ -17,7 +17,6 @@ namespace AibisDream.FixSystem
public GameObject bodyModulePrefab;
public Transform bodyModuleGroup;
public OscilloscopeSystem oscilloscopeSystem;
-
#endregion
@@ -119,6 +118,14 @@ namespace AibisDream.FixSystem
curBodyModule?.ShowWave();
}
+ ///
+ /// 插头重新插入初始插孔
+ ///
+ public void ResetPlug()
+ {
+ CableSystem.ResetPlug();
+ }
+
#region 数据加载与保存
public override string[] GetDataKeyOptions()
diff --git a/Assets/Scripts/FixSystemNew/BodyModuleSystem.cs.meta b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs.meta
similarity index 100%
rename from Assets/Scripts/FixSystemNew/BodyModuleSystem.cs.meta
rename to Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs.meta
diff --git a/Assets/Scripts/FixSystemNew/Cable.cs b/Assets/Scripts/FixSystemNew/BodyModule/Cable.cs
similarity index 100%
rename from Assets/Scripts/FixSystemNew/Cable.cs
rename to Assets/Scripts/FixSystemNew/BodyModule/Cable.cs
diff --git a/Assets/Scripts/FixSystemNew/Cable.cs.meta b/Assets/Scripts/FixSystemNew/BodyModule/Cable.cs.meta
similarity index 100%
rename from Assets/Scripts/FixSystemNew/Cable.cs.meta
rename to Assets/Scripts/FixSystemNew/BodyModule/Cable.cs.meta
diff --git a/Assets/Scripts/FixSystemNew/CableSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs
similarity index 90%
rename from Assets/Scripts/FixSystemNew/CableSystem.cs
rename to Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs
index 986bf1480..523040671 100644
--- a/Assets/Scripts/FixSystemNew/CableSystem.cs
+++ b/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs
@@ -64,6 +64,15 @@ namespace AibisDream.FixSystem
PlugRef.InitPlug(InitSocket);
}
+ public void ResetPlug()
+ {
+ // 已经在初始插孔里了，不用动
+ if (curSocket == InitSocket) return;
+ // 不在初始插孔里，就从当前插孔拔出来，插回初始插孔
+ PlugRef.PullUpSocket();
+ PlugRef.InsertSocket(InitSocket);
+ }
+
///
/// 寻找最接近的Module
///
diff --git a/Assets/Scripts/FixSystemNew/CableSystem.cs.meta b/Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs.meta
similarity index 100%
rename from Assets/Scripts/FixSystemNew/CableSystem.cs.meta
rename to Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs.meta
diff --git a/Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs
similarity index 97%
rename from Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs
rename to Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs
index 120b798b4..a64da95d3 100644
--- a/Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs
+++ b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs
@@ -9,6 +9,8 @@ namespace AibisDream.FixSystem
{
#region 组件索引
+ private BodyModuleSystem _bodyModuleSystem;
+
private TMP_Text _screenText;
private WaveformLine _waveformLine;
private ScanLine _scanLine;
@@ -114,7 +116,7 @@ namespace AibisDream.FixSystem
///
public void OnScanSuccess()
{
- FixSystemCenter.SystemDic.Get().HandleDeepIn();
+ _bodyModuleSystem.HandleDeepIn();
_ = CommonUtil.Delay(2000, StopWave);
}
diff --git a/Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs.meta b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs.meta
similarity index 100%
rename from Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs.meta
rename to Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs.meta
diff --git a/Assets/Scripts/FixSystemNew/Plug.cs b/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs
similarity index 97%
rename from Assets/Scripts/FixSystemNew/Plug.cs
rename to Assets/Scripts/FixSystemNew/BodyModule/Plug.cs
index 218c28588..e86a9a428 100644
--- a/Assets/Scripts/FixSystemNew/Plug.cs
+++ b/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs
@@ -47,7 +47,7 @@ namespace AibisDream.FixSystem
/// 插入某个socket
///
/// 目标socket
- private void InsertSocket(ISocket targetSocket)
+ public void InsertSocket(ISocket targetSocket)
{
// 修改插头位置
transform.position = targetSocket.GetSocketPos();
@@ -71,7 +71,7 @@ namespace AibisDream.FixSystem
///
/// 从某个Socket拔出来
///
- private void PullUpSocket()
+ public void PullUpSocket()
{
// 修改线头位置
_cableSystem.CableRef.SetEndPos(_plugRootPos);
@@ -82,7 +82,6 @@ namespace AibisDream.FixSystem
// 触发事件
_cableSystem.BodyModuleSystem.plugOutEvent?.Invoke(_cableSystem.curSocket);
-
_cableSystem.curBodyModule = null;
_cableSystem.curSocket = null;
}
diff --git a/Assets/Scripts/FixSystemNew/Plug.cs.meta b/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs.meta
similarity index 100%
rename from Assets/Scripts/FixSystemNew/Plug.cs.meta
rename to Assets/Scripts/FixSystemNew/BodyModule/Plug.cs.meta
diff --git a/Assets/Scripts/FixSystemNew/ScanLine.cs b/Assets/Scripts/FixSystemNew/BodyModule/ScanLine.cs
similarity index 92%
rename from Assets/Scripts/FixSystemNew/ScanLine.cs
rename to Assets/Scripts/FixSystemNew/BodyModule/ScanLine.cs
index 413457ae9..e6c8a6a9e 100644
--- a/Assets/Scripts/FixSystemNew/ScanLine.cs
+++ b/Assets/Scripts/FixSystemNew/BodyModule/ScanLine.cs
@@ -9,6 +9,7 @@ namespace AibisDream.FixSystem
#region 组件索引
private LineRenderer _line;
+ private OscilloscopeSystem _oscilloscopeSystem;
#endregion
@@ -33,6 +34,8 @@ namespace AibisDream.FixSystem
private void InitComponentRefs()
{
+ _oscilloscopeSystem = GetComponentInParent();
+
_line = GetComponent();
_line.enabled = false;
_line.positionCount = 2;
@@ -41,7 +44,7 @@ namespace AibisDream.FixSystem
public IEnumerator ScanForError(float spikeX)
{
_line.enabled = true;
- FixSystemCenter.SystemDic.Get().isScanning = true;
+ _oscilloscopeSystem.isScanning = true;
// 初始化扫描线
InitStartLine();
// 扫描线右移
@@ -68,7 +71,7 @@ namespace AibisDream.FixSystem
yield return null;
}
- FixSystemCenter.SystemDic.Get().isScanning = false;
+ _oscilloscopeSystem.isScanning = false;
}
private void InitStartLine()
diff --git a/Assets/Scripts/FixSystemNew/ScanLine.cs.meta b/Assets/Scripts/FixSystemNew/BodyModule/ScanLine.cs.meta
similarity index 100%
rename from Assets/Scripts/FixSystemNew/ScanLine.cs.meta
rename to Assets/Scripts/FixSystemNew/BodyModule/ScanLine.cs.meta
diff --git a/Assets/Scripts/FixSystemNew/WaveSlider.cs b/Assets/Scripts/FixSystemNew/BodyModule/WaveSlider.cs
similarity index 100%
rename from Assets/Scripts/FixSystemNew/WaveSlider.cs
rename to Assets/Scripts/FixSystemNew/BodyModule/WaveSlider.cs
diff --git a/Assets/Scripts/FixSystemNew/WaveSlider.cs.meta b/Assets/Scripts/FixSystemNew/BodyModule/WaveSlider.cs.meta
similarity index 100%
rename from Assets/Scripts/FixSystemNew/WaveSlider.cs.meta
rename to Assets/Scripts/FixSystemNew/BodyModule/WaveSlider.cs.meta
diff --git a/Assets/Scripts/FixSystemNew/WaveformLine.cs b/Assets/Scripts/FixSystemNew/BodyModule/WaveformLine.cs
similarity index 100%
rename from Assets/Scripts/FixSystemNew/WaveformLine.cs
rename to Assets/Scripts/FixSystemNew/BodyModule/WaveformLine.cs
diff --git a/Assets/Scripts/FixSystemNew/WaveformLine.cs.meta b/Assets/Scripts/FixSystemNew/BodyModule/WaveformLine.cs.meta
similarity index 100%
rename from Assets/Scripts/FixSystemNew/WaveformLine.cs.meta
rename to Assets/Scripts/FixSystemNew/BodyModule/WaveformLine.cs.meta
diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs
new file mode 100644
index 000000000..55a3f3fd5
--- /dev/null
+++ b/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs
@@ -0,0 +1,44 @@
+using UnityEngine;
+
+namespace AibisDream
+{
+ public class BottleSlot : MonoBehaviour
+ {
+ private CoolingMachineViewer _coolingMachine;
+
+ private void Awake()
+ {
+ InitComponentRefs();
+ }
+
+ private void InitComponentRefs()
+ {
+ _coolingMachine = GetComponentInParent();
+ }
+
+ private void OnTriggerEnter2D(Collider2D other)
+ {
+ if (_coolingMachine.isLocked) return;
+
+ if (other.gameObject.TryGetComponent(out var bottle))
+ {
+ // 进入时只给吸附标记，松手才吸附
+ bottle.isSnapped = true;
+ }
+ }
+
+ private void OnTriggerExit2D(Collider2D other)
+ {
+ if (_coolingMachine.isLocked) return;
+
+ if (other.gameObject.TryGetComponent(out var bottle))
+ {
+ // 离开时直接触发拔出逻辑，不等松手
+ bottle.isSnapped = false;
+ // 拔出
+ _coolingMachine.MoveOutBottle();
+ }
+ }
+ }
+}
+
diff --git a/Assets/Scripts/Framework/LifeCycle/ModuleLifeCycle.cs.meta b/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs.meta
similarity index 83%
rename from Assets/Scripts/Framework/LifeCycle/ModuleLifeCycle.cs.meta
rename to Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs.meta
index 52fc9dc75..8c7ec9a73 100644
--- a/Assets/Scripts/Framework/LifeCycle/ModuleLifeCycle.cs.meta
+++ b/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 7c928711dc2b0dc4c995288fdb23d1c7
+guid: bdcb57f53aa757b45a44803a2441d888
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs
index bfcb005f3..58d071bcf 100644
--- a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs
+++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs
@@ -1,5 +1,4 @@
-using System;
-using AibisDream.Framework;
+using AibisDream.Framework;
using DG.Tweening;
using UnityEngine;
@@ -7,41 +6,97 @@ namespace AibisDream
{
public class CoolingBottle : MonoBehaviour, IMoveable
{
- private GameObject _mask;
+ public CoolingMachineViewer coolingMachine;
+ private Transform _mask;
private Rigidbody2D _rb;
- private static readonly Vector3 UpPos = new(0, 1.56f, 0);
+ private static readonly Vector3 UpPos = new(0, 1.86f, 0);
private static readonly Vector3 DownPos = Vector3.zero;
+ public bool isSnapped;
+ public bool isInMachine;
+ public bool isLocked;
+
public bool isEmpty;
+ public bool IsBlock { get; }
private void Awake()
+ {
+ InitComponentRefs();
+ }
+
+ private void InitComponentRefs()
{
_rb = GetComponent();
+ _mask = transform.Find("Mask");
+ coolingMachine = FindObjectOfType();
+
+ _mask.localPosition = isEmpty ? DownPos : UpPos;
}
public void LiquidDown(float duration)
{
- _mask.transform.DOMove(DownPos, duration).OnComplete(() => isEmpty = true);
+ var targetPos = transform.parent.TransformPoint(DownPos);
+ _mask.transform.DOMove(targetPos, duration).OnComplete(() => isEmpty = true);
}
public void LiquidUp(float duration)
{
- _mask.transform.DOMove(UpPos, duration).OnComplete(() => isEmpty = false);
+ var targetPos = transform.parent.TransformPoint(UpPos);
+ _mask.transform.DOMove(targetPos, duration).OnComplete(() => isEmpty = false);
}
public void StartMove()
{
-
}
public void Move(Vector2 mousePos)
{
+ // 锁定后无法移动
+ if (isLocked) return;
+
_rb.MovePosition(mousePos);
}
public void StopMove()
{
+ // 松手时若是已吸附，就触发插入逻辑
+ if (isSnapped) coolingMachine.InsertBottle(this);
+ }
+
+ ///
+ /// 松手后吸附至某个位置
+ ///
+ /// 吸附点位
+ public void Snap(Vector3 snapPos)
+ {
+ // 吸附至指定位置
+ transform.position = snapPos;
+ // 停用重力
+ _rb.gravityScale = 0;
+ // 瓶子进入机器
+ isInMachine = true;
+ }
+
+ ///
+ /// 离开指定位置就停止吸附
+ ///
+ public void Unsnap()
+ {
+ // 重新启用重力
+ _rb.gravityScale = 1;
+ // 瓶子不在机器中
+ isInMachine = false;
+ }
+
+ public void Lock()
+ {
+ isLocked = true;
+ }
+
+ public void Unlock()
+ {
+ isLocked = false;
}
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingMachineViewer.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingMachineViewer.cs
index 64780461c..28038a6e6 100644
--- a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingMachineViewer.cs
+++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingMachineViewer.cs
@@ -1,17 +1,30 @@
+using DG.Tweening;
using UnityEngine;
namespace AibisDream
{
- public class CoolingMachineSystem : MonoBehaviour, ICoolingMachine
+ public class CoolingMachineViewer : MonoBehaviour, ICoolingMachine
{
- public bool isMachineEmpty;
-
- public GameObject bottleSlot;
+ [Header("引用")] public GameObject bottleSlot;
public CoolingBottle bottle;
- public GameObject pumpHead;
- public GameObject lockSwitch;
- public GameObject pumpButton;
-
+ public LockSlider lockSlider;
+ public Transform pumpHead;
+
+ private SpriteButton _button;
+
+ [Header("参数")] public float pumpDuration = 3f;
+ public float resetDuration = 0.5f;
+ public float pumpHeadUpY;
+ public float pumpHeadDownY;
+
+ #region 状态
+
+ [Header("状态")] public bool isMachineEmpty;
+ public bool isLocked;
+ public bool inLiquidChange;
+
+ #endregion
+
#region 对外暴露
public void LinkRobot()
@@ -25,30 +38,35 @@ namespace AibisDream
///
public void PumpCooling()
{
- // 泵头下降
-
+ inLiquidChange = true;
// 液面上升
-
- // 完成后液体满了
- isMachineEmpty = true;
+ bottle.LiquidUp(pumpDuration);
+ // 泵头下降
+ var sq = GenePumpHeadAnime();
+ sq.OnComplete(() =>
+ {
+ inLiquidChange = false;
+ isMachineEmpty = false;
+ });
}
public void UnlockBottle()
{
- // 卡扣上移
-
- // 瓶子外旋
-
- // 机器空置
+ // 动画效果拉杆处理了
+ // 触发锁定逻辑
isMachineEmpty = false;
+ isLocked = false;
+ bottle?.Unlock();
+ lockSlider.DisableHook();
}
public void MoveOutBottle()
{
+ if (bottle == null) return;
// 瓶子置空
bottle.transform.parent = null;
-
-
+ // 停止吸附
+ bottle?.Unsnap();
}
public void InsertBottle(CoolingBottle newBottle)
@@ -56,25 +74,33 @@ namespace AibisDream
// 改变瓶子归属
newBottle.transform.parent = bottleSlot.transform;
bottle = newBottle;
-
+ // 插入瓶子
+ bottle.Snap(bottleSlot.transform.position);
}
public void LockBottle()
{
- // 插槽回旋
-
- // 卡扣下降
-
- // 同步液体状态
- isMachineEmpty = bottle.isEmpty;
-
- // TODO 同步泵头状态
-
+ // 动画效果在拉杆的地方就处理了
+ // 触发锁定逻辑
+ isMachineEmpty = !bottle || bottle.isEmpty;
+ isLocked = true;
+ bottle?.Lock();
+ // 如果当前没有瓶子，就打开卡扣碰撞
+ if (!bottle) lockSlider.EnableHook();
}
public void InjectCool()
{
- throw new System.NotImplementedException();
+ inLiquidChange = true;
+ // 泵头下降
+ var sq = GenePumpHeadAnime();
+ sq.OnComplete(() =>
+ {
+ inLiquidChange = false;
+ isMachineEmpty = true;
+ });
+ // 液面上升
+ bottle.LiquidDown(pumpDuration);
}
public void UnlinkRobot()
@@ -82,8 +108,44 @@ namespace AibisDream
throw new System.NotImplementedException();
}
+ public bool CanPump()
+ {
+ if (inLiquidChange)
+ {
+ Debug.Log("泵机正在工作");
+ return false;
+ }
+
+ if (!isLocked)
+ {
+ Debug.Log("卡扣尚未锁定");
+ return false;
+ }
+
+ if (!bottle)
+ {
+ Debug.Log("没有瓶子");
+ return false;
+ }
+
+ return true;
+ }
+
#endregion
-
+
+ private Sequence GenePumpHeadAnime()
+ {
+ var sequence = DOTween.Sequence();
+ // 下降动画
+ var pumpDownPos = new Vector3(pumpHead.position.x, pumpHeadDownY + transform.position.y,
+ pumpHead.position.z);
+ sequence.Append(pumpHead.DOMove(pumpDownPos, pumpDuration));
+ // 上升动画
+ var pumpUpPos = new Vector3(pumpHead.position.x, pumpHeadUpY + transform.position.y, pumpHead.position.z);
+ sequence.Append(pumpHead.DOMove(pumpUpPos, resetDuration));
+
+ return sequence;
+ }
}
///
@@ -100,4 +162,4 @@ namespace AibisDream
void InjectCool();
void UnlinkRobot();
}
-}
+}
\ No newline at end of file
diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/LockSlider.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/LockSlider.cs
new file mode 100644
index 000000000..d2a832c70
--- /dev/null
+++ b/Assets/Scripts/FixSystemNew/CoolingMachine/LockSlider.cs
@@ -0,0 +1,91 @@
+using AibisDream.Framework;
+using UnityEngine;
+
+namespace AibisDream
+{
+ public class LockSlider : MonoBehaviour, IMoveable
+ {
+ private Transform _drawBar;
+ private Transform _hook;
+ private CoolingMachineViewer _coolingMachine;
+ private bool _isLocked;
+
+ private float Value
+ {
+ set
+ {
+ var sliderY = value * (offPos.position.y - onPos.position.y) + onPos.position.y;
+ transform.position = new Vector3(_drawBar.position.x, sliderY, _drawBar.position.z);
+ var hookY = value * (lockOffPos.position.y - lockOnPos.position.y) + lockOnPos.position.y;
+ _hook.position = new Vector3(_hook.position.x, hookY, _hook.position.z);
+ }
+ }
+
+ public Transform onPos;
+ public Transform offPos;
+
+ public Transform lockOnPos;
+ public Transform lockOffPos;
+
+ public bool IsBlock => _coolingMachine.inLiquidChange;
+
+ private void Awake()
+ {
+ _coolingMachine = GetComponentInParent();
+ _drawBar = transform;
+ _hook = transform.parent.Find("活动卡扣");
+ _isLocked = true;
+ }
+
+ public void StartMove()
+ {
+ }
+
+ public void Move(Vector2 mousePos)
+ {
+ var curY = Mathf.Clamp(mousePos.y, onPos.position.y, offPos.position.y);
+
+ Value = (curY - onPos.position.y) / (offPos.position.y - onPos.position.y);
+ }
+
+ public void StopMove()
+ {
+ var curValue = (_drawBar.position.y - onPos.position.y) / (offPos.position.y - onPos.position.y);
+ // 大于0.8或者小于0.2则切换状态，否则弹回去
+ _isLocked = curValue switch
+ {
+ // 移动停止时尝试吸附
+ >= 0.8f => false,
+ <= 0.2f => true,
+ _ => _isLocked
+ };
+
+ Value = _isLocked ? 0 : 1;
+ // 判定开闭锁
+ if (_isLocked)
+ {
+ _coolingMachine.LockBottle();
+ }
+ else
+ {
+ _coolingMachine.UnlockBottle();
+ }
+ }
+
+ ///
+ /// 打开卡扣碰撞
+ ///
+ public void EnableHook()
+ {
+ _hook.GetComponent().enabled = true;
+ }
+
+ ///
+ /// 关闭卡扣碰撞
+ ///
+ public void DisableHook()
+ {
+ _hook.GetComponent().enabled = false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Framework/LifeCycle/LifeCycleManager.cs.meta b/Assets/Scripts/FixSystemNew/CoolingMachine/LockSlider.cs.meta
similarity index 83%
rename from Assets/Scripts/Framework/LifeCycle/LifeCycleManager.cs.meta
rename to Assets/Scripts/FixSystemNew/CoolingMachine/LockSlider.cs.meta
index 702111eba..d26333639 100644
--- a/Assets/Scripts/Framework/LifeCycle/LifeCycleManager.cs.meta
+++ b/Assets/Scripts/FixSystemNew/CoolingMachine/LockSlider.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 3e9b9d16043250e43b350ea79cda5e7a
+guid: 9f15b93b1e22b11459ca121bedee9ba7
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/PumpButton.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/PumpButton.cs
new file mode 100644
index 000000000..2bf638b88
--- /dev/null
+++ b/Assets/Scripts/FixSystemNew/CoolingMachine/PumpButton.cs
@@ -0,0 +1,47 @@
+using UnityEngine;
+
+namespace AibisDream
+{
+ public class PumpButton : MonoBehaviour
+ {
+ private SpriteButton _button;
+ private CoolingMachineViewer _coolingMachine;
+
+ private void Awake()
+ {
+ _coolingMachine = GetComponentInParent();
+ }
+
+ private void OnEnable()
+ {
+ _button = new SpriteButton(gameObject);
+ _button.OnButtonDown += OnButtonDown;
+ }
+
+ private void OnDisable()
+ {
+ _button.OnButtonDown -= OnButtonDown;
+ _button = null;
+ }
+
+ private void Update()
+ {
+ _button.CheckButtonClick();
+ }
+
+ private void OnButtonDown()
+ {
+ if (!_coolingMachine.CanPump()) return;
+
+ if (_coolingMachine.isMachineEmpty)
+ {
+ _coolingMachine.PumpCooling();
+ }
+ else
+ {
+ Debug.Log("in");
+ _coolingMachine.InjectCool();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/PumpButton.cs.meta b/Assets/Scripts/FixSystemNew/CoolingMachine/PumpButton.cs.meta
new file mode 100644
index 000000000..5122b4d8b
--- /dev/null
+++ b/Assets/Scripts/FixSystemNew/CoolingMachine/PumpButton.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c1098201b6934115ac7c06afa1564dab
+timeCreated: 1733580710
\ No newline at end of file
diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs
index fe30b6540..a22d76322 100644
--- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs
+++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs
@@ -1,21 +1,57 @@
using AibisDream.Framework;
+using AibisDream.Kit;
using UnityEngine;
namespace AibisDream.FixSystem
{
- public class FixSystemCenter : MonoBehaviour
+ public class FixSystemCenter : Singleton
{
- public static IOCContainer SystemDic = new();
+ public FixState curState;
- private void Awake()
+ public override void OnSingletonInit()
{
SystemDic ??= new IOCContainer();
+ InitTransitionDic();
+
+ // TODO 这个回头要改
+ curState = FixState.BodyModule;
}
- private void OnDestroy()
+ #region 系统索引
+
+ // 容纳System
+ public static IOCContainer SystemDic = new();
+
+ #endregion
+
+ #region 转场管理
+
+ private static readonly StateDictionary TransitionDic = new();
+
+ private void InitTransitionDic()
{
- SystemDic = null;
+ TransitionDic.Add(FixState.BodyModule, FixState.Engine, new BodyModuleToEngineCommand());
}
+
+ ///
+ /// 执行转场
+ ///
+ /// 需要转换的状态
+ public void TransToNextState(FixState nextState)
+ {
+ // 没存过的先打个日志报错
+ if (!TransitionDic.TryGetValue(curState, nextState, out var command))
+ {
+ Debug.Log($"源为{curState.ToString()}, 目标为{nextState.ToString()}, 转场命令不存在");
+ return;
+ }
+
+ // 存过的执行转场命令
+ StartCoroutine(command.Execute());
+ curState = nextState;
+ }
+
+ #endregion
}
}
diff --git a/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs b/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs
index 028c4a130..348e857bf 100644
--- a/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs
+++ b/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs
@@ -1,5 +1,4 @@
-using AibisDream.Framework;
-using UnityEngine;
+using UnityEngine;
using Yarn.Unity;
namespace AibisDream.FixSystem
diff --git a/Assets/Scripts/FixSystemNew/StateTransition.meta b/Assets/Scripts/FixSystemNew/StateTransition.meta
new file mode 100644
index 000000000..21c637b9d
--- /dev/null
+++ b/Assets/Scripts/FixSystemNew/StateTransition.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 51102ff352f0a80499cae251e2267fe4
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs b/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs
new file mode 100644
index 000000000..faff2503e
--- /dev/null
+++ b/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using AibisDream.Framework;
+using DG.Tweening;
+using UnityEngine;
+
+namespace AibisDream.FixSystem
+{
+ public enum FixState
+ {
+ Clinic,
+ CoolingMachine,
+ BodyModule,
+ Memory,
+ VisualSense,
+ Engine,
+ Gear
+ }
+
+ public interface ITransitionCommand
+ {
+ IEnumerator Execute();
+ }
+
+ public struct BodyModuleToEngineCommand : ITransitionCommand
+ {
+ // 引擎相机设置
+ private static readonly Vector3 CameraPos = new(-2.5f, 2.13f, -10);
+ private const float OrthographicSize = 2.5f;
+ private const float Duration = 2f;
+
+ public IEnumerator Execute()
+ {
+ var bodyModuleSystem = FixSystemCenter.SystemDic.Get();
+ var engineSystem = FixSystemCenter.SystemDic.Get();
+
+ // 插头回到初始插孔
+ bodyModuleSystem.ResetPlug();
+ // 相机聚焦到目标位
+ var cameraSq = CameraKit.Instance.TransCamera(CameraPos, OrthographicSize, Duration);
+ while (cameraSq.active && !cameraSq.IsComplete())
+ {
+ yield return null;
+ }
+
+ // 打开引擎盖子
+ var coverSq = engineSystem.OpenCover();
+ while (coverSq.active && !coverSq.IsComplete())
+ {
+ yield return null;
+ }
+ }
+ }
+
+ public struct EngineToBodyModuleCommand : ITransitionCommand
+ {
+ private const float Duration = 2f;
+
+ public IEnumerator Execute()
+ {
+ var engineSystem = FixSystemCenter.SystemDic.Get();
+
+ // 关闭引擎盖
+ var coverSq = engineSystem.CloseCover();
+ while (coverSq.active && !coverSq.IsComplete())
+ {
+ yield return null;
+ }
+
+ // 相机还原
+ var cameraSq = CameraKit.Instance.ReturnInitCamera(Duration);
+ while (cameraSq.active && !cameraSq.IsComplete())
+ {
+ yield return null;
+ }
+ }
+ }
+
+ public struct EngineToGearCommand : ITransitionCommand
+ {
+ private const float Duration = 2f;
+ private static readonly Vector3 CameraPos = new(-2.5f, 2.13f, -10);
+
+ public IEnumerator Execute()
+ {
+ var engineSystem = FixSystemCenter.SystemDic.Get();
+ var gearSystem = FixSystemCenter.SystemDic.Get();
+ // 关闭一下引擎盖
+ var coverSq = engineSystem.CloseCover();
+ while (coverSq.active && !coverSq.IsComplete())
+ {
+ yield return null;
+ }
+
+ // 只需要移动一下相机就好了
+ var tween = CameraKit.Instance.TransCamera(CameraPos, Duration);
+ while (tween.active && !tween.IsComplete())
+ {
+ yield return null;
+ }
+
+ // 然后可以开启引擎盖
+
+ }
+ }
+
+ ///
+ /// 以两个Key为索引的Dic
+ ///
+ /// Value类型
+ public class StateDictionary
+ {
+ private readonly Dictionary _stateDic = new();
+
+ public T Get(FixState source, FixState target)
+ {
+ var key = new StateTransKey(source, target);
+ return _stateDic[key];
+ }
+
+ public void Add(FixState source, FixState target, T value)
+ {
+ var key = new StateTransKey(source, target);
+ _stateDic[key] = value;
+ }
+
+ public void Clear()
+ {
+ _stateDic.Clear();
+ }
+
+ public bool ContainsKey(FixState source, FixState target)
+ {
+ var key = new StateTransKey(source, target);
+ return _stateDic.ContainsKey(key);
+ }
+
+ public bool TryGetValue(FixState source, FixState target, out T value)
+ {
+ var key = new StateTransKey(source, target);
+ return _stateDic.TryGetValue(key, out value);
+ }
+
+ ///
+ /// 用于实现两个Key的Dictionary
+ ///
+ private class StateTransKey
+ {
+ private readonly FixState _sourceState;
+ private readonly FixState _targetState;
+
+ public StateTransKey(FixState sourceState, FixState targetState)
+ {
+ _sourceState = sourceState;
+ _targetState = targetState;
+ }
+
+ public override bool Equals(object obj)
+ {
+ // 类型不同肯定不相等
+ if (obj is not StateTransKey other) return false;
+ // 判断两个key相等
+ return _sourceState == other._sourceState && _targetState == other._targetState;
+ }
+
+ public override int GetHashCode()
+ {
+ return HashCode.Combine(_sourceState, _targetState);
+ }
+ }
+ }
+}
+
+
diff --git a/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs.meta b/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs.meta
new file mode 100644
index 000000000..bbd4ef39b
--- /dev/null
+++ b/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a69c67aba0d24b8994271ee886e11d3d
+timeCreated: 1733712418
\ No newline at end of file
diff --git a/Assets/Scripts/Framework/Core/Core.cs b/Assets/Scripts/Framework/Core/Core.cs
index f89da2f1d..b7f8fdac8 100644
--- a/Assets/Scripts/Framework/Core/Core.cs
+++ b/Assets/Scripts/Framework/Core/Core.cs
@@ -15,8 +15,6 @@ namespace AibisDream.Framework
public interface ISystem
{
void Init();
- void Enable();
- void Disable();
void Deinit();
}
diff --git a/Assets/Scripts/Framework/LifeCycle.meta b/Assets/Scripts/Framework/LifeCycle.meta
deleted file mode 100644
index c0076cae6..000000000
--- a/Assets/Scripts/Framework/LifeCycle.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Scripts/Framework/LifeCycle.meta
-guid: e83cc72ae645d204ba5edddce2e36596
-folderAsset: yes
-========
-guid: 39db4a518afdbd74f8c0100de0f68c74
->>>>>>>> develop:Assets/Scenes/ScanScopeTest.unity.meta
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/Framework/LifeCycle/LifeCycleManager.cs b/Assets/Scripts/Framework/LifeCycle/LifeCycleManager.cs
deleted file mode 100644
index 71c9f96c8..000000000
--- a/Assets/Scripts/Framework/LifeCycle/LifeCycleManager.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using AibisDream.Kit;
-using Yarn.Unity;
-
-namespace AibisDream
-{
- public class LifeCycleManager : Singleton
- {
- private ILifeCycle _lifeCycle;
-
- private void OnEnable()
- {
- SceneLoader.Instance.LoadSceneEvent += OnInit;
- SceneLoader.Instance.UnloadSceneEvent += OnSceneUnload;
- }
-
- private void OnDisable()
- {
- SceneLoader.Instance.LoadSceneEvent -= OnInit;
- SceneLoader.Instance.UnloadSceneEvent -= OnSceneUnload;
- }
-
- public void Register(ILifeCycle lifeCycle)
- {
- _lifeCycle = lifeCycle;
- }
-
- private void OnInit()
- {
- _lifeCycle?.OnInit();
- }
-
- [YarnCommand("game_start")]
- public void OnGameStart()
- {
- _lifeCycle?.OnGameStart();
- }
-
- [YarnCommand("game_end")]
- public void OnGameEnd()
- {
- _lifeCycle?.OnGameEnd();
- }
-
- private void OnSceneUnload()
- {
- _lifeCycle.OnSceneUnload();
- _lifeCycle = null;
- }
- }
-}
-
diff --git a/Assets/Scripts/Framework/LifeCycle/ModuleLifeCycle.cs b/Assets/Scripts/Framework/LifeCycle/ModuleLifeCycle.cs
deleted file mode 100644
index a91d6b9a1..000000000
--- a/Assets/Scripts/Framework/LifeCycle/ModuleLifeCycle.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using UnityEngine;
-
-namespace AibisDream
-{
- public interface ILifeCycle
- {
- void OnInit();
-
- void OnGameStart();
-
- void OnGameEnd();
-
- void OnSceneUnload();
- }
-
- public abstract class AbsLifeCycle : MonoBehaviour, ILifeCycle
- {
- private void Start()
- {
- LifeCycleManager.Instance.Register(this);
- }
-
- public abstract void OnInit();
- public abstract void OnGameStart();
- public abstract void OnGameEnd();
- public abstract void OnSceneUnload();
- }
-}
diff --git a/Assets/Scripts/Framework/Moveable/IMoveable.cs b/Assets/Scripts/Framework/Moveable/IMoveable.cs
index de6f4ee6e..6dff18dad 100644
--- a/Assets/Scripts/Framework/Moveable/IMoveable.cs
+++ b/Assets/Scripts/Framework/Moveable/IMoveable.cs
@@ -4,6 +4,8 @@ namespace AibisDream.Framework
{
public interface IMoveable
{
+ bool IsBlock { get; }
+
void StartMove();
void Move(Vector2 mousePos);
diff --git a/Assets/Scripts/Framework/Moveable/MoveableSystem.cs b/Assets/Scripts/Framework/Moveable/MoveableSystem.cs
index 9ad64840a..9e26b1931 100644
--- a/Assets/Scripts/Framework/Moveable/MoveableSystem.cs
+++ b/Assets/Scripts/Framework/Moveable/MoveableSystem.cs
@@ -41,6 +41,7 @@ namespace AibisDream.Framework
{
_dragObj = hit.collider.gameObject.GetComponent();
if (_dragObj == null) return;
+ if (_dragObj.IsBlock) return;
_dragObj.StartMove();
_offset = hit.collider.transform.position - GetMouseAsWorldPoint();
diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs
new file mode 100644
index 000000000..039536c0f
--- /dev/null
+++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs
@@ -0,0 +1,48 @@
+using AibisDream.Kit;
+using DG.Tweening;
+using UnityEngine;
+
+namespace AibisDream.Framework
+{
+ public class CameraKit : SingletonBase
+ {
+ private readonly Camera _mainCamera = Camera.main;
+
+ private Vector3 _initPos;
+ private float _initOrthographicSize;
+
+ private CameraKit() {}
+
+ public override void OnSingletonInit()
+ {
+ // 无需初始化
+ }
+
+ public void ResetCamara()
+ {
+ _mainCamera.transform.position = _initPos;
+ _mainCamera.orthographicSize = _initOrthographicSize;
+ }
+
+ public Tween TransCamera(Vector3 targetPos, float targetOrthographicSize, float duration)
+ {
+ var sq = DOTween.Sequence();
+ // 移动
+ sq.Join(_mainCamera.transform.DOMove(targetPos, duration));
+ // 缩放
+ sq.Join(_mainCamera.DOOrthoSize(targetOrthographicSize, duration));
+
+ return sq;
+ }
+
+ public Tween ReturnInitCamera(float duration)
+ {
+ return TransCamera(_initPos, _initOrthographicSize, duration);
+ }
+
+ public Tween TransCamera(Vector3 targetPos, float duration)
+ {
+ return _mainCamera.transform.DOMove(targetPos, duration);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs.meta b/Assets/Scripts/Framework/OtherKit/CameraKit.cs.meta
new file mode 100644
index 000000000..5067e7e2d
--- /dev/null
+++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ab36b5f5522a4b42bf6e1054aa92bdce
+timeCreated: 1733666233
\ No newline at end of file
diff --git a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs
index f46c77588..21c993e36 100644
--- a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs
+++ b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs
@@ -1,4 +1,5 @@
using System;
+using AibisDream.FixSystem;
using UnityEngine;
namespace AibisDream.Framework
@@ -24,6 +25,7 @@ namespace AibisDream.Framework
_iocContainer ??= new IOCContainer();
// 在这里添加相应的工具
Register(new MoveableSystem());
+ Register(new TransTest());
}
private void Register(T kit) where T : IMonoKit
@@ -41,6 +43,17 @@ namespace AibisDream.Framework
private void Update() => OnUpdate?.Invoke();
}
+ public class TransTest : IMonoKit
+ {
+ public void OnUpdate()
+ {
+ if (Input.GetKeyDown(KeyCode.K))
+ {
+ FixSystemCenter.Instance.TransToNextState(FixState.Engine);
+ }
+ }
+ }
+
public interface IMonoKit
{
void OnUpdate();
diff --git a/Assets/Scripts/MiniGame/Engine/AirGate.cs b/Assets/Scripts/MiniGame/Engine/AirGate.cs
index 15e8b71d9..46e2b5276 100644
--- a/Assets/Scripts/MiniGame/Engine/AirGate.cs
+++ b/Assets/Scripts/MiniGame/Engine/AirGate.cs
@@ -1,6 +1,5 @@
using AibisDream.Framework;
using UnityEngine;
-using UnityEngine.Serialization;
namespace AibisDream
{
@@ -13,6 +12,8 @@ namespace AibisDream
[SerializeField] private float heightY;
private Vector3 _offset;
+
+ public bool IsBlock { get; }
private void Awake()
{
diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs
index 7b190f915..9a4ff3c61 100644
--- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs
+++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs
@@ -4,7 +4,9 @@ using AibisDream.FixSystem;
using AibisDream.Framework;
using AibisDream.Kit;
using AibisDream.Utility;
+using DG.Tweening;
using UnityEngine;
+using UnityEngine.Serialization;
namespace AibisDream
{
@@ -12,16 +14,24 @@ namespace AibisDream
{
public static string DataPath = Application.streamingAssetsPath + "/LevelData/EngineSystem/";
+ private SpriteRenderer _cover;
+
[Header("系统配置")] [SerializeField] public EngineConfig config;
[Header("系统数据")] [SerializeField] private EngineData engineData;
+ [FormerlySerializedAs("盖板移动时间")] [SerializeField]
+ private float coverMoveDuration = 5f;
+ [FormerlySerializedAs("盖板移动距离")] [SerializeField]
+ private float coverMoveDistance = 2.8f;
+
private bool IsValid => engineData.isValid.Value;
-
+
public event Action UpdateDashboard;
private void Awake()
{
FixSystemCenter.SystemDic.Register(this);
+ _cover = transform.Find("Cover").GetComponent();
}
private void OnEnable()
@@ -58,13 +68,65 @@ namespace AibisDream
// 失效期无法加油门
}
+ ///
+ /// 更新引擎气门变化
+ ///
+ /// 当前气门等级
public void UpdateAirLevel(int curLevel)
{
engineData.UpdateAirLevel(curLevel, config.maxLevel);
}
+ ///
+ /// 打开盖板
+ ///
+ /// 动画序列
+ public Tween OpenCover()
+ {
+ var sq = DOTween.Sequence();
+ // 盖板上移
+ var moveDis = new Vector3(0, coverMoveDistance, 0);
+ sq.Join(_cover.transform.DOBlendableMoveBy(moveDis, coverMoveDuration));
+ // 盖板淡出
+ sq.Join(_cover.DOFade(0, coverMoveDuration));
+
+ // 为引擎系统解锁
+ sq.OnComplete(Unlock);
+
+ return sq;
+ }
+
+ ///
+ /// 关闭盖板
+ ///
+ /// 动画序列
+ public Tween CloseCover()
+ {
+ var sq = DOTween.Sequence();
+ sq.Join(_cover.DOFade(1, coverMoveDuration));
+
+ var moveDis = new Vector3(0, -coverMoveDistance, 0);
+ sq.Join(_cover.transform.DOBlendableMoveBy(moveDis, coverMoveDuration));
+
+ // 锁定引擎系统
+ sq.OnComplete(Lock);
+
+ return sq;
+ }
+
+ public void Lock()
+ {
+ // 禁止油门和气门
+
+ }
+
+ public void Unlock()
+ {
+ // 开启油门和气门
+ }
+
#region 数据加载与保存
-
+
private string[] _keyOptions;
public override string CurDataKey { get; set; }
@@ -81,7 +143,7 @@ namespace AibisDream
Debug.Log("配置项名称为空");
return;
}
-
+
if (!ConfigUtil.Instance.TryLoadConfig(DataPath + CurDataKey,
out var data))
{
@@ -94,13 +156,14 @@ namespace AibisDream
public override void Save()
{
- if (string.IsNullOrEmpty(CurDataKey))
+ if (string.IsNullOrEmpty(CurDataKey))
{
Debug.Log("名称不为空");
return;
}
+
ConfigUtil.Instance.SaveConfig(config, DataPath + CurDataKey);
-
+
if (!_keyOptions.Contains(CurDataKey))
{
// 重新读取key
@@ -176,6 +239,8 @@ namespace AibisDream
{
isValid.Value = false;
}
+
+ inAirRange = curInAirRange;
}
public void UpdateAirLevel(int level, int maxLevel)
diff --git a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs
index 027d1f139..9fa62402e 100644
--- a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs
+++ b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs
@@ -6,8 +6,8 @@ namespace AibisDream
{
private Transform _pointer;
- [SerializeField] private float leftPosX;
- [SerializeField] private float rightPosX;
+ [SerializeField] private float leftRot;
+ [SerializeField] private float rightRot;
protected override void OnStart()
{
@@ -16,8 +16,9 @@ namespace AibisDream
protected override void UpdateDashboard(EngineData data)
{
- var targetPosX = (rightPosX - leftPosX) * data.curSpeed + leftPosX;
- _pointer.localPosition = new Vector3(targetPosX, _pointer.localPosition.y, _pointer.localPosition.y);
+ var targetRot = (rightRot - leftRot) * data.curSpeed + leftRot;
+
+ _pointer.eulerAngles = new Vector3(0, 0, -targetRot);
}
}
}
diff --git a/Assets/Scripts/MiniGame/Engine/StoneLifeCycle.cs b/Assets/Scripts/MiniGame/Engine/StoneLifeCycle.cs
deleted file mode 100644
index f548d95b8..000000000
--- a/Assets/Scripts/MiniGame/Engine/StoneLifeCycle.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using UnityEngine;
-
-namespace AibisDream
-{
- public class StoneLifeCycle : AbsLifeCycle
- {
- public override void OnInit()
- {
- Debug.Log("场景加载");
- }
-
- public override void OnGameStart()
- {
- GameObject.Find("Gear System").gameObject.SetActive(true);
- }
-
- public override void OnGameEnd()
- {
- GameObject.Find("Gear System").gameObject.SetActive(false);
- GameObject.Find("Engine System").gameObject.SetActive(false);
- }
-
- public override void OnSceneUnload()
- {
- Debug.Log("场景卸载");
- }
- }
-}
-
diff --git a/Assets/Scripts/MiniGame/Engine/StoneLifeCycle.cs.meta b/Assets/Scripts/MiniGame/Engine/StoneLifeCycle.cs.meta
deleted file mode 100644
index 89cb56bf8..000000000
--- a/Assets/Scripts/MiniGame/Engine/StoneLifeCycle.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 9d2cedabb95163448b13ee5c471b832a
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/MiniGame/Gear/Gear.cs b/Assets/Scripts/MiniGame/Gear/Gear.cs
index 489e04be6..39d202a80 100644
--- a/Assets/Scripts/MiniGame/Gear/Gear.cs
+++ b/Assets/Scripts/MiniGame/Gear/Gear.cs
@@ -15,6 +15,8 @@ namespace AibisDream
private SpriteRenderer _spriteRenderer;
public Shaft targetShaft;
+
+ public bool IsBlock { get; }
private void Awake()
{
diff --git a/Assets/Scripts/MiniGame/Gear/GearSystem.cs b/Assets/Scripts/MiniGame/Gear/GearSystem.cs
index a5fcc07ac..e4bd1ef64 100644
--- a/Assets/Scripts/MiniGame/Gear/GearSystem.cs
+++ b/Assets/Scripts/MiniGame/Gear/GearSystem.cs
@@ -109,6 +109,8 @@ namespace AibisDream
{
Debug.Log("达成目标");
}
+
+
#region 数据保存与加载