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
d0d64737
Commit
d0d64737
authored
Jun 23, 2021
by
王雪伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试开屏
parent
b41b8bb5
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
44 additions
and
91 deletions
+44
-91
AdManager.cs
Assets/Base/AdSDK/AD/AD_Manager/AdManager.cs
+9
-8
AdDemo.cs
Assets/Base/AdSDK/AD/Demo/AdDemo.cs
+1
-1
GDTSDK.unionNormal.4.333.1203.aar
...unshion/Plugins/Android/GDTSDK.unionNormal.4.333.1203.aar
+0
-0
GDTSDK.unionNormal.4.333.1203.aar.meta
...on/Plugins/Android/GDTSDK.unionNormal.4.333.1203.aar.meta
+0
-32
IOSDemoUtils.cs
Assets/Base/AdSDK/AD/GDT/UnionDemo/IOSDemoUtils.cs
+3
-0
wechat-sdk-android-without-mta-6.6.14.aar
...Plugins/Android/wechat-sdk-android-without-mta-6.6.14.aar
+0
-0
wechat-sdk-android-without-mta-6.6.14.aar.meta
...ns/Android/wechat-sdk-android-without-mta-6.6.14.aar.meta
+0
-31
EventUtils.cs
Assets/Base/Umeng/EventReportHttp/EventUtils.cs
+2
-2
packages-lock.json
Packages/packages-lock.json
+13
-13
EditorBuildSettings.asset
ProjectSettings/EditorBuildSettings.asset
+6
-3
GraphicsSettings.asset
ProjectSettings/GraphicsSettings.asset
+1
-0
ProjectSettings.asset
ProjectSettings/ProjectSettings.asset
+9
-1
No files found.
Assets/Base/AdSDK/AD/AD_Manager/AdManager.cs
View file @
d0d64737
...
...
@@ -244,16 +244,17 @@ public class AdManager
if
(
adList
==
null
||
adList
.
Count
==
0
)
{
Debug
.
unityLogger
.
Log
(
ZXADConfig
.
ADManagerTAG
,
"Splash没有广告数据"
);
listener
.
onLastError
();
return
;
}
// 首次启动时倒序加载
if
(
PlayerPrefs
.
GetInt
(
"isFirstLoadSplashAd"
)
!=
1
)
{
adList
.
Reverse
();
PlayerPrefs
.
SetInt
(
"isFirstLoadSplashAd"
,
1
);
}
adList
.
Reverse
();
//
//
首次启动时倒序加载
//
if (PlayerPrefs.GetInt("isFirstLoadSplashAd") != 1)
//
{
//
adList.Reverse();
//
PlayerPrefs.SetInt("isFirstLoadSplashAd", 1);
//
}
List
<
AdEntity
>
totalEntityList
=
adList
;
AdEntity
entity
=
totalEntityList
[
0
];
...
...
Assets/Base/AdSDK/AD/Demo/AdDemo.cs
View file @
d0d64737
...
...
@@ -18,7 +18,7 @@ public class AdDemo : MonoBehaviour
private
void
Awake
()
{
//AdManager.Instance.LoadSplshAd(new SplshAdListener(this));
AppConfig
.
Instance
.
InitProgect
(
tru
e
,
true
,
"c4f628fe0c45566f"
);
AppConfig
.
Instance
.
InitProgect
(
fals
e
,
true
,
"c4f628fe0c45566f"
);
}
private
void
Start
()
{
...
...
Assets/Base/AdSDK/AD/Funshion/Plugins/Android/GDTSDK.unionNormal.4.333.1203.aar
deleted
100644 → 0
View file @
b41b8bb5
File deleted
Assets/Base/AdSDK/AD/Funshion/Plugins/Android/GDTSDK.unionNormal.4.333.1203.aar.meta
deleted
100644 → 0
View file @
b41b8bb5
fileFormatVersion: 2
guid: 313bb0c6c369747158b3e1a958090eed
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
Assets/Base/AdSDK/AD/GDT/UnionDemo/IOSDemoUtils.cs
View file @
d0d64737
...
...
@@ -3,6 +3,7 @@ using System.Runtime.InteropServices;
public
class
IOSDemoUtils
{
#if UNITY_IOS
public
static
void
ShowView
(
IntPtr
view
)
{
GDT_UnionPlatform_Ad_ShowAdView
(
view
);
...
...
@@ -10,4 +11,6 @@ public class IOSDemoUtils
[
DllImport
(
"__Internal"
)]
private
static
extern
void
GDT_UnionPlatform_Ad_ShowAdView
(
IntPtr
adView
);
#endif
}
\ No newline at end of file
Assets/Base/AdSDK/AD/GDT/UnionDemo/Plugins/Android/wechat-sdk-android-without-mta-6.6.14.aar
deleted
100644 → 0
View file @
b41b8bb5
File deleted
Assets/Base/AdSDK/AD/GDT/UnionDemo/Plugins/Android/wechat-sdk-android-without-mta-6.6.14.aar.meta
deleted
100644 → 0
View file @
b41b8bb5
fileFormatVersion: 2
guid: 1ce90202173eb411e904f5932583b2a0
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
Assets/Base/Umeng/EventReportHttp/EventUtils.cs
View file @
d0d64737
...
...
@@ -60,8 +60,8 @@ public class EventUtils
map
[
"code_id"
]
=
entity
.
codeId
;
map
[
"reqId"
]
=
entity
.
reqId
;
map
[
"slot"
]
=
entity
.
actionName
;
map
[
"errorMsg"
]
=
code
;
map
[
"errorCode"
]
=
msg
;
map
[
"errorMsg"
]
=
msg
;
map
[
"errorCode"
]
=
code
;
EventHttp
.
Instance
.
_PostEvent
(
JsonMapper
.
ToJson
(
map
));
if
(
entity
.
pullfail_tracking
!=
null
&&
entity
.
pullfail_tracking
.
Count
>
0
)
...
...
Packages/packages-lock.json
View file @
d0d64737
...
...
@@ -19,7 +19,7 @@
"dependencies"
:
{
"com.unity.ugui"
:
"1.0.0"
},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"com.unity.analytics"
:
{
"version"
:
"3.3.5"
,
...
...
@@ -28,21 +28,21 @@
"dependencies"
:
{
"com.unity.ugui"
:
"1.0.0"
},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"com.unity.collab-proxy"
:
{
"version"
:
"1.2.16"
,
"depth"
:
0
,
"source"
:
"registry"
,
"dependencies"
:
{},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"com.unity.ext.nunit"
:
{
"version"
:
"1.0.6"
,
"depth"
:
1
,
"source"
:
"registry"
,
"dependencies"
:
{},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"com.unity.ide.rider"
:
{
"version"
:
"1.1.4"
,
...
...
@@ -51,14 +51,14 @@
"dependencies"
:
{
"com.unity.test-framework"
:
"1.1.1"
},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"com.unity.ide.vscode"
:
{
"version"
:
"1.2.3"
,
"depth"
:
0
,
"source"
:
"registry"
,
"dependencies"
:
{},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"com.unity.multiplayer-hlapi"
:
{
"version"
:
"1.0.8"
,
...
...
@@ -67,7 +67,7 @@
"dependencies"
:
{
"nuget.mono-cecil"
:
"0.1.6-preview"
},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"com.unity.purchasing"
:
{
"version"
:
"2.2.1"
,
...
...
@@ -76,7 +76,7 @@
"dependencies"
:
{
"com.unity.ugui"
:
"1.0.0"
},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"com.unity.test-framework"
:
{
"version"
:
"1.1.20"
,
...
...
@@ -87,7 +87,7 @@
"com.unity.modules.imgui"
:
"1.0.0"
,
"com.unity.modules.jsonserialize"
:
"1.0.0"
},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"com.unity.textmeshpro"
:
{
"version"
:
"2.1.1"
,
...
...
@@ -96,14 +96,14 @@
"dependencies"
:
{
"com.unity.ugui"
:
"1.0.0"
},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"com.unity.timeline"
:
{
"version"
:
"1.2.17"
,
"depth"
:
0
,
"source"
:
"registry"
,
"dependencies"
:
{},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"com.unity.ugui"
:
{
"version"
:
"1.0.0"
,
...
...
@@ -122,14 +122,14 @@
"com.unity.modules.vr"
:
"1.0.0"
,
"com.unity.modules.xr"
:
"1.0.0"
},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"nuget.mono-cecil"
:
{
"version"
:
"0.1.6-preview"
,
"depth"
:
1
,
"source"
:
"registry"
,
"dependencies"
:
{},
"url"
:
"https://packages.unity.c
om
"
"url"
:
"https://packages.unity.c
n
"
},
"com.unity.modules.ai"
:
{
"version"
:
"1.0.0"
,
...
...
ProjectSettings/EditorBuildSettings.asset
View file @
d0d64737
...
...
@@ -5,16 +5,19 @@ EditorBuildSettings:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Scenes
:
-
enabled
:
1
-
enabled
:
0
path
:
Assets/Game/Main/Scenes/InitScene.unity
guid
:
902436d14e36d4d42921eab701175b51
-
enabled
:
1
-
enabled
:
0
path
:
Assets/Game/Splash/Splash.unity
guid
:
37af8cf3fb373478ab04e3ee2f3b700a
-
enabled
:
1
-
enabled
:
0
path
:
Assets/Game/Main/Scenes/CrazyCar.unity
guid
:
2ae344869669f6641a05481805b94e98
-
enabled
:
0
path
:
Assets/Base/AdSDK/AD/GDT/UnionDemo/UnionExample.unity
guid
:
6c963ae210fa3c3438c2f6770ee81fc9
-
enabled
:
1
path
:
Assets/Base/AdSDK/AD/Demo/AdDemo.unity
guid
:
ef80a35d44f809e4a8957d1ed9571fd2
m_configObjects
:
{}
ProjectSettings/GraphicsSettings.asset
View file @
d0d64737
...
...
@@ -34,6 +34,7 @@ GraphicsSettings:
-
{
fileID
:
16000
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
-
{
fileID
:
16001
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
-
{
fileID
:
17000
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
-
{
fileID
:
16003
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_PreloadedShaders
:
[]
m_SpritesDefaultMaterial
:
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
...
...
ProjectSettings/ProjectSettings.asset
View file @
d0d64737
...
...
@@ -41,6 +41,12 @@ PlayerSettings:
height
:
1
m_SplashScreenLogos
:
[]
m_VirtualRealitySplashScreen
:
{
fileID
:
0
}
m_ShowUnitySplashAds
:
0
m_AdsAndroidGameId
:
m_AdsIosGameId
:
m_ShowSplashAdsSlogan
:
0
m_SloganImage
:
{
fileID
:
0
}
m_SloganHeight
:
150
m_HolographicTrackingLossScreen
:
{
fileID
:
0
}
defaultScreenWidth
:
1024
defaultScreenHeight
:
768
...
...
@@ -118,6 +124,7 @@ PlayerSettings:
vulkanNumSwapchainBuffers
:
3
vulkanEnableSetSRGBWrite
:
0
vulkanEnableLateAcquireNextImage
:
0
useSecurityBuild
:
0
m_SupportedAspectRatios
:
4:3
:
1
5:4
:
1
...
...
@@ -258,7 +265,7 @@ PlayerSettings:
AndroidEnableTango
:
0
androidEnableBanner
:
1
androidUseLowAccuracyLocation
:
0
androidUseCustomKeystore
:
0
androidUseCustomKeystore
:
1
m_AndroidBanners
:
-
width
:
320
height
:
180
...
...
@@ -465,6 +472,7 @@ PlayerSettings:
m_Kind
:
4
m_SubKind
:
App Store
m_BuildTargetBatching
:
[]
m_BuildTargetEncrypting
:
[]
m_BuildTargetGraphicsJobs
:
-
m_BuildTarget
:
MacStandaloneSupport
m_GraphicsJobs
:
0
...
...
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