Skip to content

Commit 1708594

Browse files
committed
all working
1 parent d9a6579 commit 1708594

1 file changed

Lines changed: 47 additions & 3 deletions

File tree

void-nexus/Assets/Scenes/MainScene.unity

Lines changed: 47 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104153,6 +104153,10 @@ PrefabInstance:
104153104153
propertyPath: m_Layer
104154104154
value: 18
104155104155
objectReference: {fileID: 0}
104156+
- target: {fileID: 919132149155446097, guid: a9dc61e478f53ac428440a8cf501ecbb, type: 3}
104157+
propertyPath: m_TagString
104158+
value: hitbox
104159+
objectReference: {fileID: 0}
104156104160
m_RemovedComponents: []
104157104161
m_RemovedGameObjects: []
104158104162
m_AddedGameObjects: []
@@ -104163,6 +104167,9 @@ PrefabInstance:
104163104167
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a9dc61e478f53ac428440a8cf501ecbb, type: 3}
104164104168
insertIndex: -1
104165104169
addedObject: {fileID: 1440744409}
104170+
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a9dc61e478f53ac428440a8cf501ecbb, type: 3}
104171+
insertIndex: -1
104172+
addedObject: {fileID: 1440744412}
104166104173
m_SourcePrefab: {fileID: 100100000, guid: a9dc61e478f53ac428440a8cf501ecbb, type: 3}
104167104174
--- !u!43 &1206357604
104168104175
Mesh:
@@ -104776,6 +104783,21 @@ CapsuleCollider:
104776104783
m_Height: 0.06336048
104777104784
m_Direction: 2
104778104785
m_Center: {x: -0.0000013827872, y: 0.000023618939, z: 0.032622367}
104786+
--- !u!114 &1214745372
104787+
MonoBehaviour:
104788+
m_ObjectHideFlags: 0
104789+
m_CorrespondingSourceObject: {fileID: 0}
104790+
m_PrefabInstance: {fileID: 0}
104791+
m_PrefabAsset: {fileID: 0}
104792+
m_GameObject: {fileID: 1214745366}
104793+
m_Enabled: 1
104794+
m_EditorHideFlags: 0
104795+
m_Script: {fileID: 11500000, guid: 7716b5f513ed9f74e8588d277a887e07, type: 3}
104796+
m_Name:
104797+
m_EditorClassIdentifier:
104798+
eventName: l_handshot
104799+
damage: 3
104800+
hapticRotate: 0
104779104801
--- !u!1 &1216139376
104780104802
GameObject:
104781104803
m_ObjectHideFlags: 0
@@ -123917,6 +123939,21 @@ CapsuleCollider:
123917123939
m_Height: 0.06336048
123918123940
m_Direction: 2
123919123941
m_Center: {x: -0.0000013827872, y: 0.000023618939, z: 0.032622367}
123942+
--- !u!114 &1440744412
123943+
MonoBehaviour:
123944+
m_ObjectHideFlags: 0
123945+
m_CorrespondingSourceObject: {fileID: 0}
123946+
m_PrefabInstance: {fileID: 0}
123947+
m_PrefabAsset: {fileID: 0}
123948+
m_GameObject: {fileID: 1440744406}
123949+
m_Enabled: 1
123950+
m_EditorHideFlags: 0
123951+
m_Script: {fileID: 11500000, guid: 7716b5f513ed9f74e8588d277a887e07, type: 3}
123952+
m_Name:
123953+
m_EditorClassIdentifier:
123954+
eventName: r_handshot
123955+
damage: 3
123956+
hapticRotate: 0
123920123957
--- !u!114 &1442180060
123921123958
MonoBehaviour:
123922123959
m_ObjectHideFlags: 0
@@ -176690,6 +176727,10 @@ PrefabInstance:
176690176727
propertyPath: m_Layer
176691176728
value: 18
176692176729
objectReference: {fileID: 0}
176730+
- target: {fileID: 919132149155446097, guid: a9dc61e478f53ac428440a8cf501ecbb, type: 3}
176731+
propertyPath: m_TagString
176732+
value: hitbox
176733+
objectReference: {fileID: 0}
176693176734
m_RemovedComponents: []
176694176735
m_RemovedGameObjects: []
176695176736
m_AddedGameObjects: []
@@ -176700,6 +176741,9 @@ PrefabInstance:
176700176741
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a9dc61e478f53ac428440a8cf501ecbb, type: 3}
176701176742
insertIndex: -1
176702176743
addedObject: {fileID: 1214745369}
176744+
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a9dc61e478f53ac428440a8cf501ecbb, type: 3}
176745+
insertIndex: -1
176746+
addedObject: {fileID: 1214745372}
176703176747
m_SourcePrefab: {fileID: 100100000, guid: a9dc61e478f53ac428440a8cf501ecbb, type: 3}
176704176748
--- !u!43 &2052866396
176705176749
Mesh:
@@ -347353,7 +347397,6 @@ Transform:
347353347397
m_Children:
347354347398
- {fileID: 6718756095301136244}
347355347399
- {fileID: 623863065}
347356-
- {fileID: 1380053333182564806}
347357347400
m_Father: {fileID: 1957129606427444802}
347358347401
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
347359347402
--- !u!33 &352439619906200984
@@ -501923,14 +501966,14 @@ Transform:
501923501966
serializedVersion: 2
501924501967
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
501925501968
m_LocalPosition: {x: 0, y: 0, z: 0}
501926-
m_LocalScale: {x: 0.6666666, y: 0.6666667, z: 0.6666666}
501969+
m_LocalScale: {x: 1, y: 1, z: 1}
501927501970
m_ConstrainProportionsScale: 0
501928501971
m_Children:
501929501972
- {fileID: 2587279704805725167}
501930501973
- {fileID: 4209055015716605159}
501931501974
- {fileID: 8024428945592843308}
501932501975
- {fileID: 4767707707786735358}
501933-
m_Father: {fileID: 351255627462401584}
501976+
m_Father: {fileID: 2407588557368848829}
501934501977
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
501935501978
--- !u!23 &1380560639586774127
501936501979
MeshRenderer:
@@ -625820,6 +625863,7 @@ Transform:
625820625863
m_ConstrainProportionsScale: 0
625821625864
m_Children:
625822625865
- {fileID: 1957129606427444802}
625866+
- {fileID: 1380053333182564806}
625823625867
- {fileID: 7921342539833734508}
625824625868
m_Father: {fileID: 0}
625825625869
m_LocalEulerAnglesHint: {x: 0, y: -44.994, z: 0}

0 commit comments

Comments
 (0)