Commit e9460770 authored by zhangzhe's avatar zhangzhe

广告加载框

parent be803ec4
No preview for this file type
fileFormatVersion: 2 fileFormatVersion: 2
guid: a7e20345cf807564fbfb4c3d2779e72f guid: c7895a97019184bc5ae692e9fcb88337
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class ADLoading : MonoBehaviour
{
/// <summary>
/// 是否正在显示中
/// </summary>
public static bool isShowing;
// 播放要记录的参数
public static string adSlotName;
public static string adActionName;
public static ZXADRewardVideoListener adListener;
/// <summary>
/// 加载失败的次数
/// A组或B组视频加载失败, 都加载失败时要隐藏加载框
/// 每次隐藏加载框时都重置此变量
/// </summary>
public int loadFailCount;
/// <summary>
/// 加载动画GameObject
/// </summary>
private static GameObject ADLoadingGameObject;
/// <summary>
/// 加载图片
/// </summary>
private Transform LoadingImage;
private static ADLoading instance;
public static ADLoading Instance()
{
if (instance == null)
{
GameObject obj = new GameObject();
// 设置对象名字为脚本名
obj.name = typeof(ADLoading).ToString();
// 让这个单例模式对象 切换场景不移除
DontDestroyOnLoad(obj);
instance = obj.AddComponent<ADLoading>();
}
return instance;
}
private void Start()
{
InitSubviews();
}
private void Update()
{
if (LoadingImage != null)
{
LoadingImage.Rotate(-Vector3.forward * Time.deltaTime * 250);
}
}
/// <summary>
/// 初始化控件
/// </summary>
private void InitSubviews()
{
}
/// <summary>
/// 显示广告加载图
/// </summary>
public void ShowADLoading(string slotName, string actionName, ZXADRewardVideoListener listener)
{
if (!isShowing)
{
GameObject prefab = Resources.Load<GameObject>("ADLoading/ADLoading");
GameObject ADLoading = Instantiate(prefab, Camera.main.transform.parent);
ADLoading.name = "ADLoading";
isShowing = true;
adSlotName = slotName;
adActionName = actionName;
adListener = listener;
ADLoadingGameObject = ADLoading;
LoadingImage = ADLoading.transform.Find("BgImage/LoadingImage");
Text loadText = ADLoading.transform.Find("BgImage/Text").GetComponent<Text>();
StartCoroutine(PlayAnimator(loadText));
}
}
IEnumerator PlayAnimator(Text loadText)
{
int num = 1;
while (loadText != null)
{
loadText.text = "正在加载视频\n请稍后";
for (int i = 0; i < num; i++)
{
loadText.text = loadText.text + ".";
}
num++;
if (num == 4)
{
num = 1;
}
yield return new WaitForSeconds(0.8f);
}
}
public void HideADLoading()
{
isShowing = false;
adSlotName = null;
adActionName = null;
adListener = null;
loadFailCount = 0;
Destroy(ADLoadingGameObject);
}
}
fileFormatVersion: 2
guid: b8e186fde1a424d898d035bae5a45073
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 6720d104380e0437080431c470e702ef
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f1ac1b402258d4239b87a3e36be36bac
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.UI;
public static class EffectMgr
{
public static float TimeSpeed = 1;
private static WaitForEndOfFrame WaitForNextFrame = new WaitForEndOfFrame();
//逐渐显示(Image)
public static Coroutine GraduallyAppear(this Image picture, float duration, UnityAction<Image> callback = null)
{
return MonoMgr.Getinstance().StartCoroutine(IEGraduallyAppear(picture, duration, callback));
}
private static IEnumerator IEGraduallyAppear(Image picture, float duration, UnityAction<Image> callback = null)
{
Color color = picture.color;
float ColorPercent = 1-color.a;
while (color.a < 1)
{
color.a += Time.deltaTime / duration * ColorPercent;
picture.color = color;
yield return WaitForNextFrame;
}
callback?.Invoke(picture);
}
//逐渐显示(Text)
public static Coroutine GraduallyAppear(this Text picture, float duration, UnityAction<Text> callback = null)
{
return MonoMgr.Getinstance().StartCoroutine(IEGraduallyAppear(picture, duration, callback));
}
private static IEnumerator IEGraduallyAppear(Text picture, float duration, UnityAction<Text> callback = null)
{
Color color = picture.color;
float ColorPercent = 1 - color.a;
while (color.a < 1)
{
color.a += Time.deltaTime / duration * ColorPercent;
picture.color = color;
yield return WaitForNextFrame;
}
callback?.Invoke(picture);
}
//逐渐消失(Image)
public static Coroutine GraduallyDisappear(this Image picture, float duration, UnityAction<Image> callback = null)
{
return MonoMgr.Getinstance().StartCoroutine(IEGraduallyDisappear(picture, duration, callback));
}
private static IEnumerator IEGraduallyDisappear(Image picture, float duration, UnityAction<Image> callback = null)
{
Color color = picture.color;
float Percent = color.a;
while (color.a > 0)
{
color.a -= Time.deltaTime / duration;
picture.color = color;
yield return WaitForNextFrame;
}
callback?.Invoke(picture);
}
//逐渐消失(Text)
public static Coroutine GraduallyDisappear(this Text picture, float duration, UnityAction<Text> callback = null)
{
return MonoMgr.Getinstance().StartCoroutine(IEGraduallyDisappear(picture, duration, callback));
}
private static IEnumerator IEGraduallyDisappear(Text picture, float duration, UnityAction<Text> callback = null)
{
Color color = picture.color;
float Percent = color.a;
while (color.a > 0)
{
color.a -= Time.deltaTime / duration;
picture.color = color;
yield return WaitForNextFrame;
}
callback?.Invoke(picture);
}
//消失复现循环(Image)
public static Coroutine GraduallyAppearAndDisAppear(this Image picture)
{
return MonoMgr.Getinstance().StartCoroutine(IEGraduallyAppearAndDisAppear(picture));
}
private static IEnumerator IEGraduallyAppearAndDisAppear(Image picture)
{
Color color = picture.color;
while (true)
{
while (color.a > 0)
{
color.a -= Time.deltaTime;
picture.color = color;
yield return WaitForNextFrame;
}
while (color.a < 1)
{
color.a += Time.deltaTime;
picture.color = color;
yield return WaitForNextFrame;
}
}
}
//消失复现循环(Text)
public static Coroutine GraduallyAppearAndDisAppear(this Text picture)
{
return MonoMgr.Getinstance().StartCoroutine(IEGraduallyAppearAndDisAppear(picture));
}
private static IEnumerator IEGraduallyAppearAndDisAppear(Text picture)
{
Color color = picture.color;
while (true)
{
while (color.a > 0)
{
color.a -= Time.deltaTime;
picture.color = color;
yield return WaitForNextFrame;
}
while (color.a < 1)
{
color.a += Time.deltaTime;
picture.color = color;
yield return WaitForNextFrame;
}
}
}
//放大缩小
public static Coroutine GraduallyChangeScale(this Transform picture, Vector2 endScale, float duration, UnityAction<Transform> func = null)
{
return MonoMgr.Getinstance().StartCoroutine(IEGraduallyChangeScale(picture, endScale, duration, func));
}
private static IEnumerator IEGraduallyChangeScale(Transform picture, Vector2 endScale, float duration, UnityAction<Transform> func = null)
{
Vector2 originScale = picture.localScale;
Vector2 nowScale = picture.localScale;
int para = endScale.x > originScale.x ? 1 : -1;
while (nowScale.x < endScale.x * para)
{
nowScale += Time.deltaTime * (endScale - originScale) / duration;
picture.localScale = nowScale;
yield return WaitForNextFrame;
}
picture.GetComponent<RectTransform>().localScale = endScale;
func?.Invoke(picture);
}
//旋转 参数:图片,转几圈,最后角度,是否顺时针,持续时间,回调函数
public static Coroutine GraduallyRotate(this Transform picture, int Rotatetimes, float lastangel, bool clockwise, float duration, UnityAction<Transform> callback = null)
{
return MonoMgr.Getinstance().StartCoroutine(IEGraduallyRotate(picture, Rotatetimes, lastangel, clockwise, duration, callback));
}
private static IEnumerator IEGraduallyRotate(Transform picture, int Rotatetimes, float lastangel, bool clockwise, float duration, UnityAction<Transform> callback = null)
{
Vector3 OriginRotate = picture.localEulerAngles;
Vector3 NowRotate = picture.localEulerAngles;
float nowangel = picture.eulerAngles.z % 360;
if (nowangel < 0)
{
nowangel = 360 + nowangel;
}
lastangel %= 360;
if (lastangel < 0)
{
lastangel = 360 + lastangel;
}
float totalangle;
float Goingangle = 0;
//是否顺时针
if (clockwise)
{
float angel = nowangel - lastangel;
if (angel < 0)
{
angel = 360 + angel;
}
totalangle = angel + Rotatetimes * 360;
while (Goingangle < totalangle)
{
float steprotate = Time.deltaTime * (totalangle - OriginRotate.z) / duration;
NowRotate.z -= steprotate;
picture.localEulerAngles = NowRotate;
Goingangle += steprotate;
yield return WaitForNextFrame;
}
OriginRotate.z = lastangel;
picture.localEulerAngles = OriginRotate;
}
else
{
float angel = lastangel - nowangel;
if (angel < 0)
{
angel = 360 + angel;
}
totalangle = angel + Rotatetimes * 360;
while (Goingangle < totalangle)
{
float steprotate = Time.deltaTime * (totalangle - OriginRotate.z) / duration;
NowRotate.z += steprotate;
picture.localEulerAngles = NowRotate;
Goingangle += steprotate;
yield return WaitForNextFrame;
}
OriginRotate.z = lastangel;
picture.localEulerAngles = OriginRotate;
}
callback?.Invoke(picture);
}
//移动
public static Coroutine DoMove(this RectTransform picture, float duration, Vector2 endpos, UnityAction<RectTransform> callback = null)
{
return MonoMgr.Getinstance().StartCoroutine(IEDoMove(picture, duration, endpos, callback));
}
private static IEnumerator IEDoMove(RectTransform picture, float duration, Vector2 endpos, UnityAction<RectTransform> callback = null)
{
Vector2 startpos = picture.anchoredPosition;
Vector2 nowpos = picture.anchoredPosition;
Vector2 Dir = (endpos - startpos).normalized;
Vector2 GoingDir = (endpos - nowpos).normalized;
while (Dir.x * GoingDir.x > 0)
{
nowpos += Time.deltaTime * (endpos - startpos) / duration;
picture.anchoredPosition = nowpos;
GoingDir = (endpos - nowpos).normalized;
yield return WaitForNextFrame;
}
picture.anchoredPosition = endpos;
callback?.Invoke(picture);
}
//打字机效果
public static Coroutine TyperEffect(this Text text,string conststring,string totalstring,float intervaltime=0.05f,UnityAction<Text> callback=null)
{
return MonoMgr.Getinstance().StartCoroutine(IETyperEffect(text, conststring, totalstring, intervaltime, callback));
}
private static IEnumerator IETyperEffect(Text text, string conststring, string totalstring, float intervaltime, UnityAction<Text> callback = null)
{
string str = totalstring.Substring(conststring.Length);
text.text = conststring;
int index = 0;
while (index<str.Length)
{
text.text += str[index];
index++;
yield return new WaitForSeconds(intervaltime);
}
callback?.Invoke(text);
}
//延迟函数
public static Coroutine Invoke<T>(this object obj,float time, T parm, UnityAction<T> func)
{
return MonoMgr.Getinstance().StartCoroutine(IEInvoke(time, parm, func));
}
private static IEnumerator IEInvoke<T>(float time, T parm, UnityAction<T> func)
{
yield return new WaitForSeconds(time);
func.Invoke(parm);
}
public static Coroutine Invoke(this object obj,float time, UnityAction func)
{
return MonoMgr.Getinstance().StartCoroutine(IEInvoke(time, func));
}
private static IEnumerator IEInvoke(float time, UnityAction func)
{
yield return new WaitForSeconds(time);
func.Invoke();
}
//设置为透明方法
public static void HideImage(this Image picture)
{
Color color = picture.color;
color.a = 0;
picture.color = color;
}
//恢复透明度方法
public static void ShowImage(this Image picture)
{
Color color = picture.color;
color.a = 1;
picture.color = color;
}
////初始化
//public static void ReSet(this Transform trans)
//{
// trans.localPosition = Vector3.zero;
// trans.localScale = Vector3.one;
// RectTransform rect = null;
// trans.TryGetComponent(out rect);
// if (rect!=null)
// {
// rect.anchoredPosition = Vector3.zero;
// }
// PersonBase person = null;
// trans.TryGetComponent(out person);
// if (person!=null)
// {
// person.ReSetCell();
// }
//}
//public static void ReSet(this Transform trans,Vector3 pos)
//{
// trans.localPosition = pos;
// trans.localScale = Vector3.one;
// RectTransform rect = null;
// trans.TryGetComponent(out rect);
// if (rect != null)
// {
// rect.anchoredPosition = pos;
// }
// PersonBase person = null;
// trans.TryGetComponent(out person);
// if (person != null)
// {
// person.ReSetCell();
// }
//}
//public static void ReSet(this Transform trans, Vector3 pos,Vector3 Scale)
//{
// trans.localPosition = pos;
// trans.localScale = Scale;
// RectTransform rect = null;
// trans.TryGetComponent(out rect);
// if (rect != null)
// {
// rect.anchoredPosition = pos;
// }
// PersonBase person = null;
// trans.TryGetComponent(out person);
// if (person != null)
// {
// person.ReSetCell();
// }
//}
//public static void ResetToCanvas(this Transform trans,E_Layer layer)
//{
// try
// {
// switch (layer)
// {
// case E_Layer.bot:
// trans.SetParent(UIMgr.Getinstance().bot);
// break;
// case E_Layer.lower_mid:
// trans.SetParent(UIMgr.Getinstance().lower_mid);
// break;
// case E_Layer.mid:
// trans.SetParent(UIMgr.Getinstance().mid);
// break;
// case E_Layer.upper_mid:
// trans.SetParent(UIMgr.Getinstance().upper_mid);
// break;
// case E_Layer.lower_top:
// trans.SetParent(UIMgr.Getinstance().lower_top);
// break;
// case E_Layer.top:
// trans.SetParent(UIMgr.Getinstance().top);
// break;
// case E_Layer.upper_top:
// trans.SetParent(UIMgr.Getinstance().upper_top);
// break;
// case E_Layer.system:
// trans.SetParent(UIMgr.Getinstance().system);
// break;
// }
// trans.ReSet();
// }
// catch
// {
// Debug.Log("ResetToCanvas失败");
// }
//}
//public static void ResetToCanvas(this Transform trans, E_Layer layer,Vector3 pos)
//{
// try
// {
// switch (layer)
// {
// case E_Layer.bot:
// trans.SetParent(UIMgr.Getinstance().bot);
// break;
// case E_Layer.lower_mid:
// trans.SetParent(UIMgr.Getinstance().lower_mid);
// break;
// case E_Layer.mid:
// trans.SetParent(UIMgr.Getinstance().mid);
// break;
// case E_Layer.upper_mid:
// trans.SetParent(UIMgr.Getinstance().upper_mid);
// break;
// case E_Layer.lower_top:
// trans.SetParent(UIMgr.Getinstance().lower_top);
// break;
// case E_Layer.top:
// trans.SetParent(UIMgr.Getinstance().top);
// break;
// case E_Layer.upper_top:
// trans.SetParent(UIMgr.Getinstance().upper_top);
// break;
// case E_Layer.system:
// trans.SetParent(UIMgr.Getinstance().system);
// break;
// }
// trans.ReSet(pos);
// }
// catch
// {
// Debug.Log("ResetToCanvas失败");
// }
//}
//public static void ResetToCanvas(this Transform trans, E_Layer layer, Vector3 pos,Vector3 Scale)
//{
// try
// {
// switch (layer)
// {
// case E_Layer.bot:
// trans.SetParent(UIMgr.Getinstance().bot);
// break;
// case E_Layer.lower_mid:
// trans.SetParent(UIMgr.Getinstance().lower_mid);
// break;
// case E_Layer.mid:
// trans.SetParent(UIMgr.Getinstance().mid);
// break;
// case E_Layer.upper_mid:
// trans.SetParent(UIMgr.Getinstance().upper_mid);
// break;
// case E_Layer.lower_top:
// trans.SetParent(UIMgr.Getinstance().lower_top);
// break;
// case E_Layer.top:
// trans.SetParent(UIMgr.Getinstance().top);
// break;
// case E_Layer.upper_top:
// trans.SetParent(UIMgr.Getinstance().upper_top);
// break;
// case E_Layer.system:
// trans.SetParent(UIMgr.Getinstance().system);
// break;
// }
// trans.ReSet(pos,Scale);
// }
// catch
// {
// Debug.Log("ResetToCanvas失败");
// }
//}
}
\ No newline at end of file
fileFormatVersion: 2
guid: 19cb369d889b04755a0562447e6cdc2e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class MonoBaseMgr<T> : MonoBehaviour where T:MonoBehaviour
{
private static T instance;
public static T Getinstance()
{
if (instance==null)
{
GameObject obj = new GameObject(typeof(T).ToString() + "Scripts");
instance = obj.AddComponent<T>();
DontDestroyOnLoad(obj);
}
return instance;
}
public static T GetInstance()
{
if (instance == null)
{
GameObject obj = new GameObject(typeof(T).ToString() + "Scripts");
instance = obj.AddComponent<T>();
DontDestroyOnLoad(obj);
}
return instance;
}
public static T Instance()
{
if (instance == null)
{
GameObject obj = new GameObject(typeof(T).ToString() + "Scripts");
instance = obj.AddComponent<T>();
DontDestroyOnLoad(obj);
}
return instance;
}
}
fileFormatVersion: 2
guid: e8de3608ab9494f819f3c11756db1eff
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Events;
public class MonoMgr : MonoBaseMgr<MonoMgr>
{
public UnityAction func;
void Update()
{
func?.Invoke();
}
public void AddUpdateListener(UnityAction func)
{
this.func += func;
}
public void RemoveUpdateListener(UnityAction func)
{
this.func -= func;
}
}
fileFormatVersion: 2
guid: 96eabe63e0a424642a928c97daa31a5f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
...@@ -1077,6 +1077,11 @@ public class AdManager ...@@ -1077,6 +1077,11 @@ public class AdManager
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "激励视频请求失败" + errMsg); Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "激励视频请求失败" + errMsg);
if (ADLoading.isShowing)
{
ADLoading.Instance().HideADLoading();
}
})); }));
} }
...@@ -1108,6 +1113,13 @@ public class AdManager ...@@ -1108,6 +1113,13 @@ public class AdManager
{ {
Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "激励视频A组缓存成功 " + entity.adPlatform + " CodeID " + entity.codeId); Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "激励视频A组缓存成功 " + entity.adPlatform + " CodeID " + entity.codeId);
ZXADConfig.Instance.SetAdCache(sloatName, bl, "A"); ZXADConfig.Instance.SetAdCache(sloatName, bl, "A");
if (ADLoading.isShowing)
{
ADLoading.Instance().HideADLoading();
PlayCacheRewardVideoAd(ADLoading.adSlotName, ADLoading.adActionName, ADLoading.adListener);
}
} }
else else
{ {
...@@ -1118,6 +1130,13 @@ public class AdManager ...@@ -1118,6 +1130,13 @@ public class AdManager
totalEntityList.RemoveAt(0); totalEntityList.RemoveAt(0);
mLoadRewardVideoAdPlatform(entity, rewardVideoAdCallBackA); mLoadRewardVideoAdPlatform(entity, rewardVideoAdCallBackA);
} }
ADLoading.Instance().loadFailCount++;
if (ADLoading.Instance().loadFailCount == 2)
{
ADLoading.Instance().HideADLoading();
}
} }
}); });
Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "A开始缓存激励视频"); Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "A开始缓存激励视频");
...@@ -1147,6 +1166,13 @@ public class AdManager ...@@ -1147,6 +1166,13 @@ public class AdManager
{ {
Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "激励视频B组缓存成功 " + bl.adPlatform + " CodeID " + bl.codeId); Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "激励视频B组缓存成功 " + bl.adPlatform + " CodeID " + bl.codeId);
ZXADConfig.Instance.SetAdCache(sloatName, bl, "B"); ZXADConfig.Instance.SetAdCache(sloatName, bl, "B");
if (ADLoading.isShowing)
{
ADLoading.Instance().HideADLoading();
PlayCacheRewardVideoAd(ADLoading.adSlotName, ADLoading.adActionName, ADLoading.adListener);
}
} }
else else
{ {
...@@ -1157,6 +1183,13 @@ public class AdManager ...@@ -1157,6 +1183,13 @@ public class AdManager
totalEntityList.RemoveAt(0); totalEntityList.RemoveAt(0);
mLoadRewardVideoAdPlatform(entity, rewardVideoAdCallBackB); mLoadRewardVideoAdPlatform(entity, rewardVideoAdCallBackB);
} }
ADLoading.Instance().loadFailCount++;
if (ADLoading.Instance().loadFailCount == 2)
{
ADLoading.Instance().HideADLoading();
}
} }
}); });
Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "B开始缓存激励视频"); Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "B开始缓存激励视频");
...@@ -1281,6 +1314,8 @@ public class AdManager ...@@ -1281,6 +1314,8 @@ public class AdManager
{ {
listener.onError("播放激励视频失败 缓存的信息为null"); listener.onError("播放激励视频失败 缓存的信息为null");
Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "播放激励视频失败 缓存的信息为null"); Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "播放激励视频失败 缓存的信息为null");
ADLoading.Instance().ShowADLoading(slotName, actionName, listener);
LoadCacheRewardVideoAd(slotName); LoadCacheRewardVideoAd(slotName);
} }
} }
......
...@@ -18,7 +18,7 @@ public class AdDemo : MonoBehaviour ...@@ -18,7 +18,7 @@ public class AdDemo : MonoBehaviour
private void Awake() private void Awake()
{ //AdManager.Instance.LoadSplshAd(new SplshAdListener(this)); { //AdManager.Instance.LoadSplshAd(new SplshAdListener(this));
} }
private void Start() private void Start()
{ {
......
...@@ -15,7 +15,9 @@ public class HttpTool : MonoBehaviour ...@@ -15,7 +15,9 @@ public class HttpTool : MonoBehaviour
public bool IsShowLog = false; public bool IsShowLog = false;
private static string HttpLogTag = "UnityHttp"; private static string HttpLogTag = "UnityHttp";
private string appLs = "1d8a0d53c33a9b95"; //private string appLs = "1d8a0d53c33a9b95";
private string appLs = "e2555df241c52443";
private static HttpTool _instacne = null; private static HttpTool _instacne = null;
......
fileFormatVersion: 2
guid: b4d9d86d996b243338be67e5b5ef90be
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: a99917c380e234b12b80798e45c7a200
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1536522157032478397
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2457654821774259866}
- component: {fileID: 839483270753962913}
- component: {fileID: 4327836263028225179}
m_Layer: 5
m_Name: LoadingImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2457654821774259866
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1536522157032478397}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7874596720360528069}
m_RootOrder: 0
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: 0, y: 36.1}
m_SizeDelta: {x: 80, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &839483270753962913
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1536522157032478397}
m_CullTransparentMesh: 0
--- !u!114 &4327836263028225179
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1536522157032478397}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f1ac1b402258d4239b87a3e36be36bac, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6003573939384324070
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3539564417102066413}
- component: {fileID: 2894339810150173924}
- component: {fileID: 4209478334735856580}
- component: {fileID: 7053496330904981438}
m_Layer: 5
m_Name: Bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3539564417102066413
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6003573939384324070}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7874596718903047865}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2894339810150173924
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6003573939384324070}
m_CullTransparentMesh: 0
--- !u!114 &4209478334735856580
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6003573939384324070}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &7053496330904981438
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6003573939384324070}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 4209478334735856580}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 4283400949935885017}
m_MethodName: HideADLoading
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
--- !u!1 &7874596718903047813
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7874596718903047865}
- component: {fileID: 7874596718903047866}
- component: {fileID: 7874596718903047867}
- component: {fileID: 7874596718903047812}
- component: {fileID: 4283400949935885017}
m_Layer: 5
m_Name: ADLoading
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7874596718903047865
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7874596718903047813}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 3539564417102066413}
- {fileID: 7874596720360528069}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!223 &7874596718903047866
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7874596718903047813}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 100
m_TargetDisplay: 0
--- !u!114 &7874596718903047867
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7874596718903047813}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 720, y: 1280}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!114 &7874596718903047812
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7874596718903047813}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &4283400949935885017
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7874596718903047813}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b8e186fde1a424d898d035bae5a45073, type: 3}
m_Name:
m_EditorClassIdentifier:
isShowing: 0
adSlotName:
adActionName:
loadFailCount: 0
--- !u!1 &7874596720360528070
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7874596720360528069}
- component: {fileID: 7874596720360528123}
- component: {fileID: 7874596720360528068}
m_Layer: 5
m_Name: BgImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7874596720360528069
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7874596720360528070}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2457654821774259866}
- {fileID: 7753775141321137103}
m_Father: {fileID: 7874596718903047865}
m_RootOrder: 1
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: 0, y: 0}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7874596720360528123
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7874596720360528070}
m_CullTransparentMesh: 0
--- !u!114 &7874596720360528068
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7874596720360528070}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6720d104380e0437080431c470e702ef, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &9179211069209240939
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7753775141321137103}
- component: {fileID: 101693279033312132}
- component: {fileID: 2377602394494052916}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7753775141321137103
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9179211069209240939}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7874596720360528069}
m_RootOrder: 1
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: 0, y: -51.7}
m_SizeDelta: {x: 160, y: 76.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &101693279033312132
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9179211069209240939}
m_CullTransparentMesh: 0
--- !u!114 &2377602394494052916
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9179211069209240939}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 22
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1.36
m_Text: "\u6B63\u5728\u52A0\u8F7D\u89C6\u9891\n\u8BF7\u7A0D\u540E..."
fileFormatVersion: 2
guid: c4af3a9c54f1e4018b7e087fa4bff163
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"com.unity.modules.animation": "1.0.0", "com.unity.modules.animation": "1.0.0",
"com.unity.modules.uielements": "1.0.0" "com.unity.modules.uielements": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.2d.common": { "com.unity.2d.common": {
"version": "2.1.0", "version": "2.1.0",
...@@ -21,21 +21,21 @@ ...@@ -21,21 +21,21 @@
"com.unity.2d.sprite": "1.0.0", "com.unity.2d.sprite": "1.0.0",
"com.unity.modules.uielements": "1.0.0" "com.unity.modules.uielements": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.2d.path": { "com.unity.2d.path": {
"version": "2.1.0", "version": "2.1.0",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.2d.pixel-perfect": { "com.unity.2d.pixel-perfect": {
"version": "2.1.0", "version": "2.1.0",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.2d.psdimporter": { "com.unity.2d.psdimporter": {
"version": "2.1.6", "version": "2.1.6",
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
"com.unity.2d.animation": "3.2.5", "com.unity.2d.animation": "3.2.5",
"com.unity.2d.sprite": "1.0.0" "com.unity.2d.sprite": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.2d.sprite": { "com.unity.2d.sprite": {
"version": "1.0.0", "version": "1.0.0",
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
"com.unity.2d.common": "2.0.2", "com.unity.2d.common": "2.0.2",
"com.unity.2d.path": "2.0.6" "com.unity.2d.path": "2.0.6"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.2d.tilemap": { "com.unity.2d.tilemap": {
"version": "1.0.0", "version": "1.0.0",
...@@ -76,14 +76,14 @@ ...@@ -76,14 +76,14 @@
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ext.nunit": { "com.unity.ext.nunit": {
"version": "1.0.6", "version": "1.0.6",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ide.rider": { "com.unity.ide.rider": {
"version": "1.1.4", "version": "1.1.4",
...@@ -92,28 +92,28 @@ ...@@ -92,28 +92,28 @@
"dependencies": { "dependencies": {
"com.unity.test-framework": "1.1.1" "com.unity.test-framework": "1.1.1"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ide.vscode": { "com.unity.ide.vscode": {
"version": "1.2.3", "version": "1.2.3",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.mathematics": { "com.unity.mathematics": {
"version": "1.1.0", "version": "1.1.0",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.mobile.android-logcat": { "com.unity.mobile.android-logcat": {
"version": "1.2.1", "version": "1.2.1",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.mobile.notifications": { "com.unity.mobile.notifications": {
"version": "1.3.2", "version": "1.3.2",
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
"dependencies": { "dependencies": {
"com.unity.modules.androidjni": "1.0.0" "com.unity.modules.androidjni": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.test-framework": { "com.unity.test-framework": {
"version": "1.1.22", "version": "1.1.22",
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
"com.unity.modules.imgui": "1.0.0", "com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0" "com.unity.modules.jsonserialize": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.textmeshpro": { "com.unity.textmeshpro": {
"version": "2.1.3", "version": "2.1.3",
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.timeline": { "com.unity.timeline": {
"version": "1.2.18", "version": "1.2.18",
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
"com.unity.modules.audio": "1.0.0", "com.unity.modules.audio": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0" "com.unity.modules.particlesystem": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ugui": { "com.unity.ugui": {
"version": "1.0.0", "version": "1.0.0",
......
...@@ -5,7 +5,7 @@ EditorBuildSettings: ...@@ -5,7 +5,7 @@ EditorBuildSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes:
- enabled: 1 - enabled: 0
path: Assets/AdSDK/AD/CSJ/Example/Example.unity path: Assets/AdSDK/AD/CSJ/Example/Example.unity
guid: 1e4f8457b1266154e80399e42b932ceb guid: 1e4f8457b1266154e80399e42b932ceb
- enabled: 0 - enabled: 0
...@@ -17,7 +17,7 @@ EditorBuildSettings: ...@@ -17,7 +17,7 @@ EditorBuildSettings:
- enabled: 0 - enabled: 0
path: Assets/AdSDK/SplashDemo/Splash.unity path: Assets/AdSDK/SplashDemo/Splash.unity
guid: 37af8cf3fb373478ab04e3ee2f3b700a guid: 37af8cf3fb373478ab04e3ee2f3b700a
- enabled: 0 - enabled: 1
path: Assets/AdSDK/AD/Demo/AdDemo.unity path: Assets/AdSDK/AD/Demo/AdDemo.unity
guid: ef80a35d44f809e4a8957d1ed9571fd2 guid: ef80a35d44f809e4a8957d1ed9571fd2
- enabled: 0 - enabled: 0
......
...@@ -38,7 +38,6 @@ GraphicsSettings: ...@@ -38,7 +38,6 @@ GraphicsSettings:
- {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: [] m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
......
...@@ -17,7 +17,7 @@ MonoBehaviour: ...@@ -17,7 +17,7 @@ MonoBehaviour:
m_Registries: m_Registries:
- m_Id: main - m_Id: main
m_Name: m_Name:
m_Url: https://packages.unity.cn m_Url: https://packages.unity.com
m_Scopes: [] m_Scopes: []
m_IsDefault: 1 m_IsDefault: 1
m_UserSelectedRegistryName: m_UserSelectedRegistryName:
......
...@@ -17,7 +17,7 @@ PlayerSettings: ...@@ -17,7 +17,7 @@ PlayerSettings:
defaultCursor: {fileID: 0} defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0} cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
m_ShowUnitySplashScreen: 0 m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1 m_ShowUnitySplashLogo: 1
m_SplashScreenOverlayOpacity: 1 m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 1 m_SplashScreenAnimation: 1
...@@ -41,12 +41,6 @@ PlayerSettings: ...@@ -41,12 +41,6 @@ PlayerSettings:
height: 1 height: 1
m_SplashScreenLogos: [] m_SplashScreenLogos: []
m_VirtualRealitySplashScreen: {fileID: 0} 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} m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1920 defaultScreenWidth: 1920
defaultScreenHeight: 1080 defaultScreenHeight: 1080
...@@ -124,7 +118,6 @@ PlayerSettings: ...@@ -124,7 +118,6 @@ PlayerSettings:
vulkanNumSwapchainBuffers: 3 vulkanNumSwapchainBuffers: 3
vulkanEnableSetSRGBWrite: 0 vulkanEnableSetSRGBWrite: 0
vulkanEnableLateAcquireNextImage: 0 vulkanEnableLateAcquireNextImage: 0
useSecurityBuild: 0
m_SupportedAspectRatios: m_SupportedAspectRatios:
4:3: 1 4:3: 1
5:4: 1 5:4: 1
...@@ -178,7 +171,7 @@ PlayerSettings: ...@@ -178,7 +171,7 @@ PlayerSettings:
Android: com.ym.wdlc Android: com.ym.wdlc
Lumin: com.DefaultCompany.com.unity.template.mobile2D Lumin: com.DefaultCompany.com.unity.template.mobile2D
Standalone: com.DefaultCompany.com.unity.template.mobile2D Standalone: com.DefaultCompany.com.unity.template.mobile2D
iPhone: com.DefaultCompany.com.unity.template.mobile2D iPhone: com.ym.iosawpdd
tvOS: com.DefaultCompany.com.unity.template.mobile2D tvOS: com.DefaultCompany.com.unity.template.mobile2D
buildNumber: buildNumber:
Standalone: 0 Standalone: 0
...@@ -373,7 +366,6 @@ PlayerSettings: ...@@ -373,7 +366,6 @@ PlayerSettings:
m_Kind: 2 m_Kind: 2
m_SubKind: m_SubKind:
m_BuildTargetBatching: [] m_BuildTargetBatching: []
m_BuildTargetEncrypting: []
m_BuildTargetGraphicsJobs: m_BuildTargetGraphicsJobs:
- m_BuildTarget: MacStandaloneSupport - m_BuildTarget: MacStandaloneSupport
m_GraphicsJobs: 0 m_GraphicsJobs: 0
......
m_EditorVersion: 2019.4.21f1c1 m_EditorVersion: 2019.4.19f1
m_EditorVersionWithRevision: 2019.4.21f1c1 (7fef87dbc35f) m_EditorVersionWithRevision: 2019.4.19f1 (ca5b14067cec)
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