Commit 46caeb07 authored by 王雪伟's avatar 王雪伟

多多菜园Unity

parent 916cdd8d
...@@ -293,7 +293,7 @@ RectTransform: ...@@ -293,7 +293,7 @@ RectTransform:
m_GameObject: {fileID: 1520672815} m_GameObject: {fileID: 1520672815}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1584776466} m_Father: {fileID: 1584776466}
m_RootOrder: 0 m_RootOrder: 0
...@@ -301,7 +301,7 @@ RectTransform: ...@@ -301,7 +301,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 122} m_AnchoredPosition: {x: 0, y: 122}
m_SizeDelta: {x: 438, y: 143} m_SizeDelta: {x: 566, y: 213}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1520672817 --- !u!114 &1520672817
MonoBehaviour: MonoBehaviour:
...@@ -322,7 +322,7 @@ MonoBehaviour: ...@@ -322,7 +322,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 621821e9f2ec65440bf6c3a2442b2216, type: 3} m_Sprite: {fileID: 21300000, guid: ec4c8f8c1653cd345af7c9a03ccadf06, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
......
...@@ -19,7 +19,7 @@ public class HttpTool : MonoBehaviour ...@@ -19,7 +19,7 @@ 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 = "53a1b390e9b29cf1"; private string appLs = "afcbef40e31631d3";
private static HttpTool _instacne = null; private static HttpTool _instacne = null;
......
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: ddc5b039ed5c6e94db5cc6626971ca0d
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:
...@@ -4897,7 +4897,7 @@ MonoBehaviour: ...@@ -4897,7 +4897,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: a9dfc5fc50faaae48a3e361e79720ac5, type: 3} m_Sprite: {fileID: 21300000, guid: 6e3c07098821c00418ebeeeee23c5679, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -54806,7 +54806,7 @@ MonoBehaviour: ...@@ -54806,7 +54806,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u795E\u5947\u83DC\u56ED" m_Text: "\u591A\u591A\u83DC\u56ED"
--- !u!222 &2059799537 --- !u!222 &2059799537
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -6,20 +6,20 @@ public class AdUtils ...@@ -6,20 +6,20 @@ public class AdUtils
{ {
private string Banner = "banner"; private string Banner = "banner";
private string Splash = "splash"; private string Splash = "splash";
private string Feed = "bigimage"; private string Feed = "common_bigimage";
private string FullVideo = "fullvideo"; private string FullVideo = "fullvideo";
private string Reward = "video"; private string Reward = "common_video";
private string Interstitial = "Interstitial"; private string Interstitial = "Interstitial";
public static void ShowFeedAd(string actionName) public static void ShowFeedAd(string actionName)
{ {
AdManager.Instance.ShowCacheFeedAd("bigimage", actionName); AdManager.Instance.ShowCacheFeedAd("common_bigimage", actionName);
} }
public static void CloseFeedAd() public static void CloseFeedAd()
{ {
AdManager.Instance.CloseFeedAd(); AdManager.Instance.CloseFeedAd();
AdManager.Instance.LoadCacheFeedAd("bigimage"); AdManager.Instance.LoadCacheFeedAd("common_bigimage");
} }
public static void PlayRewardAd(string actionName,Action<bool> callback) public static void PlayRewardAd(string actionName,Action<bool> callback)
...@@ -29,7 +29,7 @@ public class AdUtils ...@@ -29,7 +29,7 @@ public class AdUtils
// ReportVideo(slot); // ReportVideo(slot);
callback(true); callback(true);
#else #else
AdManager.Instance.PlayCacheRewardVideoAd("video", actionName, new RewardAdListener(actionName, callback)); AdManager.Instance.PlayCacheRewardVideoAd("common_video", actionName, new RewardAdListener(actionName, callback));
#endif #endif
} }
...@@ -163,7 +163,7 @@ public class AdUtils ...@@ -163,7 +163,7 @@ public class AdUtils
ReportVideo(slot); ReportVideo(slot);
callback(true); callback(true);
#else #else
AdManager.Instance.PlayCacheRewardVideoAd("video", slot, new RewardAdListener(slot, callback)); AdManager.Instance.PlayCacheRewardVideoAd("common_video", slot, new RewardAdListener(slot, callback));
#endif #endif
} }
else else
......
...@@ -9,8 +9,8 @@ public class WxLoginUtil : MonoBehaviour ...@@ -9,8 +9,8 @@ public class WxLoginUtil : MonoBehaviour
public GameObject wxLoginBg; public GameObject wxLoginBg;
public GameObject loadingImg; public GameObject loadingImg;
public static WxLoginUtil WxLogin; public static WxLoginUtil WxLogin;
private static string WX_APPID = "wx4d85f2174f49d140"; private static string WX_APPID = "wxe7a03eb52cce1b51";
private static string WX_APPKEY = "79598c0e909f81093c358c1c55090ef9"; private static string WX_APPKEY = "6fa72a89ea188c4dff5729cff328b587";
private void Awake() private void Awake()
{ {
......
...@@ -468,7 +468,7 @@ RectTransform: ...@@ -468,7 +468,7 @@ RectTransform:
m_GameObject: {fileID: 197678801} m_GameObject: {fileID: 197678801}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1814038931} m_Father: {fileID: 1814038931}
m_RootOrder: 0 m_RootOrder: 0
...@@ -476,7 +476,7 @@ RectTransform: ...@@ -476,7 +476,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 122} m_AnchoredPosition: {x: 0, y: 122}
m_SizeDelta: {x: 438, y: 143} m_SizeDelta: {x: 566, y: 213}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &197678803 --- !u!114 &197678803
MonoBehaviour: MonoBehaviour:
...@@ -497,7 +497,7 @@ MonoBehaviour: ...@@ -497,7 +497,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 621821e9f2ec65440bf6c3a2442b2216, type: 3} m_Sprite: {fileID: 21300000, guid: ec4c8f8c1653cd345af7c9a03ccadf06, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -1449,6 +1449,11 @@ PrefabInstance: ...@@ -1449,6 +1449,11 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 570526026224346322, guid: 8263fb61881c37345be8525a90d1260a,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -235.6
objectReference: {fileID: 0}
- target: {fileID: 6886931801205532841, guid: 8263fb61881c37345be8525a90d1260a, - target: {fileID: 6886931801205532841, guid: 8263fb61881c37345be8525a90d1260a,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
...@@ -1473,12 +1478,12 @@ PrefabInstance: ...@@ -1473,12 +1478,12 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: m_Sprite propertyPath: m_Sprite
value: value:
objectReference: {fileID: 21300000, guid: 9f9238cc50f7c0649bcb8372a7c2993f, objectReference: {fileID: 21300000, guid: ddc5b039ed5c6e94db5cc6626971ca0d,
type: 3} type: 3}
- target: {fileID: 6886931801774430219, guid: 8263fb61881c37345be8525a90d1260a, - target: {fileID: 6886931801774430219, guid: 8263fb61881c37345be8525a90d1260a,
type: 3} type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 725 value: 722
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6886931801774430219, guid: 8263fb61881c37345be8525a90d1260a, - target: {fileID: 6886931801774430219, guid: 8263fb61881c37345be8525a90d1260a,
type: 3} 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:
...@@ -175,7 +175,7 @@ PlayerSettings: ...@@ -175,7 +175,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1 androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1 androidMaxAspectRatio: 2.1
applicationIdentifier: applicationIdentifier:
Android: com.ym.sqcy Android: com.ym.ddcy
buildNumber: {} buildNumber: {}
AndroidBundleVersionCode: 1 AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 21 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