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
da67cfae
Commit
da67cfae
authored
Apr 06, 2021
by
wanqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改脚本
parent
9b65694b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
19 deletions
+36
-19
SecondLevelTrigger.cs
...e/Assets/#A2_Scripts/Battle/Trigger/SecondLevelTrigger.cs
+9
-1
StorageView.cs
Storage/Assets/#A2_Scripts/Battle/View/StorageView.cs
+10
-1
Level9.prefab
Storage/Assets/Res/Levels/Level9.prefab
+17
-17
No files found.
Storage/Assets/#A2_Scripts/Battle/Trigger/SecondLevelTrigger.cs
View file @
da67cfae
...
...
@@ -6,13 +6,21 @@ public class SecondLevelTrigger : MonoBehaviour
{
private
bool
m_bControl
=
true
;
private
List
<
MeshRenderer
>
m_lst
=
new
List
<
MeshRenderer
>();
private
void
OnTrigger
Enter
(
Collider
other
)
private
void
OnTrigger
Stay
(
Collider
other
)
{
if
(
other
.
gameObject
.
CompareTag
(
"Target"
))
{
StorageView
varView
=
BattleCtrl
.
instance
.
levelManager
.
curLevel
.
storageView
;
if
(
varView
&&
!
varView
.
curTargetTrans
)
{
Rigidbody
varBody
=
other
.
GetComponent
<
Rigidbody
>();
if
(
varBody
)
{
if
(
varBody
.
velocity
.
y
<
0
)
{
return
;
}
}
MeshRenderer
varMesh
=
other
.
GetComponent
<
MeshRenderer
>();
if
(
varMesh
&&
!
m_lst
.
Contains
(
varMesh
))
{
...
...
Storage/Assets/#A2_Scripts/Battle/View/StorageView.cs
View file @
da67cfae
...
...
@@ -495,7 +495,16 @@ public class StorageView : MonoBehaviour
m_dicBox
[
varBox
]
=
false
;
}
Rigidbody
varBody
=
m_curTargetTrans
.
GetComponent
<
Rigidbody
>();
varBody
.
constraints
=
RigidbodyConstraints
.
None
;
//if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelEightIndex ||
// BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelNineIndex)
//{
// varBody.constraints = RigidbodyConstraints.FreezeRotationY;
//}
//else
{
varBody
.
constraints
=
RigidbodyConstraints
.
None
;
varBody
.
velocity
=
Vector3
.
zero
;
}
varBody
.
isKinematic
=
false
;
m_curTargetTrans
=
null
;
}
...
...
Storage/Assets/Res/Levels/Level9.prefab
View file @
da67cfae
...
...
@@ -9492,6 +9492,20 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &8736184324907998887
MeshCollider:
m_ObjectHideFlags: 10
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1111088554673867607}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 1259799638878855867, guid: 0622e02e03a3de641b2fe4d56189351c, type: 2}
--- !u!114 &5794006671520906204
MonoBehaviour:
m_ObjectHideFlags: 0
...
...
@@ -9522,20 +9536,6 @@ MonoBehaviour:
m_material: {fileID: 0}
m_showColliders: 0
m_colliderAsset: {fileID: 11400000, guid: 0622e02e03a3de641b2fe4d56189351c, type: 2}
--- !u!64 &8736184324907998887
MeshCollider:
m_ObjectHideFlags: 10
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1111088554673867607}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 1259799638878855867, guid: 0622e02e03a3de641b2fe4d56189351c, type: 2}
--- !u!1 &1166944828174422386
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -116030,7 +116030,7 @@ PrefabInstance:
- target: {fileID: 6929364722880124094, guid: 5b1464ccc6293b645ad3bb978bd8086e,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.
31
value: -0.
56
objectReference: {fileID: 0}
- target: {fileID: 6929364722880124094, guid: 5b1464ccc6293b645ad3bb978bd8086e,
type: 3}
...
...
@@ -116040,7 +116040,7 @@ PrefabInstance:
- target: {fileID: 6929364722880124094, guid: 5b1464ccc6293b645ad3bb978bd8086e,
type: 3}
propertyPath: m_LocalPosition.z
value: -3.
872
value: -3.
26
objectReference: {fileID: 0}
- target: {fileID: 6929364722880124094, guid: 5b1464ccc6293b645ad3bb978bd8086e,
type: 3}
...
...
@@ -116247,7 +116247,7 @@ PrefabInstance:
- target: {fileID: 2104312745476564078, guid: 12483245eada61746b6f5e7f36eb0c84,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.
3
value: -0.
02
objectReference: {fileID: 0}
- target: {fileID: 2104312745476564078, guid: 12483245eada61746b6f5e7f36eb0c84,
type: 3}
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