Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
BattleMuscle
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
czy
BattleMuscle
Commits
737e03ba
Commit
737e03ba
authored
May 07, 2021
by
czy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
跑步动画,相机优化
parent
c56b9d8c
Changes
24
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
6171 additions
and
126 deletions
+6171
-126
FollowTarget.cs
BattleMuscle/Assets/#A2_Scripts/Camera/FollowTarget.cs
+8
-8
Running2.fbx
BattleMuscle/Assets/Animation/Movement/Running2.fbx
+0
-0
Running2.fbx.meta
BattleMuscle/Assets/Animation/Movement/Running2.fbx.meta
+99
-0
Running3.fbx
BattleMuscle/Assets/Animation/Movement/Running3.fbx
+0
-0
Running3.fbx.meta
BattleMuscle/Assets/Animation/Movement/Running3.fbx.meta
+128
-0
SimpleAnimations.controller
...dels/Supercyan/AnimatorAssets/SimpleAnimations.controller
+19
-19
Level 1.unity
BattleMuscle/Assets/Levels/Level 1.unity
+554
-20
AnimationController.meta
BattleMuscle/Assets/My/AnimationController.meta
+8
-0
AnimatorControllerPlayer.controller
...y/AnimationController/AnimatorControllerPlayer.controller
+91
-0
AnimatorControllerPlayer.controller.meta
...mationController/AnimatorControllerPlayer.controller.meta
+8
-0
AnimatorControllerPlayerTest.controller
...imationController/AnimatorControllerPlayerTest.controller
+72
-0
AnimatorControllerPlayerTest.controller.meta
...onController/AnimatorControllerPlayerTest.controller.meta
+8
-0
PlayerMove.cs
BattleMuscle/Assets/My/Scripts/Player/PlayerMove.cs
+25
-8
Wall.cs
BattleMuscle/Assets/My/Scripts/Wall.cs
+0
-66
Wall.meta
BattleMuscle/Assets/My/Scripts/Wall.meta
+8
-0
Wall.cs
BattleMuscle/Assets/My/Scripts/Wall/Wall.cs
+27
-0
Wall.cs.meta
BattleMuscle/Assets/My/Scripts/Wall/Wall.cs.meta
+1
-1
Test.meta
BattleMuscle/Assets/My/Test.meta
+8
-0
TestAnimation.unity
BattleMuscle/Assets/My/Test/TestAnimation.unity
+747
-0
TestAnimation.unity.meta
BattleMuscle/Assets/My/Test/TestAnimation.unity.meta
+7
-0
TestCamera.unity
BattleMuscle/Assets/My/Test/TestCamera.unity
+4345
-0
TestCamera.unity.meta
BattleMuscle/Assets/My/Test/TestCamera.unity.meta
+7
-0
manifest.json
BattleMuscle/Packages/manifest.json
+1
-0
tttt.txt
tttt.txt
+0
-4
No files found.
BattleMuscle/Assets/#A2_Scripts/Camera/FollowTarget.cs
View file @
737e03ba
...
...
@@ -39,7 +39,7 @@ public class FollowTarget : MonoBehaviour
[
Tooltip
(
"控制摄像机的旋转角度"
)]
public
Vector3
rotationVector3
;
private
Vector3
tt
;
//
public float smood=10;
public
float
smood
=
10
;
public
Transform
target
;
...
...
@@ -60,13 +60,13 @@ public class FollowTarget : MonoBehaviour
backDis
=
ConfigurationFile
.
instance
.
backDis
;
upDis
=
ConfigurationFile
.
instance
.
upDis
;
//Vector3 followPoint = target.position + Vector3.up * upDis - target.forward * backDis;
//transform.position = followPoint;
//transform.position = Vector3.Lerp(transform.position, followPoint,Time.deltaTime*smood);//平滑移动
//transform.LookAt(target);
Vector3
followPoint
=
new
Vector3
(
0
,
0
,
target
.
position
.
z
)
+
Vector3
.
up
*
upDis
-
target
.
forward
*
backDis
;
//照相机不左右移动
Vector3
followPoint
=
target
.
position
+
Vector3
.
up
*
upDis
-
target
.
forward
*
backDis
;
transform
.
position
=
followPoint
;
transform
.
position
=
Vector3
.
Lerp
(
transform
.
position
,
followPoint
,
Time
.
deltaTime
*
smood
);
//平滑移动
transform
.
LookAt
(
target
);
//旋转
//transform.Rotate(RotateVector3); //在update中将会一直旋转
//Vector3 temp = Vector3.Lerp(transform.rotation.eulerAngles, rotationVector3, 0.01f);
...
...
BattleMuscle/Assets/Animation/Movement/Running2.fbx
0 → 100644
View file @
737e03ba
File added
BattleMuscle/Assets/Animation/Movement/Running2.fbx.meta
0 → 100644
View file @
737e03ba
fileFormatVersion: 2
guid: 092b5adfc35664b43a5e216c3aba0c4d
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/Animation/Movement/Running3.fbx
0 → 100644
View file @
737e03ba
File added
BattleMuscle/Assets/Animation/Movement/Running3.fbx.meta
0 → 100644
View file @
737e03ba
fileFormatVersion: 2
guid: c219f3651d3c9d94bbb025aba0f6cd5e
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:
- serializedVersion: 16
name: mixamo.com
takeName: mixamo.com
internalID: 0
firstFrame: 0
lastFrame: 21
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
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/Art_Assets/0C1_Models/Supercyan/AnimatorAssets/SimpleAnimations.controller
View file @
737e03ba
...
...
@@ -14,103 +14,103 @@ AnimatorController:
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Jump
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Land
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Pickup
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
PickupFast
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Grounded
m_Type
:
4
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
ButtonPress
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Throw
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Win
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Lose
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Lose2
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Wave
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
No
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Shrug
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Yes
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Conversation
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
-
m_Name
:
Dance
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
...
...
@@ -1463,10 +1463,10 @@ AnimatorStateMachine:
m_Position
:
{
x
:
-1008
,
y
:
-120
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
110233156
}
m_Position
:
{
x
:
-14
64
,
y
:
-120
,
z
:
0
}
m_Position
:
{
x
:
-14
70
,
y
:
-120
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
110233528
}
m_Position
:
{
x
:
127
2
,
y
:
-120
,
z
:
0
}
m_Position
:
{
x
:
127
0
,
y
:
-120
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
110213214
}
m_Position
:
{
x
:
-1236
,
y
:
-120
,
z
:
0
}
...
...
BattleMuscle/Assets/Levels/Level 1.unity
View file @
737e03ba
This diff is collapsed.
Click to expand it.
BattleMuscle/Assets/My/AnimationController.meta
0 → 100644
View file @
737e03ba
fileFormatVersion: 2
guid: 826af287e1ba56b4eaf76a578a33e101
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/My/AnimationController/AnimatorControllerPlayer.controller
0 → 100644
View file @
737e03ba
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1107
&-8623709172497609324
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
:
171450083320412537
}
m_Position
:
{
x
:
150
,
y
:
10
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
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
:
171450083320412537
}
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
AnimatorControllerPlayer
serializedVersion
:
5
m_AnimatorParameters
:
-
m_Name
:
Blend
m_Type
:
1
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
9100000
}
-
m_Name
:
MoveSpeed
m_Type
:
1
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
9100000
}
-
m_Name
:
Grounded
m_Type
:
4
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
9100000
}
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
m_StateMachine
:
{
fileID
:
-8623709172497609324
}
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
&171450083320412537
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Running
m_Speed
:
0.8
m_CycleOffset
:
0
m_Transitions
:
[]
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
:
-203655887218126122
,
guid
:
c219f3651d3c9d94bbb025aba0f6cd5e
,
type
:
3
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
Grounded
m_CycleOffsetParameter
:
Blend
m_TimeParameter
:
Blend
BattleMuscle/Assets/My/AnimationController/AnimatorControllerPlayer.controller.meta
0 → 100644
View file @
737e03ba
fileFormatVersion: 2
guid: f709e8dc6e3dec64885141ab1ecdf487
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/My/AnimationController/AnimatorControllerPlayerTest.controller
0 → 100644
View file @
737e03ba
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1102
&-5642794074313696729
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
New State
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
[]
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
:
0
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1107
&-5054787022844395735
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
:
-5642794074313696729
}
m_Position
:
{
x
:
30
,
y
:
60
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
m_StateMachineTransitions
:
{}
m_StateMachineBehaviours
:
[]
m_AnyStatePosition
:
{
x
:
40
,
y
:
-120
,
z
:
0
}
m_EntryPosition
:
{
x
:
50
,
y
:
-40
,
z
:
0
}
m_ExitPosition
:
{
x
:
50
,
y
:
250
,
z
:
0
}
m_ParentStateMachinePosition
:
{
x
:
800
,
y
:
20
,
z
:
0
}
m_DefaultState
:
{
fileID
:
-5642794074313696729
}
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
AnimatorControllerPlayerTest
serializedVersion
:
5
m_AnimatorParameters
:
[]
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
m_StateMachine
:
{
fileID
:
-5054787022844395735
}
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
}
BattleMuscle/Assets/My/AnimationController/AnimatorControllerPlayerTest.controller.meta
0 → 100644
View file @
737e03ba
fileFormatVersion: 2
guid: a60a49f19b8b9b149aa0edc3706d53dd
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/My/Scripts/Player/PlayerMove.cs
View file @
737e03ba
...
...
@@ -68,6 +68,8 @@ public class PlayerMove : MonoBehaviour
// Start is called before the first frame update
void
Start
()
{
...
...
@@ -220,13 +222,7 @@ public class PlayerMove : MonoBehaviour
RaycastHit
hit
;
//移动
MoveSpeed
=
VSpeed
+
(
AddSpeed
*
(
SpeedLevel
-
1
));
//是否在地面
Grounded
=
characterController
.
isGrounded
;
animator
.
SetFloat
(
"MoveSpeed"
,
MoveSpeed
);
animator
.
SetBool
(
"Grounded"
,
Grounded
);
xDelta
=
0
;
yDelta
=
0
;
...
...
@@ -330,7 +326,28 @@ public class PlayerMove : MonoBehaviour
//characterController.Move((transform.forward * MoveSpeed + new Vector3(0, _vertSpeed, 0)) * Time.deltaTime + (new Vector3(xDelta, 0, 0)));
}
zDelta
+=
GameServices
.
inputService
.
joyStick
.
axisY
.
axisValue
*
HSpeed
*
Time
.
deltaTime
;
characterController
.
Move
(
new
Vector3
(
xDelta
,
yDelta
,
zDelta
));
if
(
xDelta
!=
0
||
zDelta
!=
0
)
{
//float angle = Vector3.Angle(new Vector3(transform.forward.x, 0, transform.forward.z), new Vector3(xDelta, 0, zDelta));
float
angle
=
Vector3
.
Angle
(
Vector3
.
forward
,
new
Vector3
(
xDelta
,
0
,
zDelta
));
if
(
xDelta
<
0
)
{
angle
=
-
Mathf
.
Abs
(
angle
);
}
transform
.
localEulerAngles
=
new
Vector3
(
0
,
angle
,
0
);
//transform.rotation = Quaternion.Euler(0, angle, 0);//转向
characterController
.
Move
(
new
Vector3
(
xDelta
,
yDelta
,
zDelta
));
//移动
}
//移动
MoveSpeed
=
Vector3
.
Distance
(
Vector3
.
zero
,
characterController
.
velocity
);
//是否在地面
Grounded
=
characterController
.
isGrounded
;
animator
.
SetFloat
(
"MoveSpeed"
,
MoveSpeed
);
animator
.
SetBool
(
"Grounded"
,
Grounded
);
}
...
...
BattleMuscle/Assets/My/Scripts/Wall.cs
deleted
100644 → 0
View file @
c56b9d8c
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
public
enum
WallType
{
reward
=
10
,
punish
=-
10
}
/// <summary>
/// 随机控制经过wall的奖惩情况,并控制不同的材质球。
/// </summary>
public
class
Wall
:
MonoBehaviour
{
public
Material
rewardMaterial
;
//奖励
public
Material
punishMaterial
;
//惩罚
private
WallType
type
=
WallType
.
reward
;
void
Start
()
{
int
random
=
Random
.
Range
(
0
,
2
);
//0 1 不包括2
//print("随机数:"+random);
if
(
random
==
0
)
{
this
.
type
=
WallType
.
punish
;
Renderer
[]
renders
=
GetComponentsInChildren
<
Renderer
>();
foreach
(
var
i
in
renders
)
{
i
.
material
=
punishMaterial
;
}
}
else
if
(
random
==
1
)
{
this
.
type
=
WallType
.
reward
;
Renderer
[]
renders
=
GetComponentsInChildren
<
Renderer
>();
foreach
(
var
i
in
renders
)
{
i
.
material
=
rewardMaterial
;
}
}
}
void
Update
()
{
//print("0或者1:"+Random.Range(0, 2));
//print("[0,2)的小数:" + Random.Range(0.0f, 2.0f));
}
private
void
OnTriggerEnter
(
Collider
other
)
{
if
(
other
.
tag
==
"Player"
)
{
switch
(
type
)
{
case
WallType
.
reward
:
BattleCtrl
.
instance
.
Score
+=
(
int
)
WallType
.
reward
;
break
;
case
WallType
.
punish
:
BattleCtrl
.
instance
.
Score
+=
(
int
)
WallType
.
punish
;
break
;
default
:
break
;
}
//print("(int)WallType.reward:" + (int)WallType.reward);
//print("(int)WallType.punish:" + (int)WallType.punish);
BattleCtrl
.
instance
.
updateScore
?.
Invoke
();
}
}
}
BattleMuscle/Assets/My/Scripts/Wall.meta
0 → 100644
View file @
737e03ba
fileFormatVersion: 2
guid: 2e5c3052eac3d224d980b1047b57b268
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/My/Scripts/Wall/Wall.cs
0 → 100644
View file @
737e03ba
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
public
class
Wall
:
MonoBehaviour
{
public
ParticleSystem
ps
;
void
Start
()
{
}
private
void
OnTriggerEnter
(
Collider
other
)
{
if
(
other
.
name
==
"PathEndTrigger"
)
{
ParticleSystem
particleSystem
=
Instantiate
(
ps
,
transform
.
position
,
transform
.
rotation
);
particleSystem
.
gameObject
.
AddComponent
<
DestroyMySel
>();
particleSystem
.
Play
();
Destroy
(
gameObject
);
}
}
void
Update
()
{
}
}
BattleMuscle/Assets/My/Scripts/Wall.cs.meta
→
BattleMuscle/Assets/My/Scripts/Wall
/Wall
.cs.meta
View file @
737e03ba
fileFormatVersion: 2
guid:
b27925858888a84499a05a861bc624ca
guid:
267d4e345a9b9c44fa9acb5159d7815f
MonoImporter:
externalObjects: {}
serializedVersion: 2
...
...
BattleMuscle/Assets/My/Test.meta
0 → 100644
View file @
737e03ba
fileFormatVersion: 2
guid: c4bce1ffe0385aa48812671dbf684a53
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/My/Test/TestAnimation.unity
0 → 100644
View file @
737e03ba
This diff is collapsed.
Click to expand it.
BattleMuscle/Assets/My/Test/TestAnimation.unity.meta
0 → 100644
View file @
737e03ba
fileFormatVersion: 2
guid: 8cb34a92b2b14344ab27dc8c44f0d4c6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/My/Test/TestCamera.unity
0 → 100644
View file @
737e03ba
This diff is collapsed.
Click to expand it.
BattleMuscle/Assets/My/Test/TestCamera.unity.meta
0 → 100644
View file @
737e03ba
fileFormatVersion: 2
guid: 0a5339d21096c214ab865c1cf2849bd5
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Packages/manifest.json
View file @
737e03ba
{
"dependencies"
:
{
"com.unity.cinemachine"
:
"2.7.3"
,
"com.unity.collab-proxy"
:
"1.2.16"
,
"com.unity.ide.rider"
:
"1.1.4"
,
"com.unity.ide.vscode"
:
"1.2.0"
,
...
...
tttt.txt
deleted
100644 → 0
View file @
c56b9d8c
C:\Program Files\Java\jre1.8.0_74\bin>keytool -exportcert -alias androiddebugkey -keystore D:\Android_keystore\user.keystore | C:\openss1-0.9.8k_X64\bin\openssl shal -binary |C:\openssl-0.9.8k_X64\bin\openssl base64
mBiKXr2MyG2TrTkTYfnKF/eLFuM=
com.facebook.unity.FBUnityDeepLinkingActivity
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment