浏览代码

Refactoring, moved items

/UI
Ciro Continisio 4 年前
当前提交
0d4b9d8a
共有 13 个文件被更改,包括 177 次插入145 次删除
  1. 38
      UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_CaneHit2.fbx.meta
  2. 267
      UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
  3. 2
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/Rotate.asset
  4. 2
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset
  5. 2
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/PickUpTrigger_OnEnter.asset
  6. 2
      UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Walking.asset
  7. 1
      UOP1_Project/Assets/Scripts/Characters/Protagonist.cs
  8. 8
      UOP1_Project/Assets/Prefabs/Characters/Pig.meta
  9. 0
      /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset.meta
  10. 0
      /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/PickUpTrigger_OnEnter.asset.meta
  11. 0
      /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset
  12. 0
      /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/PickUpTrigger_OnEnter.asset

38
UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_CaneHit2.fbx.meta


animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
clipAnimations:
- serializedVersion: 16
name: cane_hit2
takeName: cane_hit2
internalID: 0
firstFrame: 1
lastFrame: 65
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events:
- time: 0.41218638
functionName: PlayCaneSwing
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
isReadable: 0
meshes:
lODScreenPercentages: []

267
UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab


m_Name:
m_EditorClassIdentifier:
_attackConfigSO: {fileID: 11400000, guid: b8283b4a85847b44993fc5a971db3ac8, type: 2}
--- !u!1 &2248731488678348755
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6649678422514028085}
- component: {fileID: 5021713601820606395}
- component: {fileID: 4712659148336435792}
- component: {fileID: 6918309245020967560}
m_Layer: 0
m_Name: Interaction
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6649678422514028085
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2248731488678348755}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1083073290189785667}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &5021713601820606395
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2248731488678348755}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.3, y: 1, z: 1}
m_Center: {x: 0, y: 0.5, z: 0.8}
--- !u!114 &4712659148336435792
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2248731488678348755}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a40d14d4203a8e14e9cc748b46975252, type: 3}
m_Name:
m_EditorClassIdentifier:
currentInteraction: 0
_inputReader: {fileID: 11400000, guid: 945ec0365077176418488737deed54be, type: 2}
_onObjectPickUp: {fileID: 11400000, guid: 582b52ca2b84a41528fe274eea1ced6a, type: 2}
_onCookingStart: {fileID: 11400000, guid: 146c579dca5c2f248a607ef66a36d765, type: 2}
_startTalking: {fileID: 11400000, guid: bff3df361fa61684386f84b5b062875a, type: 2}
_toggleInteractionUI: {fileID: 11400000, guid: 818cc55cb05226248bdb15ace58eab84,
type: 2}
_onInteractionEnded: {fileID: 11400000, guid: c499d87f35465124f8fb2751b150430d,
type: 2}
--- !u!54 &6918309245020967560
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2248731488678348755}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &2346068202725057742
GameObject:
m_ObjectHideFlags: 0

objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3}
--- !u!4 &6251068571708505270 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -2428247613635587810, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7646398735186508214 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -2121169907620178914, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9121043209303941797 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8509855438106808077, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2518796056843120514 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3060741017273451050, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6905220490405268265 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6294103071620228737, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &928224351994020785 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 318866306700684825, guid: c478a391cfbc4b74ebda3f9a57283705,

type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8291487101514034000 stripped
--- !u!4 &8132278368170902139 stripped
m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705,
m_CorrespondingSourceObject: {fileID: -552033998009847853, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}

type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2973733550900446787 stripped
--- !u!4 &5700738674217691736 stripped
m_CorrespondingSourceObject: {fileID: -6788698156879991829, guid: c478a391cfbc4b74ebda3f9a57283705,
m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}

type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2973733550900446787 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -6788698156879991829, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7479199366626129125 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8018118334481897805, guid: c478a391cfbc4b74ebda3f9a57283705,

type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8237582483159280860 stripped
--- !u!4 &5337852870612368657 stripped
m_CorrespondingSourceObject: {fileID: 8853132977705894260, guid: c478a391cfbc4b74ebda3f9a57283705,
m_CorrespondingSourceObject: {fileID: -4422890038042128199, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5337852870612368657 stripped
--- !u!4 &8237582483159280860 stripped
m_CorrespondingSourceObject: {fileID: -4422890038042128199, guid: c478a391cfbc4b74ebda3f9a57283705,
m_CorrespondingSourceObject: {fileID: 8853132977705894260, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5700738674217691736 stripped
--- !u!4 &8291487101514034000 stripped
m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705,
m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}

type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8132278368170902139 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -552033998009847853, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8731736048503314800 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8187609794124182744, guid: c478a391cfbc4b74ebda3f9a57283705,

--- !u!4 &2669244628279071469 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -5942939723840012475, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6905220490405268265 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6294103071620228737, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}

--- !u!4 &2680419760045213584 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3296533255824239160, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6251068571708505270 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -2428247613635587810, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7646398735186508214 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -2121169907620178914, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9121043209303941797 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8509855438106808077, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2518796056843120514 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3060741017273451050, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}

objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6be2ee433475f3a4096eaf60a7f40137, type: 3}
--- !u!1001 &8177583275354962040
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1083073290189785667}
m_Modifications:
- target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3466124848074566184, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: _onObjectPickUp
value:
objectReference: {fileID: 11400000, guid: 582b52ca2b84a41528fe274eea1ced6a,
type: 2}
- target: {fileID: 7947030310713933739, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_Name
value: Interaction
objectReference: {fileID: 0}
- target: {fileID: 7947030310713933739, guid: f8b7770f18df7614e90765b366548764,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f8b7770f18df7614e90765b366548764, type: 3}
--- !u!1001 &8181670996397994228
PrefabInstance:
m_ObjectHideFlags: 0

objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9, type: 3}
--- !u!4 &8517470450379016030 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 558165235346798506, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9,
type: 3}
m_PrefabInstance: {fileID: 8181670996397994228}
m_PrefabAsset: {fileID: 0}
--- !u!198 &334012115255375375 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 8442424470799517435, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9,

--- !u!4 &8517470450379016030 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 558165235346798506, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9,
type: 3}
m_PrefabInstance: {fileID: 8181670996397994228}
m_PrefabAsset: {fileID: 0}

2
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/Rotate.asset


m_Script: {fileID: 11500000, guid: 8c2b40ff7519a5e41a2dc48c2aca516c, type: 3}
m_Name: Rotate
m_EditorClassIdentifier:
_turnSmoothTime: 0.2
turnSmoothTime: 0.2

2
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset


m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: AttackTrigger
m_Name: AttackTrigger_OnEnter
m_EditorClassIdentifier:
parameterType: 3
parameterName: CaneHit

2
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/PickUpTrigger_OnEnter.asset


m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4c70afd7f911db7449d578cc18700875, type: 3}
m_Name: PickUpTrigger
m_Name: PickUpTrigger_OnEnter
m_EditorClassIdentifier:
parameterType: 3
parameterName: PickUp

2
UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Walking.asset


- {fileID: 11400000, guid: 6a9da1e686e8c3142bcbcc7ccb5bd5ac, type: 2}
- {fileID: 11400000, guid: bd85c54d16eb60c4c99504f1679af851, type: 2}
- {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}
- {fileID: 11400000, guid: 096d532f9a47f3145892efa1c4322e72, type: 2}
- {fileID: 11400000, guid: 4badb7afa3370ba4d8a229584c5c744f, type: 2}
- {fileID: 11400000, guid: fa0ce5b895dcf17499819f0d6f2dce96, type: 2}
- {fileID: 11400000, guid: 5aac41c53e47f1040a52303b2000ceb5, type: 2}
- {fileID: 11400000, guid: 74800142628360a42bb516b1e5c630e1, type: 2}

1
UOP1_Project/Assets/Scripts/Characters/Protagonist.cs


_inputReader.openInventoryEvent -= OnOpenInventory;
_inputReader.startedRunning -= OnStartedRunning;
_inputReader.stoppedRunning -= OnStoppedRunning;
_inputReader.attackEvent -= OnAttack;
//...
}

8
UOP1_Project/Assets/Prefabs/Characters/Pig.meta


fileFormatVersion: 2
guid: 58698d3586b800744aa03cccf6d9caed
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset.meta → /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset.meta

/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/PickUpTrigger.asset.meta → /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/PickUpTrigger_OnEnter.asset.meta

/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset → /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset

/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/PickUpTrigger.asset → /UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/PickUpTrigger_OnEnter.asset

正在加载...
取消
保存