浏览代码

Fix dialogue shots

/main
Amel 3 年前
当前提交
7b7510b3
共有 10 个文件被更改,包括 1039 次插入171 次删除
  1. 120
      UOP1_Project/Assets/Cutscenes/SavoryDishCutscene.playable
  2. 794
      UOP1_Project/Assets/Cutscenes/SweetDishCutscene.playable
  3. 31
      UOP1_Project/Assets/Prefabs/Characters/NPCs_BasePrefabs/Townsfolk_F.prefab
  4. 33
      UOP1_Project/Assets/Prefabs/Characters/NPCs_BasePrefabs/Townsfolk_M.prefab
  5. 36
      UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare.prefab
  6. 38
      UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/ChefComb.prefab
  7. 35
      UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Felfel.prefab
  8. 8
      UOP1_Project/Assets/Prefabs/Managers/DialogueShot.prefab
  9. 74
      UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Market.prefab
  10. 41
      UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Upper.prefab

120
UOP1_Project/Assets/Cutscenes/SavoryDishCutscene.playable


m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4

m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4

m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4

m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4

m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4

m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4

794
UOP1_Project/Assets/Cutscenes/SweetDishCutscene.playable
文件差异内容过多而无法显示
查看文件

31
UOP1_Project/Assets/Prefabs/Characters/NPCs_BasePrefabs/Townsfolk_F.prefab


- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.00000071525574
value: 2
value: 0
value: 1
value: -10.000007
value: 3
value: 0.9989147
value: -0.35028172
value: -0.046576764
value: -3.945242e-16
value: -0.000000059604638
value: 0.93664443
value: -0.0000000037252899
value: -1.0549478e-15
objectReference: {fileID: 0}
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}

- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -123.948
value: 0
objectReference: {fileID: 0}
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}

propertyPath: m_LookAt
value:
objectReference: {fileID: 1345491811586392000}
- target: {fileID: 5374472330741316883, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_FollowOffset.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5374472330741316883, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_FollowOffset.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5374472330741316883, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_FollowOffset.z
value: 3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2f2b34bb9de172f478cdd8e33a4589a9, type: 3}
--- !u!1 &4147769428160019637 stripped

33
UOP1_Project/Assets/Prefabs/Characters/NPCs_BasePrefabs/Townsfolk_M.prefab


- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: 2
value: 0
value: 1
value: -10
value: 3
value: 0.9989147
value: -0.35028172
value: -0.046576772
value: -2.2191721e-15
value: 0.0000000037212475
value: 0.93664443
value: 1.7351201e-10
value: 8.5833914e-16
objectReference: {fileID: 0}
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}

- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -123.948
value: 0
objectReference: {fileID: 0}
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}

- target: {fileID: 5170601539462982588, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_Lens.m_SensorSize.x
value: 1.7772529
value: 2.7445052
objectReference: {fileID: 0}
- target: {fileID: 5374472330741316883, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_FollowOffset.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5374472330741316883, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_FollowOffset.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5374472330741316883, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_FollowOffset.z
value: 3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2f2b34bb9de172f478cdd8e33a4589a9, type: 3}

36
UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare.prefab


- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.0000042915344
value: 2.0000002
value: 0
value: 1
value: -9.999998
value: 3.0000005
value: 0.9989147
value: -0.35028157
value: -0.046576794
value: -2.127503e-38
value: -0.00000026822087
value: 0.93664443
value: -0.000000014901159
value: 1.086494e-38
objectReference: {fileID: 0}
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}

- target: {fileID: 5170601539462982588, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_Lens.m_SensorSize.x
value: 1.7780331
value: 2.7445052
objectReference: {fileID: 0}
- target: {fileID: 5374472330741316883, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_FollowOffset.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5374472330741316883, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_FollowOffset.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5374472330741316883, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_FollowOffset.z
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6230831866616406394, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_TrackedObjectOffset.y
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2f2b34bb9de172f478cdd8e33a4589a9, type: 3}

38
UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/ChefComb.prefab


- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: 2
value: 0
value: 1
value: -10
value: 3
value: 0.9989147
value: -0.3502817
value: -0.04657678
value: 1.0812832e-32
value: -0
value: 0.93664443
value: -0
value: 1.2468431e-31
objectReference: {fileID: 0}
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}

- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -123.948
value: 0
objectReference: {fileID: 0}
- target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}

propertyPath: m_Name
value: DialogueShot
objectReference: {fileID: 0}
- target: {fileID: 599892197291055368, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170601539462982588, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_Follow

- target: {fileID: 5170601539462982588, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_Lens.m_SensorSize.x
value: 2.440945
value: 2.7445052
objectReference: {fileID: 0}
- target: {fileID: 5374472330741316883, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_FollowOffset.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5374472330741316883, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_FollowOffset.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5374472330741316883, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
type: 3}
propertyPath: m_FollowOffset.z
value: 3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2f2b34bb9de172f478cdd8e33a4589a9, type: 3}

35
UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Felfel.prefab


propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 0442a28b915bb4e43a91412e25d7a75c, type: 2}
- target: {fileID: 4621968594439007087, guid: 661c491ac76af4b429f8a8c0e6e8c762,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4799525130884635568, guid: 661c491ac76af4b429f8a8c0e6e8c762,
type: 3}
propertyPath: _npcMovementConfig

type: 3}
propertyPath: m_Name
value: Felfel
objectReference: {fileID: 0}
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.27000135
objectReference: {fileID: 0}
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.1999998
objectReference: {fileID: 0}
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
type: 3}
propertyPath: m_LocalRotation.w
value: -0.07307121
objectReference: {fileID: 0}
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.0039387187
objectReference: {fileID: 0}
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.9958733
objectReference: {fileID: 0}
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.05368003
objectReference: {fileID: 0}
- target: {fileID: 5579597578339563075, guid: 661c491ac76af4b429f8a8c0e6e8c762,
type: 3}

8
UOP1_Project/Assets/Prefabs/Managers/DialogueShot.prefab


m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 599892197291055368}
m_LocalRotation: {x: 0.011707943, y: -0.9842885, z: 0.07158658, w: 0.16097975}
m_LocalPosition: {x: 1.220001, y: 1.56, z: 3.63}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: -123.948, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5170601539462982588
MonoBehaviour:
m_ObjectHideFlags: 0

ModeOverride: 0
LensShift: {x: 0, y: 0}
GateFit: 2
m_SensorSize: {x: 1.7789599, y: 1}
m_SensorSize: {x: 2.7445052, y: 1}
m_Transitions:
m_BlendHint: 2
m_InheritPosition: 0

74
UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Market.prefab


m_Modification:
m_TransformParent: {fileID: 791697371593637568}
m_Modifications:
- target: {fileID: 3270932272345889027, guid: 6494d957e2f12413faed3836aad6c425,
type: 3}
propertyPath: m_BoundingSphereOverride.y
value: 3e-45
objectReference: {fileID: 0}
- target: {fileID: 3270932272345889027, guid: 6494d957e2f12413faed3836aad6c425,
type: 3}
propertyPath: m_BoundingSphereOverride.z
value: 4.2e-44
objectReference: {fileID: 0}
- target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
type: 3}
propertyPath: m_RootOrder

m_Modification:
m_TransformParent: {fileID: 791697371593637568}
m_Modifications:
- target: {fileID: 3270932272345889027, guid: 6494d957e2f12413faed3836aad6c425,
type: 3}
propertyPath: m_BoundingSphereOverride.w
value: 2.2729683
objectReference: {fileID: 0}
- target: {fileID: 3270932272345889027, guid: 6494d957e2f12413faed3836aad6c425,
type: 3}
propertyPath: m_BoundingSphereOverride.x
value: 7.08e-43
objectReference: {fileID: 0}
- target: {fileID: 3270932272345889027, guid: 6494d957e2f12413faed3836aad6c425,
type: 3}
propertyPath: m_BoundingSphereOverride.y
value: 1.4034e-41
objectReference: {fileID: 0}
- target: {fileID: 3270932272345889027, guid: 6494d957e2f12413faed3836aad6c425,
type: 3}
propertyPath: m_BoundingSphereOverride.z
value: NaN
objectReference: {fileID: 0}
- target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
type: 3}
propertyPath: m_RootOrder

propertyPath: m_Name
value: Felfel
objectReference: {fileID: 0}
- target: {fileID: 469619271513959702, guid: 14637e42c9f6e5a47a90f54664572a28,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
type: 3}
propertyPath: m_RootOrder

- target: {fileID: 872615007514310307, guid: 14637e42c9f6e5a47a90f54664572a28,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.00000071525574
value: 2.0000005
objectReference: {fileID: 0}
- target: {fileID: 872615007514310307, guid: 14637e42c9f6e5a47a90f54664572a28,
type: 3}
propertyPath: m_LocalPosition.y
value: 1
value: -10.000003
value: 3.0000005
value: -0.9989148
value: -0.35028186
value: 0.046576764
value: 1.2444513e-15
value: 0.00000008940697
value: 0.9366444
value: 0.000000004656613
value: 3.3276297e-15
objectReference: {fileID: 0}
- target: {fileID: 872615007514310307, guid: 14637e42c9f6e5a47a90f54664572a28,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4918675056030894349, guid: 14637e42c9f6e5a47a90f54664572a28,
type: 3}
propertyPath: m_FollowOffset.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4918675056030894349, guid: 14637e42c9f6e5a47a90f54664572a28,
type: 3}
propertyPath: m_FollowOffset.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4918675056030894349, guid: 14637e42c9f6e5a47a90f54664572a28,
type: 3}
propertyPath: m_FollowOffset.z
value: 3
value: 1.7782634
value: 2.7445052
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 14637e42c9f6e5a47a90f54664572a28, type: 3}

41
UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Upper.prefab


- target: {fileID: 653251662382642302, guid: 27c7b99622d41f04ba08f0f122783c20,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: 1.29
value: 0
value: 0.9300003
value: -10
value: 2.85
value: 0.9989147
value: -0.26690763
value: -0.04657678
value: 0.0037250672
value: -1e-45
value: 0.96362114
value: -0
value: 0.013448674
objectReference: {fileID: 0}
- target: {fileID: 653251662382642302, guid: 27c7b99622d41f04ba08f0f122783c20,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4705789593186421712, guid: 27c7b99622d41f04ba08f0f122783c20,
type: 3}
propertyPath: m_FollowOffset.x
value: 1.29
objectReference: {fileID: 0}
- target: {fileID: 4705789593186421712, guid: 27c7b99622d41f04ba08f0f122783c20,
type: 3}
propertyPath: m_FollowOffset.y
value: 0.9300003
objectReference: {fileID: 0}
- target: {fileID: 4705789593186421712, guid: 27c7b99622d41f04ba08f0f122783c20,
type: 3}
propertyPath: m_FollowOffset.z
value: 2.85
objectReference: {fileID: 0}
- target: {fileID: 5483711007322561919, guid: 27c7b99622d41f04ba08f0f122783c20,
type: 3}
propertyPath: m_Priority
value: 1
value: 1.6020408
value: 2.7445052
objectReference: {fileID: 0}
- target: {fileID: 5815136950816891769, guid: 27c7b99622d41f04ba08f0f122783c20,
type: 3}

正在加载...
取消
保存