浏览代码

Walkling cane as weapon, tweaks to animations

/devlogs-3-input
Ciro Continisio 4 年前
当前提交
6e9237b6
共有 18 个文件被更改,包括 3259 次插入440 次删除
  1. 917
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/IdleWithStaff.anim
  2. 21
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef.controller
  3. 2
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_CaneHit.fbx.meta
  4. 2
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Collect.fbx.meta
  5. 2
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Idle.fbx.meta
  6. 2
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Jump.fbx.meta
  7. 2
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Walk.fbx.meta
  8. 4
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_faint.fbx.meta
  9. 2
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_run.fbx.meta
  10. 651
      UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
  11. 20
      UOP1_Project/Assets/Prefabs/Items/WalkingCane.prefab
  12. 6
      UOP1_Project/Assets/Scripts/Characters/Weapon.cs
  13. 25
      UOP1_Project/Assets/Scripts/Input/GameInput.cs
  14. 25
      UOP1_Project/Assets/Settings/Input/GameInput.inputactions
  15. 1001
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/RunWithStaff.anim
  16. 8
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/RunWithStaff.anim.meta
  17. 1001
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/WalkWithStaff.anim
  18. 8
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/WalkWithStaff.anim.meta

917
UOP1_Project/Assets/Art/Characters/PigChef/Animation/IdleWithStaff.anim
文件差异内容过多而无法显示
查看文件

21
UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef.controller


m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionDuration: 0.2
m_TransitionOffset: 0
m_ExitTime: 0.8076923
m_HasExitTime: 0

m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -5252816984213320552, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_Motion: {fileID: 7400000, guid: e75fc203107f62d4cb7bdf94806fcc25, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:

m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8943662
m_HasExitTime: 1

m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8943662
m_HasExitTime: 1

m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionDuration: 0.2
m_TransitionOffset: 0
m_ExitTime: 0.8076923
m_HasExitTime: 0

m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionDuration: 0.2
m_TransitionOffset: 0
m_ExitTime: 0.98747915
m_HasExitTime: 0

m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionDuration: 0.2
m_TransitionOffset: 0
m_ExitTime: 0.7580645
m_HasExitTime: 0

m_Name: Blend Tree
m_Childs:
- serializedVersion: 2
m_Motion: {fileID: -3419257869308726280, guid: d7866876f824fdd439187217dc8684f0,
type: 3}
m_Motion: {fileID: 7400000, guid: 5976cd6b402e9564c9451dbdae1c5871, type: 2}
m_Threshold: 0
m_Position: {x: 0, y: 0}
m_TimeScale: 1

- serializedVersion: 2
m_Motion: {fileID: 6200578666267062213, guid: 1da1da422bdf1a54788013b6f1edbd45,
type: 3}
m_Motion: {fileID: 7400000, guid: f2c6830f0e8743443a792b8ed6663b59, type: 2}
m_Threshold: 0.8
m_Position: {x: 0, y: 0}
m_TimeScale: 1

2
UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_CaneHit.fbx.meta


addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importVisibility: 0
importBlendShapes: 1
importCameras: 1
importLights: 1

2
UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Collect.fbx.meta


addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importVisibility: 0
importBlendShapes: 1
importCameras: 1
importLights: 1

2
UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Idle.fbx.meta


addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importVisibility: 0
importBlendShapes: 1
importCameras: 1
importLights: 1

2
UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Jump.fbx.meta


addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importVisibility: 0
importBlendShapes: 1
importCameras: 1
importLights: 1

2
UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Walk.fbx.meta


addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importVisibility: 0
importBlendShapes: 1
importCameras: 1
importLights: 1

4
UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_faint.fbx.meta


addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importVisibility: 0
generateSecondaryUV: 1
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1

2
UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_run.fbx.meta


addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importVisibility: 0
importBlendShapes: 1
importCameras: 1
importLights: 1

651
UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
文件差异内容过多而无法显示
查看文件

20
UOP1_Project/Assets/Prefabs/Items/WalkingCane.prefab


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!136 &969440480837226763
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4112729716880871686}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.091426246
m_Height: 1.1348616
m_Direction: 1
m_Center: {x: -0.01, y: -0.011085637, z: -0.02}
--- !u!1001 &3878215223713049687
PrefabInstance:
m_ObjectHideFlags: 0

objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c5d242d6bd84e46af8b2bb85418929ef, type: 3}
--- !u!1 &4112729716880871686 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c5d242d6bd84e46af8b2bb85418929ef,
type: 3}
m_PrefabInstance: {fileID: 3878215223713049687}
m_PrefabAsset: {fileID: 0}

6
UOP1_Project/Assets/Scripts/Characters/Weapon.cs


[SerializeField] private int _attackStrength = default;
private bool _enable = false;
public bool Enable
{
get => _enable;
set => _enable = value;
}
public bool Enable { get; set; }
public int AttackStrength
{

25
UOP1_Project/Assets/Scripts/Input/GameInput.cs


{
""name"": """",
""id"": ""91ce58d8-88e1-4ade-945b-59c4f0939828"",
""path"": ""<Keyboard>/j"",
""path"": ""<Keyboard>/f"",
""interactions"": """",
""processors"": """",
""groups"": ""KeyboardOrGamepad"",

{
""name"": """",
""id"": ""937b421c-9467-4b47-a1fd-445b9b44d5c9"",
""path"": ""<Keyboard>/l"",
""path"": ""<Keyboard>/q"",
""interactions"": """",
""processors"": """",
""groups"": ""KeyboardOrGamepad"",

""isPartOfComposite"": false
},
{
""name"": ""Keyboard TFGH"",
""name"": ""Keyboard IJKL"",
""id"": ""8e17360e-f036-4963-93f6-05d14787dfb5"",
""path"": ""2DVector(mode=1)"",
""interactions"": """",

{
""name"": ""up"",
""id"": ""9a4ec3f5-78bf-4f42-b7d7-f1edd7ce12dc"",
""path"": ""<Keyboard>/t"",
""path"": ""<Keyboard>/i"",
""interactions"": """",
""processors"": """",
""groups"": ""KeyboardOrGamepad"",

{
""name"": ""down"",
""id"": ""5d82874e-55d8-4d54-84f5-c4d59dc3b39c"",
""path"": ""<Keyboard>/g"",
""path"": ""<Keyboard>/k"",
""interactions"": """",
""processors"": """",
""groups"": ""KeyboardOrGamepad"",

{
""name"": ""left"",
""id"": ""13a13bd5-f4ec-4f5b-9a8e-ef1165cc9f5f"",
""path"": ""<Keyboard>/f"",
""path"": ""<Keyboard>/j"",
""interactions"": """",
""processors"": """",
""groups"": ""KeyboardOrGamepad"",

{
""name"": ""right"",
""id"": ""78626b57-196b-4f24-9a3f-af2477d3633b"",
""path"": ""<Keyboard>/h"",
""interactions"": """",
""processors"": """",
""groups"": ""KeyboardOrGamepad"",
""action"": ""RotateCamera"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""up"",
""id"": ""4e483eb2-4460-4dc1-af9f-9bcb31ebe837"",
""path"": ""<Gamepad>/rightStick/up"",
""path"": ""<Keyboard>/l"",
""interactions"": """",
""processors"": """",
""groups"": ""KeyboardOrGamepad"",

25
UOP1_Project/Assets/Settings/Input/GameInput.inputactions


{
"name": "",
"id": "91ce58d8-88e1-4ade-945b-59c4f0939828",
"path": "<Keyboard>/j",
"path": "<Keyboard>/f",
"interactions": "",
"processors": "",
"groups": "KeyboardOrGamepad",

{
"name": "",
"id": "937b421c-9467-4b47-a1fd-445b9b44d5c9",
"path": "<Keyboard>/l",
"path": "<Keyboard>/q",
"interactions": "",
"processors": "",
"groups": "KeyboardOrGamepad",

"isPartOfComposite": false
},
{
"name": "Keyboard TFGH",
"name": "Keyboard IJKL",
"id": "8e17360e-f036-4963-93f6-05d14787dfb5",
"path": "2DVector(mode=1)",
"interactions": "",

{
"name": "up",
"id": "9a4ec3f5-78bf-4f42-b7d7-f1edd7ce12dc",
"path": "<Keyboard>/t",
"path": "<Keyboard>/i",
"interactions": "",
"processors": "",
"groups": "KeyboardOrGamepad",

{
"name": "down",
"id": "5d82874e-55d8-4d54-84f5-c4d59dc3b39c",
"path": "<Keyboard>/g",
"path": "<Keyboard>/k",
"interactions": "",
"processors": "",
"groups": "KeyboardOrGamepad",

{
"name": "left",
"id": "13a13bd5-f4ec-4f5b-9a8e-ef1165cc9f5f",
"path": "<Keyboard>/f",
"path": "<Keyboard>/j",
"interactions": "",
"processors": "",
"groups": "KeyboardOrGamepad",

{
"name": "right",
"id": "78626b57-196b-4f24-9a3f-af2477d3633b",
"path": "<Keyboard>/h",
"interactions": "",
"processors": "",
"groups": "KeyboardOrGamepad",
"action": "RotateCamera",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "up",
"id": "4e483eb2-4460-4dc1-af9f-9bcb31ebe837",
"path": "<Gamepad>/rightStick/up",
"path": "<Keyboard>/l",
"interactions": "",
"processors": "",
"groups": "KeyboardOrGamepad",

1001
UOP1_Project/Assets/Art/Characters/PigChef/Animation/RunWithStaff.anim
文件差异内容过多而无法显示
查看文件

8
UOP1_Project/Assets/Art/Characters/PigChef/Animation/RunWithStaff.anim.meta


fileFormatVersion: 2
guid: f2c6830f0e8743443a792b8ed6663b59
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

1001
UOP1_Project/Assets/Art/Characters/PigChef/Animation/WalkWithStaff.anim
文件差异内容过多而无法显示
查看文件

8
UOP1_Project/Assets/Art/Characters/PigChef/Animation/WalkWithStaff.anim.meta


fileFormatVersion: 2
guid: 5976cd6b402e9564c9451dbdae1c5871
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存