Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
3
3D Fruit
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
3D Fruit
Commits
c86dec3e
Commit
c86dec3e
authored
Jun 10, 2021
by
wanqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调试模式
parent
0cc24f9a
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
179246 additions
and
179254 deletions
+179246
-179254
DemoScenes.unity
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
+179238
-179238
FruitView.cs
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs
+7
-7
BattleUI.prefab
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
+1
-1
TextMesh Pro.meta
3D Fruit/Assets/TextMesh Pro.meta
+0
-8
No files found.
3D Fruit/Assets/#A1_Scenes/DemoScenes.unity
View file @
c86dec3e
This diff is collapsed.
Click to expand it.
3D Fruit/Assets/#A2_Scripts/Battle/View/FruitView.cs
View file @
c86dec3e
...
...
@@ -1079,35 +1079,35 @@ public class FruitView : MonoBehaviour
{
if
(
BattleCtrl
.
instance
.
levelManager
.
CurLevelIndex
==
LevelEnum
.
levelOneIndex
)
{
if
(
m_firstTotalNum
<=
GlobalConfig
.
TotalValidNum
)
//
if(m_firstTotalNum <= GlobalConfig.TotalValidNum)
{
GlobalConfig
.
LoadFirstRandomFruit
(
m_SelectNum
,
m_fruitParent
);
}
}
else
if
(
BattleCtrl
.
instance
.
levelManager
.
CurLevelIndex
==
LevelEnum
.
levelTwoIndex
)
{
if
(
m_secondTotalNum
<=
GlobalConfig
.
TotalValidNum
)
//
if(m_secondTotalNum <= GlobalConfig.TotalValidNum)
{
GlobalConfig
.
LoadSecondRandomFruit
(
m_SelectNum
,
m_fruitParent
);
}
}
else
if
(
BattleCtrl
.
instance
.
levelManager
.
CurLevelIndex
==
LevelEnum
.
levelThreeIndex
)
{
if
(
m_thirdTotalNum
<=
GlobalConfig
.
TotalValidNum
)
//
if (m_thirdTotalNum <= GlobalConfig.TotalValidNum)
{
GlobalConfig
.
LoadThirdRandomFruit
(
m_SelectNum
,
m_fruitParent
);
}
}
else
if
(
BattleCtrl
.
instance
.
levelManager
.
CurLevelIndex
==
LevelEnum
.
levelFourIndex
)
{
if
(
m_fourthTotalNum
<=
GlobalConfig
.
TotalValidNum
)
//
if (m_fourthTotalNum <= GlobalConfig.TotalValidNum)
{
GlobalConfig
.
LoadFourthRandomFruit
(
m_SelectNum
,
m_fruitParent
);
}
}
else
if
(
BattleCtrl
.
instance
.
levelManager
.
CurLevelIndex
==
LevelEnum
.
levelFiveIndex
)
{
if
(
m_fifthTotalNum
<=
GlobalConfig
.
TotalValidNum
)
//
if (m_fifthTotalNum <= GlobalConfig.TotalValidNum)
{
GlobalConfig
.
LoadFifthRandomFruit
(
m_SelectNum
,
m_fruitParent
);
}
...
...
@@ -1406,8 +1406,8 @@ public class FruitView : MonoBehaviour
{
if
(
hit
.
collider
&&
hit
.
collider
.
gameObject
.
CompareTag
(
"Target"
))
{
float
varX
=
(
Input
.
mousePosition
.
x
-
Screen
.
width
/
2f
)
/
(
Screen
.
width
/
GlobalConfig
.
NormalWidth
);
float
varY
=
(
Input
.
mousePosition
.
y
-
Screen
.
height
/
2f
)
/
(
Screen
.
width
/
GlobalConfig
.
NormalWidth
);
float
varX
=
(
Input
.
mousePosition
.
x
-
Screen
.
width
/
2f
)
/
(
Screen
.
width
/
GlobalConfig
.
NormalWidth
)
-
100.0f
;
float
varY
=
(
Input
.
mousePosition
.
y
-
Screen
.
height
/
2f
)
/
(
Screen
.
width
/
GlobalConfig
.
NormalWidth
)
-
100.0f
;
BattleCtrl
.
instance
.
battleUI
.
SetKnifePos
(
varX
,
varY
);
FruitItemView
varHitTrans
=
hit
.
collider
.
transform
.
GetComponent
<
FruitItemView
>();
if
(!
m_selectLst
.
Contains
(
varHitTrans
))
...
...
3D Fruit/Assets/#A3_Prefabs/BattleUI.prefab
View file @
c86dec3e
...
...
@@ -16981,7 +16981,7 @@ MonoBehaviour:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6064464677632144689
}
m_Enabled
:
0
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
14433df62b9b3554e93abbfbc187fc8c
,
type
:
3
}
m_Name
:
...
...
3D Fruit/Assets/TextMesh Pro.meta
deleted
100644 → 0
View file @
0cc24f9a
fileFormatVersion: 2
guid: 8d9282ce6b301ca4d95cbb2eb703cfef
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
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