Skip to content

B
BattleMuscle
Commit 71a15bff authored by Ruidong's avatar Ruidong
Browse files
Options

修复动画bug

parent a7312eac
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 118810 additions and 58 deletions
BattleMuscle/Assembly-CSharp-Editor-firstpass.csproj
View file @ 71a15bff
......@@ -299,6 +299,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
......@@ -674,6 +677,10 @@
<Project>{B963598E-A5D0-DFFD-EFC8-145E7DC9E300}</Project>
<Name>Unity.Timeline.Editor</Name>
</ProjectReference>
<ProjectReference Include="Cinemachine.csproj">
<Project>{CBEBAE20-68FB-3AB8-585F-7BBBCBA563FF}</Project>
<Name>Cinemachine</Name>
</ProjectReference>
<ProjectReference Include="Unity.VSCode.Editor.csproj">
<Project>{5AE9B300-2DCE-37BB-9C60-D1E3AFCBC500}</Project>
<Name>Unity.VSCode.Editor</Name>
......@@ -710,6 +717,10 @@
<Project>{420C308A-933F-4293-9EB1-FB6D047ED76B}</Project>
<Name>Unity.Rider.Editor</Name>
</ProjectReference>
<ProjectReference Include="com.unity.cinemachine.editor.csproj">
<Project>{A47DA747-C542-385A-5C52-109DFD4DDBBA}</Project>
<Name>com.unity.cinemachine.editor</Name>
</ProjectReference>
<ProjectReference Include="Unity.TextMeshPro.csproj">
<Project>{F7D5727F-6FCD-8C5C-FE8F-ECFA5FF2509B}</Project>
<Name>Unity.TextMeshPro</Name>
......
BattleMuscle/Assembly-CSharp-Editor.csproj
View file @ 71a15bff
......@@ -84,6 +84,7 @@
<Compile Include="Assets\#E1_Plugins\RayFire\Scripts\Editor\RayfireVortexEditor.cs" />
<Compile Include="Assets\#E1_Plugins\RayFire\Scripts\Editor\RayfireWindEditor.cs" />
<Compile Include="Assets\Art_Assets\0D2_Shaders\Toony Colors\Editor\TCF_MaterialInspector.cs" />
<Compile Include="Assets\Art_Assets\Animation\Joystick\EnumFlags\Editor\EnumFlagsDrawer.cs" />
<Compile Include="Assets\Art_Assets\swatchrpackage\swatchr\Editor\SwatchAssetImporter.cs" />
<Compile Include="Assets\Art_Assets\swatchrpackage\swatchr\Editor\SwatchCreator.cs" />
<Compile Include="Assets\Art_Assets\swatchrpackage\swatchr\Editor\SwatchEditorGUI.cs" />
......@@ -348,6 +349,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
......@@ -731,6 +735,10 @@
<Project>{B963598E-A5D0-DFFD-EFC8-145E7DC9E300}</Project>
<Name>Unity.Timeline.Editor</Name>
</ProjectReference>
<ProjectReference Include="Cinemachine.csproj">
<Project>{CBEBAE20-68FB-3AB8-585F-7BBBCBA563FF}</Project>
<Name>Cinemachine</Name>
</ProjectReference>
<ProjectReference Include="Unity.VSCode.Editor.csproj">
<Project>{5AE9B300-2DCE-37BB-9C60-D1E3AFCBC500}</Project>
<Name>Unity.VSCode.Editor</Name>
......@@ -767,6 +775,10 @@
<Project>{420C308A-933F-4293-9EB1-FB6D047ED76B}</Project>
<Name>Unity.Rider.Editor</Name>
</ProjectReference>
<ProjectReference Include="com.unity.cinemachine.editor.csproj">
<Project>{A47DA747-C542-385A-5C52-109DFD4DDBBA}</Project>
<Name>com.unity.cinemachine.editor</Name>
</ProjectReference>
<ProjectReference Include="Unity.TextMeshPro.csproj">
<Project>{F7D5727F-6FCD-8C5C-FE8F-ECFA5FF2509B}</Project>
<Name>Unity.TextMeshPro</Name>
......
BattleMuscle/Assembly-CSharp-firstpass.csproj
View file @ 71a15bff
......@@ -409,6 +409,9 @@
<Reference Include="DOTweenPro">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/DOTweenPro.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<HintPath>D:/unity2019/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
</Reference>
......@@ -769,6 +772,10 @@
<Project>{B963598E-A5D0-DFFD-EFC8-145E7DC9E300}</Project>
<Name>Unity.Timeline.Editor</Name>
</ProjectReference>
<ProjectReference Include="Cinemachine.csproj">
<Project>{CBEBAE20-68FB-3AB8-585F-7BBBCBA563FF}</Project>
<Name>Cinemachine</Name>
</ProjectReference>
<ProjectReference Include="Unity.VSCode.Editor.csproj">
<Project>{5AE9B300-2DCE-37BB-9C60-D1E3AFCBC500}</Project>
<Name>Unity.VSCode.Editor</Name>
......@@ -805,6 +812,10 @@
<Project>{420C308A-933F-4293-9EB1-FB6D047ED76B}</Project>
<Name>Unity.Rider.Editor</Name>
</ProjectReference>
<ProjectReference Include="com.unity.cinemachine.editor.csproj">
<Project>{A47DA747-C542-385A-5C52-109DFD4DDBBA}</Project>
<Name>com.unity.cinemachine.editor</Name>
</ProjectReference>
<ProjectReference Include="Unity.TextMeshPro.csproj">
<Project>{F7D5727F-6FCD-8C5C-FE8F-ECFA5FF2509B}</Project>
<Name>Unity.TextMeshPro</Name>
......
BattleMuscle/Assembly-CSharp.csproj
View file @ 71a15bff
......@@ -240,6 +240,11 @@
<Compile Include="Assets\Art_Assets\0D1_Effects\Epic Toon FX\Scripts\ETFXPitchRandomizer.cs" />
<Compile Include="Assets\Art_Assets\0D1_Effects\Epic Toon FX\Scripts\ETFXRotation.cs" />
<Compile Include="Assets\Art_Assets\0D2_Shaders\Toony Colors\Demo 2.0\TCF_Demo.cs" />
<Compile Include="Assets\Art_Assets\Animation\Joystick\EnumFlags\EnumFlagsAttribute.cs" />
<Compile Include="Assets\Art_Assets\Animation\Joystick\Example\Common\Scripts\ConfigurationDemo.cs" />
<Compile Include="Assets\Art_Assets\Animation\Joystick\Example\ThirdPersonSolution\ThirdPersonSolution.cs" />
<Compile Include="Assets\Art_Assets\Animation\Joystick\Scripts\DirectionArrow.cs" />
<Compile Include="Assets\Art_Assets\Animation\Joystick\Scripts\Joystick.cs" />
<Compile Include="Assets\Art_Assets\swatchrpackage\swatchr\InternalScripts\FastSmartWeakEvent.cs" />
<Compile Include="Assets\Art_Assets\swatchrpackage\swatchr\InternalScripts\InspectorButton.cs" />
<Compile Include="Assets\Art_Assets\swatchrpackage\swatchr\InternalScripts\SwatchASEFile.cs" />
......@@ -331,6 +336,7 @@
<Compile Include="Assets\My\Scripts\DoRanking.cs" />
<Compile Include="Assets\My\Scripts\EndPoint.cs" />
<Compile Include="Assets\My\Scripts\FloorBoard.cs" />
<Compile Include="Assets\My\Scripts\Food\RandomFood.cs" />
<Compile Include="Assets\My\Scripts\Gold\Gold.cs" />
<Compile Include="Assets\My\Scripts\Gold\PurseImage.cs" />
<Compile Include="Assets\My\Scripts\Gold\UITextToPurse.cs" />
......@@ -341,12 +347,7 @@
<Compile Include="Assets\My\Scripts\Prop\Prop.cs" />
<Compile Include="Assets\My\Scripts\RandomEnvironment.cs" />
<Compile Include="Assets\My\Scripts\TriggerTurnDir.cs" />
<Compile Include="Assets\My\Scripts\Wall.cs" />
<Compile Include="Assets\My\Test\TestChinarForece.cs" />
<Compile Include="Assets\My\Test\TestEtc.cs" />
<Compile Include="Assets\My\Test\TestOnDrag.cs" />
<Compile Include="Assets\My\Test\TestTrigger.cs" />
<Compile Include="Assets\My\Test\TestVector3.cs" />
<Compile Include="Assets\My\Scripts\Wall\Wall.cs" />
<Compile Include="Assets\SampleScenes\Menu\Scripts\MenuSceneLoader.cs" />
<Compile Include="Assets\SampleScenes\Menu\Scripts\PauseMenu.cs" />
<Compile Include="Assets\SampleScenes\Menu\Scripts\SceneAndURLLoader.cs" />
......@@ -663,6 +664,9 @@
<Reference Include="DOTweenPro">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/DOTweenPro.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<HintPath>D:/unity2019/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
</Reference>
......@@ -1027,6 +1031,10 @@
<Project>{B963598E-A5D0-DFFD-EFC8-145E7DC9E300}</Project>
<Name>Unity.Timeline.Editor</Name>
</ProjectReference>
<ProjectReference Include="Cinemachine.csproj">
<Project>{CBEBAE20-68FB-3AB8-585F-7BBBCBA563FF}</Project>
<Name>Cinemachine</Name>
</ProjectReference>
<ProjectReference Include="Unity.VSCode.Editor.csproj">
<Project>{5AE9B300-2DCE-37BB-9C60-D1E3AFCBC500}</Project>
<Name>Unity.VSCode.Editor</Name>
......@@ -1063,6 +1071,10 @@
<Project>{420C308A-933F-4293-9EB1-FB6D047ED76B}</Project>
<Name>Unity.Rider.Editor</Name>
</ProjectReference>
<ProjectReference Include="com.unity.cinemachine.editor.csproj">
<Project>{A47DA747-C542-385A-5C52-109DFD4DDBBA}</Project>
<Name>com.unity.cinemachine.editor</Name>
</ProjectReference>
<ProjectReference Include="Unity.TextMeshPro.csproj">
<Project>{F7D5727F-6FCD-8C5C-FE8F-ECFA5FF2509B}</Project>
<Name>Unity.TextMeshPro</Name>
......
BattleMuscle/Assets/#Z4_Icons.meta deleted 100644 → 0
View file @ a7312eac
fileFormatVersion: 2
guid: 2e117c0bfc6741e4ebc4a8c8aebc0b8a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/#Z4_Previews.meta deleted 100644 → 0
View file @ a7312eac
fileFormatVersion: 2
guid: 55c4962f2a6593c4b9c1bb6003b1ff08
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/#Z1_Tabs.meta → BattleMuscle/Assets/Art_Assets/Animation/Animation.meta
View file @ 71a15bff
fileFormatVersion: 2
guid: ca40beb7fc6998f40a6e15a59c6ab599
guid: 722d4c6938ab7f944bf89da3cb7bcdc0
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
BattleMuscle/Assets/#Z2_Documents.meta → BattleMuscle/Assets/Art_Assets/Animation/Animation/Fight.meta
View file @ 71a15bff
fileFormatVersion: 2
guid: 325c11e064841204bbd6de7c85bebef6
guid: 37b419391fcaf784f9ae43756f5d0080
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
BattleMuscle/Assets/Art_Assets/Animation/Animation/Fight/Hurricane Kick.anim.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 544aa5389b07e4e4b9c1de0438175f1b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Animation/Fight/Leg Sweep.anim.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: a2570e61eaf069f48bcdf94590c884ae
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Animation/Fight/Quad Punch.anim.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 94bdca932c1497541b45183d9b65fd5c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/#Z3_WebAPI.meta → BattleMuscle/Assets/Art_Assets/Animation/Animation/Movement.meta
View file @ 71a15bff
fileFormatVersion: 2
guid: aa43ce62596b0784081ec9bd0abc8516
guid: 2f398cd3335e427428328818a6e16956
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
BattleMuscle/Assets/Art_Assets/Animation/Animation/Movement/Running (1).anim.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 835686e6351dbb84fb2e9150838327a4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Animation/Movement/Running.anim 0 → 100644
View file @ 71a15bff
This source diff could not be displayed because it is too large. You can view the blob instead.
BattleMuscle/Assets/Art_Assets/Animation/Animation/Movement/Running.anim.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: c3a674b0eeac5d24b988ad5ad0f379e5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Animation/Movement/Running2.anim.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 29ca71290187b84469bcb971dac0bb68
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Animation/Movement/Running3.anim.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: e45fc5d7ec548c643951138984eb2ddc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Animation/Running2.controller 0 → 100644
View file @ 71a15bff
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-8306793983816526677
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -340101015679708446}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8636364
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-8002753567531812254
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -7856523028850394630}
m_Position: {x: 250, y: 30, z: 0}
- serializedVersion: 1
m_State: {fileID: 2416042625615780993}
m_Position: {x: 510, y: 30, z: 0}
- serializedVersion: 1
m_State: {fileID: 4471307210666310047}
m_Position: {x: 250, y: 170, z: 0}
- serializedVersion: 1
m_State: {fileID: -340101015679708446}
m_Position: {x: 520, y: 170, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -7856523028850394630}
--- !u!1102 &-7856523028850394630
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Running2
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 7435512687331368735}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 29ca71290187b84469bcb971dac0bb68, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-4818862182480953434
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4471307210666310047}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6428572
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-1711718038297474370
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7856523028850394630}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.89285713
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-340101015679708446
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Leg Sweep
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -1711718038297474370}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: a2570e61eaf069f48bcdf94590c884ae, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Running2
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -8002753567531812254}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &2416042625615780993
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Running (1)
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -4818862182480953434}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 835686e6351dbb84fb2e9150838327a4, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &4471307210666310047
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hurricane Kick
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -8306793983816526677}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 544aa5389b07e4e4b9c1de0438175f1b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &7435512687331368735
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2416042625615780993}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6428572
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
BattleMuscle/Assets/Art_Assets/Animation/Animation/Running2.controller.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: e2f54264df04086409034f69c7b9a93e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Animation/Running3.controller 0 → 100644
View file @ 71a15bff
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-8002753567531812254
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 6534431720261202067}
m_Position: {x: 560, y: 200, z: 0}
- serializedVersion: 1
m_State: {fileID: -1211659778325114652}
m_Position: {x: 560, y: 10, z: 0}
- serializedVersion: 1
m_State: {fileID: 8650196453075220448}
m_Position: {x: 270, y: 110, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8650196453075220448}
--- !u!1101 &-5686070150152284661
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8650196453075220448}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.60526323
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-1211659778325114652
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Running
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -5686070150152284661}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: c3a674b0eeac5d24b988ad5ad0f379e5, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Running3
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -8002753567531812254}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &5239871436706073785
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1211659778325114652}
m_Solo: 0
m_Mute: 1
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6428572
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &6534431720261202067
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Quad Punch
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 8583691091879068204}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 94bdca932c1497541b45183d9b65fd5c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8583691091879068204
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8650196453075220448}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.5
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &8650196453075220448
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Running3
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 5239871436706073785}
- {fileID: 8735242791962041930}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: e45fc5d7ec548c643951138984eb2ddc, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8735242791962041930
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6534431720261202067}
m_Solo: 0
m_Mute: 1
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6428572
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
BattleMuscle/Assets/Art_Assets/Animation/Animation/Running3.controller.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 7bd77968b133a5d479ca24ac40e56c8f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Demo.unity 0 → 100644
View file @ 71a15bff
This diff is collapsed.
BattleMuscle/Assets/Art_Assets/Animation/Demo.unity.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: a386a6adbbc484642bcfd4011b15fb26
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Fight/mixamo.com.anim 0 → 100644
View file @ 71a15bff
This source diff could not be displayed because it is too large. You can view the blob instead.
BattleMuscle/Assets/Art_Assets/Animation/Fight/mixamo.com.anim.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 257806efffd780a47a539f43ca6c11a6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/#B2_Graphics.meta → BattleMuscle/Assets/Art_Assets/Animation/Joystick.meta
View file @ 71a15bff
fileFormatVersion: 2
guid: 317d19313d1d7204e9bbc37122116e7f
guid: fb61e2731fc164f41b309aca76c8a6af
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
BattleMuscle/Assets/Art_Assets/Animation/Joystick/EnumFlags.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: f8b6e925aa015714194f0dbe4045972b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/EnumFlags/Editor.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 538d8bb7c13259449949b398f42ece3c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/EnumFlags/Editor/EnumFlagsDrawer.cs 0 → 100644
View file @ 71a15bff
namespace zFrame.UI
{
using UnityEditor;
using UnityEngine;
[CustomPropertyDrawer(typeof(EnumFlagsAttribute))]
public class EnumFlagsDrawer : PropertyDrawer
{
public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
{
/*绘制枚举复选框 ， 0-Nothing，-1-Everything,其他是枚举之和
枚举值（2的x次幂）：2的0次幂=1，2的1次幂=2，2的2次幂=4，8，16...
*/
EditorGUI.BeginChangeCheck();
property.intValue = EditorGUI.MaskField(position, label, property.intValue, property.enumNames);
if (EditorGUI.EndChangeCheck())
{
property.serializedObject.ApplyModifiedProperties();
}
}
}
}
BattleMuscle/Assets/Art_Assets/Animation/Joystick/EnumFlags/Editor/EnumFlagsDrawer.cs.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 78f69a1cfba55634d885bd10fe930cbf
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/EnumFlags/EnumFlagsAttribute.cs 0 → 100644
View file @ 71a15bff
namespace zFrame.UI
{
using UnityEngine;
public class EnumFlagsAttribute : PropertyAttribute { }
}
BattleMuscle/Assets/Art_Assets/Animation/Joystick/EnumFlags/EnumFlagsAttribute.cs.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 6bd5e8a6f1e19ff4a80ef67b4c8e28f5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: b10c341119ff7f046bc09504414533fb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: e9389cbd0701a1a4b8409a4abe3ff55c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common/Material.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 42669f781de23d146b29327130743010
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common/Material/ForPlane.mat 0 → 100644
View file @ 71a15bff
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: ForPlane
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 10914, guid: 0000000000000000f000000000000000, type: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.3773585, g: 0.3773585, b: 0.3773585, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common/Material/ForPlane.mat.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: d18312374a05da549b1b3ec17ed5ae4d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common/Resources.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: b088790d778388d4aa66c08a2868f126
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common/Resources/UI.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 10e6dff0b11126047901480952f6ea73
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common/Resources/UI/Joystick.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: c41e13c18be65424ba18a108b31e88b4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common/Resources/UI/Joystick/Joystick.prefab.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 745e65d5ee916dd47944050290a22205
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common/Scripts.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 0b9ffdea8cc40c643aab6b252b23ebeb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common/Scripts/ConfigurationDemo.cs 0 → 100644
View file @ 71a15bff
// Copyright (c) Bian Shanghai
// https://github.com/Bian-Sh/UniJoystick
// Licensed under the MIT license. See the LICENSE.md file in the project root for more information.
namespace zFrame.Example
{
using UnityEngine;
using UnityEngine.UI;
using zFrame.UI;
public class ConfigurationDemo : MonoBehaviour
{
public Joystick joystick;
Text text;
public Text text2;
void Start()
{
text = GetComponent<Text>();
joystick.OnValueChanged.AddListener(v => text.text = string.Format("Horizontal ：{0} \nVertical：{1}", v.x, v.y));
}
private void Update()
{
if (Input.GetKeyDown(KeyCode.R))
{
joystick.DynamicJoystick = !joystick.DynamicJoystick;
text2.text = joystick.DynamicJoystick ? "切换为动态摇杆" : "切换成静态摇杆";
}
}
}
}
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common/Scripts/ConfigurationDemo.cs.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 85462be83270a0542bd07a2ce4d046f0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common/Texture.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 0adc7af0ae5648a4d99cc4432da21c8d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/Common/Texture/JoyStick.png.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: c49d214d34c99db43bd8a730f9d145dd
TextureImporter:
internalIDToNameTable:
- first:
213: 21300000
second: JoyStick_0
- first:
213: 21300002
second: JoyStick_1
- first:
213: 21300004
second: JoyStick_2
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: JoyStick_0
rect:
serializedVersion: 2
x: 2
y: 272
width: 238
height: 238
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 9229dae539ac4e44d9d7e1516f36618f
internalID: 21300000
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: JoyStick_1
rect:
serializedVersion: 2
x: 2
y: 81
width: 81
height: 189
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8462541e7abb9c84d83f2c19af7511b3
internalID: 21300002
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: JoyStick_2
rect:
serializedVersion: 2
x: 85
y: 175
width: 95
height: 95
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 02fbcb06a29529f42b535e3b36c069bb
internalID: 21300004
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 42c7a9727be41a441b15fa339cffb479
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/ThirdPersonSolution.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 1264694e4bd81ce499736d6516df2ba7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/ThirdPersonSolution/ThirdPersonSolution.cs 0 → 100644
View file @ 71a15bff
// Copyright (c) Bian Shanghai
// https://github.com/Bian-Sh/UniJoystick
// Licensed under the MIT license. See the LICENSE.md file in the project root for more information.
namespace zFrame.Example
{
using UnityEngine;
using zFrame.UI;
public class ThirdPersonSolution : MonoBehaviour
{
[SerializeField] Joystick joystick;
public float speed = 5;
CharacterController controller;
void Start()
{
controller = GetComponent<CharacterController>();
joystick.OnValueChanged.AddListener(v =>
{
if (v.magnitude != 0)
{
Vector3 direction = new Vector3(v.x, 0, v.y);
controller.Move(direction * speed * Time.deltaTime);
transform.rotation = Quaternion.LookRotation(new Vector3(v.x, 0, v.y));
}
});
}
}
}
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Example/ThirdPersonSolution/ThirdPersonSolution.cs.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 4d01c5f2ab593a546bf7081c533655a3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Scripts.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 87445d6983ef82b4b90e4aea575f4166
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Scripts/DirectionArrow.cs 0 → 100644
View file @ 71a15bff
// Copyright (c) Bian Shanghai
// https://github.com/Bian-Sh/UniJoystick
// Licensed under the MIT license. See the LICENSE.md file in the project root for more information.
namespace zFrame.UI
{
using System;
using UnityEngine;
public class DirectionArrow : MonoBehaviour
{
private Joystick joystick;
private void Start()
{
joystick = GetComponentInParent<Joystick>();
if (null == joystick)
{
throw new InvalidOperationException("The directional arrow is an optional part of the joystick and it relies on the instance of the joystick!");
}
joystick.OnPointerUp.AddListener(OnPointerUp);
joystick.OnValueChanged.AddListener(UpdateDirectionArrow);
gameObject.SetActive(false);
}
void OnDestroy()
{
joystick.OnPointerUp.RemoveListener(OnPointerUp);
joystick.OnValueChanged.RemoveListener(UpdateDirectionArrow);
}
// 更新指向器的朝向
private void UpdateDirectionArrow(Vector2 position)
{
if (position.magnitude != 0)
{
if (!gameObject.activeSelf)
{
gameObject.SetActive(true);
}
transform.localEulerAngles = new Vector3(0, 0, Vector2.Angle(Vector2.right, position) * (position.y > 0 ? 1 : -1));
}
}
void OnPointerUp(Vector2 pos)
{
gameObject.SetActive(false);
}
}
}
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Scripts/DirectionArrow.cs.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: e81cca764216ee343ab19ef27af7e0d4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Scripts/Joystick.cs 0 → 100644
View file @ 71a15bff
// Copyright (c) Bian Shanghai
// https://github.com/Bian-Sh/UniJoystick
// Licensed under the MIT license. See the LICENSE.md file in the project root for more information.
namespace zFrame.UI
{
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.Events;
using UnityEngine.UI;
public class Joystick : MonoBehaviour, IPointerDownHandler, IDragHandler, IPointerUpHandler
{
public float maxRadius = 100; //Handle 移动最大半径
[EnumFlags]
public Direction activatedAxis = (Direction)(-1); //选择激活的轴向
[SerializeField] bool dynamic = true; // 动态摇杆
[SerializeField] Transform handle; //摇杆
[SerializeField] Transform backGround; //背景
public JoystickEvent OnValueChanged = new JoystickEvent(); //事件 ： 摇杆被 拖拽时
public JoystickEvent OnPointerDown = new JoystickEvent(); // 事件： 摇杆被按下时
public JoystickEvent OnPointerUp = new JoystickEvent(); //事件 ： 摇杆上抬起时
public bool IsDraging { get { return fingerId != int.MinValue; } } //摇杆拖拽状态
public bool DynamicJoystick //运行时代码配置摇杆是否为动态摇杆
{
set
{
if (dynamic != value)
{
dynamic = value;
ConfigJoystick();
}
}
get
{
return dynamic;
}
}
#region MonoBehaviour functions
private void Awake() => backGroundOriginLocalPostion = backGround.localPosition;
void Update()=>OnValueChanged.Invoke(handle.localPosition / maxRadius);
void OnDisable() => RestJoystick(); //意外被 Disable 各单位需要被重置
#endregion
#region The implement of pointer event Interface
void IPointerDownHandler.OnPointerDown(PointerEventData eventData)
{
if (eventData.pointerId < -1 || IsDraging) return; //适配 Touch：只响应一个Touch；适配鼠标：只响应左键
fingerId = eventData.pointerId;
pointerDownPosition = eventData.position;
if (dynamic)
{
pointerDownPosition[2] = eventData.pressEventCamera?.WorldToScreenPoint(backGround.position).z ?? backGround.position.z;
backGround.position = eventData.pressEventCamera?.ScreenToWorldPoint(pointerDownPosition) ?? pointerDownPosition; ;
}
OnPointerDown.Invoke(eventData.position);
}
void IDragHandler.OnDrag(PointerEventData eventData)
{
if (fingerId != eventData.pointerId) return;
Vector2 direction = eventData.position - (Vector2)pointerDownPosition; //得到BackGround 指向 Handle 的向量
float radius = Mathf.Clamp(Vector3.Magnitude(direction), 0, maxRadius); //获取并锁定向量的长度 以控制 Handle 半径
Vector2 localPosition = new Vector2()
{
x = (0 != (activatedAxis & Direction.Horizontal)) ? (direction.normalized * radius).x : 0, //确认是否激活水平轴向
y = (0 != (activatedAxis & Direction.Vertical)) ? (direction.normalized * radius).y : 0 //确认是否激活垂直轴向，激活就搞事情
};
handle.localPosition = localPosition; //更新 Handle 位置
}
void IPointerUpHandler.OnPointerUp(PointerEventData eventData)
{
if (fingerId != eventData.pointerId) return;//正确的手指抬起时才会重置摇杆；
RestJoystick();
OnPointerUp.Invoke(eventData.position);
}
#endregion
#region Assistant functions / fields / structures
void RestJoystick()
{
backGround.localPosition = backGroundOriginLocalPostion;
handle.localPosition = Vector3.zero;
fingerId = int.MinValue;
}
void ConfigJoystick() //配置动态/静态摇杆
{
if (!dynamic) backGroundOriginLocalPostion = backGround.localPosition;
GetComponent<Image>().raycastTarget = dynamic;
handle.GetComponent<Image>().raycastTarget = !dynamic;
}
#if UNITY_EDITOR
private void OnValidate()
{
if (!handle) handle = transform.Find("BackGround/Handle");
if (!backGround) backGround = transform.Find("BackGround");
ConfigJoystick();
}
#endif
private Vector3 backGroundOriginLocalPostion, pointerDownPosition;
private int fingerId = int.MinValue; //当前触发摇杆的 pointerId ，预设一个永远无法企及的值
[System.Serializable] public class JoystickEvent : UnityEvent<Vector2> { }
[System.Flags]
public enum Direction
{
Horizontal = 1 << 0,
Vertical = 1 << 1
}
#endregion
}
}
BattleMuscle/Assets/Art_Assets/Animation/Joystick/Scripts/Joystick.cs.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: b509d37a016b4b9419665292627db670
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/Movement/Running.anim 0 → 100644
View file @ 71a15bff
This diff is collapsed.
BattleMuscle/Assets/Art_Assets/Animation/Movement/Running.anim.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: ffae3f44d0f830c4faf01048e7958567
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Animation/Movement/Running3.fbx.meta → BattleMuscle/Assets/Art_Assets/Animation/Movement/Running3.fbx.meta
View file @ 71a15bff
fileFormatVersion: 2
guid: c219f3651d3c9d94bbb025aba0f6cd5e
ModelImporter:
serializedVersion: 19300
serializedVersion: 19301
internalIDToNameTable:
- first:
74: -203655887218126122
......@@ -25,7 +25,7 @@ ModelImporter:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
importConstraints: 1
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
......@@ -75,6 +75,7 @@ ModelImporter:
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
......
BattleMuscle/Assets/Art_Assets/Animation/Running (4).fbx.meta 0 → 100644
View file @ 71a15bff
fileFormatVersion: 2
guid: 2c586f96f6e27ae48bf8e6ecc1598bce
ModelImporter:
serializedVersion: 19300
internalIDToNameTable:
- first:
74: -203655887218126122
second: mixamo.com
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Levels/Level 1.unity
View file @ 71a15bff
......@@ -204,7 +204,7 @@ MonoBehaviour:
ModeOverride: 0
LensShift: {x: 0, y: 0}
GateFit: 2
m_SensorSize: {x: 0.5625, y: 1}
m_SensorSize: {x: 0.43820226, y: 1}
m_Transitions:
m_BlendHint: 0
m_InheritPosition: 0
......@@ -220,7 +220,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 44004332}
m_LocalRotation: {x: 0.28842446, y: -0.08867417, z: 0.02683686, w: 0.95301}
m_LocalRotation: {x: 0.2797443, y: -0.088914596, z: 0.026029205, w: 0.95559394}
m_LocalPosition: {x: 0, y: 0, z: -13.099998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
......@@ -1641,7 +1641,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 883198004}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.5, z: 0}
m_LocalPosition: {x: 0, y: 1.143, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 77352342}
......@@ -1659,13 +1659,13 @@ CharacterController:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Height: 3.65
m_Height: 3.23
m_Radius: 0.73
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 0.61, z: 0}
m_Center: {x: 0, y: 1.58, z: 0}
--- !u!4 &887053111 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5957448837996379867, guid: 15d49ef1e12d35a46b7c6fb953021b43,
......@@ -1958,7 +1958,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1001386389}
m_LocalRotation: {x: 0.28842446, y: -0.08867417, z: 0.02683686, w: 0.95301}
m_LocalRotation: {x: 0.2797443, y: -0.088914596, z: 0.026029205, w: 0.95559394}
m_LocalPosition: {x: 4.5559893, y: 17.040298, z: -24.270386}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
......@@ -4428,7 +4428,12 @@ PrefabInstance:
- target: {fileID: 815079108182812359, guid: ed4e91d9a28ad7e4eb40ceb0e7e9f29b,
type: 3}
propertyPath: m_ApplyRootMotion
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 815079108182812359, guid: ed4e91d9a28ad7e4eb40ceb0e7e9f29b,
type: 3}
propertyPath: m_Avatar
value:
objectReference: {fileID: 0}
- target: {fileID: 815079108190062857, guid: ed4e91d9a28ad7e4eb40ceb0e7e9f29b,
type: 3}
......
BattleMuscle/Assets/My/AnimationController/AnimatorControllerPlayer.controller
View file @ 71a15bff
......@@ -10,19 +10,18 @@ AnimatorStateMachine:
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 7178080885167727702}
m_Position: {x: 160, y: -60, z: 0}
m_State: {fileID: 5095978937089661629}
m_Position: {x: 280, y: -70, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions:
- {fileID: 2231578916844529555}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 110, y: -320, z: 0}
m_EntryPosition: {x: 110, y: -210, z: 0}
m_ExitPosition: {x: 300, y: 240, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 7178080885167727702}
m_DefaultState: {fileID: 5095978937089661629}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
......@@ -63,28 +62,14 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1109 &2231578916844529555
AnimatorTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7178080885167727702}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!1102 &7178080885167727702
--- !u!1102 &5095978937089661629
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: mixamo_com
m_Name: Running
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
......@@ -97,8 +82,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -203655887218126122, guid: c219f3651d3c9d94bbb025aba0f6cd5e,
type: 3}
m_Motion: {fileID: 7400000, guid: ffae3f44d0f830c4faf01048e7958567, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
......
BattleMuscle/BattleMuscle.sln
View file @ 71a15bff
......@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro", "Unity.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline", "Unity.Timeline.csproj", "{A3249720-D8B6-B9D0-BBDF-717D6FBB4B94}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cinemachine", "Cinemachine.csproj", "{CBEBAE20-68FB-3AB8-585F-7BBBCBA563FF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NonConvexCollider", "NonConvexCollider.csproj", "{61956053-6F43-8229-0AAA-08853F44A1D8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NonConvexColliderRuntimeAPI", "NonConvexColliderRuntimeAPI.csproj", "{9225EC92-3A26-72D6-23D6-D13CEDBB1388}"
......@@ -27,6 +29,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEditor.TestRunner", "U
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor-firstpass", "Assembly-CSharp-Editor-firstpass.csproj", "{7D3722B7-C4F9-442E-8D54-18F3109D6754}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "com.unity.cinemachine.editor", "com.unity.cinemachine.editor.csproj", "{A47DA747-C542-385A-5C52-109DFD4DDBBA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEditor.UI", "UnityEditor.UI.csproj", "{718AB795-DD2E-EEAD-3A1B-4C4B0F215950}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Rider.Editor", "Unity.Rider.Editor.csproj", "{420C308A-933F-4293-9EB1-FB6D047ED76B}"
......@@ -69,6 +73,10 @@ Global
{A3249720-D8B6-B9D0-BBDF-717D6FBB4B94}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A3249720-D8B6-B9D0-BBDF-717D6FBB4B94}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A3249720-D8B6-B9D0-BBDF-717D6FBB4B94}.Release|Any CPU.Build.0 = Release|Any CPU
{CBEBAE20-68FB-3AB8-585F-7BBBCBA563FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CBEBAE20-68FB-3AB8-585F-7BBBCBA563FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CBEBAE20-68FB-3AB8-585F-7BBBCBA563FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CBEBAE20-68FB-3AB8-585F-7BBBCBA563FF}.Release|Any CPU.Build.0 = Release|Any CPU
{61956053-6F43-8229-0AAA-08853F44A1D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61956053-6F43-8229-0AAA-08853F44A1D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61956053-6F43-8229-0AAA-08853F44A1D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -97,6 +105,10 @@ Global
{7D3722B7-C4F9-442E-8D54-18F3109D6754}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D3722B7-C4F9-442E-8D54-18F3109D6754}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D3722B7-C4F9-442E-8D54-18F3109D6754}.Release|Any CPU.Build.0 = Release|Any CPU
{A47DA747-C542-385A-5C52-109DFD4DDBBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A47DA747-C542-385A-5C52-109DFD4DDBBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A47DA747-C542-385A-5C52-109DFD4DDBBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A47DA747-C542-385A-5C52-109DFD4DDBBA}.Release|Any CPU.Build.0 = Release|Any CPU
{718AB795-DD2E-EEAD-3A1B-4C4B0F215950}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{718AB795-DD2E-EEAD-3A1B-4C4B0F215950}.Debug|Any CPU.Build.0 = Debug|Any CPU
{718AB795-DD2E-EEAD-3A1B-4C4B0F215950}.Release|Any CPU.ActiveCfg = Release|Any CPU
......
BattleMuscle/Cinemachine.csproj 0 → 100644
View file @ 71a15bff
This diff is collapsed.
BattleMuscle/NonConvexCollider.csproj
View file @ 71a15bff
......@@ -296,6 +296,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="netstandard">
<HintPath>D:/unity2019/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>
</Reference>
......
BattleMuscle/NonConvexColliderRuntimeAPI.csproj
View file @ 71a15bff
......@@ -296,6 +296,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="netstandard">
<HintPath>D:/unity2019/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>
</Reference>
......
BattleMuscle/NonConvexEditor.csproj
View file @ 71a15bff
......@@ -297,6 +297,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
......
BattleMuscle/RuntimeTestAssembly.csproj
View file @ 71a15bff
......@@ -295,6 +295,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="netstandard">
<HintPath>D:/unity2019/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>
</Reference>
......
BattleMuscle/Unity.CollabProxy.Editor.csproj
View file @ 71a15bff
......@@ -314,6 +314,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
......
BattleMuscle/Unity.Rider.Editor.csproj
View file @ 71a15bff
......@@ -315,6 +315,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
......
BattleMuscle/Unity.TextMeshPro.Editor.csproj
View file @ 71a15bff
......@@ -341,6 +341,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
......
BattleMuscle/Unity.TextMeshPro.csproj
View file @ 71a15bff
......@@ -350,6 +350,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="netstandard">
<HintPath>D:/unity2019/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>
</Reference>
......
BattleMuscle/Unity.Timeline.Editor.csproj
View file @ 71a15bff
......@@ -530,6 +530,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
......
BattleMuscle/Unity.Timeline.csproj
View file @ 71a15bff
......@@ -364,6 +364,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="netstandard">
<HintPath>D:/unity2019/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>
</Reference>
......
BattleMuscle/Unity.VSCode.Editor.csproj
View file @ 71a15bff
......@@ -301,6 +301,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
......
BattleMuscle/UnityEditor.UI.csproj
View file @ 71a15bff
......@@ -329,6 +329,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
......
BattleMuscle/UnityEngine.UI.csproj
View file @ 71a15bff
......@@ -377,6 +377,9 @@
<Reference Include="DOTweenProEditor">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Assets/Demigiant/DOTweenPro/Editor/DOTweenProEditor.dll</HintPath>
</Reference>
<Reference Include="clipper_library">
<HintPath>D:/Projects/Battle Muscle/BattleMuscle/BattleMuscle/Library/PackageCache/com.unity.cinemachine@2.7.3/Runtime/ThirdParty/clipper_library.dll</HintPath>
</Reference>
<Reference Include="netstandard">
<HintPath>D:/unity2019/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>
</Reference>
......
BattleMuscle/com.unity.cinemachine.editor.csproj 0 → 100644
View file @ 71a15bff
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment