Commit f2a162eb authored by 王雪伟's avatar 王雪伟

我的菜园

parent a05f4d78
......@@ -29,7 +29,7 @@ public class AdDemo : MonoBehaviour
}
public void OnClickLoadRewardAd()
{
AdManager.Instance.LoadCacheRewardVideoAd("common_video");
AdManager.Instance.LoadCacheRewardVideoAd("video");
//loadThread.Start();
}
......@@ -37,13 +37,13 @@ public class AdDemo : MonoBehaviour
public void OnClickPlayRewardAd()
{
AdManager.Instance.PlayCacheRewardVideoAd("common_video", "test", new RewardAdListener(this));
AdManager.Instance.PlayCacheRewardVideoAd("video", "test", new RewardAdListener(this));
}
//private Thread loadThread = new Thread(new LoadNextVideo());
private void LoadNextVideo()
{
AdManager.Instance.LoadCacheRewardVideoAd("common_video");
AdManager.Instance.LoadCacheRewardVideoAd("video");
}
public sealed class RewardAdListener : ZXADRewardVideoListener
{
......
......@@ -293,7 +293,7 @@ RectTransform:
m_GameObject: {fileID: 1520672815}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.4, y: 1.4, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1584776466}
m_RootOrder: 0
......@@ -301,7 +301,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 122}
m_SizeDelta: {x: 287, y: 94}
m_SizeDelta: {x: 720, y: 260}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1520672817
MonoBehaviour:
......@@ -322,7 +322,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b6480c436be53cb46a65c99c82375380, type: 3}
m_Sprite: {fileID: 21300000, guid: 8b8f83505adf9434f921a7db9b12cc2c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......
......@@ -19,7 +19,7 @@ public class HttpTool : MonoBehaviour
public bool IsShowLog = false;
private static string HttpLogTag = "UnityHttp";
private string appLs = "afcbef40e31631d3";
private string appLs = "c4f628fe0c45566f";
private static HttpTool _instacne = null;
......
......@@ -340,7 +340,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 455528767290619782}
m_Enabled: 1
m_Alpha: 1
m_Alpha: 0
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
......@@ -1979,7 +1979,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 9dd0e1dbcdde681429d4f4d3a2b81206, type: 3}
m_Sprite: {fileID: 21300000, guid: 185b2ac2d371f4fa8a0dcdd11d330138, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......
fileFormatVersion: 2
guid: 6e3c07098821c00418ebeeeee23c5679
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: a9dfc5fc50faaae48a3e361e79720ac5
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: 9dd0e1dbcdde681429d4f4d3a2b81206
guid: 0bc9c1e1b4ea09648958166c6d884337
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
......
......@@ -4897,7 +4897,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6e3c07098821c00418ebeeeee23c5679, type: 3}
m_Sprite: {fileID: 21300000, guid: 3a63263f6daae48bb9b73d049b433912, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -54806,7 +54806,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u591A\u591A\u83DC\u56ED"
m_Text: "\u6211\u7684\u83DC\u56ED"
--- !u!222 &2059799537
CanvasRenderer:
m_ObjectHideFlags: 0
......@@ -6,20 +6,20 @@ public class AdUtils
{
private string Banner = "banner";
private string Splash = "splash";
private string Feed = "common_bigimage";
private string Feed = "bigimage";
private string FullVideo = "fullvideo";
private string Reward = "common_video";
private string Reward = "video";
private string Interstitial = "Interstitial";
public static void ShowFeedAd(string actionName)
{
AdManager.Instance.ShowCacheFeedAd("common_bigimage", actionName);
AdManager.Instance.ShowCacheFeedAd("bigimage", actionName);
}
public static void CloseFeedAd()
{
AdManager.Instance.CloseFeedAd();
AdManager.Instance.LoadCacheFeedAd("common_bigimage");
AdManager.Instance.LoadCacheFeedAd("bigimage");
}
public static void PlayRewardAd(string actionName,Action<bool> callback)
......@@ -29,7 +29,7 @@ public class AdUtils
// ReportVideo(slot);
callback(true);
#else
AdManager.Instance.PlayCacheRewardVideoAd("common_video", actionName, new RewardAdListener(actionName, callback));
AdManager.Instance.PlayCacheRewardVideoAd("video", actionName, new RewardAdListener(actionName, callback));
#endif
}
......@@ -65,7 +65,7 @@ public class AdUtils
public void onAdClose(AdEntity entity)
{
AdManager.Instance.LoadCacheRewardVideoAd("common_video");
AdManager.Instance.LoadCacheRewardVideoAd("video");
ReportVideo(actionName);
callback(true);
EventCenter.Broadcast(MyEventType.FlyVideoRedPack);
......@@ -163,7 +163,7 @@ public class AdUtils
ReportVideo(slot);
callback(true);
#else
AdManager.Instance.PlayCacheRewardVideoAd("common_video", slot, new RewardAdListener(slot, callback));
AdManager.Instance.PlayCacheRewardVideoAd("video", slot, new RewardAdListener(slot, callback));
#endif
}
else
......
......@@ -9,8 +9,8 @@ public class WxLoginUtil : MonoBehaviour
public GameObject wxLoginBg;
public GameObject loadingImg;
public static WxLoginUtil WxLogin;
private static string WX_APPID = "wxe7a03eb52cce1b51";
private static string WX_APPKEY = "6fa72a89ea188c4dff5729cff328b587";
private static string WX_APPID = "wxeb614acc314efbfb";
private static string WX_APPKEY = "89abbb00107cc6255198cf1285181b4e";
private void Awake()
{
......
......@@ -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()
......
......@@ -468,7 +468,7 @@ RectTransform:
m_GameObject: {fileID: 197678801}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.5, y: 1.5, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1814038931}
m_RootOrder: 0
......@@ -476,7 +476,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 122}
m_SizeDelta: {x: 287, y: 94}
m_SizeDelta: {x: 720, y: 260}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &197678803
MonoBehaviour:
......@@ -497,7 +497,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b6480c436be53cb46a65c99c82375380, type: 3}
m_Sprite: {fileID: 21300000, guid: 8b8f83505adf9434f921a7db9b12cc2c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -1478,17 +1478,17 @@ PrefabInstance:
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: e18e4723a6fface4e9a10e0f5f4fc327,
objectReference: {fileID: 21300000, guid: 0bc9c1e1b4ea09648958166c6d884337,
type: 3}
- 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: 569
objectReference: {fileID: 0}
- target: {fileID: 6886931802485600685, guid: 8263fb61881c37345be8525a90d1260a,
type: 3}
......
fileFormatVersion: 2
guid: ec4c8f8c1653cd345af7c9a03ccadf06
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: b6480c436be53cb46a65c99c82375380
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: 621821e9f2ec65440bf6c3a2442b2216
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:
......@@ -175,7 +175,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.ym.ddcy
Android: com.ym.wdcy
buildNumber: {}
AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 21
......
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