Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
BoomMaster
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
wanqing
BoomMaster
Commits
a6923685
Commit
a6923685
authored
Mar 04, 2021
by
Yuyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
于:动画更新
parent
8ea770ba
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
1580 additions
and
1523 deletions
+1580
-1523
关卡编辑.unity
BoomMaster/Assets/#A1_Scenes/关卡编辑.unity
+0
-0
Props4.mat
BoomMaster/Assets/#C1_Models/Props/Materials/Props4.mat
+2
-2
Porps1_Attack.anim
BoomMaster/Assets/#C2_Animations/Porps1_Attack.anim
+365
-39
Porps1_Idle.anim
BoomMaster/Assets/#C2_Animations/Porps1_Idle.anim
+467
-0
Porps1_Idle.anim.meta
BoomMaster/Assets/#C2_Animations/Porps1_Idle.anim.meta
+8
-0
Porps2_Attack.anim
BoomMaster/Assets/#C2_Animations/Porps2_Attack.anim
+177
-1479
Porps2_Idle.anim
BoomMaster/Assets/#C2_Animations/Porps2_Idle.anim
+431
-0
Porps2_Idle.anim.meta
BoomMaster/Assets/#C2_Animations/Porps2_Idle.anim.meta
+8
-0
Porps3_Idle.anim
BoomMaster/Assets/#C2_Animations/Porps3_Idle.anim
+53
-0
Porps3_Idle.anim.meta
BoomMaster/Assets/#C2_Animations/Porps3_Idle.anim.meta
+8
-0
Props1.controller
BoomMaster/Assets/#C2_Animations/Props1.controller
+31
-2
Props2.controller
BoomMaster/Assets/#C2_Animations/Props2.controller
+30
-1
No files found.
BoomMaster/Assets/#A1_Scenes/关卡编辑.unity
View file @
a6923685
This diff is collapsed.
Click to expand it.
BoomMaster/Assets/#C1_Models/Props/Materials/Props4.mat
View file @
a6923685
...
...
@@ -73,5 +73,5 @@ Material:
-
_UVSec
:
0
-
_ZWrite
:
1
m_Colors
:
-
_Color
:
{
r
:
0.2235294
,
g
:
0.7915548
,
b
:
1
,
a
:
1
}
-
_EmissionColor
:
{
r
:
0.
047058824
,
g
:
0.19803922
,
b
:
0.34509805
,
a
:
1
}
-
_Color
:
{
r
:
1
,
g
:
0.010103254
,
b
:
0
,
a
:
1
}
-
_EmissionColor
:
{
r
:
0.
34509805
,
g
:
0.11451234
,
b
:
0.04705882
,
a
:
1
}
BoomMaster/Assets/#C2_Animations/Porps1_Attack.anim
View file @
a6923685
This diff is collapsed.
Click to expand it.
BoomMaster/Assets/#C2_Animations/Porps1_Idle.anim
0 → 100644
View file @
a6923685
This diff is collapsed.
Click to expand it.
BoomMaster/Assets/#C2_Animations/Porps1_Idle.anim.meta
0 → 100644
View file @
a6923685
fileFormatVersion: 2
guid: fb2f4c841e58ca045b9f4267aabf10e2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#C2_Animations/Porps2_Attack.anim
View file @
a6923685
This diff is collapsed.
Click to expand it.
BoomMaster/Assets/#C2_Animations/Porps2_Idle.anim
0 → 100644
View file @
a6923685
This diff is collapsed.
Click to expand it.
BoomMaster/Assets/#C2_Animations/Porps2_Idle.anim.meta
0 → 100644
View file @
a6923685
fileFormatVersion: 2
guid: 897e8ea043c189847a5dbbcac1b4b537
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#C2_Animations/Porps3_Idle.anim
0 → 100644
View file @
a6923685
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!74
&7400000
AnimationClip
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Porps3_Idle
serializedVersion
:
6
m_Legacy
:
0
m_Compressed
:
0
m_UseHighQualityCurve
:
1
m_RotationCurves
:
[]
m_CompressedRotationCurves
:
[]
m_EulerCurves
:
[]
m_PositionCurves
:
[]
m_ScaleCurves
:
[]
m_FloatCurves
:
[]
m_PPtrCurves
:
[]
m_SampleRate
:
60
m_WrapMode
:
0
m_Bounds
:
m_Center
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_Extent
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_ClipBindingConstant
:
genericBindings
:
[]
pptrCurveMapping
:
[]
m_AnimationClipSettings
:
serializedVersion
:
2
m_AdditiveReferencePoseClip
:
{
fileID
:
0
}
m_AdditiveReferencePoseTime
:
0
m_StartTime
:
0
m_StopTime
:
1
m_OrientationOffsetY
:
0
m_Level
:
0
m_CycleOffset
:
0
m_HasAdditiveReferencePose
:
0
m_LoopTime
:
0
m_LoopBlend
:
0
m_LoopBlendOrientation
:
0
m_LoopBlendPositionY
:
0
m_LoopBlendPositionXZ
:
0
m_KeepOriginalOrientation
:
0
m_KeepOriginalPositionY
:
1
m_KeepOriginalPositionXZ
:
0
m_HeightFromFeet
:
0
m_Mirror
:
0
m_EditorCurves
:
[]
m_EulerEditorCurves
:
[]
m_HasGenericRootTransform
:
0
m_HasMotionFloatCurves
:
0
m_Events
:
[]
BoomMaster/Assets/#C2_Animations/Porps3_Idle.anim.meta
0 → 100644
View file @
a6923685
fileFormatVersion: 2
guid: 76fab6a0a7caa834c8e6ba0a9e30db60
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#C2_Animations/Props1.controller
View file @
a6923685
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1102
&-3192207249383302874
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Porps1_Idle
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
:
7400000
,
guid
:
fb2f4c841e58ca045b9f4267aabf10e2
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
...
...
@@ -59,7 +85,10 @@ AnimatorStateMachine:
m_ChildStates
:
-
serializedVersion
:
1
m_State
:
{
fileID
:
6730958153914027838
}
m_Position
:
{
x
:
200
,
y
:
0
,
z
:
0
}
m_Position
:
{
x
:
180
,
y
:
300
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
-3192207249383302874
}
m_Position
:
{
x
:
190
,
y
:
220
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
...
...
@@ -69,4 +98,4 @@ AnimatorStateMachine:
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
:
6730958153914027838
}
m_DefaultState
:
{
fileID
:
-3192207249383302874
}
BoomMaster/Assets/#C2_Animations/Props2.controller
View file @
a6923685
...
...
@@ -48,6 +48,32 @@ AnimatorController:
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
---
!u!1102
&2659269805789241262
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Porps2_Idle
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
:
7400000
,
guid
:
897e8ea043c189847a5dbbcac1b4b537
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1107
&8596786493504815029
AnimatorStateMachine
:
serializedVersion
:
5
...
...
@@ -60,6 +86,9 @@ AnimatorStateMachine:
-
serializedVersion
:
1
m_State
:
{
fileID
:
-2052713961857118699
}
m_Position
:
{
x
:
200
,
y
:
0
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
2659269805789241262
}
m_Position
:
{
x
:
230
,
y
:
250
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
...
...
@@ -69,4 +98,4 @@ AnimatorStateMachine:
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
:
-2052713961857118699
}
m_DefaultState
:
{
fileID
:
2659269805789241262
}
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