Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
M
MusicBigWatermelon
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王雪伟
MusicBigWatermelon
Commits
77aaf348
Commit
77aaf348
authored
Aug 02, 2021
by
LiLiuZhou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
53a97488
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
1487 additions
and
1375 deletions
+1487
-1375
Canvas.prefab
Assets/Resources/UI/Canvas.prefab
+1
-1
MainPanel.prefab
Assets/Resources/UI/Panel/MainPanel.prefab
+1282
-0
MainPanel.prefab.meta
Assets/Resources/UI/Panel/MainPanel.prefab.meta
+7
-0
TouchPanel.prefab
Assets/Resources/UI/Panel/TouchPanel.prefab
+104
-0
TouchPanel.prefab.meta
Assets/Resources/UI/Panel/TouchPanel.prefab.meta
+7
-0
Game.unity
Assets/Scenes/Game.unity
+18
-1353
HomeInfoControl.cs
Assets/Scripts/Main/HomeInfoControl.cs
+8
-19
MainPanel.cs
Assets/Scripts/Panel/MainPanel.cs
+34
-0
MainPanel.cs.meta
Assets/Scripts/Panel/MainPanel.cs.meta
+11
-0
TouchPanel.cs
Assets/Scripts/Panel/TouchPanel.cs
+15
-2
TouchPanel.cs.meta
Assets/Scripts/Panel/TouchPanel.cs.meta
+0
-0
No files found.
Assets/Resources/UI/Canvas.prefab
View file @
77aaf348
...
@@ -170,7 +170,7 @@ Canvas:
...
@@ -170,7 +170,7 @@ Canvas:
m_SortingBucketNormalizedSize
:
0
m_SortingBucketNormalizedSize
:
0
m_AdditionalShaderChannelsFlag
:
0
m_AdditionalShaderChannelsFlag
:
0
m_SortingLayerID
:
0
m_SortingLayerID
:
0
m_SortingOrder
:
2
m_SortingOrder
:
0
m_TargetDisplay
:
0
m_TargetDisplay
:
0
---
!u!114
&1071024550456484696
---
!u!114
&1071024550456484696
MonoBehaviour
:
MonoBehaviour
:
...
...
Assets/Resources/UI/Panel/MainPanel.prefab
0 → 100644
View file @
77aaf348
This diff is collapsed.
Click to expand it.
Assets/Resources/UI/Panel/MainPanel.prefab.meta
0 → 100644
View file @
77aaf348
fileFormatVersion: 2
guid: 3583be0e4b88eed418cd50f1a1bcecf9
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/UI/Panel/TouchPanel.prefab
0 → 100644
View file @
77aaf348
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1
&2567631666307646508
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
2567631666967080983
}
-
component
:
{
fileID
:
2567631666307646504
}
-
component
:
{
fileID
:
2567631666307646511
}
-
component
:
{
fileID
:
2567631666307646510
}
-
component
:
{
fileID
:
2567631666307646509
}
m_Layer
:
5
m_Name
:
TouchPanel
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!224
&2567631666967080983
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2567631666307646508
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
0
}
m_AnchorMax
:
{
x
:
1
,
y
:
1
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
{
x
:
0
,
y
:
0
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!222
&2567631666307646504
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2567631666307646508
}
m_CullTransparentMesh
:
0
---
!u!114
&2567631666307646511
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2567631666307646508
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
fe87c0e1cc204ed48ad3b37840f39efc
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
0
}
m_RaycastTarget
:
1
m_Maskable
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_Sprite
:
{
fileID
:
0
}
m_Type
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
m_UseSpriteMesh
:
0
m_PixelsPerUnitMultiplier
:
1
---
!u!114
&2567631666307646510
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2567631666307646508
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
d0b148fe25e99eb48b9724523833bab1
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Delegates
:
[]
---
!u!114
&2567631666307646509
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2567631666307646508
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
92cf87e5051393a4da5925c45506a813
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
cam
:
{
fileID
:
0
}
Assets/Resources/UI/Panel/TouchPanel.prefab.meta
0 → 100644
View file @
77aaf348
fileFormatVersion: 2
guid: 61ff8650998cf29419237800b7aca55b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/Game.unity
View file @
77aaf348
This diff is collapsed.
Click to expand it.
Assets/Scripts/Main/HomeInfoControl.cs
View file @
77aaf348
...
@@ -10,10 +10,10 @@ public class HomeInfoControl : MonoBehaviour
...
@@ -10,10 +10,10 @@ public class HomeInfoControl : MonoBehaviour
private
Image
songProgress
;
private
Image
songProgress
;
private
void
Awake
()
private
void
Awake
()
{
{
cashTv
=
transform
.
Find
(
"Top/WithDraw/CashNumTv"
).
transform
.
GetComponent
<
Text
>();
//
cashTv = transform.Find("Top/WithDraw/CashNumTv").transform.GetComponent<Text>();
fruitNumTv
=
transform
.
Find
(
"Top/ForFruit/FruitNumTv"
).
transform
.
GetComponent
<
Text
>();
//
fruitNumTv = transform.Find("Top/ForFruit/FruitNumTv").transform.GetComponent<Text>();
songProgressTv
=
transform
.
Find
(
"Top/SongProgress/ProgressTv"
).
transform
.
GetComponent
<
Text
>();
//
songProgressTv = transform.Find("Top/SongProgress/ProgressTv").transform.GetComponent<Text>();
songProgress
=
transform
.
Find
(
"Top/SongProgress/ProgressBar"
).
transform
.
GetComponent
<
Image
>();
//
songProgress = transform.Find("Top/SongProgress/ProgressBar").transform.GetComponent<Image>();
}
}
...
@@ -25,29 +25,18 @@ public class HomeInfoControl : MonoBehaviour
...
@@ -25,29 +25,18 @@ public class HomeInfoControl : MonoBehaviour
#if UNITY_EDITOR
#if UNITY_EDITOR
AppConfig
.
Instance
.
InitProgect
(
true
);
AppConfig
.
Instance
.
InitProgect
(
true
);
#endif
#endif
GetHomeInfo
();
//
GetHomeInfo();
//获取下一组要生成的水果的音符
//获取下一组要生成的水果的音符
//GameController.GetInstance().GetNextNoteList(0);
//GameController.GetInstance().GetNextNoteList(0);
UIMgr
.
GetInstance
().
ShowPanel
<
MusicPanel
>(
E_Layer
.
mid
);
UIMgr
.
Getinstance
().
ShowPanel
<
MainPanel
>(
E_Layer
.
mid
);
UIMgr
.
GetInstance
().
ShowPanel
<
MusicPanel
>(
E_Layer
.
mid
);
UIMgr
.
Getinstance
().
ShowPanel
<
TouchPanel
>(
E_Layer
.
bot
);
}
}
private
void
GetHomeInfo
()
{
HttpTool
.
Instance
.
_Get
(
"app/v1/watermelon/info"
,
null
,
new
Action
<
WatermelonInfoBean
>((
result
)
=>
{
cashTv
.
text
=
"¥"
+
result
.
available
;
fruitNumTv
.
text
=
result
.
count
+
"个"
;
}),
new
Action
<
string
,
string
>((
code
,
msg
)
=>
{
Debug
.
unityLogger
.
Log
(
"首页信息 "
+
code
+
" msg "
+
msg
);
}));
}
}
}
Assets/Scripts/Panel/MainPanel.cs
0 → 100644
View file @
77aaf348
using
System
;
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
using
UnityEngine.UI
;
public
class
MainPanel
:
BasePanel
{
public
override
void
OnHide
(
object
data
=
null
)
{
}
public
override
void
OnInit
(
object
data
=
null
)
{
GetHomeInfo
();
}
public
override
void
OnRefresh
(
object
data
=
null
)
{
}
private
void
GetHomeInfo
()
{
HttpTool
.
Instance
.
_Get
(
"app/v1/watermelon/info"
,
null
,
new
Action
<
WatermelonInfoBean
>((
result
)
=>
{
GetControl
<
Text
>(
"CashNumTv"
).
text
=
"¥"
+
result
.
available
;
GetControl
<
Text
>(
"FruitNumTv"
).
text
=
result
.
count
+
"个"
;
}),
new
Action
<
string
,
string
>((
code
,
msg
)
=>
{
Debug
.
unityLogger
.
Log
(
"首页信息 "
+
code
+
" msg "
+
msg
);
}));
}
}
Assets/Scripts/Panel/MainPanel.cs.meta
0 → 100644
View file @
77aaf348
fileFormatVersion: 2
guid: 7954304bcf0ef574491e05601bf57e5a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/
Others
/TouchPanel.cs
→
Assets/Scripts/
Panel
/TouchPanel.cs
View file @
77aaf348
...
@@ -5,7 +5,7 @@ using UnityEngine;
...
@@ -5,7 +5,7 @@ using UnityEngine;
using
UnityEngine.EventSystems
;
using
UnityEngine.EventSystems
;
[RequireComponent(typeof(EventTrigger))]
[RequireComponent(typeof(EventTrigger))]
public
class
TouchPanel
:
MonoBehaviour
public
class
TouchPanel
:
BasePanel
{
{
//相机
//相机
public
Camera
cam
;
public
Camera
cam
;
...
@@ -27,8 +27,9 @@ public class TouchPanel : MonoBehaviour
...
@@ -27,8 +27,9 @@ public class TouchPanel : MonoBehaviour
//将要生成的水果集合
//将要生成的水果集合
private
Queue
<
int
>
InstantFruitList
=
new
Queue
<
int
>();
private
Queue
<
int
>
InstantFruitList
=
new
Queue
<
int
>();
p
rivate
void
Start
(
)
p
ublic
override
void
OnInit
(
object
data
=
null
)
{
{
cam
=
UIMgr
.
Getinstance
().
MainCamera
;
#
region
添加拖动事件
#
region
添加拖动事件
EventTrigger
trigger
=
GetComponent
<
EventTrigger
>();
EventTrigger
trigger
=
GetComponent
<
EventTrigger
>();
...
@@ -57,6 +58,16 @@ public class TouchPanel : MonoBehaviour
...
@@ -57,6 +58,16 @@ public class TouchPanel : MonoBehaviour
RightScreenBound
=
cam
.
ScreenToWorldPoint
(
new
Vector2
(
Screen
.
width
,
0
)).
x
;
RightScreenBound
=
cam
.
ScreenToWorldPoint
(
new
Vector2
(
Screen
.
width
,
0
)).
x
;
}
}
public
override
void
OnRefresh
(
object
data
=
null
)
{
}
public
override
void
OnHide
(
object
data
=
null
)
{
}
private
void
OnBeginDrag
(
BaseEventData
data
)
private
void
OnBeginDrag
(
BaseEventData
data
)
{
{
if
(
NowFruit
==
null
)
if
(
NowFruit
==
null
)
...
@@ -149,4 +160,6 @@ public class TouchPanel : MonoBehaviour
...
@@ -149,4 +160,6 @@ public class TouchPanel : MonoBehaviour
Debug
.
unityLogger
.
Log
(
"获取下一组生成的球 "
+
code
+
" msg "
+
msg
);
Debug
.
unityLogger
.
Log
(
"获取下一组生成的球 "
+
code
+
" msg "
+
msg
);
}));
}));
}
}
}
}
Assets/Scripts/
Others
/TouchPanel.cs.meta
→
Assets/Scripts/
Panel
/TouchPanel.cs.meta
View file @
77aaf348
File moved
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