Skip to content

W
wdlc_mjb_unity
Commit 7286f149 authored by LiLiuZhou's avatar LiLiuZhou
Browse files
Options

Merge branch 'develop_mjb_cscmnq_1.0.7' of… 

Merge branch 'develop_mjb_cscmnq_1.0.7' of gitlab.huolea.com:wangxuewei/wdlc_mjb_unity into develop_mjb_cscmnq_1.0.7
parents 16787df8 149af5ed
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 27 deletions
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ 7286f149
......@@ -12821,7 +12821,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 93, y: -340}
m_AnchoredPosition: {x: -48, y: -241}
m_SizeDelta: {x: 97, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &382383543
......@@ -15298,9 +15298,9 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 0c520f4a549cc05449cbde3bc94a0dd9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
......@@ -15544,7 +15544,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 91, y: -347}
m_AnchoredPosition: {x: -48, y: -243}
m_SizeDelta: {x: 97, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &455875925
......@@ -16681,8 +16681,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1531958713}
m_HandleRect: {fileID: 1531958712}
m_Direction: 2
m_Value: 1.0000033
m_Size: 0.93547666
m_Value: 1.0000066
m_Size: 0.9349216
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -39858,9 +39858,9 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 0c520f4a549cc05449cbde3bc94a0dd9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
......@@ -47153,7 +47153,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: 55, y: -236}
m_AnchoredPosition: {x: 343, y: -555}
m_SizeDelta: {x: 97, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1443660352
......@@ -55564,7 +55564,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 83, y: -347}
m_AnchoredPosition: {x: -36, y: -248}
m_SizeDelta: {x: 97, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1699807654
......@@ -56383,7 +56383,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: -80, y: -220}
m_AnchoredPosition: {x: -283, y: -574}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1725500823
......@@ -58888,9 +58888,9 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 0c520f4a549cc05449cbde3bc94a0dd9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
......@@ -67865,7 +67865,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: -232, y: 426}
m_AnchoredPosition: {x: -281, y: 256}
m_SizeDelta: {x: 97, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2098422175
......@@ -69456,6 +69456,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455528767808094872, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_Alpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455528768202490609, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: carId
Assets/Scripts/Splash/Splash.cs
View file @ 7286f149
......@@ -159,11 +159,19 @@ public class Splash : MonoBehaviour
public void initAD()
{
EventUtils.OnEvent("init_AD");
#if UNITY_ANDROID
ZXADConfig.Instance.CSJ_AD_APP_ID = "5166523";
ZXADConfig.Instance.GDT_AD_APP_ID = "1111797082";
ZXADConfig.Instance.KS_AD_APP_ID = null;
ZXADConfig.Instance.YLB_AD_APP_ID = "10000632";
ZXADConfig.Instance.HC_AD_APP_ID = null;
#else
ZXADConfig.Instance.CSJ_AD_APP_ID = "5171386";
ZXADConfig.Instance.GDT_AD_APP_ID = "1111776191";
ZXADConfig.Instance.KS_AD_APP_ID = null;
ZXADConfig.Instance.YLB_AD_APP_ID = null;
ZXADConfig.Instance.HC_AD_APP_ID = null;
#endif
AdManager.Instance.InitAd(new Action<bool>((cb) =>
{
StartCoroutine(loadSplash());
......
Packages/packages-lock.json
View file @ 7286f149
......@@ -19,7 +19,7 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.analytics": {
"version": "3.3.5",
......@@ -28,21 +28,21 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "1.2.16",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "1.1.4",
......@@ -51,14 +51,14 @@
"dependencies": {
"com.unity.test-framework": "1.1.1"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.3",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.multiplayer-hlapi": {
"version": "1.0.8",
......@@ -67,7 +67,7 @@
"dependencies": {
"nuget.mono-cecil": "0.1.6-preview"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.purchasing": {
"version": "2.2.1",
......@@ -76,7 +76,7 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"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.cn"
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "2.1.1",
......@@ -96,14 +96,14 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.2.17",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"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.cn"
"url": "https://packages.unity.com"
},
"nuget.mono-cecil": {
"version": "0.1.6-preview",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.modules.ai": {
"version": "1.0.0",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment