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
9eacab18
Commit
9eacab18
authored
Mar 17, 2021
by
wanqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
024f86b4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
25 deletions
+38
-25
BattleUI.cs
Storage/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
+5
-0
StorageView.cs
Storage/Assets/#A2_Scripts/Battle/View/StorageView.cs
+10
-2
Level1.prefab
Storage/Assets/Res/Levels/Level1.prefab
+23
-23
No files found.
Storage/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @
9eacab18
...
...
@@ -332,6 +332,11 @@ public class BattleUI : MonoBehaviour
{
BattleCtrl
.
instance
.
OnBattleFail
();
}
StorageView
varView
=
BattleCtrl
.
instance
.
levelManager
.
curLevel
.
storageView
;
if
(
varView
)
{
varView
.
SetRigidBodyState
();
}
}
//设置take按钮状态
public
void
SetTakeBtnState
(
bool
value
)
...
...
Storage/Assets/#A2_Scripts/Battle/View/StorageView.cs
View file @
9eacab18
...
...
@@ -160,7 +160,7 @@ public class StorageView : MonoBehaviour
void
RotateInvoke
()
{
CancelRotateInvoke
();
InvokeRepeating
(
"RotateTarget"
,
0.5f
,
0.5f
);
InvokeRepeating
(
"RotateTarget"
,
0.5f
,
Time
.
deltaTime
);
}
//取消invoke
void
CancelRotateInvoke
()
...
...
@@ -174,7 +174,15 @@ public class StorageView : MonoBehaviour
{
if
(
m_curTargetTrans
)
{
m_curTargetTrans
.
transform
.
Rotate
(
transform
.
up
,
90.0f
);
m_curTargetTrans
.
transform
.
Rotate
(
transform
.
up
,
1.0f
);
}
}
//设置刚体状态
public
void
SetRigidBodyState
()
{
for
(
int
i
=
0
;
i
<
m_targetTrans
.
Length
;
i
++)
{
m_targetTrans
[
i
].
GetComponent
<
Rigidbody
>().
isKinematic
=
true
;
}
}
void
Update
()
...
...
Storage/Assets/Res/Levels/Level1.prefab
View file @
9eacab18
...
...
@@ -102,15 +102,15 @@ Transform:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
187876713504093420
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
-0.1
,
z
:
-0.35
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
4194934126150823155
}
-
{
fileID
:
3194231658186451816
}
-
{
fileID
:
5028890651223847900
}
m_Father
:
{
fileID
:
1686006853241719565
}
m_RootOrder
:
5
m_Father
:
{
fileID
:
3301154099989536049
}
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1
&499608947157982307
GameObject
:
...
...
@@ -391,7 +391,6 @@ Transform:
-
{
fileID
:
1686006852456209409
}
-
{
fileID
:
1686006853777943200
}
-
{
fileID
:
7609197319393572573
}
-
{
fileID
:
7917013256073000625
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
...
@@ -815,6 +814,7 @@ Transform:
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
1243971526296356416
}
-
{
fileID
:
7917013256073000625
}
m_Father
:
{
fileID
:
1686006853777943200
}
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
...
@@ -907,7 +907,7 @@ BoxCollider:
m_GameObject
:
{
fileID
:
5716957435794791961
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_Enabled
:
1
m_Enabled
:
0
serializedVersion
:
2
m_Size
:
{
x
:
0.18
,
y
:
1.18
,
z
:
3.49
}
m_Center
:
{
x
:
-1.93
,
y
:
0.24
,
z
:
0
}
...
...
@@ -920,7 +920,7 @@ BoxCollider:
m_GameObject
:
{
fileID
:
5716957435794791961
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_Enabled
:
1
m_Enabled
:
0
serializedVersion
:
2
m_Size
:
{
x
:
0.18
,
y
:
1.18
,
z
:
3.49
}
m_Center
:
{
x
:
1.93
,
y
:
0.24
,
z
:
0
}
...
...
@@ -933,7 +933,7 @@ BoxCollider:
m_GameObject
:
{
fileID
:
5716957435794791961
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_Enabled
:
1
m_Enabled
:
0
serializedVersion
:
2
m_Size
:
{
x
:
3.49
,
y
:
1.18
,
z
:
0.18
}
m_Center
:
{
x
:
0
,
y
:
0.24
,
z
:
-1.89
}
...
...
@@ -946,7 +946,7 @@ BoxCollider:
m_GameObject
:
{
fileID
:
5716957435794791961
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_Enabled
:
1
m_Enabled
:
0
serializedVersion
:
2
m_Size
:
{
x
:
1.36
,
y
:
1.18
,
z
:
0.4
}
m_Center
:
{
x
:
0
,
y
:
0.24
,
z
:
-2.38
}
...
...
@@ -959,7 +959,7 @@ BoxCollider:
m_GameObject
:
{
fileID
:
5716957435794791961
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_Enabled
:
1
m_Enabled
:
0
serializedVersion
:
2
m_Size
:
{
x
:
3.49
,
y
:
1.18
,
z
:
0.18
}
m_Center
:
{
x
:
0
,
y
:
0.24
,
z
:
1.89
}
...
...
@@ -972,7 +972,7 @@ MeshCollider:
m_GameObject
:
{
fileID
:
5716957435794791961
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_Enabled
:
0
m_Enabled
:
1
serializedVersion
:
4
m_Convex
:
0
m_CookingOptions
:
30
...
...
@@ -1892,18 +1892,18 @@ PrefabInstance:
objectReference
:
{
fileID
:
2100000
,
guid
:
823ac0e34852f1946b70b81aa0a7763c
,
type
:
2
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
ae2f75a4966658e468029b815a0bd3ac
,
type
:
3
}
---
!u!4
&4194934126150823155
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
400000
,
guid
:
ae2f75a4966658e468029b815a0bd3ac
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
4194934126150956659
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&4194934126151053523
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
100000
,
guid
:
ae2f75a4966658e468029b815a0bd3ac
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
4194934126150956659
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!4
&4194934126150823155
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
400000
,
guid
:
ae2f75a4966658e468029b815a0bd3ac
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
4194934126150956659
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&5028890651223976284
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -1985,18 +1985,18 @@ PrefabInstance:
objectReference
:
{
fileID
:
2100000
,
guid
:
823ac0e34852f1946b70b81aa0a7763c
,
type
:
2
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
49bd86e2cfdb81d458813d8609a06235
,
type
:
3
}
---
!u!1
&5028890651224010748
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
100000
,
guid
:
49bd86e2cfdb81d458813d8609a06235
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
5028890651223976284
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!4
&5028890651223847900
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
400000
,
guid
:
49bd86e2cfdb81d458813d8609a06235
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
5028890651223976284
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&5028890651224010748
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
100000
,
guid
:
49bd86e2cfdb81d458813d8609a06235
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
5028890651223976284
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&6069107706239774042
PrefabInstance
:
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