Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
W
wdlc_mjb_unity
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
王雪伟
wdlc_mjb_unity
Commits
d44c4b23
Commit
d44c4b23
authored
Jun 23, 2021
by
maxiaoliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改问题
parent
c1fa9208
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
17 deletions
+26
-17
CrazyCar.unity
Assets/Game/Main/Scenes/CrazyCar.unity
+4
-3
ExchangeItem.cs
Assets/Game/Main/Scripts/Item/ExchangeItem.cs
+1
-1
AdUtils.cs
Assets/Game/Main/Scripts/Utils/AdUtils.cs
+4
-0
DialogControl.cs
Assets/Game/Main/Scripts/View/DialogControl.cs
+1
-0
TitleControl.cs
Assets/Game/Main/Scripts/View/TitleControl.cs
+6
-5
ChouTiDongHua.cs
Assets/Game/Main/Scripts/View/chouti/ChouTiDongHua.cs
+2
-1
PlantTreeControl.cs
Assets/Game/Main/Scripts/dialog/PlantTreeControl.cs
+4
-3
EditorBuildSettings.asset
ProjectSettings/EditorBuildSettings.asset
+4
-4
No files found.
Assets/Game/Main/Scenes/CrazyCar.unity
View file @
d44c4b23
...
...
@@ -23449,6 +23449,7 @@ MonoBehaviour:
cashTitleDescTv: {fileID: 1718676778}
tvTitle: {fileID: 5414249951143182002}
tv_process: {fileID: 5414249951374873190}
tv_cash: {fileID: 1890460382}
lables:
- {fileID: 21300000, guid: 06eed7c796a1a40cdaee2a224a648531, type: 3}
- {fileID: 21300000, guid: 07e7c47f587414ecfa2292dc9e01c603, type: 3}
...
...
@@ -30736,7 +30737,7 @@ Canvas:
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder:
4
m_SortingOrder:
1
m_TargetDisplay: 0
--- !u!224 &970469213
RectTransform:
...
...
@@ -59696,7 +59697,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
"2000\u5143"
m_Text:
--- !u!222 &1890460383
CanvasRenderer:
m_ObjectHideFlags: 0
...
...
@@ -80037,7 +80038,7 @@ Canvas:
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder:
1
m_SortingOrder:
2
m_TargetDisplay: 0
--- !u!224 &6910674076541744956
RectTransform:
Assets/Game/Main/Scripts/Item/ExchangeItem.cs
View file @
d44c4b23
...
...
@@ -26,12 +26,12 @@ public class ExchangeItem : MonoBehaviour
}
public
void
clickDuihuan
()
{
Debug
.
Log
(
""
+
bean
.
id
);
if
(
bean
.
status
==
0
)
{
ToastPlugin
.
ToastHelper
.
ShowToast
(
"余额不足"
);
return
;
}
EventUtils
.
OnEvent
(
"click_duihuan_goods"
);
FindObjectOfType
<
DialogControl
>().
ShowRealAwardsWinDialog
().
SetUpSubviews
(
bean
.
img
,
bean
.
name
,
bean
.
id
);
}
...
...
Assets/Game/Main/Scripts/Utils/AdUtils.cs
View file @
d44c4b23
...
...
@@ -183,7 +183,11 @@ public class AdUtils
else
if
(
actionName
.
Equals
(
"hot_lunch_reward"
))
{
EventUtils
.
OnEvent
(
"hot_lunch_reward"
,
"热启动广告"
);
}
else
if
(
actionName
.
Equals
(
"jingxihongbao"
))
{
EventUtils
.
OnEvent
(
"jingxi_hongbao_video_show"
,
"惊喜红包视频"
);
}
}
public
void
onAdVideoBarClick
()
...
...
Assets/Game/Main/Scripts/View/DialogControl.cs
View file @
d44c4b23
...
...
@@ -1227,6 +1227,7 @@ public class DialogControl : MonoBehaviour
//打开惊喜红包
public
void
openJingxiHongbao
()
{
EventUtils
.
OnEvent
(
"open_jingxi_hongbao"
);
CloseJingxiDialog
();
AdUtils
.
PlayRewardAd
(
"jingxihongbao"
,
new
Action
<
bool
>((
cb
)
=>
{
...
...
Assets/Game/Main/Scripts/View/TitleControl.cs
View file @
d44c4b23
...
...
@@ -13,7 +13,7 @@ public class TitleControl : MonoBehaviour
private
Animator
m_Animator
,
btn_Animator
;
public
Image
img_withdraw
;
// public GameObject contentParent, item_prefab;
public
Text
cashTitleDescTv
,
tvTitle
,
tv_process
;
public
Text
cashTitleDescTv
,
tvTitle
,
tv_process
,
tv_cash
;
// public Image img_bottom_icon;
public
Sprite
[]
lables
;
//获取首页第一个提现信息
...
...
@@ -51,6 +51,7 @@ public class TitleControl : MonoBehaviour
private
void
setSliderData
(
WithDrawFirstInfoBean
bean
)
{
Debug
.
Log
(
"给首页进度条设置数据"
);
tv_cash
.
text
=
"<size=28>"
+
bean
.
wdlcWdDataList
[
0
].
yuan
+
"</size>"
+
"元"
;
img_icon
.
sprite
=
lables
[
bean
.
nextSeedPlantId
-
1
];
img_procress
.
fillAmount
=
(
float
)
bean
.
wdlcWdDataList
[
0
].
current
/
bean
.
wdlcWdDataList
[
0
].
targetNum
;
tv_process
.
text
=
bean
.
wdlcWdDataList
[
0
].
current
+
"/"
+
bean
.
wdlcWdDataList
[
0
].
targetNum
;
...
...
@@ -144,10 +145,10 @@ public class TitleControl : MonoBehaviour
{
EventUtils
.
OnEvent
(
"tixian"
);
}
else
{
EventUtils
.
OnEvent
(
"maicaizhuanqian"
);
}
//
else
//
{
//
EventUtils.OnEvent("maicaizhuanqian");
//
}
GameObject
.
Find
(
"Dialog"
).
GetComponent
<
DialogControl
>().
showPlantTreeWithDrawDialog
();
}
public
void
clickEveryReward
()
...
...
Assets/Game/Main/Scripts/View/chouti/ChouTiDongHua.cs
View file @
d44c4b23
...
...
@@ -31,6 +31,7 @@ public class ChouTiDongHua : MonoBehaviour
private
List
<
RectTransform
>
ObjList
=
new
List
<
RectTransform
>();
public
GameObject
imghongbao
;
public
void
clickhongbao
()
{
EventUtils
.
OnEvent
(
"click_tixian_hongbao"
);
if
(
IsOpen
)
{
Close
();
...
...
@@ -226,7 +227,7 @@ public class ChouTiDongHua : MonoBehaviour
{
if
(!
IsOpen
)
return
;
Debug
.
Log
(
"展示弹窗
"
);
EventUtils
.
OnEvent
(
"click_tixian_renwu
"
);
GameObject
.
Find
(
"Title"
).
GetComponent
<
TitleControl
>().
clickWithDrawBg
(
1
);
}
}
Assets/Game/Main/Scripts/dialog/PlantTreeControl.cs
View file @
d44c4b23
...
...
@@ -148,6 +148,7 @@ public class PlantTreeControl : MonoBehaviour
scrollview2
.
SetActive
(
true
);
getExchangeListData
();
// index = 2;
EventUtils
.
OnEvent
(
"click_duihui_shangcheng"
);
}
public
void
clickthree
()
{
...
...
@@ -157,6 +158,7 @@ public class PlantTreeControl : MonoBehaviour
scrollview1
.
SetActive
(
true
);
scrollview2
.
SetActive
(
false
);
getRecordLog
();
EventUtils
.
OnEvent
(
"click_duihui_jilu"
);
// index = 3;
}
//完成填写信息后
...
...
@@ -167,7 +169,6 @@ public class PlantTreeControl : MonoBehaviour
parm
.
Add
(
"id"
,
id
);
HttpTool
.
Instance
.
_Post
(
"app/v1/game/module/exchange/choose"
,
parm
,
new
Action
<
GoodsBean
>((
bean
)
=>
{
// setItemData(bean);
action
(
bean
.
no
);
}),
new
Action
<
string
,
string
>((
code
,
errMsg
)
=>
...
...
ProjectSettings/EditorBuildSettings.asset
View file @
d44c4b23
...
...
@@ -5,19 +5,19 @@ EditorBuildSettings:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Scenes
:
-
enabled
:
0
-
enabled
:
1
path
:
Assets/Game/Main/Scenes/InitScene.unity
guid
:
902436d14e36d4d42921eab701175b51
-
enabled
:
0
-
enabled
:
1
path
:
Assets/Game/Splash/Splash.unity
guid
:
37af8cf3fb373478ab04e3ee2f3b700a
-
enabled
:
0
-
enabled
:
1
path
:
Assets/Game/Main/Scenes/CrazyCar.unity
guid
:
2ae344869669f6641a05481805b94e98
-
enabled
:
0
path
:
Assets/Base/AdSDK/AD/GDT/UnionDemo/UnionExample.unity
guid
:
6c963ae210fa3c3438c2f6770ee81fc9
-
enabled
:
1
-
enabled
:
0
path
:
Assets/Base/AdSDK/AD/Demo/AdDemo.unity
guid
:
ef80a35d44f809e4a8957d1ed9571fd2
m_configObjects
:
{}
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