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
637017e0
Commit
637017e0
authored
Apr 29, 2021
by
王雪伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
幸福花园加入1.0.5需求马甲包Unity
parent
d2bd5a4f
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
7 deletions
+39
-7
WithdrawalEveryDayItem.prefab
Assets/Game/Main/Prefabs/WithdrawalEveryDayItem.prefab
+22
-2
底(1).png
Assets/Game/Main/Resource/ui/WithdrawEveryDay/底(1).png
+0
-0
领取.png
Assets/Game/Main/Resource/ui/WithdrawEveryDay/领取.png
+0
-0
CrazyCar.unity
Assets/Game/Main/Scenes/CrazyCar.unity
+2
-2
TitleControl.cs
Assets/Game/Main/Scripts/View/TitleControl.cs
+1
-1
WithdrawalEveryDayControl.cs
Assets/Game/Main/Scripts/View/WithdrawalEveryDayControl.cs
+4
-0
WithdrawalEveryDayItemControl.cs
...s/Game/Main/Scripts/View/WithdrawalEveryDayItemControl.cs
+9
-1
Splash.unity
Assets/Game/Splash/Splash.unity
+1
-1
No files found.
Assets/Game/Main/Prefabs/WithdrawalEveryDayItem.prefab
View file @
637017e0
...
...
@@ -116,7 +116,7 @@ MonoBehaviour:
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
0.
2627451
,
g
:
0.49411765
,
b
:
0.14509805
,
a
:
1
}
m_Color
:
{
r
:
0.
80784315
,
g
:
0.42352942
,
b
:
0.07450981
,
a
:
1
}
m_RaycastTarget
:
1
m_Maskable
:
1
m_OnCullStateChanged
:
...
...
@@ -222,6 +222,7 @@ GameObject:
-
component
:
{
fileID
:
4820329151650945109
}
-
component
:
{
fileID
:
3830571633674503303
}
-
component
:
{
fileID
:
7830625092607302200
}
-
component
:
{
fileID
:
4851421776959170195
}
m_Layer
:
5
m_Name
:
receiver_btn
m_TagString
:
Untagged
...
...
@@ -339,6 +340,25 @@ MonoBehaviour:
m_StringArgument
:
m_BoolArgument
:
0
m_CallState
:
2
---
!u!95
&4851421776959170195
Animator
:
serializedVersion
:
3
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6988976598671568271
}
m_Enabled
:
1
m_Avatar
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
9100000
,
guid
:
c453ddf064153a840a0558b7748ff029
,
type
:
2
}
m_CullingMode
:
0
m_UpdateMode
:
0
m_ApplyRootMotion
:
0
m_LinearVelocityBlending
:
0
m_WarningMessage
:
m_HasTransformHierarchy
:
1
m_AllowConstantClipSamplingOptimization
:
1
m_KeepAnimatorControllerStateOnDisable
:
0
---
!u!1
&7618304266170614699
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -397,7 +417,7 @@ MonoBehaviour:
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
0.
2627451
,
g
:
0.49411765
,
b
:
0.14509805
,
a
:
1
}
m_Color
:
{
r
:
0.
80784315
,
g
:
0.42352942
,
b
:
0.07450981
,
a
:
1
}
m_RaycastTarget
:
1
m_Maskable
:
1
m_OnCullStateChanged
:
...
...
Assets/Game/Main/Resource/ui/WithdrawEveryDay/底(1).png
View replaced file @
d2bd5a4f
View file @
637017e0
6.87 KB
|
W:
|
H:
6.8 KB
|
W:
|
H:
2-up
Swipe
Onion skin
Assets/Game/Main/Resource/ui/WithdrawEveryDay/领取.png
View replaced file @
d2bd5a4f
View file @
637017e0
9.41 KB
|
W:
|
H:
14 KB
|
W:
|
H:
2-up
Swipe
Onion skin
Assets/Game/Main/Scenes/CrazyCar.unity
View file @
637017e0
...
...
@@ -15160,7 +15160,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x:
56, y: 66
}
m_SizeDelta: {x:
100, y: 100
}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &559426349
MonoBehaviour:
...
...
@@ -17093,7 +17093,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 6
10
}
m_AnchoredPosition: {x: 0, y: 6
27
}
m_SizeDelta: {x: 750, y: 1334}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &634203770
Assets/Game/Main/Scripts/View/TitleControl.cs
View file @
637017e0
...
...
@@ -62,7 +62,7 @@ public class TitleControl : MonoBehaviour
{
if
(
data
.
Count
>
0
)
{
withDrawTitleTv
.
text
=
data
[
0
].
c
onditionContent
;
withDrawTitleTv
.
text
=
data
[
0
].
shortC
onditionContent
;
GetComponent
<
HomeItem
>().
setItemData
(
data
[
0
]);
}
}
...
...
Assets/Game/Main/Scripts/View/WithdrawalEveryDayControl.cs
View file @
637017e0
...
...
@@ -136,6 +136,8 @@ public class WithdrawalEveryDayControl : MonoBehaviour
}
private
int
Onesid
;
/// <summary>
/// 设置list数据
/// </summary>
...
...
@@ -148,6 +150,7 @@ public class WithdrawalEveryDayControl : MonoBehaviour
}
for
(
int
i
=
0
;
i
<
taskList
.
Count
;
i
++)
{
Onesid
=
taskList
[
0
].
sid
;
GameObject
game
=
Instantiate
(
itemObj
,
scroolViewContent
.
transform
);
game
.
name
=
""
+
i
;
game
.
GetComponent
<
WithdrawalEveryDayItemControl
>().
setDateInfo
(
taskList
[
i
]);
...
...
@@ -248,6 +251,7 @@ public class WithdrawalEveryDayControl : MonoBehaviour
}
else
{
videoGetHeart
(
Onesid
);
ToastPlugin
.
ToastHelper
.
ShowToast
(
"进度未达到,快去增加进度吧!"
);
}
}
...
...
Assets/Game/Main/Scripts/View/WithdrawalEveryDayItemControl.cs
View file @
637017e0
...
...
@@ -13,8 +13,14 @@ public class WithdrawalEveryDayItemControl : MonoBehaviour
public
Button
receiver_btn
;
//btn
public
Text
descript_tv
;
//描述
public
Sprite
[]
btnArraySprite
;
private
Animator
m_Animator
;
private
WithdrawalEverydayBean
.
TaskListItem
taskItemDate
;
private
void
Awake
()
{
m_Animator
=
receiver_btn
.
GetComponent
<
Animator
>();
}
private
WithdrawalEverydayBean
.
TaskListItem
taskItemDate
;
public
void
setDateInfo
(
WithdrawalEverydayBean
.
TaskListItem
taskListItem
)
{
this
.
taskItemDate
=
taskListItem
;
...
...
@@ -23,9 +29,11 @@ public class WithdrawalEveryDayItemControl : MonoBehaviour
if
(
taskListItem
.
status
==
1
)
{
receiver_btn
.
GetComponent
<
Image
>().
sprite
=
btnArraySprite
[
0
];
m_Animator
.
Play
(
"shake"
);
}
else
{
receiver_btn
.
GetComponent
<
Image
>().
sprite
=
btnArraySprite
[
1
];
m_Animator
.
Play
(
"stop"
);
}
}
...
...
Assets/Game/Splash/Splash.unity
View file @
637017e0
...
...
@@ -1493,7 +1493,7 @@ PrefabInstance:
-
target
:
{
fileID
:
6886931802485600685
,
guid
:
8263fb61881c37345be8525a90d1260a
,
type
:
3
}
propertyPath
:
m_IsActive
value
:
1
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6886931802851080946
,
guid
:
8263fb61881c37345be8525a90d1260a
,
type
:
3
}
...
...
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