diff --git a/Assets/_Zombie/Scenes/Guangdong_Meizhou_Meixian_TianhongShangchang.unity b/Assets/_Zombie/Scenes/Guangdong_Meizhou_Meixian_TianhongShangchang.unity index 629ff475..b3f53402 100644 --- a/Assets/_Zombie/Scenes/Guangdong_Meizhou_Meixian_TianhongShangchang.unity +++ b/Assets/_Zombie/Scenes/Guangdong_Meizhou_Meixian_TianhongShangchang.unity @@ -7260,7 +7260,7 @@ MonoBehaviour: IncludeChildColliders: 0 RuntimeFollower: {fileID: 0} colliderMaxDistance: 100 - lastTimeMaxDistanceCalced: 639045154691048452 + lastTimeMaxDistanceCalced: 639046710503862871 --- !u!1 &679496949 GameObject: m_ObjectHideFlags: 0 @@ -11284,7 +11284,7 @@ Transform: m_GameObject: {fileID: 1055672619} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.52, y: 0, z: 1.26} + m_LocalPosition: {x: 0.5, y: 0, z: 2.24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -11920,7 +11920,7 @@ Transform: m_GameObject: {fileID: 1128989867} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.04, y: 0, z: -0.56} + m_LocalPosition: {x: 1.57, y: 0, z: 0.14} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -16501,6 +16501,16 @@ PrefabInstance: propertyPath: m_Layer value: 3 objectReference: {fileID: 0} + - target: {fileID: 7728216681710882664, guid: 4bafd252883bc0a4497677d09db78edf, + type: 3} + propertyPath: m_LocalPosition.x + value: 16.69 + objectReference: {fileID: 0} + - target: {fileID: 7728216681710882664, guid: 4bafd252883bc0a4497677d09db78edf, + type: 3} + propertyPath: m_LocalPosition.z + value: -6.06 + objectReference: {fileID: 0} - target: {fileID: 7746347934944296680, guid: 4bafd252883bc0a4497677d09db78edf, type: 3} propertyPath: m_Layer @@ -16699,6 +16709,7 @@ PrefabInstance: - {fileID: 8554972562835404292, guid: 4bafd252883bc0a4497677d09db78edf, type: 3} - {fileID: 8046944854677527222, guid: 4bafd252883bc0a4497677d09db78edf, type: 3} - {fileID: 9134954933615970813, guid: 4bafd252883bc0a4497677d09db78edf, type: 3} + - {fileID: 6511908554205835989, guid: 4bafd252883bc0a4497677d09db78edf, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 7313517071151561347, guid: 4bafd252883bc0a4497677d09db78edf, type: 3} @@ -18347,7 +18358,7 @@ Transform: m_GameObject: {fileID: 1674039075} serializedVersion: 2 m_LocalRotation: {x: 0.0034169469, y: 0.6828598, z: 0.015391782, w: 0.7303794} - m_LocalPosition: {x: 18.84, y: 8.66, z: -9.32} + m_LocalPosition: {x: 21.26, y: 8.73, z: -10.01} m_LocalScale: {x: 0.57245, y: 0.57245, z: 0.57245} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/_Zombie/Scripts/GameLocal.cs b/Assets/_Zombie/Scripts/GameLocal.cs index df0d86aa..7c491599 100644 --- a/Assets/_Zombie/Scripts/GameLocal.cs +++ b/Assets/_Zombie/Scripts/GameLocal.cs @@ -105,6 +105,7 @@ public enum Place Guangdong_Meizhou_Meixian_TianhongShangchang = 61, Beijing_Tongzhou_Luyijie_XiangrikuiGuangchang = 62, Ningxia_Yinchuang_Shizuishan_WandaGuangchang = 63, + Jilin_Jilin_Chuangying_Zhongdongxinshenghuo = 64, } diff --git a/Assets/sucai/Apocalyptic_World/Art/Materials/Veg_Tree_Fir.mat b/Assets/sucai/Apocalyptic_World/Art/Materials/Veg_Tree_Fir.mat new file mode 100644 index 00000000..7a15ed56 --- /dev/null +++ b/Assets/sucai/Apocalyptic_World/Art/Materials/Veg_Tree_Fir.mat @@ -0,0 +1,168 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2761689945903823880 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Veg_Tree_Fir + m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + - _COLORCOLOR_ON + - _EMISSION + m_InvalidKeywords: + - _FLIPBOOKBLENDING_OFF + m_LightmapFlags: 0 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - GRABPASS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: f312e052c4b89e2429a00e05c179a0d0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f312e052c4b89e2429a00e05c179a0d0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TerrainHolesTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BlendOp: 0 + - _BumpScale: 0.5 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 4 + - _Cull: 0 + - _Cutoff: 0.332 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EmissionEnabled: 0 + - _EnableExternalAlpha: 0 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.446 + - _GlossyReflections: 1 + - _LightingEnabled: 1 + - _Metallic: 0.38 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _ShadowStrength: 1 + - _Smoothness: 0.446 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SquashAmount: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _TranslucencyViewDependency: 0.551 + - _UVSec: 0 + - _WindQuality: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1.0592737, g: 1.0592737, b: 0.74870133, a: 1} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 1.0592737, g: 1.0592737, b: 0.74870133, a: 1} + - _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0} + - _EmisColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _HueVariation: {r: 1, g: 0.5, b: 0, a: 0.1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + - _TranslucencyColor: {r: 0.3144731, g: 0.3207547, b: 0.2980598, a: 1} + - _TreeInstanceColor: {r: 1, g: 1, b: 1, a: 1} + - _TreeInstanceScale: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/sucai/Apocalyptic_World/Art/Materials/Veg_Tree_Fir.mat.meta b/Assets/sucai/Apocalyptic_World/Art/Materials/Veg_Tree_Fir.mat.meta new file mode 100644 index 00000000..e03cf314 --- /dev/null +++ b/Assets/sucai/Apocalyptic_World/Art/Materials/Veg_Tree_Fir.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e03a4c5b89792474ebd4794f374f470a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/sucai/包图标.png b/Assets/sucai/包图标.png new file mode 100644 index 00000000..c784de56 Binary files /dev/null and b/Assets/sucai/包图标.png differ diff --git a/Assets/sucai/包图标.png.meta b/Assets/sucai/包图标.png.meta new file mode 100644 index 00000000..b8509270 --- /dev/null +++ b/Assets/sucai/包图标.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 764f7bd8ab79d234db8db091e414ce9c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 6f43c932..01f415e9 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -188,9 +188,15 @@ EditorBuildSettings: - enabled: 0 path: Assets/_Zombie/Scenes/Shandong_Weifang_Linqu_WandaGuangchang_Shinei.unity guid: 75df82cb2511b9540bd6a7f17b80f2ba - - enabled: 1 + - enabled: 0 path: Assets/_Zombie/Scenes/Ningxia_Yinchuang_Shizuishan_WandaGuangchang.unity guid: 525c186856248874bbe8a21e8d004e40 + - enabled: 0 + path: Assets/_Zombie/Scenes/Guangdong_Meizhou_Meixian_TianhongShangchang.unity + guid: 837514a25419ccc4192b3f9e9f977ed4 + - enabled: 1 + path: Assets/_Zombie/Scenes/Jilin_Jilin_Chuangying_Zhongdongxinshenghuo.unity + guid: 3d8d235cd72a3c84690e13e75d1a13fb m_configObjects: Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 7022d09e..b30d437c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: pineappletech - productName: "\u50F5\u5C38\u6765\u4E86_\u77F3\u5634\u5C71" + productName: "\u50F5\u5C38\u6765\u4E86" defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -142,9 +142,7 @@ PlayerSettings: visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 bundleVersion: 1.0.2 - preloadedAssets: - - {fileID: 1814176829808956018, guid: 58f40b12bbc864f3c96c6505a9a1e1e3, type: 2} - - {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -165,7 +163,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.pineappletech.zombie.ningxiayinchuangshizuishangwandaguangchang + Android: com.pineappletech.zombie.jilinjilinchuangyingzhongdongxinshenghuo Standalone: com.DefaultCompany.com.unity.template.ar buildNumber: Standalone: 0