Commit a8aef385 authored by maxiaoliang's avatar maxiaoliang

修改多多菜园

parent 45ad83c4
...@@ -382,8 +382,8 @@ MonoBehaviour: ...@@ -382,8 +382,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 788e2a3a769e26b459cd63d4a5de7d76, type: 3} m_Script: {fileID: 11500000, guid: 788e2a3a769e26b459cd63d4a5de7d76, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
isTest: 0 isTest: 1
isShowLog: 0 isShowLog: 1
XyDialog: {fileID: 0} XyDialog: {fileID: 0}
--- !u!1 &2010092450 --- !u!1 &2010092450
GameObject: GameObject:
...@@ -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: 5bf0a560c667f4d6a87a873c5727f7c6, type: 3} m_Sprite: {fileID: 21300000, guid: 6958945dad5ae4991ab092364acd9856, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
......
...@@ -19,8 +19,8 @@ public class Constant ...@@ -19,8 +19,8 @@ public class Constant
/// </summary> /// </summary>
public bool IsTestNet{ get; set; } public bool IsTestNet{ get; set; }
//微信key //微信key
public string WX_APP_ID= "wx21eef1b1b33e2ccd"; public string WX_APP_ID= "wxe7a03eb52cce1b51";
public string WX_APP_Key= "dff00145f278fc1b808197a68e8cb5db"; public string WX_APP_Key= "6fa72a89ea188c4dff5729cff328b587";
public string universalLink = "https://feedapi.zhangxineducation.com/simulator/"; public string universalLink = "https://feedapi.zhangxineducation.com/simulator/";
// 友盟key ios // 友盟key ios
...@@ -31,7 +31,7 @@ public class Constant ...@@ -31,7 +31,7 @@ public class Constant
#if UNITY_IOS #if UNITY_IOS
return "609a589b53b6726499f8543d"; return "609a589b53b6726499f8543d";
#else #else
return "608669265844f15425eb7953"; return "5f9bb48945b2b751a91fb2d5";
#endif #endif
} }
...@@ -47,7 +47,7 @@ public class Constant ...@@ -47,7 +47,7 @@ public class Constant
#if UNITY_IOS #if UNITY_IOS
return "399d87a2b8c8d900"; return "399d87a2b8c8d900";
#else #else
return "1d8a0d53c33a9b95"; return "afcbef40e31631d3";
#endif #endif
} }
} }
......
package com.ym.cscmnq.wxapi; package com.ym.ddcy.wxapi;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 301ac352a80394760bc850f2d70a6cd0 guid: 386679950a62d451fbb9ef6fe2277577
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: d76b7be096b6244ee9744b113057721d guid: 6958945dad5ae4991ab092364acd9856
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}
......
fileFormatVersion: 2
guid: 5bf0a560c667f4d6a87a873c5727f7c6
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 fileFormatVersion: 2
guid: a4410143886057d43a3c370cebc136ae guid: 27e8c92516b284c6f911f866494ef5c6
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}
......
fileFormatVersion: 2
guid: 0bc9c1e1b4ea09648958166c6d884337
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: e744ff1c0e6284ff09eeec14a81e7da5
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:
...@@ -8936,7 +8936,7 @@ MonoBehaviour: ...@@ -8936,7 +8936,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u5E78\u8FD0\u519C\u7530\u7684\u7EA2\u5305" m_Text: "\u591A\u591A\u83DC\u56ED\u7684\u7EA2\u5305"
--- !u!222 &283979087 --- !u!222 &283979087
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -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: 5bf0a560c667f4d6a87a873c5727f7c6, type: 3} m_Sprite: {fileID: 21300000, guid: 6958945dad5ae4991ab092364acd9856, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -3021,7 +3021,7 @@ MonoBehaviour: ...@@ -3021,7 +3021,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 301ac352a80394760bc850f2d70a6cd0, type: 3} m_Sprite: {fileID: 21300000, guid: 27e8c92516b284c6f911f866494ef5c6, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
android:value="yanmao" /> android:value="yanmao" />
<!-- 微信配置 --> <!-- 微信配置 -->
<activity <activity
android:name="com.ym.cscmnq.wxapi.WXEntryActivity" android:name="com.ym.ddcy.wxapi.WXEntryActivity"
android:exported="true" android:exported="true"
android:launchMode="singleTop"/> android:launchMode="singleTop"/>
<!-- 友盟配置 --> <!-- 友盟配置 -->
......
...@@ -35,7 +35,7 @@ public final class UnionApplication extends Application { ...@@ -35,7 +35,7 @@ public final class UnionApplication extends Application {
mApplcation = this; mApplcation = this;
AppliContext.init(this); AppliContext.init(this);
UMConfigure.setLogEnabled(true); UMConfigure.setLogEnabled(true);
UMConfigure.init(this, "608669265844f15425eb7953", "toutiao", UMConfigure.DEVICE_TYPE_PHONE,""); UMConfigure.init(this, "5f9bb48945b2b751a91fb2d5", "", UMConfigure.DEVICE_TYPE_PHONE,"");
} }
......
...@@ -13,7 +13,7 @@ PlayerSettings: ...@@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0 useOnDemandResources: 0
accelerometerFrequency: 60 accelerometerFrequency: 60
companyName: ym companyName: ym
productName: "\u5E78\u8FD0\u519C\u7530\u7B54\u9898\u9886\u798F\u5229" productName: "\u591A\u591A\u83DC\u56ED"
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}
...@@ -41,6 +41,12 @@ PlayerSettings: ...@@ -41,6 +41,12 @@ 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: 1024 defaultScreenWidth: 1024
defaultScreenHeight: 768 defaultScreenHeight: 768
...@@ -118,6 +124,7 @@ PlayerSettings: ...@@ -118,6 +124,7 @@ 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
...@@ -168,7 +175,7 @@ PlayerSettings: ...@@ -168,7 +175,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1 androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1 androidMaxAspectRatio: 2.1
applicationIdentifier: applicationIdentifier:
Android: com.ym.xynt Android: com.ym.ddcy
iPhone: com.ym.simulator iPhone: com.ym.simulator
buildNumber: buildNumber:
iPhone: 0 iPhone: 0
...@@ -270,7 +277,7 @@ PlayerSettings: ...@@ -270,7 +277,7 @@ PlayerSettings:
- m_BuildTarget: - m_BuildTarget:
m_Icons: m_Icons:
- serializedVersion: 2 - serializedVersion: 2
m_Icon: {fileID: 2800000, guid: d76b7be096b6244ee9744b113057721d, type: 3} m_Icon: {fileID: 2800000, guid: 386679950a62d451fbb9ef6fe2277577, type: 3}
m_Width: 128 m_Width: 128
m_Height: 128 m_Height: 128
m_Kind: 0 m_Kind: 0
...@@ -501,6 +508,7 @@ PlayerSettings: ...@@ -501,6 +508,7 @@ PlayerSettings:
m_Kind: 4 m_Kind: 4
m_SubKind: App Store m_SubKind: App Store
m_BuildTargetBatching: [] m_BuildTargetBatching: []
m_BuildTargetEncrypting: []
m_BuildTargetGraphicsJobs: m_BuildTargetGraphicsJobs:
- m_BuildTarget: MacStandaloneSupport - m_BuildTarget: MacStandaloneSupport
m_GraphicsJobs: 0 m_GraphicsJobs: 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