浏览代码

Fix CM bug, tweaks

/main
Ciro Continisio 4 年前
当前提交
f0dc54d3
共有 13 个文件被更改,包括 2318 次插入2299 次删除
  1. 2
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/Pig.controller
  2. 2
      UOP1_Project/Assets/Art/Characters/PigChef/Pig.mat
  3. 2
      UOP1_Project/Assets/Materials/Prototype_Grass.mat
  4. 584
      UOP1_Project/Assets/Scenes/TestingGround.unity
  5. 8
      UOP1_Project/Assets/Scenes/TestingGround_Small.unity
  6. 8
      UOP1_Project/Assets/Scenes/TestingGround_Small/LightingData.asset
  7. 999
      UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-0_comp_dir.png
  8. 1001
      UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-0_comp_light.exr
  9. 999
      UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-1_comp_dir.png
  10. 1001
      UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-1_comp_light.exr
  11. 1
      UOP1_Project/Assets/ScriptableObjects/Protagonist/Actions/Ascend.asset
  12. 2
      UOP1_Project/Assets/ScriptableObjects/Protagonist/Actions/Walk.asset
  13. 8
      UOP1_Project/Assets/Scripts/Sound.meta

2
UOP1_Project/Assets/Art/Characters/PigChef/Animation/Pig.controller


m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Walk
m_Speed: 1
m_Speed: 1.5
m_CycleOffset: 0
m_Transitions:
- {fileID: 7941493872309352012}

2
UOP1_Project/Assets/Art/Characters/PigChef/Pig.mat


- _OcclusionStrength: 1
- _OutlineDepthSensitivity: 0.3
- _OutlineNormalsSensitivity: 0.5
- _OutlineThickness: 2
- _OutlineThickness: 3
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.233

2
UOP1_Project/Assets/Materials/Prototype_Grass.mat


- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _MainColor: {r: 0.14173195, g: 0.46226418, b: 0.18923469, a: 1}
- _MainColor: {r: 0.2488875, g: 0.4433962, b: 0.2773522, a: 1}
- _Offset: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 0}

584
UOP1_Project/Assets/Scenes/TestingGround.unity
文件差异内容过多而无法显示
查看文件

8
UOP1_Project/Assets/Scenes/TestingGround_Small.unity


m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1348188976}
m_LocalRotation: {x: -0.22812407, y: -0.79218626, z: 0.15663585, w: 0.54393536}
m_LocalPosition: {x: -3.61, y: 1.05, z: 4.95}
m_LocalScale: {x: 6.5463004, y: 1, z: 2.5586}
m_LocalPosition: {x: -3.88, y: -0.13, z: 5.64}
m_LocalScale: {x: 6.5463004, y: 4, z: 2.5586}
m_Children: []
m_Father: {fileID: 1343018183}
m_RootOrder: 3

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1536930179}
m_LocalRotation: {x: -0.37815893, y: -0.7325267, z: 0.25965363, w: 0.5029717}
m_LocalPosition: {x: -1.95, y: 1.59, z: 6.47}
m_LocalScale: {x: 6.5463004, y: 1, z: 2.5586}
m_LocalPosition: {x: -3.32, y: -1.13, z: 10.04}
m_LocalScale: {x: 6.5463004, y: 10.913133, z: 2.5586}
m_Children: []
m_Father: {fileID: 1343018183}
m_RootOrder: 2

8
UOP1_Project/Assets/Scenes/TestingGround_Small/LightingData.asset
文件差异内容过多而无法显示
查看文件

999
UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-0_comp_dir.png
文件差异内容过多而无法显示
查看文件

1001
UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-0_comp_light.exr
文件差异内容过多而无法显示
查看文件

999
UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-1_comp_dir.png
文件差异内容过多而无法显示
查看文件

1001
UOP1_Project/Assets/Scenes/TestingGround_Small/Lightmap-1_comp_light.exr
文件差异内容过多而无法显示
查看文件

1
UOP1_Project/Assets/ScriptableObjects/Protagonist/Actions/Ascend.asset


m_Script: {fileID: 11500000, guid: d102e2f241954884fba03c7553584369, type: 3}
m_Name: Ascend
m_EditorClassIdentifier:
_initialJumpForce: 6

2
UOP1_Project/Assets/ScriptableObjects/Protagonist/Actions/Walk.asset


m_Script: {fileID: 11500000, guid: 09fcb347b6cb3524c9f59fbde36ec7c7, type: 3}
m_Name: Walk
m_EditorClassIdentifier:
_speed: 3
_speed: 4

8
UOP1_Project/Assets/Scripts/Sound.meta


fileFormatVersion: 2
guid: 7f027bef4434b504f9b49753067f5ea1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存