Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
BoomMaster
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
BoomMaster
Commits
3713be27
Commit
3713be27
authored
Mar 05, 2021
by
wanqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改场景
parent
58dfc12c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
12 deletions
+18
-12
BombView.cs
BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs
+13
-7
BattleUI.prefab
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
+1
-1
Props4Parent.prefab
...Master/Assets/#C1_Models/Props/Prefab/Props4Parent.prefab
+2
-2
Level8.prefab
BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
+1
-1
Level9.prefab
BoomMaster/Assets/Res/Prefabs/Levels/Level9.prefab
+1
-1
No files found.
BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs
View file @
3713be27
...
...
@@ -56,10 +56,14 @@ public class BombView : MonoBehaviour
,
new
Vector3
(
10.62f
,
3.52f
,
-
1.66f
),
new
Vector3
(
10.62f
,
1.89f
,
1.78f
)};
private
Quaternion
[]
m_levelOnekniftDefaultRotate
=
new
[]
{
Quaternion
.
Euler
(
45
,
0
,
80
),
Quaternion
.
Euler
(
135
,
0
,
90
)
,
Quaternion
.
Euler
(
45
,
0
,
90
)};
private
Vector3
[]
m_levelTwokniftDefaultPos
=
new
[]
{
new
Vector3
(
6.77f
,
6.71f
,
-
5.2f
),
new
Vector3
(
12.68f
,
5.5f
,
-
0.37f
)
,
new
Vector3
(
7.2f
,
4.75f
,
-
5.0f
),
new
Vector3
(
12.36f
,
1.16f
,
0.52f
)};
private
Quaternion
[]
m_levelTwokniftDefaultRotate
=
new
[]
{
Quaternion
.
Euler
(
66
,
0
,
35
),
Quaternion
.
Euler
(
87
,
0
,
48
)
,
Quaternion
.
Euler
(
66
,
0
,
43
)};
//private Vector3[] m_levelTwokniftDefaultPos = new[] { new Vector3(6.77f, 6.71f, -5.2f), new Vector3(12.68f, 5.5f, -0.37f)
// ,new Vector3(7.2f, 4.75f, -5.0f),new Vector3(12.36f, 1.16f, 0.52f)};
//private Quaternion[] m_levelTwokniftDefaultRotate = new[] { Quaternion.Euler(66,0,35), Quaternion.Euler(87, 0, 48)
// , Quaternion.Euler(66,0,43)};
private
Vector3
[]
m_levelTwokniftDefaultPos
=
new
[]
{
new
Vector3
(
13.34f
,
5.95f
,
-
2.27f
),
new
Vector3
(
13.34f
,
4.42f
,
1.35f
)
,
new
Vector3
(
13.34f
,
3.65f
,
-
1.92f
),
new
Vector3
(
13.34f
,
2.27f
,
1.19f
)};
private
Quaternion
[]
m_levelTwokniftDefaultRotate
=
new
[]
{
Quaternion
.
Euler
(
45
,
0
,
80
),
Quaternion
.
Euler
(
135
,
0
,
90
)
,
Quaternion
.
Euler
(
45
,
0
,
90
)};
//private Vector3[] m_lineDefaultPos = new[] { new Vector3(0.7f, 0.68f, -1.11f), new Vector3(10.62f, 4.92f, 1.78f)
// ,new Vector3(10.62f, 3.52f, -1.66f),new Vector3(10.62f, 1.89f, 1.78f)};
//private Quaternion[] m_lineDefaultRotate = new[] { Quaternion.Euler(12,0,0), Quaternion.Euler(135, 0, 90)
...
...
@@ -78,11 +82,13 @@ public class BombView : MonoBehaviour
{
m_kniftDefaultPos
=
m_levelOnekniftDefaultPos
;
m_kniftDefaultRotate
=
m_levelOnekniftDefaultRotate
;
m_totalCutOffNum
=
10
;
}
else
if
(
BattleCtrl
.
instance
.
levelManager
.
CurLevelIndex
==
LevelEnum
.
levelTwoIndex
)
{
m_kniftDefaultPos
=
m_levelTwokniftDefaultPos
;
m_kniftDefaultRotate
=
m_levelTwokniftDefaultRotate
;
m_kniftDefaultPos
=
m_levelOnekniftDefaultPos
;
m_kniftDefaultRotate
=
m_levelOnekniftDefaultRotate
;
m_totalCutOffNum
=
10
;
}
//else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelSixIndex)
//{
...
...
@@ -359,7 +365,7 @@ public class BombView : MonoBehaviour
varTrans
.
GetComponent
<
Rigidbody
>()
&&
!
m_lstDamage
.
Contains
(
varTrans
))
{
m_curCutOffNum
++;
Debug
.
LogError
(
m_curCutOffNum
);
//
Debug.LogError(m_curCutOffNum);
m_lstDamage
.
Add
(
varTrans
);
}
}
...
...
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
View file @
3713be27
...
...
@@ -13166,7 +13166,7 @@ Animator:
m_GameObject
:
{
fileID
:
6064464677660112694
}
m_Enabled
:
1
m_Avatar
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
9100000
,
guid
:
bb389cc2efde9ef4ba6b88a34ad44400
,
type
:
2
}
m_CullingMode
:
0
m_UpdateMode
:
0
m_ApplyRootMotion
:
0
...
...
BoomMaster/Assets/#C1_Models/Props/Prefab/Props4Parent.prefab
View file @
3713be27
...
...
@@ -287,7 +287,7 @@ Transform:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6639848910996357174
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalRotation
:
{
x
:
0.2588191
,
y
:
0
,
z
:
0
,
w
:
0.9659258
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
...
...
@@ -296,7 +296,7 @@ Transform:
-
{
fileID
:
3559471649338698318
}
m_Father
:
{
fileID
:
6639848910144351730
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
3
0
,
y
:
0
,
z
:
0
}
---
!u!1
&7198987875259221642
GameObject
:
m_ObjectHideFlags
:
0
...
...
BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
View file @
3713be27
...
...
@@ -10299,7 +10299,7 @@ MonoBehaviour:
m_chainRopeView
:
{
fileID
:
0
}
m_camera
:
{
fileID
:
0
}
m_bombView
:
{
fileID
:
3451800651537292261
}
curLevelIndex
:
0
curLevelIndex
:
1
---
!u!114
&3451800651537292261
MonoBehaviour
:
m_ObjectHideFlags
:
0
...
...
BoomMaster/Assets/Res/Prefabs/Levels/Level9.prefab
View file @
3713be27
...
...
@@ -8363,7 +8363,7 @@ MonoBehaviour:
m_chainRopeView
:
{
fileID
:
0
}
m_camera
:
{
fileID
:
0
}
m_bombView
:
{
fileID
:
8917163245792337136
}
curLevelIndex
:
1
curLevelIndex
:
0
---
!u!114
&8917163245792337136
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