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
5b57d047
Commit
5b57d047
authored
Apr 29, 2021
by
王雪伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
幸福花园1.0.5需求
parent
3721bad0
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
37 additions
and
48 deletions
+37
-48
HttpTool.cs
Assets/AdSDK/NetWork/HTTP/HttpTool.cs
+1
-1
幸福花园login.png
Assets/Game/Main/Resource/ui/wechat/幸福花园login.png
+0
-0
CrazyCar.unity
Assets/Game/Main/Scenes/CrazyCar.unity
+13
-24
WxLoginUtil.cs
Assets/Game/Main/Scripts/Utils/WxLoginUtil.cs
+16
-16
Splash.cs
Assets/Game/Splash/Splash.cs
+3
-3
Splash.unity
Assets/Game/Splash/Splash.unity
+3
-3
ProjectSettings.asset
ProjectSettings/ProjectSettings.asset
+1
-1
No files found.
Assets/AdSDK/NetWork/HTTP/HttpTool.cs
View file @
5b57d047
...
...
@@ -19,7 +19,7 @@ public class HttpTool : MonoBehaviour
public
bool
IsShowLog
=
false
;
private
static
string
HttpLogTag
=
"UnityHttp"
;
private
string
appLs
=
"
afcbef40e31631d3
"
;
private
string
appLs
=
"
6781c93e52cfb32f
"
;
private
static
HttpTool
_instacne
=
null
;
...
...
Assets/Game/Main/Resource/ui/wechat/幸福花园login.png
View replaced file @
3721bad0
View file @
5b57d047
130 KB
|
W:
|
H:
330 KB
|
W:
|
H:
2-up
Swipe
Onion skin
Assets/Game/Main/Scenes/CrazyCar.unity
View file @
5b57d047
...
...
@@ -7379,9 +7379,9 @@ RectTransform:
m_Father: {fileID: 1548415916}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y:
1
}
m_AnchorMax: {x: 0, y:
1
}
m_AnchoredPosition: {x: 355, y:
-72.5
}
m_AnchorMin: {x: 0, y:
0
}
m_AnchorMax: {x: 0, y:
0
}
m_AnchoredPosition: {x: 355, y:
0
}
m_SizeDelta: {x: 710, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &300181110
...
...
@@ -10862,7 +10862,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive:
1
m_IsActive:
0
--- !u!224 &407844799
RectTransform:
m_ObjectHideFlags: 0
...
...
@@ -17906,19 +17906,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2012954741}
m_MethodName: JumpWithDraw
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1343088502}
m_MethodName: GetWithDrawPageInfo
- m_Target: {fileID: 716226833}
m_MethodName: clickWithDrawBg
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
...
...
@@ -22408,7 +22397,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget:
1
m_RaycastTarget:
0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
...
...
@@ -22457,7 +22446,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 864805489}
m_Enabled:
1
m_Enabled:
0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
...
...
@@ -28239,7 +28228,7 @@ PrefabInstance:
- target: {fileID: 2853166085728200632, guid: 1053be02c113a7a45adf322c929b0cb6,
type: 3}
propertyPath: m_IsActive
value:
1
value:
0
objectReference: {fileID: 0}
- target: {fileID: 2853166085728200634, guid: 1053be02c113a7a45adf322c929b0cb6,
type: 3}
...
...
@@ -32125,7 +32114,7 @@ RectTransform:
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:
267.8, y: -21.9
}
m_AnchoredPosition: {x:
0, y: -22
}
m_SizeDelta: {x: 140, y: 111}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &1230170801
...
...
@@ -38411,7 +38400,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5356\u8
3DC
\u5373\u53EF\u8D5A\u94B1\uFF0C\u76F4\u63A5\u63D0\u73B0\u5230\u5FAE\u4FE1"
m_Text: "\u5356\u8
2B1
\u5373\u53EF\u8D5A\u94B1\uFF0C\u76F4\u63A5\u63D0\u73B0\u5230\u5FAE\u4FE1"
--- !u!222 &1433294659
CanvasRenderer:
m_ObjectHideFlags: 0
...
...
@@ -43246,7 +43235,7 @@ RectTransform:
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: -2
76.1, y: -21
}
m_AnchoredPosition: {x: -2
39.7, y: -22
}
m_SizeDelta: {x: 139, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1599538624
...
...
@@ -49791,7 +49780,7 @@ RectTransform:
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:
-9
5, y: -41}
m_AnchoredPosition: {x:
24
5, y: -41}
m_SizeDelta: {x: 150, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &1841722934
Assets/Game/Main/Scripts/Utils/WxLoginUtil.cs
View file @
5b57d047
...
...
@@ -9,8 +9,8 @@ public class WxLoginUtil : MonoBehaviour
public
GameObject
wxLoginBg
;
public
GameObject
loadingImg
;
public
static
WxLoginUtil
WxLogin
;
private
static
string
WX_APPID
=
"wx
e7a03eb52cce1b51
"
;
private
static
string
WX_APPKEY
=
"
6fa72a89ea188c4dff5729cff328b587
"
;
private
static
string
WX_APPID
=
"wx
9807a0ef418a4078
"
;
private
static
string
WX_APPKEY
=
"
b16208510fd84cb3fd318de9666037e5
"
;
private
void
Awake
()
{
...
...
@@ -30,23 +30,23 @@ public class WxLoginUtil : MonoBehaviour
{
////直接打包
callBack
=
wxLoginCallBack
;
DeviceLogin
();
//
callBack = wxLoginCallBack;
//
DeviceLogin();
//Android打包
//Token为null 没有登录
//
if (PrefenceUtils.GetInstance().getToken().Equals(""))
//
{
//
EventUtils.OnEvent("login_show");
//
callBack = wxLoginCallBack;
//
wxLoginBg.SetActive(true);
//
loadingImg.SetActive(false);
//
}
//
else
//
{
//
wxLoginBg.SetActive(false);
//
wxLoginCallBack(true);
//
}
if
(
PrefenceUtils
.
GetInstance
().
getToken
().
Equals
(
""
))
{
EventUtils
.
OnEvent
(
"login_show"
);
callBack
=
wxLoginCallBack
;
wxLoginBg
.
SetActive
(
true
);
loadingImg
.
SetActive
(
false
);
}
else
{
wxLoginBg
.
SetActive
(
false
);
wxLoginCallBack
(
true
);
}
}
public
void
ShowWxLoginPage
()
{
...
...
Assets/Game/Splash/Splash.cs
View file @
5b57d047
...
...
@@ -119,7 +119,7 @@ public class Splash : MonoBehaviour
{
yield
return
new
WaitForSeconds
(
3f
);
AdManager
.
Instance
.
LoadSplashAd
(
new
SplshAdListener
());
AdManager
.
Instance
.
LoadCacheRewardVideoAd
(
"
common_
video"
);
AdManager
.
Instance
.
LoadCacheRewardVideoAd
(
"video"
);
}
private
sealed
class
SplshAdListener
:
ZXADSplashListener
{
...
...
@@ -244,9 +244,9 @@ public class Splash : MonoBehaviour
private
void
LoadCacheAd
()
{
//预加载激励视频广告
AdManager
.
Instance
.
LoadCacheRewardVideoAd
(
"
common_
video"
);
AdManager
.
Instance
.
LoadCacheRewardVideoAd
(
"video"
);
//预加载其他类型的广告 。。。
AdManager
.
Instance
.
LoadCacheFeedAd
(
"
common_
bigimage"
);
AdManager
.
Instance
.
LoadCacheFeedAd
(
"bigimage"
);
}
private
static
void
Login
()
...
...
Assets/Game/Splash/Splash.unity
View file @
5b57d047
...
...
@@ -1483,17 +1483,17 @@ PrefabInstance:
-
target
:
{
fileID
:
6886931801774430219
,
guid
:
8263fb61881c37345be8525a90d1260a
,
type
:
3
}
propertyPath
:
m_SizeDelta.x
value
:
671
value
:
750
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6886931801774430219
,
guid
:
8263fb61881c37345be8525a90d1260a
,
type
:
3
}
propertyPath
:
m_SizeDelta.y
value
:
286
value
:
549
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6886931802485600685
,
guid
:
8263fb61881c37345be8525a90d1260a
,
type
:
3
}
propertyPath
:
m_IsActive
value
:
0
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6886931802851080946
,
guid
:
8263fb61881c37345be8525a90d1260a
,
type
:
3
}
...
...
ProjectSettings/ProjectSettings.asset
View file @
5b57d047
...
...
@@ -175,7 +175,7 @@ PlayerSettings:
androidSupportedAspectRatio
:
1
androidMaxAspectRatio
:
2.1
applicationIdentifier
:
Android
:
com.ym.
ddcy
Android
:
com.ym.
garden
buildNumber
:
{}
AndroidBundleVersionCode
:
1
AndroidMinSdkVersion
:
21
...
...
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