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
793ff41f
Commit
793ff41f
authored
Jun 30, 2021
by
zhangzhe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
93ff45fb
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
25 additions
and
18 deletions
+25
-18
UnityPhoneUtils.cs
Assets/Base/UnityTool/UnityPhoneUtils.cs
+2
-2
CrazyCar.unity
Assets/Game/Main/Scenes/CrazyCar.unity
+5
-5
TaskItem.cs
Assets/Game/Main/Scripts/Item/TaskItem.cs
+10
-3
HarvestControl.cs
Assets/Game/Main/Scripts/View/HarvestControl.cs
+1
-1
TaskDiamandControl.cs
Assets/Game/Main/Scripts/View/TaskDiamandControl.cs
+1
-1
Splash.unity
Assets/Game/Splash/Splash.unity
+3
-3
Splash.cs
Assets/Scripts/Splash/Splash.cs
+1
-1
ProjectSettings.asset
ProjectSettings/ProjectSettings.asset
+2
-2
No files found.
Assets/Base/UnityTool/UnityPhoneUtils.cs
View file @
793ff41f
...
@@ -178,12 +178,12 @@ public class UnityPhoneUtils
...
@@ -178,12 +178,12 @@ public class UnityPhoneUtils
string
vc
=
""
;
string
vc
=
""
;
#if UNITY_EDITOR
#if UNITY_EDITOR
vc
=
"
6
"
;
vc
=
"
8
"
;
#elif UNITY_ANDROID
#elif UNITY_ANDROID
vc
=
GetPhoneUtil
().
Call
<
int
>(
"getAppVersionCode"
,
GetActivity
())+
""
;
vc
=
GetPhoneUtil
().
Call
<
int
>(
"getAppVersionCode"
,
GetActivity
())+
""
;
#elif UNITY_IOS
#elif UNITY_IOS
vc
=
"
6
"
;
vc
=
"
8
"
;
#endif
#endif
Debug
.
unityLogger
.
Log
(
"GetVC "
+
vc
);
Debug
.
unityLogger
.
Log
(
"GetVC "
+
vc
);
return
vc
;
return
vc
;
...
...
Assets/Game/Main/Scenes/CrazyCar.unity
View file @
793ff41f
...
@@ -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:
0
m_Value:
1
m_Size: 1
m_Size: 1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
...
@@ -9660,7 +9660,7 @@ RectTransform:
...
@@ -9660,7 +9660,7 @@ RectTransform:
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: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 355, y: -72.
29167
}
m_AnchoredPosition: {x: 355, y: -72.
5
}
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
...
@@ -16996,8 +16996,8 @@ MonoBehaviour:
...
@@ -16996,8 +16996,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:
1.0000032
m_Value:
0
m_Size:
0.9349216
m_Size:
1
m_NumberOfSteps: 0
m_NumberOfSteps: 0
m_OnValueChanged:
m_OnValueChanged:
m_PersistentCalls:
m_PersistentCalls:
...
@@ -66885,7 +66885,7 @@ MonoBehaviour:
...
@@ -66885,7 +66885,7 @@ MonoBehaviour:
m_PersistentCalls:
m_PersistentCalls:
m_Calls:
m_Calls:
- m_Target: {fileID: 2052625161}
- m_Target: {fileID: 2052625161}
m_MethodName:
getDiamondRewar
d
m_MethodName:
LookvideoGetDiamon
d
m_Mode: 1
m_Mode: 1
m_Arguments:
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgument: {fileID: 0}
Assets/Game/Main/Scripts/Item/TaskItem.cs
View file @
793ff41f
...
@@ -171,12 +171,19 @@ public class TaskItem : MonoBehaviour
...
@@ -171,12 +171,19 @@ public class TaskItem : MonoBehaviour
GameObject
.
Find
(
"Dialog"
).
GetComponent
<
DialogControl
>().
showSignDialog
();
GameObject
.
Find
(
"Dialog"
).
GetComponent
<
DialogControl
>().
showSignDialog
();
}
else
if
(
item
.
appmodel_id
==
67
)
//跳转收获奖励弹窗
}
else
if
(
item
.
appmodel_id
==
67
)
//跳转收获奖励弹窗
{
{
GameObject
.
Find
(
"HarvestReward"
).
GetComponent
<
HarvestControl
>().
OnClick
Open
HarvestInPanel
();
GameObject
.
Find
(
"HarvestReward"
).
GetComponent
<
HarvestControl
>().
OnClick
Close
HarvestInPanel
();
}
else
if
(
item
.
appmodel_id
==
68
)
}
else
if
(
item
.
appmodel_id
==
68
)
{
{
JumpUtils
.
Instance
.
JumpWithdrawalEveryDay
();
JumpUtils
.
Instance
.
JumpWithdrawalEveryDay
();
}
}
else
if
(
item
.
appmodel_id
==
73
)
// 跳转到一盒草莓
{
GameObject
.
Find
(
"Main"
).
GetComponent
<
HomeInfoControl
>().
clickStrawberries
();
}
else
if
(
item
.
appmodel_id
==
74
)
// 跳转到翻一翻
{
GameObject
.
Find
(
"Main"
).
GetComponent
<
HomeInfoControl
>().
DidSelectedShiwujiangli
();
}
}
}
else
if
(
item
.
opentype
==
1
)
//
else
if
(
item
.
opentype
==
1
)
//
...
@@ -203,7 +210,7 @@ public class TaskItem : MonoBehaviour
...
@@ -203,7 +210,7 @@ public class TaskItem : MonoBehaviour
Dictionary
<
string
,
object
>
parm
=
new
Dictionary
<
string
,
object
>();
Dictionary
<
string
,
object
>
parm
=
new
Dictionary
<
string
,
object
>();
parm
.
Clear
();
parm
.
Clear
();
parm
.
Add
(
"adId"
,
item
.
sid
);
parm
.
Add
(
"adId"
,
item
.
sid
);
HttpTool
.
Instance
.
_Post
(
"app/v
1/wdlc/task
/receive_diamond_task"
,
parm
,
new
Action
<
RewardData
>((
bean
)
=>
HttpTool
.
Instance
.
_Post
(
"app/v
2/cscmnq
/receive_diamond_task"
,
parm
,
new
Action
<
RewardData
>((
bean
)
=>
{
{
EventCenter
.
Broadcast
(
MyEventType
.
FlyDiamond
);
EventCenter
.
Broadcast
(
MyEventType
.
FlyDiamond
);
EventCenter
.
Broadcast
(
MyEventType
.
UpdateTaskList
);
EventCenter
.
Broadcast
(
MyEventType
.
UpdateTaskList
);
...
...
Assets/Game/Main/Scripts/View/HarvestControl.cs
View file @
793ff41f
...
@@ -54,7 +54,7 @@ public class HarvestControl : MonoBehaviour
...
@@ -54,7 +54,7 @@ public class HarvestControl : MonoBehaviour
private
void
getDiamandTaskList
()
private
void
getDiamandTaskList
()
{
{
Debug
.
Log
(
"获取任务列表"
);
Debug
.
Log
(
"获取任务列表"
);
HttpTool
.
Instance
.
_Get
(
"app/v
1/wdlc/task
/diamond_task_list"
,
null
,
new
Action
<
TaskDiamondBean
>((
bean
)
=>
HttpTool
.
Instance
.
_Get
(
"app/v
2/cscmnq
/diamond_task_list"
,
null
,
new
Action
<
TaskDiamondBean
>((
bean
)
=>
{
{
SetListInfo
(
bean
);
SetListInfo
(
bean
);
}),
new
Action
<
string
,
string
>((
code
,
errMsg
)
=>
}),
new
Action
<
string
,
string
>((
code
,
errMsg
)
=>
...
...
Assets/Game/Main/Scripts/View/TaskDiamandControl.cs
View file @
793ff41f
...
@@ -42,7 +42,7 @@ public class TaskDiamandControl : MonoBehaviour
...
@@ -42,7 +42,7 @@ public class TaskDiamandControl : MonoBehaviour
private
void
getTaskList
()
private
void
getTaskList
()
{
{
Debug
.
Log
(
"获取任务列表"
);
Debug
.
Log
(
"获取任务列表"
);
HttpTool
.
Instance
.
_Get
(
"app/v
1/wdlc/task
/diamond_task_list"
,
null
,
new
Action
<
TaskDiamondBean
>((
bean
)
=>
HttpTool
.
Instance
.
_Get
(
"app/v
2/cscmnq
/diamond_task_list"
,
null
,
new
Action
<
TaskDiamondBean
>((
bean
)
=>
{
{
SetTaskListInfo
(
bean
);
SetTaskListInfo
(
bean
);
}),
new
Action
<
string
,
string
>((
code
,
errMsg
)
=>
}),
new
Action
<
string
,
string
>((
code
,
errMsg
)
=>
...
...
Assets/Game/Splash/Splash.unity
View file @
793ff41f
...
@@ -1491,7 +1491,7 @@ RectTransform:
...
@@ -1491,7 +1491,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
:
3
,
y
:
-11
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
{
x
:
720
,
y
:
260
}
m_SizeDelta
:
{
x
:
720
,
y
:
260
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&1199571191
---
!u!114
&1199571191
...
@@ -1643,8 +1643,8 @@ RectTransform:
...
@@ -1643,8 +1643,8 @@ RectTransform:
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
1
49.99988
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
1
30
}
m_SizeDelta
:
{
x
:
0
,
y
:
10
0
}
m_SizeDelta
:
{
x
:
720
,
y
:
26
0
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!1
&1266608718
---
!u!1
&1266608718
GameObject
:
GameObject
:
...
...
Assets/Scripts/Splash/Splash.cs
View file @
793ff41f
...
@@ -90,7 +90,7 @@ public class Splash : MonoBehaviour
...
@@ -90,7 +90,7 @@ public class Splash : MonoBehaviour
{
{
Constant
.
Instance
.
shubiao
=
false
;
Constant
.
Instance
.
shubiao
=
false
;
}
}
Constant
.
Instance
.
shubiao
=
true
;
//
Constant.Instance.shubiao = true;
novelInfo
();
novelInfo
();
}),
new
Action
<
string
,
string
>((
code
,
errMsg
)
=>
}),
new
Action
<
string
,
string
>((
code
,
errMsg
)
=>
{
{
...
...
ProjectSettings/ProjectSettings.asset
View file @
793ff41f
...
@@ -124,7 +124,7 @@ PlayerSettings:
...
@@ -124,7 +124,7 @@ PlayerSettings:
16:10
:
1
16:10
:
1
16:9
:
1
16:9
:
1
Others
:
1
Others
:
1
bundleVersion
:
1.0.
6
bundleVersion
:
1.0.
7
preloadedAssets
:
[]
preloadedAssets
:
[]
metroInputSource
:
0
metroInputSource
:
0
wsaTransparentSwapchain
:
0
wsaTransparentSwapchain
:
0
...
@@ -172,7 +172,7 @@ PlayerSettings:
...
@@ -172,7 +172,7 @@ PlayerSettings:
iPhone
:
com.ym.simulator
iPhone
:
com.ym.simulator
buildNumber
:
buildNumber
:
iPhone
:
6
iPhone
:
6
AndroidBundleVersionCode
:
7
AndroidBundleVersionCode
:
8
AndroidMinSdkVersion
:
21
AndroidMinSdkVersion
:
21
AndroidTargetSdkVersion
:
0
AndroidTargetSdkVersion
:
0
AndroidPreferredInstallLocation
:
1
AndroidPreferredInstallLocation
:
1
...
...
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