Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
SteelBall
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
SteelBall
Commits
221b32af
Commit
221b32af
authored
Jan 27, 2021
by
wanqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加死亡动画
parent
1dca60ae
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
935 additions
and
8 deletions
+935
-8
.suo
SteelBall/.vs/SteelBall/v16/.suo
+0
-0
SixLevelPlayerCollision.cs
...s/0A2_Scripts/Battle/Collision/SixLevelPlayerCollision.cs
+1
-0
ChainHandle.cs
SteelBall/Assets/0A2_Scripts/Battle/View/ChainHandle.cs
+26
-5
Death_FallForwards.fbx
...racter Pack Free Sample/Animations/Death_FallForwards.fbx
+0
-0
Death_FallForwards.fbx.meta
...r Pack Free Sample/Animations/Death_FallForwards.fbx.meta
+875
-0
Player.controller
...er Pack Free Sample/AnimatorControllers/Player.controller
+31
-1
Level06.prefab
SteelBall/Assets/Res/Prefabs/Levels/Level06.prefab
+2
-2
No files found.
SteelBall/.vs/SteelBall/v16/.suo
View file @
221b32af
No preview for this file type
SteelBall/Assets/0A2_Scripts/Battle/Collision/SixLevelPlayerCollision.cs
View file @
221b32af
...
...
@@ -23,6 +23,7 @@ public class SixLevelPlayerCollision : MonoBehaviour
if
(
other
.
collider
.
gameObject
.
CompareTag
(
"Ball"
)
&&
m_bCollider
)
{
m_bCollider
=
false
;
m_animator
.
Play
(
"Die"
);
BattleCtrl
.
instance
.
OnBattleFail
();
}
}
...
...
SteelBall/Assets/0A2_Scripts/Battle/View/ChainHandle.cs
View file @
221b32af
...
...
@@ -198,11 +198,25 @@ public class ChainHandle : MonoBehaviour
// Mathf.Clamp(transform.position.z, varMinY, varMaxY));
//}
//铁球有去无回
if
(
transform
.
localEulerAngles
.
x
>
180.0f
&&
transform
.
localEulerAngles
.
x
<=
330.0f
&&
m_controlRotate
)
if
(
transform
.
localEulerAngles
.
x
>
180.0f
&&
m_controlRotate
)
{
m_controlRotate
=
false
;
m_rigidBody
.
isKinematic
=
true
;
transform
.
localRotation
=
Quaternion
.
Euler
(-
90
,
0
,
0
);
if
(
m_hingJoint
)
{
GameObject
.
Destroy
(
m_hingJoint
);
m_hingJoint
=
null
;
}
if
(
m_rigidBody
)
{
GameObject
.
Destroy
(
m_rigidBody
);
m_rigidBody
=
null
;
}
Quaternion
varVec3
=
transform
.
localRotation
;
varVec3
.
x
-=
Time
.
deltaTime
/
2
;
transform
.
localRotation
=
varVec3
;
if
(
transform
.
localEulerAngles
.
x
<=
280.0f
)
{
m_controlRotate
=
false
;
}
}
}
...
...
@@ -221,7 +235,10 @@ public class ChainHandle : MonoBehaviour
float
varY
=
(
Input
.
mousePosition
.
y
-
Screen
.
height
/
2f
)
/
(
Screen
.
width
/
GlobalConfig
.
NormalWidth
);
BattleCtrl
.
instance
.
battleUI
.
SetSymbolPos
(
varX
,
varY
);
//重置状态
m_rigidBody
.
isKinematic
=
true
;
if
(
m_rigidBody
)
{
m_rigidBody
.
isKinematic
=
true
;
}
if
(
m_hingJoint
)
{
GameObject
.
Destroy
(
m_hingJoint
);
...
...
@@ -238,6 +255,10 @@ public class ChainHandle : MonoBehaviour
m_parentTrans
.
position
=
varVec3
;
GameServices
.
timerServices
.
Push
(
this
,
0.1f
,
delegate
{
if
(!
m_rigidBody
)
{
m_rigidBody
=
gameObject
.
AddComponent
<
Rigidbody
>();
}
if
(!
m_hingJoint
)
{
m_hingJoint
=
gameObject
.
AddComponent
<
HingeJoint
>();
...
...
SteelBall/Assets/0C1_Models/Supercyan Character Pack Free Sample/Animations/Death_FallForwards.fbx
0 → 100644
View file @
221b32af
File added
SteelBall/Assets/0C1_Models/Supercyan Character Pack Free Sample/Animations/Death_FallForwards.fbx.meta
0 → 100644
View file @
221b32af
This diff is collapsed.
Click to expand it.
SteelBall/Assets/0C1_Models/Supercyan Character Pack Free Sample/AnimatorControllers/Player.controller
View file @
221b32af
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1102
&-8974096978781679025
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Die
m_Speed
:
1.5
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
:
1827226128182048838
,
guid
:
791a1773ec195c144b380a12f10e88e8
,
type
:
3
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
...
...
@@ -14,7 +41,7 @@ AnimatorController:
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
...
...
@@ -43,6 +70,9 @@ AnimatorStateMachine:
-
serializedVersion
:
1
m_State
:
{
fileID
:
7199662585890832343
}
m_Position
:
{
x
:
322.25034
,
y
:
181.77106
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
-8974096978781679025
}
m_Position
:
{
x
:
320
,
y
:
290
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
...
...
SteelBall/Assets/Res/Prefabs/Levels/Level06.prefab
View file @
221b32af
...
...
@@ -4442,8 +4442,8 @@ Transform:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5493773560976184134
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
-1
6.88
,
z
:
0
}
m_LocalScale
:
{
x
:
1.5
,
y
:
1.5
,
z
:
1.5
}
m_LocalPosition
:
{
x
:
0
,
y
:
-1
7.1
,
z
:
0
}
m_LocalScale
:
{
x
:
2
,
y
:
2
,
z
:
2
}
m_Children
:
[]
m_Father
:
{
fileID
:
8412891822539276460
}
m_RootOrder
:
1
...
...
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