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
d4384f6c
Commit
d4384f6c
authored
Jun 15, 2021
by
maxiaoliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改ui位置,加速气泡和害虫气泡逻辑修改
parent
f9368278
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
51 additions
and
20 deletions
+51
-20
PangleAdapterScripts.meta
Assets/AdSDK/AD/CSJ/PangleAdapterScripts.meta
+0
-8
PangleSDK.meta
Assets/AdSDK/AD/CSJ/PangleSDK.meta
+0
-8
CrazyCar.unity
Assets/Game/Main/Scenes/CrazyCar.unity
+37
-2
AdUtils.cs
Assets/Game/Main/Scripts/Utils/AdUtils.cs
+5
-1
CarUIControl.cs
Assets/Game/Main/Scripts/View/CarUIControl.cs
+8
-0
DialogControl.cs
Assets/Game/Main/Scripts/View/DialogControl.cs
+1
-1
No files found.
Assets/AdSDK/AD/CSJ/PangleAdapterScripts.meta
deleted
100644 → 0
View file @
f9368278
fileFormatVersion: 2
guid: 4de77bfbd9c014146a2b371280ff0f63
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/AdSDK/AD/CSJ/PangleSDK.meta
deleted
100644 → 0
View file @
f9368278
fileFormatVersion: 2
guid: 9216b5ab3159c44e594fa8e3a6bfcd90
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scenes/CrazyCar.unity
View file @
d4384f6c
...
@@ -1584,7 +1584,7 @@ RectTransform:
...
@@ -1584,7 +1584,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: -124.2, y: 6
09.1
}
m_AnchoredPosition: {x: -124.2, y: 6
12
}
m_SizeDelta: {x: 136.7032, y: 122.00984}
m_SizeDelta: {x: 136.7032, y: 122.00984}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &54350470
--- !u!1 &54350470
...
@@ -4912,6 +4912,11 @@ PrefabInstance:
...
@@ -4912,6 +4912,11 @@ PrefabInstance:
m_Modification:
m_Modification:
m_TransformParent: {fileID: 369872322}
m_TransformParent: {fileID: 369872322}
m_Modifications:
m_Modifications:
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
type: 3}
propertyPath: m_Sprite
propertyPath: m_Sprite
...
@@ -45856,6 +45861,16 @@ PrefabInstance:
...
@@ -45856,6 +45861,16 @@ PrefabInstance:
m_Modification:
m_Modification:
m_TransformParent: {fileID: 369872322}
m_TransformParent: {fileID: 369872322}
m_Modifications:
m_Modifications:
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 12
objectReference: {fileID: 0}
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -1
objectReference: {fileID: 0}
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
type: 3}
propertyPath: m_Sprite
propertyPath: m_Sprite
...
@@ -52149,6 +52164,16 @@ PrefabInstance:
...
@@ -52149,6 +52164,16 @@ PrefabInstance:
m_Modification:
m_Modification:
m_TransformParent: {fileID: 369872322}
m_TransformParent: {fileID: 369872322}
m_Modifications:
m_Modifications:
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -4
objectReference: {fileID: 0}
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 11
objectReference: {fileID: 0}
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
type: 3}
propertyPath: m_Sprite
propertyPath: m_Sprite
...
@@ -52304,7 +52329,7 @@ RectTransform:
...
@@ -52304,7 +52329,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: 10.6, y: 6
29.2
}
m_AnchoredPosition: {x: 10.6, y: 6
34
}
m_SizeDelta: {x: 121.23505, y: 163.89551}
m_SizeDelta: {x: 121.23505, y: 163.89551}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1747314419
--- !u!114 &1747314419
...
@@ -54700,6 +54725,11 @@ PrefabInstance:
...
@@ -54700,6 +54725,11 @@ PrefabInstance:
m_Modification:
m_Modification:
m_TransformParent: {fileID: 369872322}
m_TransformParent: {fileID: 369872322}
m_Modifications:
m_Modifications:
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 7
objectReference: {fileID: 0}
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
type: 3}
propertyPath: m_Sprite
propertyPath: m_Sprite
...
@@ -77802,6 +77832,11 @@ PrefabInstance:
...
@@ -77802,6 +77832,11 @@ PrefabInstance:
m_Modification:
m_Modification:
m_TransformParent: {fileID: 369872322}
m_TransformParent: {fileID: 369872322}
m_Modifications:
m_Modifications:
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -5
objectReference: {fileID: 0}
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
type: 3}
propertyPath: m_Sprite
propertyPath: m_Sprite
Assets/Game/Main/Scripts/Utils/AdUtils.cs
View file @
d4384f6c
...
@@ -67,7 +67,11 @@ public class AdUtils
...
@@ -67,7 +67,11 @@ public class AdUtils
public
void
onAdClose
(
AdEntity
entity
)
public
void
onAdClose
(
AdEntity
entity
)
{
{
AudioUtils
.
ins
.
music
.
Play
();
if
(
PlayerPrefs
.
GetInt
(
"IS_OPEN_MUSIC"
,
0
)
==
0
)
{
AudioUtils
.
ins
.
music
.
Play
();
}
setCurrentAdEntity
(
entity
);
setCurrentAdEntity
(
entity
);
...
...
Assets/Game/Main/Scripts/View/CarUIControl.cs
View file @
d4384f6c
...
@@ -391,6 +391,10 @@ public class CarUIControl : MonoBehaviour
...
@@ -391,6 +391,10 @@ public class CarUIControl : MonoBehaviour
floatStickObj
.
SetActive
(
true
);
floatStickObj
.
SetActive
(
true
);
imghaichongs
.
SetActive
(
true
);
imghaichongs
.
SetActive
(
true
);
}
}
else
{
floatSpeedObj
.
SetActive
(
false
);
}
//if (floatStickTipsObj.activeSelf != true)
//if (floatStickTipsObj.activeSelf != true)
//{
//{
// floatStickTipsObj.SetActive(true);
// floatStickTipsObj.SetActive(true);
...
@@ -414,6 +418,10 @@ public class CarUIControl : MonoBehaviour
...
@@ -414,6 +418,10 @@ public class CarUIControl : MonoBehaviour
floatStickObj
.
SetActive
(
false
);
floatStickObj
.
SetActive
(
false
);
imghaichongs
.
SetActive
(
false
);
imghaichongs
.
SetActive
(
false
);
}
}
else
{
floatSpeedObj
.
SetActive
(
true
);
}
//if (floatStickTipsObj.activeSelf != false)
//if (floatStickTipsObj.activeSelf != false)
//{
//{
// floatStickTipsObj.SetActive(false);
// floatStickTipsObj.SetActive(false);
...
...
Assets/Game/Main/Scripts/View/DialogControl.cs
View file @
d4384f6c
...
@@ -1013,7 +1013,7 @@ public class DialogControl : MonoBehaviour
...
@@ -1013,7 +1013,7 @@ public class DialogControl : MonoBehaviour
}
}
public
void
showTaoxinDialog
(
int
rewardcount
)
public
void
showTaoxinDialog
(
int
rewardcount
)
{
{
EventUtils
.
OnEvent
(
"happy_get_dialog"
);
taoxinDialog
.
SetActive
(
true
);
taoxinDialog
.
SetActive
(
true
);
tv_taoxin_num
.
text
=
rewardcount
.
ToString
();
tv_taoxin_num
.
text
=
rewardcount
.
ToString
();
}
}
...
...
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