Commit e22df70c authored by zhangzhe's avatar zhangzhe

iOS修改

parent ede13218
...@@ -178,12 +178,12 @@ public class UnityPhoneUtils ...@@ -178,12 +178,12 @@ public class UnityPhoneUtils
string vc = ""; string vc = "";
#if UNITY_EDITOR #if UNITY_EDITOR
vc = "10"; vc = "11";
#elif UNITY_ANDROID #elif UNITY_ANDROID
vc = GetPhoneUtil().Call<int>("getAppVersionCode", GetActivity())+""; vc = GetPhoneUtil().Call<int>("getAppVersionCode", GetActivity())+"";
#elif UNITY_IOS #elif UNITY_IOS
vc = "9"; vc = "11";
#endif #endif
Debug.unityLogger.Log("GetVC " + vc); Debug.unityLogger.Log("GetVC " + vc);
return vc; return vc;
......
fileFormatVersion: 2
guid: feed25f3a4ce64a1596f99926c2d825e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c1a96874637fb4d1cb8e001cf8b6ea3f
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:
...@@ -441,7 +441,7 @@ MonoBehaviour: ...@@ -441,7 +441,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: e5d6b9eed3a874a0397c699b5154addb, type: 3} m_Sprite: {fileID: 21300000, guid: c1a96874637fb4d1cb8e001cf8b6ea3f, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
......
...@@ -350,12 +350,18 @@ public class AdUtils ...@@ -350,12 +350,18 @@ public class AdUtils
} }
public static void closeFeedAd() public static void closeFeedAd()
{ {
#if UNITY_EDITOR #if UNITY_EDITOR
return; return;
#endif #endif
AdManager.Instance.CloseFeedAd(); AdManager.Instance.CloseFeedAd();
#if UNITY_IOS #if UNITY_IOS
AdManager.Instance.LoadCacheFeedAd("bigimage"); AdManager.Instance.LoadCacheFeedAd("bigimage");
if (PlayerPrefs.GetInt("IS_OPEN_MUSIC", 0) == 0)
{
Debug.Log("如果开的重新开");
AudioUtils.ins.music.Play();
}
#endif #endif
} }
......
...@@ -26,7 +26,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -26,7 +26,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
{ {
#if UNITY_EDITOR #if UNITY_EDITOR
AppConfig.Instance.InitProgect(true, true, "43d2b0f567e422b8"); AppConfig.Instance.InitProgect(true, true, "43d2b0f567e422b8");
Constant.Instance.shubiao = false; //Constant.Instance.shubiao = false;
#endif #endif
mPresenter = new HomePresenter(this); mPresenter = new HomePresenter(this);
EventCenter.AddListener(MyEventType.UPDATE_CAR_LIST_DATA, OnUpdateCarListData); EventCenter.AddListener(MyEventType.UPDATE_CAR_LIST_DATA, OnUpdateCarListData);
......
...@@ -1513,7 +1513,7 @@ MonoBehaviour: ...@@ -1513,7 +1513,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: e5d6b9eed3a874a0397c699b5154addb, type: 3} m_Sprite: {fileID: 21300000, guid: c1a96874637fb4d1cb8e001cf8b6ea3f, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
......
...@@ -34,7 +34,6 @@ GraphicsSettings: ...@@ -34,7 +34,6 @@ GraphicsSettings:
- {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: 17000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: [] m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0} type: 0}
......
...@@ -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:
......
...@@ -270,7 +270,7 @@ PlayerSettings: ...@@ -270,7 +270,7 @@ PlayerSettings:
- m_BuildTarget: - m_BuildTarget:
m_Icons: m_Icons:
- serializedVersion: 2 - serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 43004d061e5444c07a12e464fc3a7e20, type: 3} m_Icon: {fileID: 2800000, guid: 354f3646ee72b417eb1bbc40e7f70be3, type: 3}
m_Width: 128 m_Width: 128
m_Height: 128 m_Height: 128
m_Kind: 0 m_Kind: 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