浏览代码

sfdev merge

/main
David Woodruff 4 年前
当前提交
12e1b24a
共有 6 个文件被更改,包括 1707 次插入1152 次删除
  1. 997
      Assets/BossRoom/Models/DungeonPieces.FBX
  2. 2
      Assets/BossRoom/Prefabs/Enemy.prefab
  3. 40
      Assets/BossRoom/Prefabs/Player.prefab
  4. 812
      Assets/BossRoom/Scenes/DungeonTest.unity
  5. 1001
      Assets/BossRoom/Prefabs/Imp.prefab
  6. 7
      Assets/BossRoom/Prefabs/Imp.prefab.meta

997
Assets/BossRoom/Models/DungeonPieces.FBX
文件差异内容过多而无法显示
查看文件

2
Assets/BossRoom/Prefabs/Enemy.prefab


m_Name:
m_EditorClassIdentifier:
HitPoints:
InternalValue: 50
InternalValue: 80
Mana:
InternalValue: 20
--- !u!195 &4129073990757611390

40
Assets/BossRoom/Prefabs/Player.prefab


propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4547385851608601788, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_ModelIndex
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4547385851608601791, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_ModelIndex
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4547385851608601811, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_ModelIndex
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4547385851608603402, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_ModelIndex
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4547385851608603409, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_ModelIndex
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4547385851608603420, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_ModelIndex
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4547385851608603422, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_ModelIndex
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4547385851608603423, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_ModelIndex
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4547385851608603632, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_ModelIndex
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4547385851608603635, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_ModelIndex
value: 7
objectReference: {fileID: 0}
- target: {fileID: 7943089997373843793, guid: d396ab139e993ee43b2eb29978bba8ff, type: 3}
propertyPath: m_Enabled
value: 1

812
Assets/BossRoom/Scenes/DungeonTest.unity
文件差异内容过多而无法显示
查看文件

1001
Assets/BossRoom/Prefabs/Imp.prefab
文件差异内容过多而无法显示
查看文件

7
Assets/BossRoom/Prefabs/Imp.prefab.meta


fileFormatVersion: 2
guid: 05dc08b301a6f8c4e880a81c69d0b3e9
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存