Compare commits

...

2 Commits

4 changed files with 7685 additions and 118 deletions

View File

@@ -7479,13 +7479,13 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 151165667} m_GameObject: {fileID: 151165667}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.23748541, y: -0.76210344, z: 0.41133708, w: -0.4400008} m_LocalRotation: {x: -0.21544388, y: -0.78150594, z: 0.37316, w: -0.45120293}
m_LocalPosition: {x: 15.713, y: 0.73, z: -52.02} m_LocalPosition: {x: 15.721, y: 0.701, z: -52.025}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 545159292} m_Father: {fileID: 545159292}
m_LocalEulerAnglesHint: {x: 56.715, y: -240, z: 0} m_LocalEulerAnglesHint: {x: 51.048, y: -240, z: 0}
--- !u!23 &151165669 --- !u!23 &151165669
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -61496,7 +61496,6 @@ Transform:
m_Children: m_Children:
- {fileID: 1297435911} - {fileID: 1297435911}
- {fileID: 2111454857} - {fileID: 2111454857}
- {fileID: 2056484540}
- {fileID: 120410995} - {fileID: 120410995}
m_Father: {fileID: 1557218170} m_Father: {fileID: 1557218170}
m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0}
@@ -68822,13 +68821,13 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1371465956} m_GameObject: {fileID: 1371465956}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.23748541, y: -0.76210344, z: 0.41133708, w: -0.4400008} m_LocalRotation: {x: -0.21544388, y: -0.78150594, z: 0.37316, w: -0.45120293}
m_LocalPosition: {x: 15.035, y: 0.216, z: -51.628} m_LocalPosition: {x: 15.09, y: 0.112, z: -51.66}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 545159292} m_Father: {fileID: 545159292}
m_LocalEulerAnglesHint: {x: 56.715, y: -240, z: 0} m_LocalEulerAnglesHint: {x: 51.048, y: -240, z: 0}
--- !u!23 &1371465958 --- !u!23 &1371465958
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -84531,6 +84530,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1714789982}
- {fileID: 1136712663} - {fileID: 1136712663}
m_Father: {fileID: 1355701910} m_Father: {fileID: 1355701910}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -99095,6 +99095,72 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d67c5b90a004d6d4b80421cfd3d5b895, type: 3} m_Script: {fileID: 11500000, guid: d67c5b90a004d6d4b80421cfd3d5b895, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1001 &1714789981
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1557218170}
m_Modifications:
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalPosition.x
value: 20.169004
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalPosition.y
value: 1.2179999
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalPosition.z
value: 0.99398994
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalRotation.w
value: 0.0000025033944
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalRotation.x
value: -0.0000025033944
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalRotation.y
value: -0.70710677
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalRotation.z
value: -0.70710677
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8541960315968224901, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: PaperText.GlocText
value: papers.Password.Where
objectReference: {fileID: 0}
- target: {fileID: 8747774001340122420, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_Name
value: Paper_A (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
--- !u!4 &1714789982 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
m_PrefabInstance: {fileID: 1714789981}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1717309225 --- !u!1 &1717309225
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -114075,6 +114141,10 @@ PrefabInstance:
propertyPath: m_WalkableMask propertyPath: m_WalkableMask
value: 8 value: 8
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4121303385992341431, guid: 38f12bb4d1cddca4e91abceba5607b83, type: 3}
propertyPath: AllowHeadhsot
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4270943517178745286, guid: 38f12bb4d1cddca4e91abceba5607b83, type: 3} - target: {fileID: 4270943517178745286, guid: 38f12bb4d1cddca4e91abceba5607b83, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 6.2527777e-13 value: 6.2527777e-13
@@ -117498,72 +117568,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2054729322} m_GameObject: {fileID: 2054729322}
m_Mesh: {fileID: -6692290496178104961, guid: 981f3baed40547648b5665750d56ef42, type: 3} m_Mesh: {fileID: -6692290496178104961, guid: 981f3baed40547648b5665750d56ef42, type: 3}
--- !u!1001 &2056484539
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1136712663}
m_Modifications:
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalPosition.x
value: 0.585
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalPosition.y
value: 0.106
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalPosition.z
value: -0.311
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalRotation.z
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8541960315968224901, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: PaperText.GlocText
value: papers.Password where
objectReference: {fileID: 0}
- target: {fileID: 8747774001340122420, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
propertyPath: m_Name
value: Paper_A (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
--- !u!4 &2056484540 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
m_PrefabInstance: {fileID: 2056484539}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2057841807 --- !u!1 &2057841807
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -42,8 +42,8 @@ MonoBehaviour:
AttackTrigger: Attack AttackTrigger: Attack
AttackState: Attack 01 AttackState: Attack 01
DamageRange: DamageRange:
min: 20 min: 50
max: 40 max: 60
--- !u!114 &8407762149507097960 --- !u!114 &8407762149507097960
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -20,6 +20,10 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/ThunderWire Studio/UHFPS/_Demo/Scenes/Raining.unity path: Assets/ThunderWire Studio/UHFPS/_Demo/Scenes/Raining.unity
guid: 5d02e5420369bbe42bc168890153f297 guid: 5d02e5420369bbe42bc168890153f297
- enabled: 1
path: Assets/Scenes/TheGame.unity
guid: 54e3d8dcc56089c4f97f38881cee4d72
m_configObjects: m_configObjects:
com.unity.addressableassets: {fileID: 11400000, guid: ae838b1c970aab641bb8e4643590df24, type: 2} com.unity.addressableassets: {fileID: 11400000, guid: ae838b1c970aab641bb8e4643590df24, type: 2}
com.unity.input.settings: {fileID: 11400000, guid: ce68c4c37abec5347801e4204a280574, type: 2} com.unity.input.settings: {fileID: 11400000, guid: ce68c4c37abec5347801e4204a280574, type: 2}
m_UseUCBPForAssetBundles: 0