xgan/2025TapTapGameJam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://8.134.150.210:3000/xgan/2025TapTapGameJam

Browse Source
This commit is contained in:
10yan\641
2025-10-25 15:43:10 +08:00
parent 180e03e4c2 2f1ad467aa
commit 1944fb40a1
15 changed files with 5081 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

348
Assets/Scenes/Test.unity
View File

@@ -216,6 +216,77 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 115d4e847c444833bc8dce4a03a78e55, type: 3}
m_Name:
m_EditorClassIdentifier:
<<<<<<< HEAD
=======
--- !u!1001 &346781470
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalPosition.x
value: -20
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalPosition.z
value: -5
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6227019518059310355, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_Name
value: Lever (3)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: be07db3098b709a40a6965f50f8c9640, type: 3}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
--- !u!1 &410087039
GameObject:
m_ObjectHideFlags: 0
@@ -548,6 +619,157 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 85652dd0e36597644aa5b3bc9603797b, type: 3}
<<<<<<< HEAD
=======
--- !u!1001 &761528196
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalPosition.x
value: -25
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalPosition.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7524217001864027819, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_Name
value: HidePlatform (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fff496640cf3cc748b6a608893c657ba, type: 3}
--- !u!114 &761528198 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5795370598927137930, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
m_PrefabInstance: {fileID: 761528196}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f28214d1465c43208546605ea8a619db, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &817379214
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalPosition.x
value: -25
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalPosition.z
value: -5
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2356242250385391551, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6227019518059310355, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
propertyPath: m_Name
value: Lever (4)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: be07db3098b709a40a6965f50f8c9640, type: 3}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
--- !u!1001 &865274353
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1210,6 +1432,21 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b3e24e2df98d14e4ebc08cc68c071afa, type: 3}
<<<<<<< HEAD
=======
--- !u!114 &1753046143 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4936355834716623489, guid: be07db3098b709a40a6965f50f8c9640,
type: 3}
m_PrefabInstance: {fileID: 817379214}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b9b9a895b0d40edb9a6d7213afbb256, type: 3}
m_Name:
m_EditorClassIdentifier:
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
--- !u!1 &1859676917
GameObject:
m_ObjectHideFlags: 0
@@ -2053,6 +2290,82 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 17ad2833fef1bc044bcc25a227730d74, type: 3}
<<<<<<< HEAD
=======
--- !u!1001 &4318083913684650404
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5795370598927137930, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: disappearType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalPosition.x
value: -20
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalPosition.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6191493531679122464, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7524217001864027819, guid: fff496640cf3cc748b6a608893c657ba,
type: 3}
propertyPath: m_Name
value: HidePlatform
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fff496640cf3cc748b6a608893c657ba, type: 3}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
--- !u!1001 &4550639332017178188
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2338,11 +2651,14 @@ PrefabInstance:
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
<<<<<<< HEAD
- target: {fileID: 3748514579879403869, guid: 667aedb0d3f8c9d469819c9ff2b4472b,
type: 3}
propertyPath: m_RendererIndex
value: -1
objectReference: {fileID: 0}
=======
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
- target: {fileID: 7437893023972897012, guid: 667aedb0d3f8c9d469819c9ff2b4472b,
type: 3}
propertyPath: m_LocalPosition.x
@@ -2414,7 +2730,11 @@ PrefabInstance:
- target: {fileID: 6919868315282518728, guid: e6007da0e1121fd4ab3b932c054f6256,
type: 3}
propertyPath: preConnectionLines.Array.size
<<<<<<< HEAD
value: 1
=======
value: 2
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
objectReference: {fileID: 0}
- target: {fileID: 6919868315282518728, guid: e6007da0e1121fd4ab3b932c054f6256,
type: 3}
@@ -2426,6 +2746,24 @@ PrefabInstance:
propertyPath: preConnectionLines.Array.data[0].target
value:
objectReference: {fileID: 183959152}
<<<<<<< HEAD
=======
- target: {fileID: 6919868315282518728, guid: e6007da0e1121fd4ab3b932c054f6256,
type: 3}
propertyPath: preConnectionLines.Array.data[1].source
value:
objectReference: {fileID: 761528198}
- target: {fileID: 6919868315282518728, guid: e6007da0e1121fd4ab3b932c054f6256,
type: 3}
propertyPath: preConnectionLines.Array.data[1].target
value:
objectReference: {fileID: 1753046143}
- target: {fileID: 6919868315282518728, guid: e6007da0e1121fd4ab3b932c054f6256,
type: 3}
propertyPath: preConnectionLines.Array.data[1].PreConnectionID
value: 0
objectReference: {fileID: 0}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
- target: {fileID: 8209060139561151121, guid: e6007da0e1121fd4ab3b932c054f6256,
type: 3}
propertyPath: m_LocalPosition.x
@@ -2787,6 +3125,11 @@ SceneRoots:
- {fileID: 4550639332017178188}
- {fileID: 6865129841946316189}
- {fileID: 2578337202726380610}
<<<<<<< HEAD
=======
- {fileID: 4318083913684650404}
- {fileID: 761528196}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
- {fileID: 1781028406820323425}
- {fileID: 7779342506646282638}
- {fileID: 8980111935536418165}
@@ -2797,6 +3140,11 @@ SceneRoots:
- {fileID: 473911345}
- {fileID: 865274353}
- {fileID: 6350903300567888677}
<<<<<<< HEAD
=======
- {fileID: 346781470}
- {fileID: 817379214}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
- {fileID: 1549323716}
- {fileID: 2110019781}
- {fileID: 730184548946979397}