This commit is contained in:
CortexCore
parent
65d90d1bfa
commit
967ad8eacf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -41,3 +41,4 @@ MonoBehaviour:
|
|||
- {fileID: 102900000, guid: 72d2660dce099184bbeb0e9039a2df00, type: 3}
|
||||
- {fileID: 102900000, guid: aee8d09a63ef2c3429a58e3664825ac3, type: 3}
|
||||
- {fileID: 833098253977982021, guid: c01b7ba098c32bd4a83fa4f641e88883, type: 3}
|
||||
- {fileID: 102900000, guid: 3c3b6903fbe8530448f026360a8f1c83, type: 3}
|
||||
|
|
|
|||
|
|
@ -37,5 +37,5 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: e10d487ea3416624f9d8b6866cfc8623,
|
||||
clip: {fileID: -5005298213620940126, guid: 49040ec99e08f4a479d274681c2f0224,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -37,5 +37,5 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: b2c0b6226e5c5ef4b9c513c64c06d31c,
|
||||
clip: {fileID: -5005298213620940126, guid: a260ff58e4c34aa4887de4cbf73b267f,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -37,5 +37,5 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: 87be0f2fac035024ebc507d9607f0e7d,
|
||||
clip: {fileID: -5005298213620940126, guid: 5b91a2e9158b82f4a98aac9427f2cb50,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940497
|
||||
- rid: 3736623726865940498
|
||||
value:
|
||||
rid: 3736623726865940499
|
||||
rid: 3736623747328901129
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
|
|
@ -34,8 +34,10 @@ MonoBehaviour:
|
|||
type: {class: Reference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
value: Equip
|
||||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
- rid: 3736623747328901129
|
||||
type: {class: MotionMatchingDualClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: 1a8337e3a0059ad4b9cb2003bbf051ee,
|
||||
clip1: {fileID: -5005298213620940126, guid: 6c6d1461845bb8943be2ef627c086617,
|
||||
type: 3}
|
||||
clip2: {fileID: 5828064820269887830, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -37,5 +37,5 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: 15f7ffc8f9f60134aa2b1121f8cd946d,
|
||||
clip: {fileID: -5005298213620940126, guid: 3d23d06fbabd61c4c80ae37a17ef6bc2,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -37,5 +37,5 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: f1a8af97ffb75664d99d9c2814d9968e,
|
||||
clip: {fileID: -6224038092205281515, guid: 70347011fba32754091f54f76f5e9586,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -37,5 +37,5 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: e2527a50e93850647a77016e2b36d512,
|
||||
clip: {fileID: -5005298213620940126, guid: 1c130561ae62a3f48ac800b0c05635ef,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -37,5 +37,5 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: abb77c2e43dfeed438472d2e013d4424,
|
||||
clip: {fileID: -5005298213620940126, guid: 45a5988f8360cf445a825aae5e154e58,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -37,5 +37,5 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: 5ec9c418c9b7f75459a8eb8a1329d64b,
|
||||
clip: {fileID: 6183853948075537494, guid: 962e3a8a690068641be39724f488fe0d,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940497
|
||||
- rid: 3736623726865940498
|
||||
value:
|
||||
rid: 3736623726865940499
|
||||
rid: 3736623747328901126
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
|
|
@ -34,8 +34,10 @@ MonoBehaviour:
|
|||
type: {class: Reference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
value: Reload
|
||||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
- rid: 3736623747328901126
|
||||
type: {class: MotionMatchingDualClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: d6c3eebf076204440a566f53f0ee13e6,
|
||||
clip1: {fileID: 3146893969071494344, guid: f8d18cf04542afa4ab4e4da1930645b3,
|
||||
type: 3}
|
||||
clip2: {fileID: 2599069708638463515, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -37,5 +37,5 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: bd60372f42a61b84c956da752509ba27,
|
||||
clip: {fileID: -4896380239855528765, guid: f4a35ae8a68d1c541a76d42051aa7cf1,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b43979511dcafe047b047852cf9f3c47, type: 3}
|
||||
m_Name: AG14W_Slide
|
||||
m_EditorClassIdentifier:
|
||||
tags:
|
||||
- rid: 3736623726865940496
|
||||
- rid: 3736623726865940497
|
||||
- rid: 3736623726865940498
|
||||
value:
|
||||
rid: 3736623726865940499
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 3736623726865940496
|
||||
type: {class: DictionaryReference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
index: -463043648
|
||||
keyword:
|
||||
- rid: 3736623726865940497
|
||||
type: {class: Reference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
value: AG14W
|
||||
- rid: 3736623726865940498
|
||||
type: {class: Reference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
value: Slide
|
||||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: 3860152649546669951, guid: 2ed0820f2388a824da6322c066fcd5c6,
|
||||
type: 3}
|
||||
|
|
@ -17,7 +17,7 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940497
|
||||
- rid: 3736623726865940498
|
||||
value:
|
||||
rid: 3736623726865940499
|
||||
rid: 3736623754094837762
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
|
|
@ -34,8 +34,10 @@ MonoBehaviour:
|
|||
type: {class: Reference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
value: Sprint
|
||||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
- rid: 3736623754094837762
|
||||
type: {class: MotionMatchingDualClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: de852abee32973e4583ce1764ef6fa80,
|
||||
clip1: {fileID: -3618829970799408532, guid: aff28d809b7b8fa4d84103019e007b29,
|
||||
type: 3}
|
||||
clip2: {fileID: 8945782531527108956, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -37,5 +37,5 @@ MonoBehaviour:
|
|||
- rid: 3736623726865940499
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: 70764c67b12777b4d92c3db7457c5171,
|
||||
clip: {fileID: -5005298213620940126, guid: e0a7bb2381bd5cd4785e1fd19556e2aa,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b43979511dcafe047b047852cf9f3c47, type: 3}
|
||||
m_Name: AG14W_Cimb
|
||||
m_EditorClassIdentifier:
|
||||
tags:
|
||||
- rid: 3736623754094837780
|
||||
- rid: 3736623754094837781
|
||||
- rid: 3736623754094837782
|
||||
value:
|
||||
rid: 3736623754094837783
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 3736623754094837780
|
||||
type: {class: DictionaryReference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
index: -463043648
|
||||
keyword:
|
||||
- rid: 3736623754094837781
|
||||
type: {class: Reference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
value: AG14W
|
||||
- rid: 3736623754094837782
|
||||
type: {class: Reference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
value: Climb
|
||||
- rid: 3736623754094837783
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: 4299282957090598557, guid: e64856a178eee57418f9f6029844ccbc,
|
||||
type: 3}
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b43979511dcafe047b047852cf9f3c47, type: 3}
|
||||
m_Name: AG14W_Draw
|
||||
m_EditorClassIdentifier:
|
||||
tags:
|
||||
- rid: 3736623747328901132
|
||||
- rid: 3736623747328901133
|
||||
- rid: 3736623747328901134
|
||||
value:
|
||||
rid: 3736623747328901135
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 3736623747328901132
|
||||
type: {class: DictionaryReference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
index: -463043648
|
||||
keyword: c
|
||||
- rid: 3736623747328901133
|
||||
type: {class: Reference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
value: AG14W
|
||||
- rid: 3736623747328901134
|
||||
type: {class: Reference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
value: Draw
|
||||
- rid: 3736623747328901135
|
||||
type: {class: MotionMatchingClip, ns: BITKit.Animations, asm: BITKit.MotionMatching}
|
||||
data:
|
||||
clip: {fileID: -623603649343465320, guid: 423c2531523ea7d47be774282830d369,
|
||||
type: 3}
|
||||
|
|
@ -11,14 +11,15 @@ Material:
|
|||
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_ValidKeywords:
|
||||
- _ALPHATEST_ON
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
m_CustomRenderQueue: 2450
|
||||
stringTagMap:
|
||||
RenderType: Opaque
|
||||
RenderType: TransparentCutout
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
|
|
@ -82,8 +83,8 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _AlphaClip: 0
|
||||
- _AlphaToMask: 0
|
||||
- _AlphaClip: 1
|
||||
- _AlphaToMask: 1
|
||||
- _Blend: 0
|
||||
- _BlendModePreserveSpecular: 1
|
||||
- _BumpScale: 1
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -129,9 +129,8 @@ MonoBehaviour:
|
|||
debug: 0
|
||||
transitionOnNextFrame: 0
|
||||
item: {fileID: 11400000, guid: 1f69b8202d0d9fc4aa50a06f24e46266, type: 2}
|
||||
animationProperties:
|
||||
_serializedList: []
|
||||
animancerComponent: {fileID: 0}
|
||||
additionalAnimancerComponent: {fileID: 0}
|
||||
vfxPlayer: {fileID: 0}
|
||||
renderers: []
|
||||
cameraTransform: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -562,9 +562,8 @@ MonoBehaviour:
|
|||
debug: 0
|
||||
transitionOnNextFrame: 0
|
||||
item: {fileID: 11400000, guid: 210ec2a785e387d49a9ef38efc588c13, type: 2}
|
||||
animationProperties:
|
||||
_serializedList: []
|
||||
animancerComponent: {fileID: 0}
|
||||
additionalAnimancerComponent: {fileID: 0}
|
||||
vfxPlayer: {fileID: 0}
|
||||
renderers: []
|
||||
cameraTransform: {fileID: 8513386799373353395}
|
||||
|
|
@ -3312,9 +3311,8 @@ MonoBehaviour:
|
|||
debug: 0
|
||||
transitionOnNextFrame: 0
|
||||
item: {fileID: 11400000, guid: 78b4d3fa9a3cca64bb14a0c836906e09, type: 2}
|
||||
animationProperties:
|
||||
_serializedList: []
|
||||
animancerComponent: {fileID: 0}
|
||||
additionalAnimancerComponent: {fileID: 0}
|
||||
vfxPlayer: {fileID: 0}
|
||||
renderers:
|
||||
- {fileID: 3878241187737398566}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6667294695047898973}
|
||||
- component: {fileID: 8365587156604046498}
|
||||
- component: {fileID: 2658742347464340854}
|
||||
- component: {fileID: 1629711899429621079}
|
||||
m_Layer: 0
|
||||
m_Name: EquipController
|
||||
m_TagString: Untagged
|
||||
|
|
@ -37,27 +35,6 @@ Transform:
|
|||
- {fileID: 829184865122574095}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!95 &8365587156604046498
|
||||
Animator:
|
||||
serializedVersion: 5
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2231966161653709123}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 9000000, guid: c7d13e3acc637614bb2a26e7472fddf6, type: 3}
|
||||
m_Controller: {fileID: 0}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 1
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_StabilizeFeet: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorStateOnDisable: 0
|
||||
m_WriteDefaultValuesOnDisable: 0
|
||||
--- !u!114 &2658742347464340854
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -73,20 +50,6 @@ MonoBehaviour:
|
|||
renderers: []
|
||||
steveRenderers: []
|
||||
alexRenderers: []
|
||||
--- !u!114 &1629711899429621079
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2231966161653709123}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_Animator: {fileID: 8365587156604046498}
|
||||
_ActionOnDisable: 0
|
||||
--- !u!1 &2241040556830830124
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -116,8 +79,8 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 3281266890569805336}
|
||||
- {fileID: 5447994368341071352}
|
||||
- {fileID: 3580928091736900889}
|
||||
m_Father: {fileID: 6667294695047898973}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &7922769575535464068
|
||||
|
|
@ -145,8 +108,8 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7922769575535464068}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0.7071068, y: 0.000000066204116, z: 0.000000066204116, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: -1.6551661, z: 0}
|
||||
m_LocalRotation: {x: 0.5000001, y: -0.4999999, z: 0.4999999, w: 0.5000001}
|
||||
m_LocalPosition: {x: 0.00000023841858, y: -1.6551664, z: 0.00000023841858}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -177,7 +140,7 @@ ParentConstraint:
|
|||
m_Active: 1
|
||||
m_IsLocked: 1
|
||||
m_Sources:
|
||||
- sourceTransform: {fileID: 6264469999971839078}
|
||||
- sourceTransform: {fileID: 5392141071707948903}
|
||||
weight: 1
|
||||
--- !u!1001 &2387505430765080332
|
||||
PrefabInstance:
|
||||
|
|
@ -195,7 +158,7 @@ PrefabInstance:
|
|||
- target: {fileID: 4798093356555329699, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
value: 0.00000047683716
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4798093356555329699, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
|
|
@ -215,17 +178,17 @@ PrefabInstance:
|
|||
- target: {fileID: 4798093356555329699, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
value: 0.00000009362675
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4798093356555329699, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
value: -1.7531937e-14
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4798093356555329699, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
value: 0.0000001872535
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4798093356555329699, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
|
|
@ -242,6 +205,16 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5067210832701162834, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_Active
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5067210832701162834, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_IsLocked
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5067210832701162834, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_RotationAtRest.x
|
||||
|
|
@ -250,28 +223,33 @@ PrefabInstance:
|
|||
- target: {fileID: 5067210832701162834, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_RotationOffsets.Array.data[0].x
|
||||
value: 90
|
||||
value: -0.0006195432
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5067210832701162834, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_RotationOffsets.Array.data[0].y
|
||||
value: 0
|
||||
value: 90.000015
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5067210832701162834, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_RotationOffsets.Array.data[0].z
|
||||
value: 89.99941
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5067210832701162834, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_TranslationOffsets.Array.data[0].x
|
||||
value: 0.03981614
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5067210832701162834, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_TranslationOffsets.Array.data[0].y
|
||||
value: -0.039797783
|
||||
value: -1.6551657
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5067210832701162834, guid: 9ef4d94580e791643aaff085d8f7148b,
|
||||
type: 3}
|
||||
propertyPath: m_Sources.Array.data[0].sourceTransform
|
||||
value:
|
||||
objectReference: {fileID: 4841918559320197192}
|
||||
objectReference: {fileID: 6848451921665925961}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -357,7 +335,7 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2989467584186400410}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3907077585415135986
|
||||
--- !u!1001 &3027509284470819315
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
|
|
@ -365,82 +343,116 @@ PrefabInstance:
|
|||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3866178064017640509}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
- target: {fileID: -8679921383154817045, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
- target: {fileID: -8679921383154817045, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.655166
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
- target: {fileID: -8679921383154817045, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
- target: {fileID: -8679921383154817045, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
- target: {fileID: -8679921383154817045, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
- target: {fileID: -8679921383154817045, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
- target: {fileID: -8679921383154817045, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
- target: {fileID: -8679921383154817045, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
- target: {fileID: -8679921383154817045, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
- target: {fileID: -8679921383154817045, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
- target: {fileID: 919132149155446097, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SK_LPAMG_Arms_Base
|
||||
value: Arm Armature
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 5866666021909216657, guid: c7d13e3acc637614bb2a26e7472fddf6, type: 3}
|
||||
- target: {fileID: 5866666021909216657, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
propertyPath: m_CullingMode
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: c7d13e3acc637614bb2a26e7472fddf6, type: 3}
|
||||
--- !u!4 &3580928091736900889 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 5201135482854042982}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 7741dc5bf9c96cc40a1d228a90680a5b, type: 3}
|
||||
--- !u!1 &2792995339984549026 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3907077585415135986}
|
||||
m_PrefabInstance: {fileID: 3027509284470819315}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4841918559320197192 stripped
|
||||
--- !u!114 &5201135482854042982
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2792995339984549026}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_Animator: {fileID: 8892720365975123042}
|
||||
_ActionOnDisable: 0
|
||||
--- !u!4 &3281266890569805336 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8433352160412543674, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3907077585415135986}
|
||||
m_PrefabInstance: {fileID: 3027509284470819315}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6264469999971839078 stripped
|
||||
--- !u!4 &5392141071707948903 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6978156215748972180, guid: c7d13e3acc637614bb2a26e7472fddf6,
|
||||
m_CorrespondingSourceObject: {fileID: 6978156215748972180, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3907077585415135986}
|
||||
m_PrefabInstance: {fileID: 3027509284470819315}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6848451921665925961 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8433352160412543674, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3027509284470819315}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!95 &8892720365975123042 stripped
|
||||
Animator:
|
||||
m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 7741dc5bf9c96cc40a1d228a90680a5b,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3027509284470819315}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -255,32 +255,37 @@ PrefabInstance:
|
|||
- target: {fileID: 5447994368341071352, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
value: 0.00000023841858
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5447994368341071352, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.6551664
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5447994368341071352, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
value: 0.00000023841858
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5447994368341071352, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
value: 0.5000001
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5447994368341071352, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.7071068
|
||||
value: 0.5000001
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5447994368341071352, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.000000066204116
|
||||
value: -0.4999999
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5447994368341071352, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.000000066204116
|
||||
value: 0.4999999
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806504471642990517, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
|
|
@ -343,6 +348,11 @@ PrefabInstance:
|
|||
propertyPath: m_TranslationAtRest.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8365587156604046498, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
propertyPath: m_Avatar
|
||||
value:
|
||||
objectReference: {fileID: 9000000, guid: 7741dc5bf9c96cc40a1d228a90680a5b, type: 3}
|
||||
- target: {fileID: 8365587156604046498, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
propertyPath: m_UpdateMode
|
||||
|
|
@ -357,6 +367,7 @@ PrefabInstance:
|
|||
- {fileID: 3168693612350792015, guid: 35f40a9ac4b236a4ca6a1590bd71f73d, type: 3}
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 5667425633007252352, guid: 35f40a9ac4b236a4ca6a1590bd71f73d, type: 3}
|
||||
- {fileID: 9100351841267732049, guid: 35f40a9ac4b236a4ca6a1590bd71f73d, type: 3}
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 2231966161653709123, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
|
|
@ -368,24 +379,30 @@ PrefabInstance:
|
|||
insertIndex: -1
|
||||
addedObject: {fileID: 4826961112179731242}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 35f40a9ac4b236a4ca6a1590bd71f73d, type: 3}
|
||||
--- !u!114 &732680967031352429 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5201135482854042982, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4757248572123382027}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!4 &2094089043630039618 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6848451921665925961, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4757248572123382027}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2427857643014188708 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7184472818559872943, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4757248572123382027}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &6095835442007821404 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1629711899429621079, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4757248572123382027}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6700420806375749704}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &6700420806375749704 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2231966161653709123, guid: 35f40a9ac4b236a4ca6a1590bd71f73d,
|
||||
|
|
@ -420,12 +437,11 @@ MonoBehaviour:
|
|||
debug: 0
|
||||
transitionOnNextFrame: 0
|
||||
item: {fileID: 11400000, guid: 0e82c571438e9b040bdaff8c666e9d68, type: 2}
|
||||
animationProperties:
|
||||
_serializedList: []
|
||||
animancerComponent: {fileID: 6095835442007821404}
|
||||
animancerComponent: {fileID: 732680967031352429}
|
||||
additionalAnimancerComponent: {fileID: 0}
|
||||
vfxPlayer: {fileID: 4826961112179731242}
|
||||
renderers: []
|
||||
cameraTransform: {fileID: 2427857643014188708}
|
||||
cameraTransform: {fileID: 2094089043630039618}
|
||||
_modify: {fileID: 0}
|
||||
meleeService:
|
||||
rid: 806583325261299712
|
||||
|
|
|
|||
|
|
@ -11,32 +11,37 @@ PrefabInstance:
|
|||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
value: 0.00000047683716
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.6551664
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
value: 0.00000023841858
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
value: 0.5000001
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.7071068
|
||||
value: 0.5000001
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.000000066204116
|
||||
value: -0.4999999
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.000000066204116
|
||||
value: 0.4999999
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2198840102418589270, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
|
|
@ -88,6 +93,11 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5543385129991014922, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: additionalAnimancerComponent
|
||||
value:
|
||||
objectReference: {fileID: 9131865978671480986}
|
||||
- target: {fileID: 6700420806375749704, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
|
|
@ -134,37 +144,42 @@ PrefabInstance:
|
|||
- target: {fileID: 1497341709194172304, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1497341709194172304, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.7071068
|
||||
value: -0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1497341709194172304, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1497341709194172304, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
value: -0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1497341709194172304, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 90
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1497341709194172304, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1497341709194172304, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5698974344049452451, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7221497041222522312, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
type: 3}
|
||||
|
|
@ -174,8 +189,57 @@ PrefabInstance:
|
|||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 7221497041222522312, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 9131865978671480986}
|
||||
- targetCorrespondingSourceObject: {fileID: 7221497041222522312, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1818782230089107983}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 947675a03b45d604c98d12ea57179e62, type: 3}
|
||||
--- !u!1 &1429131662767989229 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7221497041222522312, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 8638646121026483237}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &9131865978671480986
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1429131662767989229}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_Animator: {fileID: 1818782230089107983}
|
||||
_ActionOnDisable: 4
|
||||
--- !u!95 &1818782230089107983
|
||||
Animator:
|
||||
serializedVersion: 5
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1429131662767989229}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 9000000, guid: a23e054f57158a9488a281fbfde20dc1, type: 3}
|
||||
m_Controller: {fileID: 0}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_StabilizeFeet: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorStateOnDisable: 0
|
||||
m_WriteDefaultValuesOnDisable: 0
|
||||
--- !u!4 &7144119378625422261 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1497341709194172304, guid: 947675a03b45d604c98d12ea57179e62,
|
||||
|
|
|
|||
|
|
@ -82,35 +82,35 @@ PrefabInstance:
|
|||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 269193674217255126, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_Sources.Array.data[0].sourceTransform
|
||||
value:
|
||||
objectReference: {fileID: 410721046125941707}
|
||||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.00000023841858
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.6551664
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
value: 0.5000001
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.7071068
|
||||
value: 0.5000001
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.000000066204116
|
||||
value: -0.4999999
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.000000066204116
|
||||
value: 0.4999999
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2198840102418589270, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
|
|
@ -165,12 +165,12 @@ PrefabInstance:
|
|||
- target: {fileID: 2427857643014188708, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.0000006556511
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2427857643014188708, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.00000011920929
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2427857643014188708, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
|
|
@ -180,17 +180,17 @@ PrefabInstance:
|
|||
- target: {fileID: 2427857643014188708, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.000005335786
|
||||
value: 0.0000052430983
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2427857643014188708, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.00017283502
|
||||
value: 2.8471869e-11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2427857643014188708, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.000005431274
|
||||
value: -0.000005430352
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2699172070614207317, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
|
|
@ -222,11 +222,6 @@ PrefabInstance:
|
|||
propertyPath: m_TranslationOffsets.Array.data[0].y
|
||||
value: -0.039797902
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2699172070614207317, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_Sources.Array.data[0].sourceTransform
|
||||
value:
|
||||
objectReference: {fileID: 1183604051323025381}
|
||||
- target: {fileID: 3899463536695463337, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: m_Avatar
|
||||
|
|
@ -248,16 +243,6 @@ PrefabInstance:
|
|||
value:
|
||||
objectReference: {fileID: 11400000, guid: 88846321bf3dff340abe30b183fa1c7a,
|
||||
type: 2}
|
||||
- target: {fileID: 5543385129991014922, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: renderers.Array.size
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5543385129991014922, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: renderers.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 6707856878039024089}
|
||||
- target: {fileID: 5543385129991014922, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
propertyPath: animationProperties._serializedList.Array.size
|
||||
|
|
@ -282,27 +267,9 @@ PrefabInstance:
|
|||
addedObject: {fileID: 4272000719251572842}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9fca9f6a9cb170842bc149a7236856d5, type: 3}
|
||||
--- !u!4 &410721046125941707 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1507292011392118125, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1250266236811656870}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1183604051323025381 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 86930798388758851, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1250266236811656870}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1785634203010394709 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 693007182956483827, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1250266236811656870}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!137 &6707856878039024089 stripped
|
||||
SkinnedMeshRenderer:
|
||||
m_CorrespondingSourceObject: {fileID: 5498559582789697407, guid: 9fca9f6a9cb170842bc149a7236856d5,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1250266236811656870}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -13,7 +13,8 @@
|
|||
"GUID:3bfa6f714e036734185ec6f5b157610a",
|
||||
"GUID:6ef4ed8ff60a7aa4bb60a8030e6f4008",
|
||||
"GUID:84d565da37ad40546a118cfb3c3509f3",
|
||||
"GUID:677cd05ca06c46b4395470200b1acdad"
|
||||
"GUID:677cd05ca06c46b4395470200b1acdad",
|
||||
"GUID:3e9ced9430d8ee743b37f99f97066130"
|
||||
],
|
||||
"includePlatforms": [],
|
||||
"excludePlatforms": [],
|
||||
|
|
|
|||
|
|
@ -21,23 +21,6 @@ namespace BITFALL.GameEditor
|
|||
|
||||
window.Show();
|
||||
}
|
||||
|
||||
protected override VisualElement MakeItem()
|
||||
{
|
||||
var container = new VisualElement();
|
||||
var icon = container.Create<VisualElement>(UXConstant.Icon);
|
||||
var label = container.Create<Label>(UXConstant.ContextLabel);
|
||||
|
||||
container.style.flexDirection = FlexDirection.Row;
|
||||
container.style.alignContent = Align.Center;
|
||||
container.style.alignItems = Align.Center;
|
||||
|
||||
icon.style.width = 24;
|
||||
icon.style.height = 24;
|
||||
|
||||
return container;
|
||||
}
|
||||
|
||||
protected override void BindItem(VisualElement arg1, int arg2)
|
||||
{
|
||||
var item = List[arg2];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using BITKit;
|
||||
using BITKit.Animations;
|
||||
using BITKit.GameEditor;
|
||||
using BITKit.UX;
|
||||
using UnityEditor;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UIElements;
|
||||
|
||||
namespace BITFALL.GameEditor
|
||||
{
|
||||
public class MotionMatchingEditor : ScriptableObjectGroupEditor<ScriptableMotionMatchingObject>
|
||||
{
|
||||
protected override string AssetsPath => "Assets/Artists/Configs/MotionMatching/";
|
||||
|
||||
[MenuItem("Tools/ScriptableObjectEditor/Motion Matching")]
|
||||
public static void Open()
|
||||
{
|
||||
var window = GetWindow<MotionMatchingEditor>();
|
||||
window.titleContent = new GUIContent("Motion Matching Editor");
|
||||
|
||||
window.Show();
|
||||
}
|
||||
protected override void BindItem(VisualElement arg1, int arg2)
|
||||
{
|
||||
var item = List[arg2];
|
||||
var container = new UXContainer(arg1);
|
||||
|
||||
container.contextLabel.text = item.name;
|
||||
//container.icon.style.backgroundImage = item.SquareIcon;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -35,11 +35,12 @@ namespace BITKit.Entities
|
|||
[SerializeField] protected AssetableItem item;
|
||||
|
||||
|
||||
[Header(Constant.Header.Property)]
|
||||
[SerializeField] public SerializedDictionary<string,AnimationProperty> animationProperties;
|
||||
//[Header(Constant.Header.Property)]
|
||||
//[SerializeField] public SerializedDictionary<string,AnimationProperty> animationProperties;
|
||||
|
||||
[Header(Constant.Header.Components)]
|
||||
[SerializeField] private AnimancerComponent animancerComponent;
|
||||
[SerializeField] private AnimancerComponent additionalAnimancerComponent;
|
||||
[SerializeField] protected EntityVFXPlayer vfxPlayer;
|
||||
[SerializeField] private Renderer[] renderers;
|
||||
[SerializeField] protected Transform cameraTransform;
|
||||
|
|
@ -52,6 +53,7 @@ namespace BITKit.Entities
|
|||
public IEntity Entity { get; set; }
|
||||
public Entity UnityEntity=>Entity as Entity;
|
||||
public AnimancerComponent AnimancerComponent=>animancerComponent;
|
||||
public AnimancerComponent AdditionalAnimancerComponent=>additionalAnimancerComponent;
|
||||
public IMotionMatchingService MotionMatchingService=>motionMatchingService;
|
||||
|
||||
public IBasicItem Item
|
||||
|
|
@ -64,7 +66,7 @@ namespace BITKit.Entities
|
|||
}
|
||||
}
|
||||
private IBasicItem _item;
|
||||
public IDictionary<string, float> AnimationProperties = null;
|
||||
//public IDictionary<string, float> AnimationProperties = null;
|
||||
|
||||
[Inject(true),NonSerialized]
|
||||
public InputActionGroup inputActionGroup;
|
||||
|
|
@ -89,7 +91,15 @@ namespace BITKit.Entities
|
|||
public virtual void Entry()
|
||||
{
|
||||
if (animancerComponent)
|
||||
{
|
||||
animancerComponent.enabled = true;
|
||||
animancerComponent.Animator.enabled = true;
|
||||
}
|
||||
if (additionalAnimancerComponent)
|
||||
{
|
||||
additionalAnimancerComponent.enabled = true;
|
||||
additionalAnimancerComponent.Animator.enabled = true;
|
||||
}
|
||||
|
||||
AllowRendering.AddElement(this);
|
||||
//inputActionGroup.allowInput.AddElement(this);
|
||||
|
|
@ -117,10 +127,6 @@ namespace BITKit.Entities
|
|||
{
|
||||
AllowRendering.RemoveElement(this);
|
||||
|
||||
if (animancerComponent)
|
||||
animancerComponent.Animator.enabled = false;
|
||||
|
||||
|
||||
return UniTask.CompletedTask;
|
||||
}
|
||||
|
||||
|
|
@ -130,13 +136,28 @@ namespace BITKit.Entities
|
|||
await UniTask.NextFrame(destroyCancellationToken);
|
||||
cameraTransform.localPosition = default;
|
||||
cameraTransform.localRotation = _initialCameraRotation;
|
||||
|
||||
if (animancerComponent)
|
||||
{
|
||||
animancerComponent.enabled = false;
|
||||
animancerComponent.Animator.enabled = false;
|
||||
}
|
||||
if(AdditionalAnimancerComponent)
|
||||
{
|
||||
AdditionalAnimancerComponent.enabled = false;
|
||||
AdditionalAnimancerComponent.Stop();
|
||||
AdditionalAnimancerComponent.Animator.enabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void OnAwake()
|
||||
{
|
||||
//AnimationProperties= animationProperties.ToDictionary(x=>x.Key,x=>x.Value.Value);
|
||||
|
||||
|
||||
AnimationProperties= animationProperties.ToDictionary(x=>x.Key,x=>x.Value.Value);
|
||||
if (renderers is null or { Length: 0 })
|
||||
{
|
||||
renderers = GetComponentsInChildren<Renderer>(true);
|
||||
}
|
||||
|
||||
foreach (var x in StateDictionary.Values)
|
||||
{
|
||||
|
|
@ -195,10 +216,10 @@ namespace BITKit.Entities
|
|||
|
||||
public virtual void OnUpdate(float deltaTime)
|
||||
{
|
||||
foreach (var pair in animationProperties)
|
||||
{
|
||||
AnimationProperties[pair.Key] = pair.Value.Value;
|
||||
}
|
||||
// foreach (var pair in animationProperties)
|
||||
// {
|
||||
// AnimationProperties[pair.Key] = pair.Value.Value;
|
||||
// }
|
||||
}
|
||||
public virtual bool IsSupportItem(IBasicItem item) =>item is not null && item.AddressablePath == AddressablePath;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,20 +30,30 @@ namespace BITFALL.Guns
|
|||
public BITGun root;
|
||||
[Inject]
|
||||
protected IEntityMovement _entityMovement;
|
||||
|
||||
[Inject] protected IEquipService equipService;
|
||||
protected AnimancerComponent animancerComponent=>root.AnimancerComponent;
|
||||
public bool Enabled { get;set; }
|
||||
protected AnimancerState currentState;
|
||||
|
||||
protected string[] AnimationKey;
|
||||
protected bool PlayAnimation(params string[] args)
|
||||
{
|
||||
if (root.MotionMatchingService.TryMatch(out var obj,args) is false) return false;
|
||||
if (root.MotionMatchingService.TryMatch(out var obj,root.SearchKey.Union(args).ToArray()) is false) return false;
|
||||
switch (obj)
|
||||
{
|
||||
case IMotionMatchingClip clip:
|
||||
animancerComponent.Play(clip.Clip,0.1f);
|
||||
currentState = animancerComponent.Play(clip.Clip,0.1f);
|
||||
return true;
|
||||
case IMotionMatchingSequence sequence:
|
||||
//animancerComponent.Play(sequence.Sequence);
|
||||
return true;
|
||||
case IMotionMatchingDualClip dualClip:
|
||||
currentState = animancerComponent.Play(dualClip.Clip1,0.1f);
|
||||
if (root.AdditionalAnimancerComponent)
|
||||
{
|
||||
root.AdditionalAnimancerComponent.Stop();
|
||||
var state2 = root.AdditionalAnimancerComponent.Play(dualClip.Clip2,0.1f);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -55,20 +65,28 @@ namespace BITFALL.Guns
|
|||
switch (obj)
|
||||
{
|
||||
case IMotionMatchingClip clip:
|
||||
var state = animancerComponent.Play(clip.Clip, 0.1f);
|
||||
state.Events.OnEnd=OnEnd is null ? null : () =>
|
||||
currentState = animancerComponent.Play(clip.Clip, 0.1f);
|
||||
currentState.Events.OnEnd=OnEnd is null ? null : () =>
|
||||
{
|
||||
state.Events.OnEnd = null;
|
||||
currentState.Events.OnEnd = null;
|
||||
this.OnEnd();
|
||||
};
|
||||
break;
|
||||
case IMotionMatchingDualClip dualClip:
|
||||
currentState = animancerComponent.Play(dualClip.Clip1, 0.1f);
|
||||
root.AdditionalAnimancerComponent.Stop();
|
||||
var state2 = root.AdditionalAnimancerComponent.Play(dualClip.Clip2, 0.1f);
|
||||
currentState.Events.OnEnd = OnEnd is null ? null : () =>
|
||||
{
|
||||
currentState.Events.OnEnd = null;
|
||||
this.OnEnd();
|
||||
};
|
||||
break;
|
||||
}
|
||||
}
|
||||
public virtual void Initialize()
|
||||
{
|
||||
root.Entity.Inject(this);
|
||||
_entityMovement.OnStateChanged += OnMovementStateChanged;
|
||||
// AnimationKey = new []{BITGun.C_Weapon,GetType().Name,root._gun.Name};
|
||||
AnimationKey = root.SearchKey.Append(GetType().Name).ToArray();
|
||||
}
|
||||
|
||||
|
|
@ -424,13 +442,14 @@ namespace BITFALL.Guns
|
|||
expectFiring.shouldBe = fireAction.action.WasPressedThisFrame();
|
||||
if(burstFireInterval.AllowUpdate)
|
||||
{
|
||||
switch (AnimationProperties.TryGetValue(BITConstant.Player.AllowFire, out var allowFire))
|
||||
{
|
||||
case false:
|
||||
case true when allowFire >0.9f:
|
||||
Fire();
|
||||
break;
|
||||
}
|
||||
// switch (AnimationProperties.TryGetValue(BITConstant.Player.AllowFire, out var allowFire))
|
||||
// {
|
||||
// case false:
|
||||
// case true when allowFire >0.9f:
|
||||
// Fire();
|
||||
// break;
|
||||
// }
|
||||
Fire();
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -441,17 +460,7 @@ namespace BITFALL.Guns
|
|||
Sender = this
|
||||
});
|
||||
|
||||
if(AnimationProperties.TryGetValue(BITConstant.Player.Aim, out var __aim))
|
||||
{
|
||||
//animator.animator.SetFloat((int)BITHash.Player.Aim,__aim);
|
||||
}
|
||||
|
||||
var length = _movement.GroundVelocity.GetLength();
|
||||
// animator.animator.SetFloat(BITConstant.Player.SqrMagnitude,
|
||||
// Mathf.Clamp(
|
||||
// length / _movement.ReferenceSpeed,0.1f,1
|
||||
// )
|
||||
// );
|
||||
|
||||
if (walkState is not null)
|
||||
{
|
||||
|
|
@ -473,10 +482,9 @@ namespace BITFALL.Guns
|
|||
if (selfViewAdditive)
|
||||
{
|
||||
var positionWeight = recoilPositionWeight;
|
||||
if (AnimationProperties.TryGetValue(BITConstant.Player.Aim, out var aim))
|
||||
{
|
||||
|
||||
var aim = _equipService.Aim;
|
||||
positionWeight *= Mathf.Lerp(2, 1, aim);
|
||||
}
|
||||
//selfViewAdditive.AddEuler(recoilSpring.value);
|
||||
selfViewAdditive.AddRotation(Quaternion.Euler(recoilSpring.value));
|
||||
selfViewAdditive.AddPosition(
|
||||
|
|
@ -489,8 +497,9 @@ namespace BITFALL.Guns
|
|||
);
|
||||
}
|
||||
|
||||
if(AnimationProperties.TryGetValue(BITConstant.Player.Aim, out var _aim))
|
||||
{
|
||||
var _aim = _equipService.Aim;
|
||||
|
||||
_equipService.Zoom.Allow = CurrentState is Aim;
|
||||
_equipService.Zoom.Value =Mathf.Lerp(1,_gun.InitialAimZoom, _aim);
|
||||
_equipService.AllowScope = _aim > 0.5f && _gun.IsScopeAim;
|
||||
|
|
@ -542,15 +551,15 @@ namespace BITFALL.Guns
|
|||
}
|
||||
}
|
||||
|
||||
if (AnimationProperties.TryGetValue(BITConstant.Player.Stable, out var stable))
|
||||
{
|
||||
_equipService.Stable = stable;
|
||||
}
|
||||
|
||||
if(AnimationProperties.TryGetValue(BITConstant.Player.AllowFire, out var _allowFire))
|
||||
{
|
||||
_equipService.AllowAttack = _allowFire > 0.9f;
|
||||
}
|
||||
// if (AnimationProperties.TryGetValue(BITConstant.Player.Stable, out var stable))
|
||||
// {
|
||||
// _equipService.Stable = stable;
|
||||
// }
|
||||
//
|
||||
// if(AnimationProperties.TryGetValue(BITConstant.Player.AllowFire, out var _allowFire))
|
||||
// {
|
||||
// _equipService.AllowAttack = _allowFire > 0.9f;
|
||||
// }
|
||||
|
||||
//AllowRendering.SetDisableElements(64564,_equipService.AllowScope);
|
||||
|
||||
|
|
@ -670,10 +679,6 @@ namespace BITFALL.Guns
|
|||
{
|
||||
InternalAddRecoil();
|
||||
InternalFire(_gun.BuckShot.Value);
|
||||
// for (int i = 0; i < _gun.BuckShot.Value; i++)
|
||||
// {
|
||||
//
|
||||
// }
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -710,6 +715,7 @@ namespace BITFALL.Guns
|
|||
|
||||
private void InternalFire(int count = 1)
|
||||
{
|
||||
var aim = _equipService.Aim;
|
||||
//调用BulletManager生成子弹
|
||||
var _transform = transform;
|
||||
var rotation =_movement.ViewRotation;
|
||||
|
|
@ -720,10 +726,7 @@ namespace BITFALL.Guns
|
|||
{
|
||||
fireRecoil *= spread.Spread;
|
||||
}
|
||||
if(AnimationProperties.TryGetValue(BITConstant.Player.Aim, out var aim))
|
||||
{
|
||||
fireRecoil *= Mathf.Lerp(_gun.InitialHipFireSpread,1,aim);
|
||||
}
|
||||
fireRecoil *= recoilSpring.value.GetLength();
|
||||
var length = fireRecoil.GetLength();
|
||||
for (var i = 0; i < count; i++)
|
||||
|
|
|
|||
|
|
@ -39,10 +39,13 @@ namespace BITFALL.Guns.States
|
|||
case Equip:
|
||||
break;
|
||||
default:
|
||||
PlayAnimation();
|
||||
OnMovementStateChanged(null, _entityMovement.CurrentState);
|
||||
if (_entityMovement.CurrentState is IPlayerWalkState)
|
||||
PlayAnimation();
|
||||
else
|
||||
OnMovementStateChanged(null, _entityMovement.CurrentState);
|
||||
break;
|
||||
}
|
||||
|
||||
_selector.OnActive += OnActive;
|
||||
boltActionImmediately = root.RequireBolt;
|
||||
|
||||
|
|
@ -123,13 +126,18 @@ namespace BITFALL.Guns.States
|
|||
_expectRun = newState is IPlayerRunState or IPlayerSprintState;
|
||||
if (newState is IPlayerSlideState)
|
||||
{
|
||||
root.TransitionState<Movement>();
|
||||
PlayAnimation(root.SearchKey.Append(nameof(BITConstant.Player.Slide)).ToArray());
|
||||
if (root.CurrentState != this)
|
||||
root.TransitionState<Movement>();
|
||||
PlayAnimation(BITConstant.Player.Slide);
|
||||
//root.animator.CrossFade(BITConstant.Player.Slide, 0.32f);
|
||||
}else if (newState is IPlayerDodgeState)
|
||||
}
|
||||
else if (newState is IPlayerDodgeState)
|
||||
{
|
||||
PlayAnimation(root.SearchKey.Append(nameof(BITConstant.Player.Dodge)).ToArray());
|
||||
}else if (Enabled)
|
||||
if (root.CurrentState != this)
|
||||
root.TransitionState<Movement>();
|
||||
PlayAnimation(BITConstant.Player.Dodge);
|
||||
}
|
||||
else if (Enabled)
|
||||
{
|
||||
switch (newState)
|
||||
{
|
||||
|
|
@ -173,6 +181,10 @@ namespace BITFALL.Guns.States
|
|||
{
|
||||
root.TransitionState<Movement>();
|
||||
}
|
||||
else
|
||||
{
|
||||
currentState.Speed = _entityMovement.LocomotionBasedVelocity.GetLength() / _entityMovement.ReferenceSpeed;
|
||||
}
|
||||
}
|
||||
private void OnAim(InputAction.CallbackContext context)
|
||||
{
|
||||
|
|
@ -194,8 +206,9 @@ namespace BITFALL.Guns.States
|
|||
private ExpectState<bool> _expectSprint;
|
||||
public override void OnStateEntry(IState old)
|
||||
{
|
||||
base.OnStateEntry(old);
|
||||
//root.animator.CrossFade(BITConstant.Player.Sprint, 0.32f);
|
||||
PlayAnimation(root.SearchKey.Append(nameof(BITConstant.Player.Sprint)).ToArray());
|
||||
//PlayAnimation(root.SearchKey.Append(nameof(BITConstant.Player.Sprint)).ToArray());
|
||||
|
||||
root.inputActionGroup.RegisterCallback(root.aimAction, OnAim);
|
||||
}
|
||||
|
|
@ -209,6 +222,10 @@ namespace BITFALL.Guns.States
|
|||
{
|
||||
root.TransitionState<Movement>();
|
||||
}
|
||||
else
|
||||
{
|
||||
currentState.Speed = _entityMovement.LocomotionBasedVelocity.GetLength() / _entityMovement.ReferenceSpeed;
|
||||
}
|
||||
}
|
||||
private void OnAim(InputAction.CallbackContext context)
|
||||
{
|
||||
|
|
@ -227,17 +244,19 @@ namespace BITFALL.Guns.States
|
|||
{
|
||||
public override void OnStateEntry(IState old)
|
||||
{
|
||||
switch (old)
|
||||
{
|
||||
case IPlayerRunState:
|
||||
case IPlayerSprintState:
|
||||
//root.animator.CrossFade(BITConstant.Player.Aim, 0.32f);
|
||||
PlayAnimation(root.SearchKey.Append(nameof(BITConstant.Player.Aim)).ToArray());
|
||||
break;
|
||||
default:
|
||||
PlayAnimation(root.SearchKey.Append(nameof(BITConstant.Player.Aim)).ToArray());
|
||||
break;
|
||||
}
|
||||
// switch (old)
|
||||
// {
|
||||
// case IPlayerRunState:
|
||||
// case IPlayerSprintState:
|
||||
// //root.animator.CrossFade(BITConstant.Player.Aim, 0.32f);
|
||||
// PlayAnimation(root.SearchKey.Append(nameof(BITConstant.Player.Aim)).ToArray());
|
||||
// break;
|
||||
// default:
|
||||
// PlayAnimation(root.SearchKey.Append(nameof(BITConstant.Player.Aim)).ToArray());
|
||||
// break;
|
||||
// }
|
||||
base.OnStateEntry(old);
|
||||
|
||||
_entityMovement.ExecuteCommand<PlayerPauseRunCommand>(new(this,true));
|
||||
|
||||
_entityMovement.ExecuteCommand(new PlayerLimitMoveSpeedCommand()
|
||||
|
|
@ -267,6 +286,8 @@ namespace BITFALL.Guns.States
|
|||
root.Fire();
|
||||
}
|
||||
|
||||
equipService.Aim = currentState.Weight;
|
||||
|
||||
if (BITAppForUnity.AllowCursor)
|
||||
{
|
||||
root.TransitionState<Movement>();
|
||||
|
|
|
|||
|
|
@ -138,10 +138,10 @@ namespace BITFALL.Entities.Player.Movement.States
|
|||
{
|
||||
actor.ForceNotGrounded();
|
||||
|
||||
if (characterController.landFreeze.AllowUpdateWithoutReset is false)
|
||||
{
|
||||
currentVelocity = Vector3.Lerp(currentVelocity, default, 0.8f);
|
||||
}
|
||||
// if (characterController.landFreeze.AllowUpdateWithoutReset is false)
|
||||
// {
|
||||
// currentVelocity = Vector3.Lerp(currentVelocity, default, 0.8f);
|
||||
// }
|
||||
|
||||
currentVelocity.y+= initialJumpForce;
|
||||
|
||||
|
|
@ -190,11 +190,18 @@ namespace BITFALL.Entities.Player.Movement.States
|
|||
// Apply added velocity
|
||||
currentVelocity += addedVelocity;
|
||||
}
|
||||
else
|
||||
{
|
||||
var tempVelocity = currentVelocity;
|
||||
tempVelocity = Vector3.Lerp(tempVelocity, default, 2*deltaTime);
|
||||
currentVelocity.x = tempVelocity.x;
|
||||
currentVelocity.z = tempVelocity.z;
|
||||
}
|
||||
// Gravity
|
||||
|
||||
currentVelocity += -Vector3.up * (30 * deltaTime);
|
||||
// Drag
|
||||
currentVelocity *= (1f / (1f + (0.1f * deltaTime)));
|
||||
currentVelocity *= (1f / (1f + 0.1f * deltaTime));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,8 @@ namespace BITKit
|
|||
{
|
||||
foreach (var x in b)
|
||||
{
|
||||
if (a.Contains(x))
|
||||
var enumerable = a as T[] ?? a.ToArray();
|
||||
if (enumerable.Contains(x))
|
||||
{
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,4 +12,5 @@
|
|||
T Get();
|
||||
void Set(T t);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ namespace BITKit
|
|||
{
|
||||
public static string[] Cast(this IEnumerable<IReference> self)
|
||||
{
|
||||
return self.Select(x => x.Get()).ToArray();
|
||||
return self.Select(Get).ToArray();
|
||||
string Get(IReference x) => x.Value;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,11 @@ namespace BITKit.Animations
|
|||
{
|
||||
public AnimationClip Clip { get; }
|
||||
}
|
||||
public interface IMotionMatchingDualClip
|
||||
{
|
||||
public AnimationClip Clip1 { get; }
|
||||
public AnimationClip Clip2 { get; }
|
||||
}
|
||||
|
||||
public interface IMotionMatchingSequence
|
||||
{
|
||||
|
|
@ -34,4 +39,12 @@ namespace BITKit.Animations
|
|||
[SerializeField] private AnimationClip[] sequence;
|
||||
public AnimationClip[] Sequence => sequence;
|
||||
}
|
||||
[Serializable]
|
||||
public struct MotionMatchingDualClip:IMotionMatchingObject,IMotionMatchingDualClip
|
||||
{
|
||||
[SerializeField] private AnimationClip clip1;
|
||||
[SerializeField] private AnimationClip clip2;
|
||||
public AnimationClip Clip1 => clip1;
|
||||
public AnimationClip Clip2 => clip2;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,9 +104,8 @@ namespace BITKit.StateMachine
|
|||
{
|
||||
BIT4Log.Log<MonoStateMachine<TState>>($"TransitionState from {_currentStateName} to {newState.GetType().Name}");
|
||||
}
|
||||
|
||||
newState.OnStateEntry(oldState);
|
||||
CurrentState = newState;
|
||||
newState.OnStateEntry(oldState);
|
||||
OnStateChanged?.Invoke(oldState, newState);
|
||||
_currentStateName = newState.GetType().Name;
|
||||
newState.Enabled = true;
|
||||
|
|
|
|||
|
|
@ -11,13 +11,14 @@ using Object = UnityEngine.Object;
|
|||
|
||||
namespace BITKit.GameEditor
|
||||
{
|
||||
public class ScriptableObjectGroupEditor<T> : EditorWindow where T : Object
|
||||
public class ScriptableObjectGroupEditor<T> : EditorWindow where T : ScriptableObject
|
||||
{
|
||||
protected virtual string AssetsPath => $"Assets/Artists/";
|
||||
protected readonly List<T> List=new();
|
||||
|
||||
private ListView _listView;
|
||||
private VisualElement _container;
|
||||
private Button _createButton;
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
|
|
@ -29,6 +30,15 @@ namespace BITKit.GameEditor
|
|||
).ToArray();
|
||||
List.AddRange(allItem.Cast<T>());
|
||||
|
||||
var toolbarContainer = rootVisualElement.Create<VisualElement>();
|
||||
toolbarContainer.style.alignSelf = Align.Auto;
|
||||
toolbarContainer.style.flexDirection = FlexDirection.Row;
|
||||
|
||||
|
||||
|
||||
var refreshButton = toolbarContainer.Create<Button>();
|
||||
refreshButton.text = "刷新";
|
||||
|
||||
var container = rootVisualElement.Create<VisualElement>();
|
||||
|
||||
var css = AssetDatabase.LoadAssetAtPath<StyleSheet>(BITEditorUtils.InspectorPath);
|
||||
|
|
@ -37,11 +47,24 @@ namespace BITKit.GameEditor
|
|||
|
||||
container.style.flexDirection = FlexDirection.Row;
|
||||
|
||||
|
||||
|
||||
var listViewContainer = container.Create<VisualElement>();
|
||||
|
||||
var createContainer = listViewContainer.Create<VisualElement>();
|
||||
|
||||
createContainer.style.flexDirection = FlexDirection.Row;
|
||||
|
||||
var nameField = createContainer.Create<TextField>();
|
||||
nameField.style.flexGrow = 1;
|
||||
|
||||
_createButton=createContainer.Create<Button>();
|
||||
_createButton.text = "创建";
|
||||
_createButton.clicked += () => CreateScriptableObject(nameField.value);
|
||||
|
||||
listViewContainer.style.flexDirection = FlexDirection.Column;
|
||||
|
||||
listViewContainer.Create<Label>().text = $"{typeof(T).Name},数量:{List.Count}";
|
||||
listViewContainer.Create<Label>().text = $"获取到:{List.Count}个配置";
|
||||
listViewContainer.AddToClassList("pa-8");
|
||||
|
||||
_listView = listViewContainer.Create<ListView>();
|
||||
|
|
@ -58,6 +81,15 @@ namespace BITKit.GameEditor
|
|||
|
||||
_container = scroll.Create<GroupBox>();
|
||||
|
||||
var pingButton = toolbarContainer.Create<Button>();
|
||||
pingButton.text = "Ping";
|
||||
pingButton.clicked += () =>
|
||||
{
|
||||
if (_listView.selectedIndex < 0) return;
|
||||
var item = List[_listView.selectedIndex];
|
||||
EditorGUIUtility.PingObject(item);
|
||||
};
|
||||
|
||||
//_container.style.flexGrow = 1;
|
||||
|
||||
Debug.Log(
|
||||
|
|
@ -73,12 +105,18 @@ namespace BITKit.GameEditor
|
|||
}
|
||||
protected virtual VisualElement MakeItem()
|
||||
{
|
||||
// var container = new VisualElement();
|
||||
// var label = container.Create<Label>(UXConstant.ContextLabel);
|
||||
// label.name = "ContextLabel";
|
||||
// label.text = typeof(T).Name;
|
||||
// return container;
|
||||
return new Label();
|
||||
var container = new VisualElement();
|
||||
var icon = container.Create<VisualElement>(UXConstant.Icon);
|
||||
var label = container.Create<Label>(UXConstant.ContextLabel);
|
||||
|
||||
container.style.flexDirection = FlexDirection.Row;
|
||||
container.style.alignContent = Align.Center;
|
||||
container.style.alignItems = Align.Center;
|
||||
|
||||
icon.style.width = 24;
|
||||
icon.style.height = 24;
|
||||
|
||||
return container;
|
||||
}
|
||||
protected virtual void BindItem(VisualElement arg1, int arg2)
|
||||
{
|
||||
|
|
@ -93,6 +131,27 @@ namespace BITKit.GameEditor
|
|||
}
|
||||
|
||||
}
|
||||
protected virtual void CreateScriptableObject(string name)
|
||||
{
|
||||
if (string.IsNullOrEmpty(name))
|
||||
{
|
||||
name = $"New {typeof(T).Name}";
|
||||
}
|
||||
|
||||
var path = $"{AssetsPath}{name}.asset";
|
||||
|
||||
if (EditorUtility.DisplayDialog("创建", $"是否创建{name}与{path}?", "是", "否") is false) return;
|
||||
|
||||
var item = CreateInstance<T>();
|
||||
item.name = name;
|
||||
AssetDatabase.CreateAsset(item, path);
|
||||
AssetDatabase.SaveAssets();
|
||||
AssetDatabase.Refresh();
|
||||
|
||||
List.Add(item);
|
||||
|
||||
_listView.Rebuild();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -24,7 +24,7 @@ MonoBehaviour:
|
|||
_guidString: 716acd27-6fd5-4ac4-8389-1061aa3de334
|
||||
hasSelectRange: 1
|
||||
scrollOffset: {x: 0, y: 0}
|
||||
vertScrollHighValue: 66.66669
|
||||
vertScrollHighValue: 8
|
||||
vertScrollLowValue: 0
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -23,12 +23,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1359285309028718836}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3451614053229548740}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
|
||||
--- !u!1 &3980093908795640769
|
||||
GameObject:
|
||||
|
|
@ -39,7 +40,6 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5173628025652808089}
|
||||
- component: {fileID: 1885594619111681748}
|
||||
m_Layer: 0
|
||||
m_Name: P_LPAMG_WEP_AG14W_B
|
||||
m_TagString: Untagged
|
||||
|
|
@ -54,56 +54,21 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3980093908795640769}
|
||||
serializedVersion: 2
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1341727331872575221}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1885594619111681748
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3980093908795640769}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b2d8418b0b9634b1892b0268dd9c2743, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
boneShape: 0
|
||||
drawBones: 1
|
||||
drawTripods: 0
|
||||
boneSize: 1
|
||||
tripodSize: 1
|
||||
boneColor: {r: 0, g: 0, b: 1, a: 0.5}
|
||||
m_Transforms:
|
||||
- {fileID: 5173628025652808089}
|
||||
- {fileID: 1341727331872575221}
|
||||
- {fileID: 7590462472459977383}
|
||||
- {fileID: 7085730618867126541}
|
||||
- {fileID: 8377806046934001919}
|
||||
- {fileID: 5433555642409060210}
|
||||
- {fileID: 4248167213988543213}
|
||||
- {fileID: 6942242360835984337}
|
||||
- {fileID: 467360725773336283}
|
||||
- {fileID: 2534862338115738616}
|
||||
- {fileID: 3029466332241581552}
|
||||
- {fileID: 741097117507338605}
|
||||
- {fileID: 3451614053229548740}
|
||||
- {fileID: 5229528686878312454}
|
||||
- {fileID: 1682535746502385316}
|
||||
- {fileID: 6458090966109221155}
|
||||
- {fileID: 2641218097033369742}
|
||||
- {fileID: 5871456611384096769}
|
||||
--- !u!1001 &1518975980416264478
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 5173628025652808089}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
|
|
@ -168,6 +133,17 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 5866666021909216657, guid: a23e054f57158a9488a281fbfde20dc1, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 8449791108111901391, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 8011451827362814966}
|
||||
- targetCorrespondingSourceObject: {fileID: 4247708270278589914, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 988017070521052329}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a23e054f57158a9488a281fbfde20dc1, type: 3}
|
||||
--- !u!4 &1341727331872575221 stripped
|
||||
Transform:
|
||||
|
|
@ -175,99 +151,15 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7590462472459977383 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8953932297793891257, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7085730618867126541 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -629959760298313709, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8377806046934001919 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -2209140216783896095, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5433555642409060210 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -2417409858256802196, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4248167213988543213 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3450031135897195507, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6942242360835984337 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8449791108111901391, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &467360725773336283 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1398396828583450565, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2534862338115738616 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -5315972389251026202, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3029466332241581552 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4548265153309457646, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &741097117507338605 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2259852077798303859, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3451614053229548740 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4247708270278589914, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5229528686878312454 stripped
|
||||
--- !u!4 &6942242360835984337 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6739487554046206232, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1682535746502385316 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 166050186867783610, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6458090966109221155 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5515716708118468669, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2641218097033369742 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3581207531651740048, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5871456611384096769 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -4291958803669905121, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
m_CorrespondingSourceObject: {fileID: 8449791108111901391, guid: a23e054f57158a9488a281fbfde20dc1,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1518975980416264478}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -276,6 +168,7 @@ PrefabInstance:
|
|||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 6942242360835984337}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3890057988527515111, guid: 33f8610fb4a74ec47b87bc242dd1f234,
|
||||
|
|
@ -354,4 +247,13 @@ PrefabInstance:
|
|||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 33f8610fb4a74ec47b87bc242dd1f234, type: 3}
|
||||
--- !u!4 &8011451827362814966 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6383348808488767709, guid: 33f8610fb4a74ec47b87bc242dd1f234,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 8011451827362814965}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -790,6 +790,11 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4761347787071130782, guid: 01eae169943e17244adbb92448883a07,
|
||||
type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: e58a8646ef3991447923ef16818e723a, type: 2}
|
||||
- target: {fileID: 5046144267174197670, guid: 01eae169943e17244adbb92448883a07,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
|
|
@ -889,7 +894,8 @@ PrefabInstance:
|
|||
propertyPath: m_Materials.Array.data[1]
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: 83825d7313dbce54c8253bef1722f4a4, type: 2}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedComponents:
|
||||
- {fileID: 1885594619111681748, guid: b92e4544306c11742a539792e8d05a15, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 741097117507338605, guid: b92e4544306c11742a539792e8d05a15,
|
||||
|
|
|
|||
Loading…
Reference in New Issue