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
6136edc1
Commit
6136edc1
authored
May 12, 2021
by
czy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人物不够掉下场景
parent
e4adaa0f
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
1538 additions
and
20 deletions
+1538
-20
Running2.controller
..._Assets/Animation/AnimationController/Running2.controller
+3
-3
Level 1.unity
BattleMuscle/Assets/Levels/Level 1.unity
+1513
-13
HurricaneKickTrigger.prefab
BattleMuscle/Assets/My/Model/HurricaneKickTrigger.prefab
+1
-1
LegSweepTrigger.prefab
BattleMuscle/Assets/My/Model/LegSweepTrigger.prefab
+1
-1
BossAttack.cs
BattleMuscle/Assets/My/Scripts/AI/BossAttack.cs
+2
-0
Food.cs
BattleMuscle/Assets/My/Scripts/Food/Food.cs
+15
-1
MagnetTrigger.cs
BattleMuscle/Assets/My/Scripts/MagnetTrigger.cs
+2
-0
PlayerMove.cs
BattleMuscle/Assets/My/Scripts/Player/PlayerMove.cs
+1
-1
No files found.
BattleMuscle/Assets/Art_Assets/Animation/AnimationController/Running2.controller
View file @
6136edc1
...
...
@@ -199,7 +199,7 @@ AnimatorStateTransition:
m_TransitionDuration
:
0.25
m_TransitionOffset
:
0
m_ExitTime
:
0.89285713
m_HasExitTime
:
1
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
...
...
@@ -251,7 +251,7 @@ AnimatorStateTransition:
m_TransitionDuration
:
0.25
m_TransitionOffset
:
0
m_ExitTime
:
0.75
m_HasExitTime
:
1
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
...
...
@@ -276,7 +276,7 @@ AnimatorStateTransition:
m_TransitionDuration
:
0.03374338
m_TransitionOffset
:
0
m_ExitTime
:
0.9815945
m_HasExitTime
:
1
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
...
...
BattleMuscle/Assets/Levels/Level 1.unity
View file @
6136edc1
This diff is collapsed.
Click to expand it.
BattleMuscle/Assets/My/Model/HurricaneKickTrigger.prefab
View file @
6136edc1
...
...
@@ -50,7 +50,7 @@ MeshRenderer:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
7483224581113721909
}
m_Enabled
:
1
m_Enabled
:
0
m_CastShadows
:
1
m_ReceiveShadows
:
1
m_DynamicOccludee
:
1
...
...
BattleMuscle/Assets/My/Model/LegSweepTrigger.prefab
View file @
6136edc1
...
...
@@ -50,7 +50,7 @@ MeshRenderer:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6039842180593449807
}
m_Enabled
:
1
m_Enabled
:
0
m_CastShadows
:
1
m_ReceiveShadows
:
1
m_DynamicOccludee
:
1
...
...
BattleMuscle/Assets/My/Scripts/AI/BossAttack.cs
View file @
6136edc1
...
...
@@ -42,12 +42,14 @@ public class BossAttack : MonoBehaviour
{
TempLegSweepObj
=
Instantiate
(
LegSweepTrigger
,
RightThigh
);
}
if
(
TempHurricaneKickObj
!=
null
)
Destroy
(
TempHurricaneKickObj
);
break
;
case
AttackType
.
HurricaneKick
:
if
(
TempHurricaneKickObj
==
null
)
{
TempHurricaneKickObj
=
Instantiate
(
HurricaneKickTrigger
,
LeftThigh
);
}
if
(
TempLegSweepObj
!=
null
)
Destroy
(
TempLegSweepObj
);
break
;
default
:
Debug
.
LogError
(
attackType
);
...
...
BattleMuscle/Assets/My/Scripts/Food/Food.cs
View file @
6136edc1
...
...
@@ -12,7 +12,8 @@ public class Food : MonoBehaviour
private
RandomFood
randomFood
;
private
void
Start
()
{
randomFood
=
transform
.
parent
.
parent
.
GetComponent
<
RandomFood
>();
//randomFood = transform.parent.parent.GetComponent<RandomFood>();
}
//private void OnTriggerEnter(Collider other)
...
...
@@ -29,6 +30,18 @@ public class Food : MonoBehaviour
private
void
Update
()
{
if
(!
BattleCtrl
.
instance
.
isStartBattle
)
{
//游戏没有开始
return
;
}
if
(
BattleCtrl
.
instance
.
isEndBattle
)
{
//游戏已经结束
return
;
}
if
(
targetObj
==
null
)
{
xDelta
=
0
;
...
...
@@ -45,6 +58,7 @@ public class Food : MonoBehaviour
private
void
OnDestroy
()
{
randomFood
=
transform
.
parent
.
parent
.
GetComponent
<
RandomFood
>();
randomFood
.
AddFoodPos
(
transform
.
parent
);
}
}
BattleMuscle/Assets/My/Scripts/MagnetTrigger.cs
View file @
6136edc1
...
...
@@ -14,6 +14,8 @@ public class MagnetTrigger : MonoBehaviour
// Update is called once per frame
void
Update
()
{
transform
.
position
=
new
Vector3
(
FollowTarget
.
position
.
x
,
transform
.
position
.
y
,
FollowTarget
.
position
.
z
);
//transform.localScale = FollowTarget.localScale;
}
...
...
BattleMuscle/Assets/My/Scripts/Player/PlayerMove.cs
View file @
6136edc1
...
...
@@ -240,7 +240,7 @@ public class PlayerMove : MonoBehaviour
}
if
(
BattleCtrl
.
instance
.
isEndBattle
)
{
//游戏
没有
结束
//游戏
已经
结束
return
;
}
RaycastHit
hit
;
...
...
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