diff --git a/Assets/Editor/Script/EngineSystemEditor.cs b/Assets/Editor/Script/EngineSystemEditor.cs
deleted file mode 100644
index da8848100..000000000
--- a/Assets/Editor/Script/EngineSystemEditor.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using UnityEditor;
-
-namespace AibisDream.SystemEditor
-{
- [CustomEditor(typeof(EngineSystem))]
- public class EngineSystemEditor : SystemHasDataEditor
- {
- }
-}
\ No newline at end of file
diff --git a/Assets/Editor/Script/EngineSystemEditor.cs.meta b/Assets/Editor/Script/EngineSystemEditor.cs.meta
deleted file mode 100644
index 1fd8d6125..000000000
--- a/Assets/Editor/Script/EngineSystemEditor.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 4f1fc42dd0984554846404f2cc1e1b02
-timeCreated: 1732926273
\ No newline at end of file
diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb b/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb
index 9a8b99150..8c4bcc9fc 100644
--- a/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb
+++ b/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b51db77b8fc46305f5bb689e82d7c3b7162bd477a041a516db155142f73329a3
-size 25773125
+oid sha256:366f8330044bb08ef1f76e7e32d18d6b2d4d76d9eb5ec8a7f8d9c78f64c7ae4a
+size 25779028
diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb.meta b/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb.meta
index b04b51da4..3bcbadf00 100644
--- a/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb.meta
+++ b/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb.meta
@@ -97,7 +97,7 @@ ScriptedImporter:
- name: "\u5DE6\u4FA7\u754C\u9762"
originalName:
pivot: {x: 0.5, y: 0.5}
- alignment: 0
+ alignment: 9
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
@@ -122,8 +122,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2599
- y: 6657
+ x: 4056
+ y: 1378
width: 20
height: 43
spriteID: d7537a977e1aff249a7a37ce740f186d
@@ -134,7 +134,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2599, y: 6657}
+ uvTransform: {x: 4056, y: 1378}
spritePosition: {x: 1294, y: 1305}
- name: "\u8F6C\u901F\u8868"
originalName:
@@ -164,8 +164,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2143
- y: 6615
+ x: 3984
+ y: 224
width: 86
height: 86
spriteID: 0d86bbea963bd064fa75f3e32ddc6171
@@ -176,7 +176,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2143, y: 6615}
+ uvTransform: {x: 3984, y: 224}
spritePosition: {x: 1182, y: 1058}
- name: "\u9F7F\u8F6E\u6258\u76D8"
originalName:
@@ -248,8 +248,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2660
- y: 6441
+ x: 3852
+ y: 940
width: 162
height: 162
spriteID: ce498871e2f93464682178488c9f2eeb
@@ -260,7 +260,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2660, y: 6441}
+ uvTransform: {x: 3852, y: 940}
spritePosition: {x: 2165, y: 999}
- name: "\u9AD8\u7EA7\u9F7F\u8F6EA"
originalName:
@@ -269,8 +269,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2317
- y: 6441
+ x: 3852
+ y: 593
width: 166
height: 165
spriteID: d1eef4db336a0a44b97a09b6c3f59b51
@@ -281,7 +281,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2317, y: 6441}
+ uvTransform: {x: 3852, y: 593}
spritePosition: {x: 1957, y: 1000}
- name: "\u574F\u9F7F\u8F6EC"
originalName:
@@ -290,8 +290,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3347
- y: 6441
+ x: 3852
+ y: 1579
width: 144
height: 154
spriteID: 5fe6954d52480e344a63304c96ad02ec
@@ -302,7 +302,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3347, y: 6441}
+ uvTransform: {x: 3852, y: 1579}
spritePosition: {x: 531, y: 1262}
- name: "\u574F\u9F7F\u8F6EB"
originalName:
@@ -311,8 +311,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2830
- y: 6441
+ x: 3852
+ y: 1110
width: 154
height: 166
spriteID: 7f6287eef393ecf4b811f77f2530ab60
@@ -323,7 +323,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2830, y: 6441}
+ uvTransform: {x: 3852, y: 1110}
spritePosition: {x: 624, y: 1096}
- name: "\u574F\u9F7F\u8F6EA"
originalName:
@@ -332,8 +332,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2491
- y: 6441
+ x: 3852
+ y: 766
width: 161
height: 166
spriteID: 892f0014245c39c48a1574f6adecda1a
@@ -344,7 +344,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2491, y: 6441}
+ uvTransform: {x: 3852, y: 766}
spritePosition: {x: 442, y: 1104}
- name: "\u788E\u7247E"
originalName:
@@ -353,8 +353,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2599
- y: 6615
+ x: 4014
+ y: 1378
width: 34
height: 34
spriteID: 00173d16f3962a34da66f56604ff84fe
@@ -365,7 +365,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2599, y: 6615}
+ uvTransform: {x: 4014, y: 1378}
spritePosition: {x: 946, y: 777}
- name: "\u788E\u7247D"
originalName:
@@ -374,8 +374,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2660
- y: 6611
+ x: 3675
+ y: 5549
width: 162
height: 105
spriteID: 25a080d1c30706f4b827080b388fd6ed
@@ -386,7 +386,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2660, y: 6611}
+ uvTransform: {x: 3675, y: 5549}
spritePosition: {x: 794, y: 772}
- name: "\u788E\u7247C"
originalName:
@@ -395,8 +395,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2830
- y: 6615
+ x: 3845
+ y: 5549
width: 114
height: 92
spriteID: 7f63a61d19250aa44ac37596276ace1c
@@ -407,7 +407,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2830, y: 6615}
+ uvTransform: {x: 3845, y: 5549}
spritePosition: {x: 659, y: 780}
- name: "\u788E\u7247B"
originalName:
@@ -416,8 +416,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2237
- y: 6615
+ x: 4014
+ y: 1284
width: 68
height: 86
spriteID: 0edfdf4071c16ce4197d75fa6a7c4f0d
@@ -428,7 +428,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2237, y: 6615}
+ uvTransform: {x: 4014, y: 1284}
spritePosition: {x: 592, y: 782}
- name: "\u5531\u9488"
originalName:
@@ -437,8 +437,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3675
- y: 5577
+ x: 4014
+ y: 1110
width: 76
height: 73
spriteID: 2ddca43741137c54ba5d7e72ff04353c
@@ -449,7 +449,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3675, y: 5577}
+ uvTransform: {x: 4014, y: 1110}
spritePosition: {x: 1504, y: 990}
- name: "\u5531\u9488\u81C2"
originalName:
@@ -458,8 +458,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3675
- y: 5549
+ x: 3175
+ y: 5554
width: 293
height: 20
spriteID: 6adc419d9b00341419026a5802c9d8d6
@@ -470,7 +470,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3675, y: 5549}
+ uvTransform: {x: 3175, y: 5554}
spritePosition: {x: 1606, y: 1026}
- name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EA"
originalName:
@@ -479,8 +479,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2992
- y: 6441
+ x: 3852
+ y: 1284
width: 154
height: 154
spriteID: 6c71322698065a54eb5e2a1fb4f86514
@@ -491,7 +491,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2992, y: 6441}
+ uvTransform: {x: 3852, y: 1284}
spritePosition: {x: 1454, y: 1050}
- name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EB"
originalName:
@@ -501,7 +501,7 @@ ScriptedImporter:
rect:
serializedVersion: 2
x: 3962
- y: 5054
+ y: 5192
width: 128
height: 130
spriteID: d2f1a521626f14145b0d2b884c5dbf6f
@@ -512,7 +512,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3962, y: 5054}
+ uvTransform: {x: 3962, y: 5192}
spritePosition: {x: 1406, y: 946}
- name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EC"
originalName:
@@ -521,8 +521,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2143
- y: 6441
+ x: 3852
+ y: 419
width: 166
height: 166
spriteID: 33e8c8bbebb24d34286d612f0b261daa
@@ -533,7 +533,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2143, y: 6441}
+ uvTransform: {x: 3852, y: 419}
spritePosition: {x: 1476, y: 824}
- name: "\u53D8\u901F\u7BB1\u5531\u7247\u9F7F\u8F6E"
originalName:
@@ -542,8 +542,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3154
- y: 6574
+ x: 3962
+ y: 5054
width: 130
height: 130
spriteID: db22083879843b843b69dc1550fe5bfc
@@ -554,7 +554,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3154, y: 6574}
+ uvTransform: {x: 3962, y: 5054}
spritePosition: {x: 1318, y: 859}
- name: "\u53D8\u901F\u7BB1\u8F93\u51FA\u9F7F\u8F6E"
originalName:
@@ -563,8 +563,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2599
- y: 6708
+ x: 4056
+ y: 1429
width: 0
height: 0
spriteID: 9e9c52a5ed9bedc49995cb646b5911c5
@@ -575,7 +575,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2437, y: 6548}
+ uvTransform: {x: 3894, y: 1269}
spritePosition: {x: 1782, y: 1048}
- name: "\u53D8\u901F\u7BB1"
originalName:
@@ -605,8 +605,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3154
- y: 6441
+ x: 3852
+ y: 1446
width: 185
height: 125
spriteID: fa945402410b1f347a1469cfe5243495
@@ -617,8 +617,50 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3154, y: 6441}
+ uvTransform: {x: 3852, y: 1446}
spritePosition: {x: 1073, y: 1212}
+ - name: "\u62C9\u7EF3\u906E\u7F69"
+ originalName:
+ pivot: {x: 0.5, y: 0.5}
+ alignment: 0
+ border: {x: 0, y: 0, z: 0, w: 0}
+ rect:
+ serializedVersion: 2
+ x: 3983
+ y: 5675
+ width: 108
+ height: 345
+ spriteID: 96589d249466f6d4db2a673bb8211c54
+ spriteBone: []
+ spriteOutline: []
+ vertices: []
+ spritePhysicsOutline: []
+ indices:
+ edges: []
+ tessellationDetail: 0
+ uvTransform: {x: 3981, y: 5674}
+ spritePosition: {x: 747, y: 1025}
+ - name: "\u62C9\u7EF3"
+ originalName:
+ pivot: {x: 0.5, y: 0.03}
+ alignment: 9
+ border: {x: 0, y: 0, z: 0, w: 0}
+ rect:
+ serializedVersion: 2
+ x: 3852
+ y: 4
+ width: 124
+ height: 407
+ spriteID: bdee20e596cc4d74fade29040e21b79f
+ spriteBone: []
+ spriteOutline: []
+ vertices: []
+ spritePhysicsOutline: []
+ indices:
+ edges: []
+ tessellationDetail: 0
+ uvTransform: {x: 3852, y: 4}
+ spritePosition: {x: 738, y: 958}
- name: "\u5F15\u64CE\u5916\u9F7F\u8F6E"
originalName:
pivot: {x: 0.5, y: 0.5}
@@ -647,8 +689,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2317
- y: 6614
+ x: 3984
+ y: 318
width: 86
height: 86
spriteID: 51b6debf8b8e0c342962b76031b04cdc
@@ -659,7 +701,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2317, y: 6614}
+ uvTransform: {x: 3984, y: 318}
spritePosition: {x: 900, y: 1231}
- name: "\u5FC3\u810F\u76D6\u5B50"
originalName:
@@ -689,8 +731,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3983
- y: 5675
+ x: 3852
+ y: 1741
width: 16
height: 243
spriteID: d1fd39ae7def9f8429306cbdf5b6226c
@@ -701,7 +743,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3983, y: 5675}
+ uvTransform: {x: 3852, y: 1741}
spritePosition: {x: 1287, y: 1618}
- name: "\u8FDB\u6C14\u5EA6\u91CF"
originalName:
@@ -710,8 +752,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3983
- y: 5926
+ x: 3876
+ y: 1741
width: 16
height: 243
spriteID: d504cc99c8f5dc14a9dca37818f3686a
@@ -722,7 +764,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3983, y: 5926}
+ uvTransform: {x: 3876, y: 1741}
spritePosition: {x: 1204, y: 1618}
- name: "\u6C14\u95E8\u62C9\u6746"
originalName:
@@ -731,8 +773,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3962
- y: 5302
+ x: 3876
+ y: 1992
width: 106
height: 28
spriteID: 0234a2ed53d4a2d44a7c0c9ae9a4c0b7
@@ -743,7 +785,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3962, y: 5302}
+ uvTransform: {x: 3876, y: 1992}
spritePosition: {x: 1031, y: 1666}
- name: "\u62C9\u6746\u6C60"
originalName:
@@ -773,8 +815,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2607
- y: 6708
+ x: 4064
+ y: 1429
width: 0
height: 0
spriteID: c4af958de8260c04c998bba16422774b
@@ -785,7 +827,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2421, y: 6522}
+ uvTransform: {x: 3878, y: 1243}
spritePosition: {x: 1459, y: 1570}
- name: "\u5FC3\u810F\u9F7F\u8F6EB"
originalName:
@@ -794,8 +836,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2615
- y: 6708
+ x: 4072
+ y: 1429
width: 0
height: 0
spriteID: 9e1fb2c4e71c07348835a03b647f2390
@@ -806,7 +848,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2409, y: 6501}
+ uvTransform: {x: 3866, y: 1222}
spritePosition: {x: 1344, y: 1445}
- name: "\u5FC3\u810F\u9F7F\u8F6EC"
originalName:
@@ -815,8 +857,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2599
- y: 6716
+ x: 4056
+ y: 1437
width: 0
height: 0
spriteID: 10cfd30a75e3f13498f0e156ee72fd9a
@@ -827,7 +869,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2439, y: 6557}
+ uvTransform: {x: 3896, y: 1278}
spritePosition: {x: 1295, y: 1611}
- name: "\u5FC3\u810F\u9F7F\u8F6ED"
originalName:
@@ -836,8 +878,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2607
- y: 6716
+ x: 4064
+ y: 1437
width: 0
height: 0
spriteID: 7b3c12797bd298e498872da80d3c9774
@@ -848,7 +890,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2371, y: 6480}
+ uvTransform: {x: 3828, y: 1201}
spritePosition: {x: 1622, y: 1454}
- name: "\u5FC3\u810F\u9F7F\u8F6EE"
originalName:
@@ -857,8 +899,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2615
- y: 6716
+ x: 4072
+ y: 1437
width: 0
height: 0
spriteID: b3746e118421a8f469f19af5c28ae880
@@ -869,7 +911,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2485, y: 6586}
+ uvTransform: {x: 3942, y: 1307}
spritePosition: {x: 1541, y: 1536}
- name: "\u5FC3\u810F\u5F15\u64CE"
originalName:
@@ -899,8 +941,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 3962
- y: 5192
+ x: 3967
+ y: 5549
width: 100
height: 102
spriteID: 083fac6154604144c8a51ad9da1359f8
@@ -911,7 +953,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 3962, y: 5192}
+ uvTransform: {x: 3967, y: 5549}
spritePosition: {x: 1990, y: 1443}
- name: "\u80C3\u63D2\u5B54"
originalName:
@@ -920,8 +962,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2992
- y: 6603
+ x: 3984
+ y: 4
width: 100
height: 102
spriteID: f29558bb0c039ec4f96c64e296bbd05b
@@ -932,7 +974,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2992, y: 6603}
+ uvTransform: {x: 3984, y: 4}
spritePosition: {x: 1018, y: 206}
- name: "\u80C3"
originalName:
@@ -962,8 +1004,8 @@ ScriptedImporter:
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
- x: 2491
- y: 6615
+ x: 3984
+ y: 114
width: 100
height: 102
spriteID: 435ef27b284ac1242a7e286c6c25d48b
@@ -974,7 +1016,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
- uvTransform: {x: 2491, y: 6615}
+ uvTransform: {x: 3984, y: 114}
spritePosition: {x: 1783, y: 446}
- name: "\u809D"
originalName:
@@ -1159,7 +1201,7 @@ ScriptedImporter:
parentIndex: 1
spriteID: d7537a977e1aff249a7a37ce740f186d
layerID: 229
- mosaicPosition: {x: 2599, y: 6657}
+ mosaicPosition: {x: 4056, y: 1378}
flatten: 0
isImported: 1
isVisible: 1
@@ -1179,7 +1221,7 @@ ScriptedImporter:
parentIndex: 1
spriteID: 0d86bbea963bd064fa75f3e32ddc6171
layerID: 260
- mosaicPosition: {x: 2143, y: 6615}
+ mosaicPosition: {x: 3984, y: 224}
flatten: 0
isImported: 1
isVisible: 1
@@ -1229,7 +1271,7 @@ ScriptedImporter:
parentIndex: 8
spriteID: ce498871e2f93464682178488c9f2eeb
layerID: 786
- mosaicPosition: {x: 2660, y: 6441}
+ mosaicPosition: {x: 3852, y: 940}
flatten: 0
isImported: 1
isVisible: 1
@@ -1239,7 +1281,7 @@ ScriptedImporter:
parentIndex: 8
spriteID: d1eef4db336a0a44b97a09b6c3f59b51
layerID: 712
- mosaicPosition: {x: 2317, y: 6441}
+ mosaicPosition: {x: 3852, y: 593}
flatten: 0
isImported: 1
isVisible: 1
@@ -1259,7 +1301,7 @@ ScriptedImporter:
parentIndex: 11
spriteID: 5fe6954d52480e344a63304c96ad02ec
layerID: 698
- mosaicPosition: {x: 3347, y: 6441}
+ mosaicPosition: {x: 3852, y: 1579}
flatten: 0
isImported: 1
isVisible: 1
@@ -1269,7 +1311,7 @@ ScriptedImporter:
parentIndex: 11
spriteID: 7f6287eef393ecf4b811f77f2530ab60
layerID: 697
- mosaicPosition: {x: 2830, y: 6441}
+ mosaicPosition: {x: 3852, y: 1110}
flatten: 0
isImported: 1
isVisible: 1
@@ -1279,7 +1321,7 @@ ScriptedImporter:
parentIndex: 11
spriteID: 892f0014245c39c48a1574f6adecda1a
layerID: 687
- mosaicPosition: {x: 2491, y: 6441}
+ mosaicPosition: {x: 3852, y: 766}
flatten: 0
isImported: 1
isVisible: 1
@@ -1299,7 +1341,7 @@ ScriptedImporter:
parentIndex: 15
spriteID: 00173d16f3962a34da66f56604ff84fe
layerID: 693
- mosaicPosition: {x: 2599, y: 6615}
+ mosaicPosition: {x: 4014, y: 1378}
flatten: 0
isImported: 1
isVisible: 1
@@ -1309,7 +1351,7 @@ ScriptedImporter:
parentIndex: 15
spriteID: 25a080d1c30706f4b827080b388fd6ed
layerID: 691
- mosaicPosition: {x: 2660, y: 6611}
+ mosaicPosition: {x: 3675, y: 5549}
flatten: 0
isImported: 1
isVisible: 1
@@ -1319,7 +1361,7 @@ ScriptedImporter:
parentIndex: 15
spriteID: 7f63a61d19250aa44ac37596276ace1c
layerID: 692
- mosaicPosition: {x: 2830, y: 6615}
+ mosaicPosition: {x: 3845, y: 5549}
flatten: 0
isImported: 1
isVisible: 1
@@ -1329,7 +1371,7 @@ ScriptedImporter:
parentIndex: 15
spriteID: 0edfdf4071c16ce4197d75fa6a7c4f0d
layerID: 695
- mosaicPosition: {x: 2237, y: 6615}
+ mosaicPosition: {x: 4014, y: 1284}
flatten: 0
isImported: 1
isVisible: 1
@@ -1359,7 +1401,7 @@ ScriptedImporter:
parentIndex: 21
spriteID: 2ddca43741137c54ba5d7e72ff04353c
layerID: 791
- mosaicPosition: {x: 3675, y: 5577}
+ mosaicPosition: {x: 4014, y: 1110}
flatten: 0
isImported: 1
isVisible: 1
@@ -1369,7 +1411,7 @@ ScriptedImporter:
parentIndex: 21
spriteID: 6adc419d9b00341419026a5802c9d8d6
layerID: 797
- mosaicPosition: {x: 3675, y: 5549}
+ mosaicPosition: {x: 3175, y: 5554}
flatten: 0
isImported: 1
isVisible: 1
@@ -1379,7 +1421,7 @@ ScriptedImporter:
parentIndex: 1
spriteID: 6c71322698065a54eb5e2a1fb4f86514
layerID: 287
- mosaicPosition: {x: 2992, y: 6441}
+ mosaicPosition: {x: 3852, y: 1284}
flatten: 0
isImported: 1
isVisible: 1
@@ -1389,7 +1431,7 @@ ScriptedImporter:
parentIndex: 1
spriteID: d2f1a521626f14145b0d2b884c5dbf6f
layerID: 274
- mosaicPosition: {x: 3962, y: 5054}
+ mosaicPosition: {x: 3962, y: 5192}
flatten: 0
isImported: 1
isVisible: 1
@@ -1399,7 +1441,7 @@ ScriptedImporter:
parentIndex: 1
spriteID: 33e8c8bbebb24d34286d612f0b261daa
layerID: 280
- mosaicPosition: {x: 2143, y: 6441}
+ mosaicPosition: {x: 3852, y: 419}
flatten: 0
isImported: 1
isVisible: 1
@@ -1409,7 +1451,7 @@ ScriptedImporter:
parentIndex: 1
spriteID: db22083879843b843b69dc1550fe5bfc
layerID: 279
- mosaicPosition: {x: 3154, y: 6574}
+ mosaicPosition: {x: 3962, y: 5054}
flatten: 0
isImported: 1
isVisible: 1
@@ -1419,7 +1461,7 @@ ScriptedImporter:
parentIndex: 1
spriteID: 9e9c52a5ed9bedc49995cb646b5911c5
layerID: 281
- mosaicPosition: {x: 2599, y: 6708}
+ mosaicPosition: {x: 4056, y: 1429}
flatten: 0
isImported: 1
isVisible: 1
@@ -1439,7 +1481,7 @@ ScriptedImporter:
parentIndex: 1
spriteID: fa945402410b1f347a1469cfe5243495
layerID: 254
- mosaicPosition: {x: 3154, y: 6441}
+ mosaicPosition: {x: 3852, y: 1446}
flatten: 0
isImported: 1
isVisible: 1
@@ -1453,6 +1495,26 @@ ScriptedImporter:
flatten: 0
isImported: 0
isVisible: 1
+ - name: "\u62C9\u7EF3\u906E\u7F69"
+ spriteName: "\u62C9\u7EF3\u906E\u7F69"
+ isGroup: 0
+ parentIndex: 31
+ spriteID: 96589d249466f6d4db2a673bb8211c54
+ layerID: 806
+ mosaicPosition: {x: 3983, y: 5675}
+ flatten: 0
+ isImported: 1
+ isVisible: 1
+ - name: "\u62C9\u7EF3"
+ spriteName: "\u62C9\u7EF3"
+ isGroup: 0
+ parentIndex: 31
+ spriteID: bdee20e596cc4d74fade29040e21b79f
+ layerID: 804
+ mosaicPosition: {x: 3852, y: 4}
+ flatten: 0
+ isImported: 1
+ isVisible: 1
- name: "\u5F15\u64CE\u5916\u9F7F\u8F6E"
spriteName: "\u5F15\u64CE\u5916\u9F7F\u8F6E"
isGroup: 0
@@ -1476,17 +1538,17 @@ ScriptedImporter:
- name: "\u5FC3\u810F\u63D2\u5B54"
spriteName: "\u5FC3\u810F\u63D2\u5B54"
isGroup: 0
- parentIndex: 33
+ parentIndex: 35
spriteID: 51b6debf8b8e0c342962b76031b04cdc
layerID: 307
- mosaicPosition: {x: 2317, y: 6614}
+ mosaicPosition: {x: 3984, y: 318}
flatten: 0
isImported: 1
isVisible: 1
- name: "\u5FC3\u810F\u76D6\u5B50"
spriteName: "\u5FC3\u810F\u76D6\u5B50"
isGroup: 0
- parentIndex: 33
+ parentIndex: 35
spriteID: 2f776ec13f0fe234ab7735824e9a4001
layerID: 608
mosaicPosition: {x: 3175, y: 4340}
@@ -1506,37 +1568,37 @@ ScriptedImporter:
- name: "\u55B7\u6CB9\u5EA6\u91CF"
spriteName: "\u55B7\u6CB9\u5EA6\u91CF"
isGroup: 0
- parentIndex: 36
+ parentIndex: 38
spriteID: d1fd39ae7def9f8429306cbdf5b6226c
layerID: 421
- mosaicPosition: {x: 3983, y: 5675}
+ mosaicPosition: {x: 3852, y: 1741}
flatten: 0
isImported: 1
isVisible: 1
- name: "\u8FDB\u6C14\u5EA6\u91CF"
spriteName: "\u8FDB\u6C14\u5EA6\u91CF"
isGroup: 0
- parentIndex: 36
+ parentIndex: 38
spriteID: d504cc99c8f5dc14a9dca37818f3686a
layerID: 420
- mosaicPosition: {x: 3983, y: 5926}
+ mosaicPosition: {x: 3876, y: 1741}
flatten: 0
isImported: 1
isVisible: 1
- name: "\u6C14\u95E8\u62C9\u6746"
spriteName: "\u6C14\u95E8\u62C9\u6746"
isGroup: 0
- parentIndex: 36
+ parentIndex: 38
spriteID: 0234a2ed53d4a2d44a7c0c9ae9a4c0b7
layerID: 295
- mosaicPosition: {x: 3962, y: 5302}
+ mosaicPosition: {x: 3876, y: 1992}
flatten: 0
isImported: 1
isVisible: 1
- name: "\u62C9\u6746\u6C60"
spriteName: "\u62C9\u6746\u6C60"
isGroup: 0
- parentIndex: 36
+ parentIndex: 38
spriteID: ccf5a0714985b474aaa4ac947ed3a220
layerID: 298
mosaicPosition: {x: 1424, y: 6726}
@@ -1546,50 +1608,50 @@ ScriptedImporter:
- name: "\u5FC3\u810F\u9F7F\u8F6EA"
spriteName: "\u5FC3\u810F\u9F7F\u8F6EA"
isGroup: 0
- parentIndex: 36
+ parentIndex: 38
spriteID: c4af958de8260c04c998bba16422774b
layerID: 446
- mosaicPosition: {x: 2607, y: 6708}
+ mosaicPosition: {x: 4064, y: 1429}
flatten: 0
isImported: 1
isVisible: 1
- name: "\u5FC3\u810F\u9F7F\u8F6EB"
spriteName: "\u5FC3\u810F\u9F7F\u8F6EB"
isGroup: 0
- parentIndex: 36
+ parentIndex: 38
spriteID: 9e1fb2c4e71c07348835a03b647f2390
layerID: 445
- mosaicPosition: {x: 2615, y: 6708}
+ mosaicPosition: {x: 4072, y: 1429}
flatten: 0
isImported: 1
isVisible: 1
- name: "\u5FC3\u810F\u9F7F\u8F6EC"
spriteName: "\u5FC3\u810F\u9F7F\u8F6EC"
isGroup: 0
- parentIndex: 36
+ parentIndex: 38
spriteID: 10cfd30a75e3f13498f0e156ee72fd9a
layerID: 444
- mosaicPosition: {x: 2599, y: 6716}
+ mosaicPosition: {x: 4056, y: 1437}
flatten: 0
isImported: 1
isVisible: 1
- name: "\u5FC3\u810F\u9F7F\u8F6ED"
spriteName: "\u5FC3\u810F\u9F7F\u8F6ED"
isGroup: 0
- parentIndex: 36
+ parentIndex: 38
spriteID: 7b3c12797bd298e498872da80d3c9774
layerID: 443
- mosaicPosition: {x: 2607, y: 6716}
+ mosaicPosition: {x: 4064, y: 1437}
flatten: 0
isImported: 1
isVisible: 1
- name: "\u5FC3\u810F\u9F7F\u8F6EE"
spriteName: "\u5FC3\u810F\u9F7F\u8F6EE"
isGroup: 0
- parentIndex: 36
+ parentIndex: 38
spriteID: b3746e118421a8f469f19af5c28ae880
layerID: 439
- mosaicPosition: {x: 2615, y: 6716}
+ mosaicPosition: {x: 4072, y: 1437}
flatten: 0
isImported: 1
isVisible: 1
@@ -1609,7 +1671,7 @@ ScriptedImporter:
parentIndex: -1
spriteID: 083fac6154604144c8a51ad9da1359f8
layerID: 238
- mosaicPosition: {x: 3962, y: 5192}
+ mosaicPosition: {x: 3967, y: 5549}
flatten: 0
isImported: 1
isVisible: 1
@@ -1619,7 +1681,7 @@ ScriptedImporter:
parentIndex: -1
spriteID: f29558bb0c039ec4f96c64e296bbd05b
layerID: 236
- mosaicPosition: {x: 2992, y: 6603}
+ mosaicPosition: {x: 3984, y: 4}
flatten: 0
isImported: 1
isVisible: 1
@@ -1639,7 +1701,7 @@ ScriptedImporter:
parentIndex: -1
spriteID: 435ef27b284ac1242a7e286c6c25d48b
layerID: 237
- mosaicPosition: {x: 2491, y: 6615}
+ mosaicPosition: {x: 3984, y: 114}
flatten: 0
isImported: 1
isVisible: 1
diff --git a/Assets/Resources/Prefabs/Fix/Body Module System.prefab b/Assets/Resources/Prefabs/Fix/Body Module System.prefab
index 1bbccb2e9..33d1c8f0b 100644
--- a/Assets/Resources/Prefabs/Fix/Body Module System.prefab
+++ b/Assets/Resources/Prefabs/Fix/Body Module System.prefab
@@ -810,12 +810,6 @@ MonoBehaviour:
bodyModuleGroup: {fileID: 2309837242789316790}
oscilloscopeSystem: {fileID: 0}
heatMapController: {fileID: 0}
- plugInEvent:
- m_PersistentCalls:
- m_Calls: []
- plugOutEvent:
- m_PersistentCalls:
- m_Calls: []
inHotErr: 0
plugSnappingRange: 1
--- !u!1 &4168341163486249011
@@ -1215,9 +1209,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a2e20b111511460a8f3a151bd470da9d, type: 3}
m_Name:
m_EditorClassIdentifier:
- isScanning: 0
- isPlaying: 0
- canScan: 0
--- !u!1 &4645710116166496809
GameObject:
m_ObjectHideFlags: 0
@@ -1230,6 +1221,7 @@ GameObject:
- component: {fileID: 2511148540085322114}
- component: {fileID: 8338330826391681420}
- component: {fileID: 2869143889230164099}
+ - component: {fileID: 7908307127668400731}
m_Layer: 0
m_Name: Plug
m_TagString: Untagged
@@ -1352,6 +1344,39 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eceaf3bcec07439d8391175331323e3c, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!114 &7908307127668400731
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4645710116166496809}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Delegates:
+ - eventID: 5
+ callback:
+ m_PersistentCalls:
+ m_Calls: []
+ - eventID: 0
+ callback:
+ m_PersistentCalls:
+ m_Calls: []
+ - eventID: 1
+ callback:
+ m_PersistentCalls:
+ m_Calls: []
+ - eventID: 2
+ callback:
+ m_PersistentCalls:
+ m_Calls: []
+ - eventID: 3
+ callback:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &5242786820683991507
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity
index fe43e433f..f71fe0fee 100644
--- a/Assets/Scenes/ExpressFixScene.unity
+++ b/Assets/Scenes/ExpressFixScene.unity
@@ -520,26 +520,6 @@ PrefabInstance:
propertyPath: m_Name
value: Body Module System
objectReference: {fileID: 0}
- - target: {fileID: 7908307127668400731, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_Delegates.Array.size
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 7908307127668400731, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_Delegates.Array.data[0].eventID
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 7908307127668400731, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_Delegates.Array.data[2].eventID
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7908307127668400731, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_Delegates.Array.data[3].eventID
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 7908307127668400731, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
- propertyPath: m_Delegates.Array.data[4].eventID
- value: 3
- objectReference: {fileID: 0}
- target: {fileID: 8209014069305634267, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
@@ -904,6 +884,89 @@ MonoBehaviour:
cantStopRunning: 0
showPicPath:
checkPoints: []
+--- !u!1 &234711892
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 234711893}
+ - component: {fileID: 234711894}
+ m_Layer: 0
+ m_Name: "\u62C9\u7EF3\u906E\u7F69"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &234711893
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 234711892}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -5.158, y: 2.035, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1112213369}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!331 &234711894
+SpriteMask:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 234711892}
+ 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: -3242456358401853944, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
+ m_MaskAlphaCutoff: 0.2
+ m_FrontSortingLayerID: 1134468525
+ m_BackSortingLayerID: 1134468525
+ m_FrontSortingLayer: 10
+ m_BackSortingLayer: 10
+ m_FrontSortingOrder: 12
+ m_BackSortingOrder: 10
+ m_IsCustomRangeActive: 1
+ m_SpriteSortPoint: 0
--- !u!1 &244839600
GameObject:
m_ObjectHideFlags: 0
@@ -1877,6 +1940,184 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 4.698018, y: 2.0730464}
m_EdgeRadius: 0
+--- !u!1 &518000625
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 518000626}
+ - component: {fileID: 518000627}
+ - component: {fileID: 518000629}
+ - component: {fileID: 518000628}
+ - component: {fileID: 518000630}
+ m_Layer: 0
+ m_Name: "\u62C9\u7EF3"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &518000626
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 518000625}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -5.186, y: 1.003, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1112213369}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &518000627
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 518000625}
+ 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: 1134468525
+ m_SortingLayer: 10
+ m_SortingOrder: 11
+ m_Sprite: {fileID: -5710484997541332624, guid: 149a798e8f987264f82beb4f4052eb5e, 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: 2
+ m_SpriteSortPoint: 0
+--- !u!114 &518000628
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 518000625}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Delegates:
+ - eventID: 0
+ callback:
+ m_PersistentCalls:
+ m_Calls: []
+ - eventID: 1
+ callback:
+ m_PersistentCalls:
+ m_Calls: []
+ - eventID: 5
+ callback:
+ m_PersistentCalls:
+ m_Calls: []
+ - eventID: 13
+ callback:
+ m_PersistentCalls:
+ m_Calls: []
+ - eventID: 14
+ callback:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!61 &518000629
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 518000625}
+ 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.88972104}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.03}
+ oldSize: {x: 0.5767442, y: 1.8930233}
+ newSize: {x: 1, y: 1}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 0.5767442, y: 1.8930233}
+ m_EdgeRadius: 0
+--- !u!114 &518000630
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 518000625}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 7a6d9bb0e6b84b14a9d78479d5462d41, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ maxDistance: 0.8
--- !u!1 &536896723
GameObject:
m_ObjectHideFlags: 0
@@ -1956,152 +2197,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 0.3587699}
m_EdgeRadius: 0
---- !u!1 &551825976
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 551825977}
- - component: {fileID: 551825978}
- - component: {fileID: 551825980}
- - component: {fileID: 551825979}
- m_Layer: 0
- m_Name: Air Gate
- m_TagString: Moveable
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &551825977
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 551825976}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -3.891, y: 2.62, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1112213369}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &551825978
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 551825976}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4cba880bf0a3caf41b1d03057b9c01b1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- curLevel: 1
- heightY: 0.553
- minY: 2.517
---- !u!61 &551825979
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 551825976}
- 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.49302325, y: 0.13023256}
- newSize: {x: 0.53, y: 0.14}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 0.53, y: 0.14}
- m_EdgeRadius: 0
---- !u!212 &551825980
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 551825976}
- 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: 1134468525
- m_SortingLayer: 10
- m_SortingOrder: 7
- m_Sprite: {fileID: 6212179574069646204, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 0.53, y: 0.14}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &594749266
GameObject:
m_ObjectHideFlags: 0
@@ -3216,90 +3311,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
---- !u!1 &796145091
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 796145092}
- - component: {fileID: 796145093}
- m_Layer: 0
- m_Name: Min Pointer
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &796145092
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 796145091}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.00352, y: 0.00392, z: 0}
- m_LocalScale: {x: 0.20462403, y: 0.02083913, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1691014403}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &796145093
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 796145091}
- 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: 1134468525
- m_SortingLayer: 10
- m_SortingOrder: 6
- m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
- m_Color: {r: 0, g: 0.039215688, 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 &802161902
GameObject:
m_ObjectHideFlags: 0
@@ -3528,103 +3539,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &863998404
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 863998405}
- - component: {fileID: 863998406}
- - component: {fileID: 863998407}
- m_Layer: 0
- m_Name: Oil Dashboard
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &863998405
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 863998404}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -3.3099296, y: 2.429558, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1112213369}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &863998406
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 863998404}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f1dc6d4faf506b479900b5b2b534d14, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!212 &863998407
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 863998404}
- 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: 1134468525
- m_SortingLayer: 10
- m_SortingOrder: 5
- m_Sprite: {fileID: -7691708202054499797, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 1
- m_Size: {x: 0.08, y: 1.215}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &876556886
GameObject:
m_ObjectHideFlags: 0
@@ -4099,11 +4013,9 @@ Transform:
m_Children:
- {fileID: 8413601979190625454}
- {fileID: 9140135230840944249}
- - {fileID: 1691014403}
- - {fileID: 863998405}
+ - {fileID: 518000626}
+ - {fileID: 234711893}
- {fileID: 885292092}
- - {fileID: 1537489913}
- - {fileID: 551825977}
- {fileID: 5177406695049049041}
- {fileID: 13903366}
m_Father: {fileID: 0}
@@ -4120,27 +4032,21 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 10324e3c30ee1924893a08455ce65e0d, type: 3}
m_Name:
m_EditorClassIdentifier:
- config:
- oilDownRatio: 0.2
- oilUpRatio: 0.4
- acceleratedSpeed: 1
- resistance: 1
- airMaxRatio: 0.45
- airMinRatio: 0.37
- baseAirMax: 0.2
- maxLevel: 5
- targetSpeed: 0.8
- invalidTime: 2
+ engineConfig:
+ oilRate: 0.5
+ resistance: 0.1
+ speedRate: 15
engineData:
+ config:
+ oilRate: 0
+ resistance: 0
+ speedRate: 0
curSpeed: 0
curOil: 0
- curAir: 0
- curAirMin: 0
- curAirMax: 0
- curAirLevel: 0
- inAirRange: 0
- reachTargetTime: 0
- isSuccess: 0
+ curAcceleration: 0
+ updateSpeedEvent:
+ m_PersistentCalls:
+ m_Calls: []
coverMoveDuration: 2
coverMoveDistance: 2.8
--- !u!1 &1115166320
@@ -4299,6 +4205,68 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 1
+--- !u!1001 &1143159656
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 1821936329}
+ m_Modifications:
+ - target: {fileID: 7660119422375597550, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+ propertyPath: m_Name
+ value: Audio Manager
+ objectReference: {fileID: 0}
+ - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+--- !u!4 &1143159657 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3}
+ m_PrefabInstance: {fileID: 1143159656}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1150728711
GameObject:
m_ObjectHideFlags: 0
@@ -4383,90 +4351,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 1
---- !u!1 &1172578103
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1172578104}
- - component: {fileID: 1172578105}
- m_Layer: 0
- m_Name: Max Pointer
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1172578104
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1172578103}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.00274, y: 0.00274, z: 0}
- m_LocalScale: {x: 0.20112549, y: 0.01848743, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1691014403}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &1172578105
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1172578103}
- 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: 1134468525
- m_SortingLayer: 10
- m_SortingOrder: 6
- m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
- m_Color: {r: 0, g: 0.03572154, 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 &1192211354
GameObject:
m_ObjectHideFlags: 0
@@ -5008,149 +4892,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1502187942}
m_CullTransparentMesh: 1
---- !u!1 &1537489912
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1537489913}
- - component: {fileID: 1537489916}
- - component: {fileID: 1537489915}
- - component: {fileID: 1537489917}
- 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 &1537489913
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1537489912}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -3.0339296, y: 0.49155807, z: 0}
- m_LocalScale: {x: 0.92499995, y: 0.625, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1112213369}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1537489915
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1537489912}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 04beec2ebfad5f642bfb4a7a1716a08a, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!212 &1537489916
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1537489912}
- 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: 1134468525
- m_SortingLayer: 10
- m_SortingOrder: 11
- m_Sprite: {fileID: 6738774341365589705, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 1
- m_Size: {x: 1, y: 1}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 1
---- !u!61 &1537489917
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1537489912}
- 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.4625, y: 0.3125}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 1, y: 0}
- oldSize: {x: 0.8604651, y: 0.5813953}
- newSize: {x: 1, y: 1}
- adaptiveTilingThreshold: 0.5
- drawMode: 1
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 0.925, y: 0.625}
- m_EdgeRadius: 0
--- !u!1 &1634570219
GameObject:
m_ObjectHideFlags: 0
@@ -5399,107 +5140,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
---- !u!1 &1691014402
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1691014403}
- - component: {fileID: 1691014404}
- - component: {fileID: 1691014405}
- m_Layer: 0
- m_Name: Air Dashboard
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1691014403
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1691014402}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -2.9169297, y: 2.4245582, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 796145092}
- - {fileID: 1172578104}
- m_Father: {fileID: 1112213369}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1691014404
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1691014402}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5758967c5b7371f4996079b044127a60, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- topPosY: 1.2
- bottomPosY: 0
---- !u!212 &1691014405
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1691014402}
- 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: 1134468525
- m_SortingLayer: 10
- m_SortingOrder: 6
- m_Sprite: {fileID: 6398009670296464108, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 1
- m_Size: {x: 0.08, y: 1.215}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &1720794381
GameObject:
m_ObjectHideFlags: 0
@@ -6001,6 +5641,11 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
+--- !u!4 &1821936329 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3}
+ m_PrefabInstance: {fileID: 9210352354887959608}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1895400168
GameObject:
m_ObjectHideFlags: 0
@@ -7801,7 +7446,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &1015381349462535075
Transform:
m_ObjectHideFlags: 0
@@ -11999,8 +11644,9 @@ GameObject:
m_Component:
- component: {fileID: 8413601979190625454}
- component: {fileID: 5958833961666103347}
+ - component: {fileID: 8413601979190625455}
m_Layer: 0
- m_Name: "\u5F15\u64CE\u5916\u9F7F\u8F6E"
+ m_Name: "\u4E2D\u592E\u9F7F\u8F6E"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -12097,12 +11743,25 @@ Transform:
m_GameObject: {fileID: 8254373788995933795}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -0.99, y: 1.44, z: 0}
+ m_LocalPosition: {x: -2.704, y: 1.956, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1112213369}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8413601979190625455
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8254373788995933795}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 79006d3d747c4b8482204874bbbf6ae3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ initSpeed: 0.1
--- !u!1 &8507733278955807665
GameObject:
m_ObjectHideFlags: 0
@@ -12480,7 +12139,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3}
propertyPath: field of view
@@ -12531,8 +12190,12 @@ PrefabInstance:
value: -0.009999275
objectReference: {fileID: 0}
m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
+ m_RemovedGameObjects:
+ - {fileID: 4185425418237483623, guid: 13f00ab6092291d49a9312e52873d80b, type: 3}
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3}
+ insertIndex: 0
+ addedObject: {fileID: 1143159657}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 8168536426589423301, guid: 13f00ab6092291d49a9312e52873d80b, type: 3}
insertIndex: -1
diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity
index 5b1303713..011d4705c 100644
--- a/Assets/Scenes/Persistence.unity
+++ b/Assets/Scenes/Persistence.unity
@@ -3102,9 +3102,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 200, y: -54.599014}
m_SizeDelta: {x: 240, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &237392156
@@ -6153,7 +6153,7 @@ Transform:
m_GameObject: {fileID: 519420028}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -10}
+ m_LocalPosition: {x: -0.009999275, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -13456,7 +13456,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &1343879457
Transform:
m_ObjectHideFlags: 0
@@ -15453,9 +15453,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 200, y: -163.79704}
m_SizeDelta: {x: 240, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1596715192
@@ -15810,9 +15810,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 200, y: -272.99506}
m_SizeDelta: {x: 240, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1611684201
diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs
index 2f76b5d1c..80ac5573d 100644
--- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs
+++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs
@@ -32,6 +32,7 @@ namespace AibisDream.FixSystem
public bool inHotErr;
private int _heatValue;
+ public bool isAvailable;
private int HeatValue
{
@@ -287,6 +288,22 @@ namespace AibisDream.FixSystem
}
#endregion
+
+ ///
+ /// 激活交互系统
+ ///
+ public void EnableSystem()
+ {
+ isAvailable = true;
+ }
+
+ ///
+ /// 停止交互系统
+ ///
+ public void DisableSystem()
+ {
+ isAvailable = false;
+ }
}
public struct BodyModuleSystemData
diff --git a/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs b/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs
index a270b1c88..b4f7985a5 100644
--- a/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs
+++ b/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs
@@ -7,7 +7,7 @@ using UnityEngine.EventSystems;
namespace AibisDream.FixSystem
{
[RequireComponent(typeof(EventTriggerEx))]
- public class Plug : MonoBehaviour
+ public class Plug : MonoBehaviour, IInteraction
{
#region 插头当前信息
@@ -161,5 +161,14 @@ namespace AibisDream.FixSystem
Gizmos.color = Color.yellow;
Gizmos.DrawWireSphere(transform.position, 0.5f);
}
+
+ public bool IsActive => true;
+
+ public bool IsAvailable => _cableSystem.BodyModuleSystem.isAvailable;
+
+ public GameObject GetGameObject()
+ {
+ return gameObject;
+ }
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs
index b6bce361b..cceeb47fa 100644
--- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs
+++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs
@@ -109,6 +109,8 @@ namespace AibisDream.FixSystem
bodyModuleSystem.ResetPlug();
// 切换相机
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
+ // 开启交互
+ bodyModuleSystem.EnableSystem();
}
public IEnumerator Exit()
@@ -116,6 +118,8 @@ namespace AibisDream.FixSystem
var bodyModuleSystem = FixSystemCenter.SystemDic.Get();
// 拔出插头
bodyModuleSystem.ResetPlug();
+ // 关闭交互
+ bodyModuleSystem.DisableSystem();
yield break;
}
}
@@ -169,22 +173,26 @@ namespace AibisDream.FixSystem
public IEnumerator Enter()
{
+ var engineSystem = FixSystemCenter.SystemDic.Get();
// 先切BodyModule
if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule))
{
- //yield return MainUIController.Instance?.FadeInSync(0.5f);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
- //yield return MainUIController.Instance?.FadeOutSync(0.5f);
}
// 切换相机
yield return CameraKit.Instance.SwitchCamera(CameraEnum.Engine);
+ // 激活交互
+ engineSystem.EnableSystem();
}
public IEnumerator Exit()
{
var bodyModuleSystem = FixSystemCenter.SystemDic.Get();
bodyModuleSystem.ResetPlug();
+ // 关闭交互
+ var engineSystem = FixSystemCenter.SystemDic.Get();
+ engineSystem.DisableSystem();
yield break;
}
}
diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs
index 06f290b0f..56d81b2e1 100644
--- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs
+++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs
@@ -1,6 +1,5 @@
using AibisDream.Framework;
using AibisDream.Kit;
-using UnityEngine;
namespace AibisDream.FixSystem
{
@@ -8,8 +7,6 @@ namespace AibisDream.FixSystem
{
public FixState CurState => StateMachine.CurState;
- public Canvas deepCanvas;
-
public override void OnSingletonInit()
{
SystemDic ??= new IOCContainer();
@@ -17,12 +14,9 @@ namespace AibisDream.FixSystem
// TODO 这个回头要改
AudioManager.PlayAmb1Audio("amb_room");
- // 初始化场景组件
- InitScene();
-
// 初始化状态机
StateMachine = new FixStateMachine();
- StartCoroutine(StateMachine.SwitchState(FixState.Clinic));
+ StartCoroutine(StateMachine.SwitchState(FixState.Engine));
}
public override void OnSingletonDestroy()
@@ -31,15 +25,6 @@ namespace AibisDream.FixSystem
GameLoopManager.Instance.StartCoroutine(StateMachine.QuitState());
SystemDic.Clear();
}
-
- private void InitScene()
- {
- if (deepCanvas)
- {
- deepCanvas.worldCamera = CameraKit.Instance.uiCamera;
- deepCanvas.sortingLayerName = "FixTop";
- }
- }
#region 系统索引
diff --git a/Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs b/Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs
index 56dca5910..dfe962fff 100644
--- a/Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs
+++ b/Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs
@@ -11,32 +11,32 @@ namespace AibisDream.Framework
#region 事件触发中转
- public void OnPointerEnter(GameObject gameObject)
+ public void OnPointerEnter(IInteraction interaction)
{
- pointerOverObj = gameObject;
- EnumEventSystem.Global.Send(TriggerEnum.PointerEnter, gameObject);
+ pointerOverObj = interaction.GetGameObject();
+ EnumEventSystem.Global.Send(TriggerEnum.PointerEnter, interaction);
}
- public void OnPointerExit(GameObject gameObject)
+ public void OnPointerExit(IInteraction interaction)
{
- if (pointerOverObj == gameObject)
+ if (pointerOverObj == interaction.GetGameObject())
{
- EnumEventSystem.Global.Send(TriggerEnum.PointerExit, gameObject);
+ EnumEventSystem.Global.Send(TriggerEnum.PointerExit, interaction);
pointerOverObj = null;
}
}
- public void OnPointerDown(GameObject gameObject)
+ public void OnPointerDown(IInteraction interaction)
{
- EnumEventSystem.Global.Send(TriggerEnum.PointerDown, gameObject);
- holdingObj = gameObject;
+ EnumEventSystem.Global.Send(TriggerEnum.PointerDown, interaction);
+ holdingObj = interaction.GetGameObject();
}
- public void OnPointerUp(GameObject gameObject)
+ public void OnPointerUp(IInteraction interaction)
{
- if (holdingObj == gameObject)
+ if (holdingObj == interaction.GetGameObject())
{
- EnumEventSystem.Global.Send(TriggerEnum.PointerUp, gameObject);
+ EnumEventSystem.Global.Send(TriggerEnum.PointerUp, interaction);
holdingObj = null;
}
}
diff --git a/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs b/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs
index 12f328d1c..d7cf16741 100644
--- a/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs
+++ b/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs
@@ -11,6 +11,13 @@ namespace AibisDream.Framework
[RequireComponent(typeof(Collider2D))]
public class EventTriggerEx : EventTrigger
{
+ private IInteraction _interaction;
+
+ private void Awake()
+ {
+ _interaction = GetComponent();
+ }
+
///
/// 注册事件
///
@@ -68,26 +75,44 @@ namespace AibisDream.Framework
public override void OnPointerEnter(PointerEventData data)
{
- EventSystemEx.Instance.OnPointerEnter(gameObject);
+ EventSystemEx.Instance.OnPointerEnter(_interaction);
base.OnPointerEnter(data);
}
public override void OnPointerExit(PointerEventData data)
{
- EventSystemEx.Instance.OnPointerExit(gameObject);
+ EventSystemEx.Instance.OnPointerExit(_interaction);
base.OnPointerExit(data);
}
public override void OnPointerDown(PointerEventData eventData)
{
- EventSystemEx.Instance.OnPointerDown(gameObject);
- base.OnPointerDown(eventData);
+ if (_interaction.IsAvailable)
+ {
+ EventSystemEx.Instance.OnPointerDown(_interaction);
+ base.OnPointerDown(eventData);
+ }
}
public override void OnPointerUp(PointerEventData eventData)
{
- EventSystemEx.Instance.OnPointerUp(gameObject);
- base.OnPointerUp(eventData);
+ if (_interaction.IsAvailable)
+ {
+ EventSystemEx.Instance.OnPointerUp(_interaction);
+ base.OnPointerUp(eventData);
+ }
}
}
+
+ public interface IInteraction
+ {
+ // 判断是否激活，激活就正常显示鼠标，否则就显示禁用标志
+ public bool IsActive { get; }
+
+ // 判断是否可用，可用就正常显示鼠标，否则就保持原有标志不变
+ public bool IsAvailable { get; }
+
+ // 返回GameObject
+ public GameObject GetGameObject();
+ }
}
\ No newline at end of file
diff --git a/Assets/Scripts/Framework/Moveable/SpriteButtonKit.cs b/Assets/Scripts/Framework/Moveable/SpriteButtonKit.cs
deleted file mode 100644
index 7ff3da940..000000000
--- a/Assets/Scripts/Framework/Moveable/SpriteButtonKit.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using UnityEngine;
-
-namespace AibisDream.Framework
-{
- public class SpriteButtonKit : IMonoKit
- {
- private readonly Camera _camera = Camera.main;
- private GameObject _curButton;
-
- public void OnUpdate()
- {
- // 发射射线进行检测
- Ray ray = _camera.ScreenPointToRay(Input.mousePosition);
- RaycastHit2D hit = Physics2D.Raycast(ray.origin, ray.direction);
-
- // 射线没有碰撞到东西
- if (!hit.collider)
- {
- _curButton = null;
- return;
- }
- }
-
-
- }
-
- public interface ISpriteButton
- {
- public void OnMouseEnter();
- public void OnMouseExit();
-
- }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/Framework/Moveable/SpriteButtonKit.cs.meta b/Assets/Scripts/Framework/Moveable/SpriteButtonKit.cs.meta
deleted file mode 100644
index 933fb89de..000000000
--- a/Assets/Scripts/Framework/Moveable/SpriteButtonKit.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 787ecc68b7e444478adfaabb8d7fbe70
-timeCreated: 1734775502
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/Engine/AirDashboard.cs b/Assets/Scripts/MiniGame/Engine/AirDashboard.cs
deleted file mode 100644
index 5f27cd4dd..000000000
--- a/Assets/Scripts/MiniGame/Engine/AirDashboard.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Framework.Core;
-using UnityEngine;
-
-namespace AibisDream
-{
- public class AirDashboard : Dashboard
- {
- [FindComponent] private SpriteRenderer _pointer;
- [FindComponent("Min Pointer")] private Transform _minPointer;
- [FindComponent("Max Pointer")] private Transform _maxPointer;
-
- [SerializeField] private float topPosY;
- [SerializeField] private float bottomPosY;
-
- private float _pointerMaxHeight;
-
- protected override void OnStart()
- {
- _pointerMaxHeight = _pointer.size.y;
- }
-
- protected override void UpdateDashboard(EngineData data)
- {
- // 气门
- _pointer.size = new Vector2(_pointer.size.x, data.curAir * _pointerMaxHeight);
-
- // 气门上下限
- var minPosY = (topPosY - bottomPosY) * data.curAirMin + bottomPosY;
- var maxPosY = (topPosY - bottomPosY) * data.curAirMax + bottomPosY;
- _minPointer.localPosition = new Vector3(0, minPosY, 0);
- _maxPointer.localPosition = new Vector3(0, maxPosY, 0);
- }
- }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/Engine/AirDashboard.cs.meta b/Assets/Scripts/MiniGame/Engine/AirDashboard.cs.meta
deleted file mode 100644
index e472a49a4..000000000
--- a/Assets/Scripts/MiniGame/Engine/AirDashboard.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5758967c5b7371f4996079b044127a60
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/MiniGame/Engine/AirGate.cs b/Assets/Scripts/MiniGame/Engine/AirGate.cs
deleted file mode 100644
index b44640872..000000000
--- a/Assets/Scripts/MiniGame/Engine/AirGate.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using AibisDream.Framework;
-using UnityEngine;
-
-namespace AibisDream
-{
- public class AirGate : MonoBehaviour, IMoveable
- {
- private EngineSystem _engineSystem;
-
- [SerializeField] private int curLevel;
-
- [SerializeField] private float heightY;
- [SerializeField] private float minY;
-
- public bool IsBlock { get; }
-
- private void Awake()
- {
- _engineSystem = transform.parent.GetComponent();
- }
-
- public void StartMove()
- {
- // Debug.Log("Move");
- }
-
- public void Move(Vector2 mousePos)
- {
- SwitchAirLevel(mousePos.y);
- UpdateTransform();
- }
-
- private void UpdateTransform()
- {
- float levelHeight = heightY / (_engineSystem.config.maxLevel - 1);
- var curY = levelHeight * curLevel + minY;
- transform.localPosition = new Vector3(transform.localPosition.x, curY, transform.localPosition.z);
- }
-
- private void SwitchAirLevel(float mouseY)
- {
- mouseY -= minY + transform.parent.position.y;
-
- float levelHeight = heightY / _engineSystem.config.maxLevel;
- curLevel = (int)(mouseY / levelHeight);
- if (curLevel >= _engineSystem.config.maxLevel) curLevel = _engineSystem.config.maxLevel - 1;
- if (curLevel < 0) curLevel = 0;
- }
-
- public void MoveToLevel(int level)
- {
- curLevel = level - 1;
- UpdateTransform();
- }
-
- public void StopMove()
- {
- _engineSystem.UpdateAirLevel(curLevel);
- }
- }
-}
-
diff --git a/Assets/Scripts/MiniGame/Engine/AirGate.cs.meta b/Assets/Scripts/MiniGame/Engine/AirGate.cs.meta
deleted file mode 100644
index e7b1509fa..000000000
--- a/Assets/Scripts/MiniGame/Engine/AirGate.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4cba880bf0a3caf41b1d03057b9c01b1
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/MiniGame/Engine/AirLevelDashboard.cs b/Assets/Scripts/MiniGame/Engine/AirLevelDashboard.cs
deleted file mode 100644
index abc0c8319..000000000
--- a/Assets/Scripts/MiniGame/Engine/AirLevelDashboard.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace AibisDream
-{
- public class AirLevelDashboard : Dashboard
- {
- private Transform _pointer;
-
- [SerializeField] private float topPosY;
- [SerializeField] private float bottomPosY;
-
- private int _maxLevel;
-
- protected override void OnStart()
- {
- _pointer = transform.Find("Pointer");
- _maxLevel = engineSystem.config.maxLevel;
- }
-
- protected override void UpdateDashboard(EngineData data)
- {
- var singleLevelHeight = (topPosY - bottomPosY) / (_maxLevel - 1);
- var targetPosY = bottomPosY + data.curAirLevel * singleLevelHeight;
- _pointer.position = new Vector3(_pointer.position.x, targetPosY, _pointer.position.z);
- }
- }
-}
diff --git a/Assets/Scripts/MiniGame/Engine/AirLevelDashboard.cs.meta b/Assets/Scripts/MiniGame/Engine/AirLevelDashboard.cs.meta
deleted file mode 100644
index 1dea9987c..000000000
--- a/Assets/Scripts/MiniGame/Engine/AirLevelDashboard.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7e5ffd762a716d8409d0f37b763e6521
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/MiniGame/Engine/CordPull.cs b/Assets/Scripts/MiniGame/Engine/CordPull.cs
new file mode 100644
index 000000000..3807826d6
--- /dev/null
+++ b/Assets/Scripts/MiniGame/Engine/CordPull.cs
@@ -0,0 +1,124 @@
+using AibisDream.Framework;
+using AibisDream.Utility;
+using DG.Tweening;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+namespace AibisDream
+{
+ public class CordPull : MonoBehaviour, IInteraction
+ {
+ private EventTriggerEx _trigger;
+ private EngineSystem _engineSystem;
+ private Vector3 _initPos;
+ public float maxDistance;
+
+ private Vector3 _dragPoint;
+ private bool _isDragging;
+
+ private void Awake()
+ {
+ // 记录当前位置
+ InitRefs();
+ }
+
+ private void InitRefs()
+ {
+ _initPos = transform.position;
+
+ _trigger = GetComponent();
+ _engineSystem = transform.parent.GetComponent();
+
+ _trigger.Register(EventTriggerType.BeginDrag, OnBeginDrag);
+ _trigger.Register(EventTriggerType.EndDrag, OnEndDrag);
+ _trigger.Register(EventTriggerType.Drag, OnDrag);
+ }
+
+ public float GetCurOil()
+ {
+ return Mathf.Abs((transform.localPosition.y - _initPos.y) / maxDistance);
+ }
+
+ private void Update()
+ {
+ if (_isDragging)
+ {
+ MoveToDragPos();
+ }
+ }
+
+ private void MoveToDragPos()
+ {
+ float curY;
+ // 如果拖拽点在上方，直接移动
+ if (_dragPoint.y > transform.position.y)
+ {
+ curY = _dragPoint.y;
+ }
+ // 如果拖拽点在下方，限速移动
+ else
+ {
+ if (Mathf.Abs(_dragPoint.y - transform.position.y) / Time.deltaTime >
+ _engineSystem.engineConfig.pullMaxSpeed)
+ {
+ curY = transform.position.y - _engineSystem.engineConfig.pullMaxSpeed * Time.deltaTime;
+ }
+ else
+ {
+ curY = _dragPoint.y;
+ }
+ }
+
+ transform.position = new Vector3(transform.position.x, curY, transform.position.y);
+ }
+
+ private void OnDrag(BaseEventData data)
+ {
+ // 这里是一些阻碍拖动的情况
+
+ // 正常情况下不会出错
+ if (data is not PointerEventData pointerData) return;
+
+ // 设置拖拽目标点
+ SetDragTarget(pointerData.position);
+ }
+
+ private void OnBeginDrag(BaseEventData data)
+ {
+ // 正常情况下不会出错
+ if (data is not PointerEventData pointerData) return;
+ // 设置拖拽目标点
+ SetDragTarget(pointerData.position);
+
+ // 开始拖动的时候把原有的动画删掉
+ transform.DOKill();
+ _isDragging = true;
+ }
+
+ private void OnEndDrag(BaseEventData data)
+ {
+ _isDragging = false;
+ // 松手后抽回去
+ var retractTime = (_initPos.y - transform.localPosition.y) / _engineSystem.engineConfig.retrunSpeed;
+ transform.DOMove(_initPos, retractTime);
+ }
+
+ private void SetDragTarget(Vector3 mousePos)
+ {
+ var worldPos = CommonUtil.GetMouseWorldPos(mousePos, transform);
+
+ var dragY = CommonUtil.Limit(worldPos.y, _initPos.y, _initPos.y - maxDistance);
+
+ _dragPoint = new Vector3(transform.position.x, dragY, transform.position.z);
+ }
+
+ public bool IsActive => true;
+
+ public bool IsAvailable => _engineSystem.isAvailable;
+
+ public GameObject GetGameObject()
+ {
+ return gameObject;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/Engine/CordPull.cs.meta b/Assets/Scripts/MiniGame/Engine/CordPull.cs.meta
new file mode 100644
index 000000000..881345b1b
--- /dev/null
+++ b/Assets/Scripts/MiniGame/Engine/CordPull.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7a6d9bb0e6b84b14a9d78479d5462d41
+timeCreated: 1737097199
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/Engine/Dashboard.cs b/Assets/Scripts/MiniGame/Engine/Dashboard.cs
deleted file mode 100644
index 8a910d03b..000000000
--- a/Assets/Scripts/MiniGame/Engine/Dashboard.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Framework.Core;
-using UnityEngine;
-
-namespace AibisDream
-{
- public abstract class Dashboard : MonoBehaviour
- {
- protected EngineSystem engineSystem;
-
- private void Awake()
- {
- engineSystem = transform.parent.GetComponent();
- this.FindComponents();
- OnStart();
- }
-
- protected virtual void OnStart()
- {
- // 没有就不重写
- }
-
- private void OnEnable()
- {
- engineSystem.UpdateDashboard += UpdateDashboard;
- }
-
- private void OnDisable()
- {
- engineSystem.UpdateDashboard -= UpdateDashboard;
- }
-
- protected abstract void UpdateDashboard(EngineData data);
- }
-}
diff --git a/Assets/Scripts/MiniGame/Engine/Dashboard.cs.meta b/Assets/Scripts/MiniGame/Engine/Dashboard.cs.meta
deleted file mode 100644
index ab9ea9763..000000000
--- a/Assets/Scripts/MiniGame/Engine/Dashboard.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 82490bb3746d86e409719d43501d2c5e
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs
index 6ae28ea7e..c3760db2b 100644
--- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs
+++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs
@@ -1,42 +1,35 @@
using System;
-using System.Linq;
using AibisDream.FixSystem;
using AibisDream.Framework;
-using AibisDream.Kit;
using AibisDream.Utility;
using Cinemachine;
-using DG.Tweening;
using UnityEngine;
-using UnityEngine.Serialization;
+using UnityEngine.Events;
namespace AibisDream
{
- public class EngineSystem : SystemHasData
+ public class EngineSystem : MonoBehaviour
{
- public static string DataPath = Application.streamingAssetsPath + "/LevelData/EngineSystem/";
+ private CordPull _cordPull;
+ private StaticGear _centerGear;
- private SpriteRenderer _cover;
- private AirGate _airGate;
+ [Header("系统配置")] public EngineConfig engineConfig;
+ [Header("系统数据")] public EngineData engineData;
+
+ public bool isAvailable;
- [Header("系统配置")] [SerializeField] public EngineConfig config;
- [Header("系统数据")] [SerializeField] private EngineData engineData;
+ [HideInInspector] public UnityEvent updateSpeedEvent = new();
- [FormerlySerializedAs("盖板移动时间")] [SerializeField]
- private float coverMoveDuration = 5f;
+ [SerializeField] private float coverMoveDuration = 5f;
- [FormerlySerializedAs("盖板移动距离")] [SerializeField]
- private float coverMoveDistance = 2.8f;
-
- private bool IsValid => engineData.isValid.Value;
-
- public event Action UpdateDashboard;
+ [SerializeField] private float coverMoveDistance = 2.8f;
private void Awake()
{
FixSystemCenter.SystemDic.Register(this);
- _cover = transform.Find("Cover").GetComponent();
- _airGate = transform.Find("Air Gate").GetComponent();
-
+ _cordPull = transform.Find("拉绳").GetComponent();
+ _centerGear = transform.Find("中央齿轮").GetComponent();
+
// 注册相机
var virtualCam = transform.Find("Engine Camera").GetComponentInChildren();
CameraKit.Instance.RegisterCamera(CameraEnum.Engine, virtualCam);
@@ -44,17 +37,12 @@ namespace AibisDream
private void Start()
{
- OnLoad();
- }
-
- private void OnLoad()
- {
- engineData = new EngineData(config.invalidTime);
-
- // 初始档位置为2
- _airGate.MoveToLevel(2);
- DialogController.Instance?.SetVariable("$curAirLevel", 2);
- engineData.UpdateAirLevel(1, config.maxLevel); // 内部档位从0计数，1就是2
+ // 初始化数据
+ engineData = new EngineData
+ {
+ config = engineConfig
+ };
+ _centerGear.StartRotate();
}
private void OnDestroy()
@@ -62,254 +50,77 @@ namespace AibisDream
CameraKit.Instance.UnRegisterCamera(CameraEnum.Engine);
}
- private void Update()
+ public void Update()
{
- // 更新部分按时间自然计算的指标
- DataAutoChange();
- // 更新看板
- UpdateDashboard?.Invoke(engineData);
- }
+ // 收集数据
+ engineData.curOil = _cordPull.GetCurOil();
+ // 更新数据
+ engineData.CalcSpeed();
- private void DataAutoChange()
- {
- // 自然减速
- engineData.OilChange(-config.oilDownRatio);
- engineData.CalcAir(config.airMaxRatio, config.airMinRatio, config.baseAirMax);
- // 推算速度
- engineData.CalcSpeed(config.acceleratedSpeed, config.resistance);
- // 判断是否成功
- if (engineData.CheckSuccess(config.targetSpeed))
- {
- DialogController.Instance?.StartDialogNode("EngineSuccess");
- }
+ // 传递速度
+ updateSpeedEvent.Invoke(engineData.GetRealSpeed());
}
///
- /// 加速过程
+ /// 开启系统交互
///
- public void AddOil()
+ public void EnableSystem()
{
- if (IsValid)
- {
- engineData.OilChange(config.oilUpRatio);
- }
- // 失效期无法加油门
+ isAvailable = true;
}
///
- /// 更新引擎气门变化
+ /// 关闭系统交互
///
- /// 当前气门等级
- public void UpdateAirLevel(int curLevel)
+ public void DisableSystem()
{
- engineData.UpdateAirLevel(curLevel, config.maxLevel);
- DialogController.Instance?.SetVariable("$curAirLevel", curLevel + 1);
- DialogController.Instance?.StartDialogNode("调整进气档位");
+ isAvailable = false;
}
-
- ///
- /// 打开盖板
- ///
- /// 动画序列
- public Tween OpenCover()
- {
- AudioManager.PlayLoop2Audio("amb_shitou_engine");
-
- 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()
- {
- AudioManager.PauseLoop2Audio();
- 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; }
-
- public override string GetConfigPath()
- {
- return DataPath;
- }
-
- public override void LoadLevel()
- {
- if (string.IsNullOrEmpty(CurDataKey))
- {
- Debug.Log("配置项名称为空");
- return;
- }
-
- if (!ConfigUtil.Instance.TryLoadConfig(DataPath + CurDataKey,
- out var data))
- {
- Debug.Log("没有找到配置项");
- return;
- }
-
- config = data;
- // 重置Data
- OnLoad();
- }
-
- public override void SaveLevel()
- {
- if (string.IsNullOrEmpty(CurDataKey))
- {
- Debug.Log("名称不为空");
- return;
- }
-
- ConfigUtil.Instance.SaveConfig(config, DataPath + CurDataKey);
-
- if (!_keyOptions.Contains(CurDataKey))
- {
- // 重新读取key
- _keyOptions = ConfigUtil.Instance.GetFileNames(DataPath);
- }
- }
-
- #endregion
}
[Serializable]
public struct EngineConfig
{
- public float oilDownRatio;
- public float oilUpRatio;
- public float acceleratedSpeed;
+ public float oilRate;
public float resistance;
- public float airMaxRatio;
- public float airMinRatio;
- public float baseAirMax;
- public int maxLevel;
- public float targetSpeed;
- public float invalidTime;
+ public float speedRate;
+ public float targetDuration;
+ public float pullMaxSpeed;
+ public float retrunSpeed;
}
[Serializable]
public struct EngineData
{
- private const float SuccessDuration = 1.5f;
-
+ public EngineConfig config;
public float curSpeed;
public float curOil;
- public float curAir;
- public float curAirMin;
- public float curAirMax;
- public int curAirLevel;
-
- public AutoFlipBool isValid;
- public bool inAirRange;
-
- public float reachTargetTime;
+ public float curAcceleration;
public bool isSuccess;
+ public float reachTargetTime;
- public EngineData(float flipDelayTime)
+ public void CalcSpeed()
{
- isValid = new AutoFlipBool(flipDelayTime, true);
- curSpeed = 0;
- curOil = 0;
- curAir = 0;
- curAirMin = 0;
- curAirMax = 0;
- curAirLevel = 0;
- inAirRange = false;
- reachTargetTime = 0;
- isSuccess = false;
- }
-
- public void OilChange(float oilChangeRatio)
- {
- curOil = CommonUtil.Limit(curOil + oilChangeRatio * Time.deltaTime, 1f, 0f);
- }
-
- public void CalcSpeed(float acceleratedSpeed, float resistance)
- {
- var addNum = inAirRange && isValid.Value
- ? (curOil * acceleratedSpeed - curSpeed * resistance) * Time.deltaTime
- : -curSpeed * resistance * Time.deltaTime;
-
- curSpeed = CommonUtil.Limit(curSpeed + addNum, 1f, 0f);
- }
-
- public void CalcAir(float airMaxRatio, float airMinRatio, float baseAirMax)
- {
- curAirMax = CommonUtil.Limit(curSpeed * (curAirLevel + 1) * airMaxRatio + baseAirMax, 1f, 0f);
- curAirMin = CommonUtil.Limit(curSpeed * (curAirLevel + 1) * airMinRatio, 0.8f, 0f);
-
- curAir = curOil;
- // 如果离开范围且当前在系统有效期，就进入一段失效期
- var curInAirRange = curAir <= curAirMax && curAir >= curAirMin;
-
- if (inAirRange && !curInAirRange && !isSuccess)
+ if (curOil != 0)
{
- // 出界的话
- if (curAir > curAirMax) DialogController.Instance?.StartDialogNode("引擎过速");
- if (curAir < curAirMin) DialogController.Instance?.StartDialogNode("引擎掉速");
-
- isValid.Value = false;
+ curAcceleration = curAcceleration < 0 ? 0 : curAcceleration;
+ curAcceleration = CommonUtil.Limit(curOil * config.oilRate * Time.deltaTime + curAcceleration, 100, 0);
+ }
+ else
+ {
+ curAcceleration = -config.resistance * (1f + curSpeed);
}
- inAirRange = curInAirRange;
+
+ curSpeed = CommonUtil.Limit(curSpeed + curAcceleration * Time.deltaTime, 1, 0);
}
- public void UpdateAirLevel(int level, int maxLevel)
- {
- curAirLevel = level;
- if (curAirLevel > maxLevel)
- {
- curAirLevel = maxLevel - 1;
- }
-
- if (curAirLevel < 0)
- {
- curAirLevel = 0;
- }
- }
-
- public bool CheckSuccess(float targetSpeed)
+ public bool CheckSuccess()
{
// 已经成功就不用校验了
if (isSuccess) return false;
- if (curSpeed >= targetSpeed)
+ if (curSpeed >= 0.95f)
{
reachTargetTime += Time.deltaTime;
}
@@ -317,12 +128,22 @@ namespace AibisDream
{
reachTargetTime = 0;
}
-
+
// 如果速度达标时间足够就判断成功
- if (!(reachTargetTime >= SuccessDuration)) return false;
+ if (!(reachTargetTime >= config.targetDuration)) return false;
isSuccess = true;
return true;
}
+
+
+ ///
+ /// 获取处理后的速度
+ ///
+ /// 速度
+ public float GetRealSpeed()
+ {
+ return 1 + curSpeed * config.speedRate;
+ }
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs b/Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs
index 296ec2bd5..9611397ec 100644
--- a/Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs
+++ b/Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs
@@ -1,6 +1,5 @@
using System.Collections;
-using AibisDream.FixSystem;
-using DG.Tweening;
+using UnityEngine;
using Yarn.Unity;
namespace AibisDream
@@ -11,16 +10,16 @@ namespace AibisDream
[YarnCommand("open_engine_cover")]
public static IEnumerator OpenEngineCover()
{
- var engineSystem = FixSystemCenter.SystemDic.Get();
- yield return engineSystem.OpenCover().WaitForCompletion();
+ Debug.LogWarning("打开引擎盖命令已废弃，请尽快删除");
+ yield break;
}
// 打开引擎盖
[YarnCommand("close_engine_cover")]
public static IEnumerator CloseEngineCover()
{
- var engineSystem = FixSystemCenter.SystemDic.Get();
- yield return engineSystem.CloseCover().WaitForCompletion();
+ Debug.LogWarning("关闭引擎盖命令已废弃，请尽快删除");
+ yield break;
}
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/Engine/OilDashboard.cs b/Assets/Scripts/MiniGame/Engine/OilDashboard.cs
deleted file mode 100644
index e2a85e109..000000000
--- a/Assets/Scripts/MiniGame/Engine/OilDashboard.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Framework.Core;
-using UnityEngine;
-
-namespace AibisDream
-{
- public class OilDashBoard : Dashboard
- {
- [FindComponent] private SpriteRenderer _pointer;
- private float _pointerMaxHeight;
-
- protected override void OnStart()
- {
- _pointerMaxHeight = _pointer.size.y;
- }
-
- protected override void UpdateDashboard(EngineData data)
- {
- _pointer.size = new Vector2(_pointer.size.x, data.curOil * _pointerMaxHeight);
- }
- }
-}
diff --git a/Assets/Scripts/MiniGame/Engine/OilDashboard.cs.meta b/Assets/Scripts/MiniGame/Engine/OilDashboard.cs.meta
deleted file mode 100644
index 02eafc9eb..000000000
--- a/Assets/Scripts/MiniGame/Engine/OilDashboard.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5f1dc6d4faf506b479900b5b2b534d14
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/MiniGame/Engine/OilGate.cs b/Assets/Scripts/MiniGame/Engine/OilGate.cs
deleted file mode 100644
index b49552b94..000000000
--- a/Assets/Scripts/MiniGame/Engine/OilGate.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using DG.Tweening;
-using UnityEngine;
-
-namespace AibisDream
-{
- public class OilGate : MonoBehaviour
- {
- private SpriteButton _spriteButton;
- private EngineSystem _engineSystem;
-
- private void Start()
- {
- _engineSystem = transform.parent.GetComponent();
- }
-
- private void OnEnable()
- {
- _spriteButton = new SpriteButton(gameObject);
- _spriteButton.OnButtonDown += ButtonClick;
- _spriteButton.OnButtonUp += ButtonUp;
- _spriteButton.OnButtonHold += ButtonHold;
- }
-
- private void OnDisable()
- {
- _spriteButton = null;
- }
-
- private void Update()
- {
- _spriteButton?.CheckButtonClick();
- }
-
- private void ButtonClick()
- {
- transform.DOPause();
- transform.DORotate(new Vector3(0, 0, 45), 5f);
- // 播引擎
- AudioManager.PlayLoopAudio("engine_on");
- AudioManager.StopInteraction();
- }
-
- private void ButtonUp()
- {
- AudioManager.PauseLoopAudio();
- AudioManager.PlayInteraction("engine_off");
- transform.DOPause();
- transform.DORotate(new Vector3(0, 0, 0), 0.2f);
- }
-
- private void ButtonHold()
- {
- _engineSystem.AddOil();
- }
- }
-}
-
diff --git a/Assets/Scripts/MiniGame/Engine/OilGate.cs.meta b/Assets/Scripts/MiniGame/Engine/OilGate.cs.meta
deleted file mode 100644
index 2207de0c6..000000000
--- a/Assets/Scripts/MiniGame/Engine/OilGate.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 04beec2ebfad5f642bfb4a7a1716a08a
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs
index 9fa62402e..c2749ba35 100644
--- a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs
+++ b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs
@@ -2,19 +2,19 @@ using UnityEngine;
namespace AibisDream
{
- public class SpeedDashboard : Dashboard
+ public class SpeedDashboard : MonoBehaviour
{
private Transform _pointer;
[SerializeField] private float leftRot;
[SerializeField] private float rightRot;
- protected override void OnStart()
+ protected void OnStart()
{
_pointer = transform.Find("Pointer");
}
- protected override void UpdateDashboard(EngineData data)
+ protected void UpdateDashboard(EngineData data)
{
var targetRot = (rightRot - leftRot) * data.curSpeed + leftRot;
diff --git a/Assets/Scripts/MiniGame/Engine/StaticGear.cs b/Assets/Scripts/MiniGame/Engine/StaticGear.cs
new file mode 100644
index 000000000..1a807b3b7
--- /dev/null
+++ b/Assets/Scripts/MiniGame/Engine/StaticGear.cs
@@ -0,0 +1,35 @@
+using DG.Tweening;
+using UnityEngine;
+
+namespace AibisDream
+{
+ public class StaticGear : MonoBehaviour
+ {
+ public float initSpeed;
+ private Tween _rotateTween;
+
+ private void Start()
+ {
+ transform.parent.GetComponent().updateSpeedEvent.AddListener(UpdateSpeedScale);
+ }
+
+ ///
+ /// 开始旋转
+ ///
+ public void StartRotate()
+ {
+ _rotateTween = transform.DORotate(new Vector3(0, 0, 360), 1 / Mathf.Abs(initSpeed), RotateMode.LocalAxisAdd)
+ .SetEase(Ease.Linear)
+ .SetLoops(-1, LoopType.Incremental);
+ }
+
+ ///
+ /// 为旋转加速
+ ///
+ /// 速度倍率
+ private void UpdateSpeedScale(float speed)
+ {
+ _rotateTween.timeScale = speed;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/Engine/StaticGear.cs.meta b/Assets/Scripts/MiniGame/Engine/StaticGear.cs.meta
new file mode 100644
index 000000000..ac28556c7
--- /dev/null
+++ b/Assets/Scripts/MiniGame/Engine/StaticGear.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 79006d3d747c4b8482204874bbbf6ae3
+timeCreated: 1737104031
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/Gear/GearSystem.cs b/Assets/Scripts/MiniGame/Gear/GearSystem.cs
index 0cee1ca9a..25041a4b5 100644
--- a/Assets/Scripts/MiniGame/Gear/GearSystem.cs
+++ b/Assets/Scripts/MiniGame/Gear/GearSystem.cs
@@ -61,7 +61,6 @@ namespace AibisDream
private void Start()
{
- _shaftGraph?.Clear();
var shafts = transform.Find("Shafts").GetComponentsInChildren();
var panelShafts = _panel.GetComponentsInChildren();
_shaftGraph = new ShaftGraph(shafts, panelShafts);
@@ -277,7 +276,6 @@ namespace AibisDream
#if UNITY_EDITOR
if (!EditorApplication.isPlaying) return;
#endif
- _shaftGraph?.Clear();
_shaftGraph = new ShaftGraph(shafts, panelShafts);
}
diff --git a/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs b/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs
index 4135a15bd..aab90b35b 100644
--- a/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs
+++ b/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs
@@ -1,6 +1,5 @@
using System;
using System.Linq;
-using AibisDream.FixSystem;
using UnityEngine;
namespace AibisDream
@@ -42,9 +41,6 @@ namespace AibisDream
GeneEdgeTable();
UpdateSpeed();
-
- var engine = FixSystemCenter.SystemDic.Get();
- engine.UpdateDashboard += Accelerate;
}
private int FindDriverIdx()
@@ -269,19 +265,13 @@ namespace AibisDream
///
/// 通过引擎系统加速
///
- ///
- private void Accelerate(EngineData engineData)
+ /// 当前速度
+ private void Accelerate(float curSpeed)
{
foreach (var shaft in _vertexArray)
{
- if (shaft.HasChildGear()) shaft.UpdateSpeedScale(1 + engineData.curSpeed);
+ if (shaft.HasChildGear()) shaft.UpdateSpeedScale(1 + curSpeed);
}
}
-
- public void Clear()
- {
- var engine = FixSystemCenter.SystemDic.Get();
- engine.UpdateDashboard -= Accelerate;
- }
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Cursor/CursorManager.cs b/Assets/Scripts/UI/Cursor/CursorManager.cs
index 9b3b411d3..5fa622d49 100644
--- a/Assets/Scripts/UI/Cursor/CursorManager.cs
+++ b/Assets/Scripts/UI/Cursor/CursorManager.cs
@@ -80,13 +80,13 @@ namespace AibisDream
_unRegisters.Add(EnumEventSystem.Global.Register(InteractionEventEnum.End, OnInteractiveEnd));
_unRegisters.Add(
- EnumEventSystem.Global.Register(TriggerEnum.PointerEnter, OnPointerEnter));
+ EnumEventSystem.Global.Register(TriggerEnum.PointerEnter, OnPointerEnter));
_unRegisters.Add(
- EnumEventSystem.Global.Register(TriggerEnum.PointerExit, OnPointerExit));
+ EnumEventSystem.Global.Register(TriggerEnum.PointerExit, OnPointerExit));
_unRegisters.Add(
- EnumEventSystem.Global.Register(TriggerEnum.PointerDown, OnPointerDown));
+ EnumEventSystem.Global.Register(TriggerEnum.PointerDown, OnPointerDown));
_unRegisters.Add(
- EnumEventSystem.Global.Register(TriggerEnum.PointerUp, OnPointerUp));
+ EnumEventSystem.Global.Register(TriggerEnum.PointerUp, OnPointerUp));
}
private void LateUpdate()
@@ -154,15 +154,16 @@ namespace AibisDream
SwitchCursor(defaultCursor);
}
- private void OnPointerEnter(GameObject target)
+ private void OnPointerEnter(IInteraction target)
{
if (_curState == CursorState.Interactive && !_isTalking)
{
- SwitchCursor(interactive);
+ // 如果不可交互，就显示不可交互的指针
+ SwitchCursor(target.IsActive ? interactive : disable);
}
}
- private void OnPointerExit(GameObject target)
+ private void OnPointerExit(IInteraction target)
{
if (_curState == CursorState.Interactive && !_isTalking)
{
@@ -170,20 +171,20 @@ namespace AibisDream
}
}
- private void OnPointerDown(GameObject target)
+ private void OnPointerDown(IInteraction target)
{
if (_curState == CursorState.Interactive && !_isTalking)
{
- SwitchCursor(holding);
+ SwitchCursor(target.IsActive ? holding : defaultCursor);
}
}
- private void OnPointerUp(GameObject target)
+ private void OnPointerUp(IInteraction target)
{
if (_curState == CursorState.Interactive && !_isTalking)
{
// 如果松手时还在物体之上
- SwitchCursor(EventSystemEx.Instance.holdingObj == target ? interactive : defaultCursor);
+ SwitchCursor(EventSystemEx.Instance.holdingObj == target.GetGameObject() ? interactive : defaultCursor);
}
}