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
98160241
Commit
98160241
authored
Jul 02, 2021
by
zhangzhe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
ce65552e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
92 additions
and
12 deletions
+92
-12
ReceiveDiamondPanel.cs
Assets/Game/Main/Resource/LeeScripts/ReceiveDiamondPanel.cs
+2
-1
CrazyCar.unity
Assets/Game/Main/Scenes/CrazyCar.unity
+89
-10
DialogControl.cs
Assets/Game/Main/Scripts/View/DialogControl.cs
+1
-1
No files found.
Assets/Game/Main/Resource/LeeScripts/ReceiveDiamondPanel.cs
View file @
98160241
...
@@ -30,12 +30,13 @@ public class ReceiveDiamondPanel
...
@@ -30,12 +30,13 @@ public class ReceiveDiamondPanel
IsInit
=
true
;
IsInit
=
true
;
}
}
public
void
Show
(
int
count
)
public
void
Show
(
int
count
,
int
timenum
)
{
{
if
(!
IsInit
)
if
(!
IsInit
)
Init
();
Init
();
this
.
gameObject
.
SetActive
(
true
);
this
.
gameObject
.
SetActive
(
true
);
transform
.
Find
(
"MainBK/txtMoney"
).
GetComponent
<
Text
>().
text
=
count
.
ToString
();
transform
.
Find
(
"MainBK/txtMoney"
).
GetComponent
<
Text
>().
text
=
count
.
ToString
();
transform
.
Find
(
"MainBK/diamond_times"
).
GetComponent
<
Text
>().
text
=
"每天0点重置视频次数(剩余"
+
timenum
.
ToString
()
+
"次)"
;
}
}
public
void
Hide
()
public
void
Hide
()
...
...
Assets/Game/Main/Scenes/CrazyCar.unity
View file @
98160241
...
@@ -1432,7 +1432,7 @@ RectTransform:
...
@@ -1432,7 +1432,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 23, y: -1
82
}
m_AnchoredPosition: {x: 23, y: -1
65
}
m_SizeDelta: {x: 332, y: 95}
m_SizeDelta: {x: 332, y: 95}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &46310180
--- !u!114 &46310180
...
@@ -2545,7 +2545,7 @@ MonoBehaviour:
...
@@ -2545,7 +2545,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 782149801}
m_TargetGraphic: {fileID: 782149801}
m_HandleRect: {fileID: 782149800}
m_HandleRect: {fileID: 782149800}
m_Direction: 2
m_Direction: 2
m_Value:
1
m_Value:
0
m_Size: 1
m_Size: 1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
...
@@ -9657,9 +9657,9 @@ RectTransform:
...
@@ -9657,9 +9657,9 @@ RectTransform:
m_Father: {fileID: 1548415916}
m_Father: {fileID: 1548415916}
m_RootOrder: 0
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y:
1
}
m_AnchorMin: {x: 0, y:
0
}
m_AnchorMax: {x: 0, y:
1
}
m_AnchorMax: {x: 0, y:
0
}
m_AnchoredPosition: {x: 355, y:
-72.29167
}
m_AnchoredPosition: {x: 355, y:
0
}
m_SizeDelta: {x: 710, y: 0}
m_SizeDelta: {x: 710, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &300181110
--- !u!114 &300181110
...
@@ -16995,8 +16995,8 @@ MonoBehaviour:
...
@@ -16995,8 +16995,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1531958713}
m_TargetGraphic: {fileID: 1531958713}
m_HandleRect: {fileID: 1531958712}
m_HandleRect: {fileID: 1531958712}
m_Direction: 2
m_Direction: 2
m_Value:
0
m_Value:
1.0000032
m_Size:
1
m_Size:
0.9349216
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -35250,7 +35250,7 @@ RectTransform:
...
@@ -35250,7 +35250,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 8.6894, y: -2
97
}
m_AnchoredPosition: {x: 8.6894, y: -2
59
}
m_SizeDelta: {x: 360.62115, y: 96.78012}
m_SizeDelta: {x: 360.62115, y: 96.78012}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1079625354
--- !u!114 &1079625354
...
@@ -53167,7 +53167,7 @@ RectTransform:
...
@@ -53167,7 +53167,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 29, y: -1
82.3
}
m_AnchoredPosition: {x: 29, y: -1
65.29999
}
m_SizeDelta: {x: 211.36603, y: 94.39288}
m_SizeDelta: {x: 211.36603, y: 94.39288}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1602705965
--- !u!114 &1602705965
...
@@ -54047,7 +54047,7 @@ RectTransform:
...
@@ -54047,7 +54047,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -125.7, y: -1
81.7
}
m_AnchoredPosition: {x: -125.7, y: -1
64.69998
}
m_SizeDelta: {x: 152.56833, y: 94.39052}
m_SizeDelta: {x: 152.56833, y: 94.39052}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1635028643
--- !u!114 &1635028643
...
@@ -55771,6 +55771,84 @@ CanvasRenderer:
...
@@ -55771,6 +55771,84 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1681316798}
m_GameObject: {fileID: 1681316798}
m_CullTransparentMesh: 0
m_CullTransparentMesh: 0
--- !u!1 &1686864513
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1686864514}
- component: {fileID: 1686864516}
- component: {fileID: 1686864515}
m_Layer: 5
m_Name: diamond_times
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1686864514
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1686864513}
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: 2034263807}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 1.0000001, y: -330}
m_SizeDelta: {x: 285.92535, y: 89.22406}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1686864515
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1686864513}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.24705882, g: 0.4, b: 0.6, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 29
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 300
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6BCF\u59290\u70B9\u91CD\u7F6E\u89C6\u9891\u6B21\u6570\uFF08\u5269\u4F5920\u6B21\uFF09"
--- !u!222 &1686864516
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1686864513}
m_CullTransparentMesh: 0
--- !u!1 &1689009339
--- !u!1 &1689009339
GameObject:
GameObject:
m_ObjectHideFlags: 0
m_ObjectHideFlags: 0
...
@@ -66278,6 +66356,7 @@ RectTransform:
...
@@ -66278,6 +66356,7 @@ RectTransform:
- {fileID: 1602705964}
- {fileID: 1602705964}
- {fileID: 1079625353}
- {fileID: 1079625353}
- {fileID: 306086145}
- {fileID: 306086145}
- {fileID: 1686864514}
m_Father: {fileID: 1520725252}
m_Father: {fileID: 1520725252}
m_RootOrder: 0
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Assets/Game/Main/Scripts/View/DialogControl.cs
View file @
98160241
...
@@ -543,7 +543,7 @@ public class DialogControl : MonoBehaviour
...
@@ -543,7 +543,7 @@ public class DialogControl : MonoBehaviour
DiamondRewardNum
=
bean
.
rewardDiamondNum
;
DiamondRewardNum
=
bean
.
rewardDiamondNum
;
if
(
DiamondplayNum
>
0
)
if
(
DiamondplayNum
>
0
)
{
{
rdp
.
Show
(
bean
.
rewardDiamondNum
);
rdp
.
Show
(
bean
.
rewardDiamondNum
,
bean
.
playNum
);
}
}
else
else
{
{
...
...
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