Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
Storage
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
Storage
Commits
0a4a7489
Commit
0a4a7489
authored
Apr 01, 2021
by
wanqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
e334df9a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
6 deletions
+35
-6
SecondLevelTrigger.cs
...e/Assets/#A2_Scripts/Battle/Trigger/SecondLevelTrigger.cs
+2
-2
StorageView.cs
Storage/Assets/#A2_Scripts/Battle/View/StorageView.cs
+2
-2
箱子.controller
Storage/Assets/#C2_Animations/ShowBox/箱子.controller
+29
-0
Level1.prefab
Storage/Assets/Res/Levels/Level1.prefab
+2
-2
No files found.
Storage/Assets/#A2_Scripts/Battle/Trigger/SecondLevelTrigger.cs
View file @
0a4a7489
...
...
@@ -11,7 +11,7 @@ public class SecondLevelTrigger : MonoBehaviour
if
(
other
.
gameObject
.
CompareTag
(
"Target"
))
{
StorageView
varView
=
BattleCtrl
.
instance
.
levelManager
.
curLevel
.
storageView
;
if
(
varView
)
if
(
varView
&&
!
varView
.
curTargetTrans
)
{
MeshRenderer
varMesh
=
other
.
GetComponent
<
MeshRenderer
>();
if
(
varMesh
&&
!
m_lst
.
Contains
(
varMesh
))
...
...
@@ -27,7 +27,7 @@ public class SecondLevelTrigger : MonoBehaviour
if
(
other
.
gameObject
.
CompareTag
(
"Target"
))
{
StorageView
varView
=
BattleCtrl
.
instance
.
levelManager
.
curLevel
.
storageView
;
if
(
varView
)
if
(
varView
&&
!
varView
.
curTargetTrans
)
{
MeshRenderer
varMesh
=
other
.
GetComponent
<
MeshRenderer
>();
if
(
varMesh
&&
m_lst
.
Contains
(
varMesh
))
...
...
Storage/Assets/#A2_Scripts/Battle/View/StorageView.cs
View file @
0a4a7489
...
...
@@ -412,13 +412,13 @@ public class StorageView : MonoBehaviour
for
(
int
i
=
0
;
i
<
m_targetTrans
.
Length
;
i
++)
{
Vector3
varPos
=
m_targetTrans
[
i
].
transform
.
position
;
if
(
varPos
.
y
<
m_dicPos
[
m_targetTrans
[
i
]])
if
(
varPos
.
y
<
m_dicPos
[
m_targetTrans
[
i
]]
-
1.0f
)
{
varPos
.
y
=
m_dicPos
[
m_targetTrans
[
i
]];
}
m_targetTrans
[
i
].
transform
.
position
=
varPos
;
}
if
(
BattleCtrl
.
instance
.
levelManager
.
CurLevelIndex
==
LevelEnum
.
levelEightIndex
||
if
(
BattleCtrl
.
instance
.
levelManager
.
CurLevelIndex
==
LevelEnum
.
levelEightIndex
||
BattleCtrl
.
instance
.
levelManager
.
CurLevelIndex
==
LevelEnum
.
levelNineIndex
)
{
for
(
int
i
=
0
;
i
<
m_targetTrans
.
Length
;
i
++)
...
...
Storage/Assets/#C2_Animations/ShowBox/箱子.controller
View file @
0a4a7489
...
...
@@ -54,6 +54,9 @@ AnimatorStateMachine:
-
serializedVersion
:
1
m_State
:
{
fileID
:
-3339594912586503566
}
m_Position
:
{
x
:
420
,
y
:
850
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
3025115569210300375
}
m_Position
:
{
x
:
642.60864
,
y
:
365.1477
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
...
...
@@ -450,6 +453,32 @@ AnimatorState:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1102
&3025115569210300375
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
"
\u5931\u8D25
_L4-5"
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
:
4940c6521809e424cacc2f13ed839b8e
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1102
&4360613730991412054
AnimatorState
:
serializedVersion
:
5
...
...
Storage/Assets/Res/Levels/Level1.prefab
View file @
0a4a7489
...
...
@@ -435,7 +435,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 90189418975486087}
m_LocalRotation: {x: -0, y: -0.644323, z: -0, w: 0.7647536}
m_LocalPosition: {x: 1.567, y: 0.
4
5, z: -5.123}
m_LocalPosition: {x: 1.567, y: 0.5, z: -5.123}
m_LocalScale: {x: 20, y: 20, z: 20}
m_Children: []
m_Father: {fileID: 6381050228751430806}
...
...
@@ -518,7 +518,7 @@ Rigidbody:
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection:
0
m_CollisionDetection:
3
--- !u!114 &809487160817029154
MonoBehaviour:
m_ObjectHideFlags: 0
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