Merge remote-tracking branch 'origin/main_ZYT'

# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
This commit is contained in:
bzx
2025-10-14 10:57:38 +08:00
25 changed files with 973610 additions and 21113 deletions

View File

@@ -0,0 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1695787512151627888
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6036391029100103509}
- component: {fileID: 8370459850755508943}
- component: {fileID: 4991119681745814650}
m_Layer: 0
m_Name: "\u4E34\u6CA7\u5E02\u4E34\u7FD4\u533A\u6052\u57FA\u5E7F\u573A(\u5730\u4E0B\u573A\u666F\u4E0B\u964D\uFF09\u5730\u5F62"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6036391029100103509
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1695787512151627888}
serializedVersion: 2
m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5}
m_LocalPosition: {x: 5.683527, y: -0.0000005364418, z: 16.952724}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90}
--- !u!33 &8370459850755508943
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1695787512151627888}
m_Mesh: {fileID: -7553716758358721678, guid: 9cc6a8174e6aeea429cd1cdb048bcf04, type: 3}
--- !u!23 &4991119681745814650
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1695787512151627888}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 3446927715531741070, guid: 9cc6a8174e6aeea429cd1cdb048bcf04, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3fb71e03800e1f541b55eb87db561e75
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b33315545b7374a4885617defd8cf072
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c8e113b12c0859746ade863bd87c59bd
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,70 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &3047563408316798358
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 1406302ec1fc14b469e92179dcf2d2c3,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.26323503
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1406302ec1fc14b469e92179dcf2d2c3,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1406302ec1fc14b469e92179dcf2d2c3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.20490885
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1406302ec1fc14b469e92179dcf2d2c3,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1406302ec1fc14b469e92179dcf2d2c3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1406302ec1fc14b469e92179dcf2d2c3,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1406302ec1fc14b469e92179dcf2d2c3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1406302ec1fc14b469e92179dcf2d2c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1406302ec1fc14b469e92179dcf2d2c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1406302ec1fc14b469e92179dcf2d2c3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 1406302ec1fc14b469e92179dcf2d2c3,
type: 3}
propertyPath: m_Name
value: "\u7518\u8083\u91D1\u660C\u5730\u5F62"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1406302ec1fc14b469e92179dcf2d2c3, type: 3}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: bd494f95c18e2c94eab52f3e3311042a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -9641,7 +9641,7 @@ MonoBehaviour:
IncludeChildColliders: 0
RuntimeFollower: {fileID: 0}
colliderMaxDistance: 100
lastTimeMaxDistanceCalced: 638948567900572670
lastTimeMaxDistanceCalced: 638959466715667070
--- !u!82 &675942809
AudioSource:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8acc03c01fa495e46ab61cbd7b6f277f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -9641,7 +9641,7 @@ MonoBehaviour:
IncludeChildColliders: 0
RuntimeFollower: {fileID: 0}
colliderMaxDistance: 100
lastTimeMaxDistanceCalced: 638948562745121642
lastTimeMaxDistanceCalced: 638959466612043820
--- !u!82 &675942809
AudioSource:
m_ObjectHideFlags: 0

View File

@@ -9641,7 +9641,7 @@ MonoBehaviour:
IncludeChildColliders: 0
RuntimeFollower: {fileID: 0}
colliderMaxDistance: 100
lastTimeMaxDistanceCalced: 638948543099908134
lastTimeMaxDistanceCalced: 638959466464150231
--- !u!82 &675942809
AudioSource:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0fe651c1fb955904688361a328dc07f7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b5e8b773833e3c6428add186d3377dc7
guid: dc51f151175283c4e9315b04d47ec85b
DefaultImporter:
externalObjects: {}
userData:

View File

@@ -9714,7 +9714,7 @@ MonoBehaviour:
IncludeChildColliders: 0
RuntimeFollower: {fileID: 0}
colliderMaxDistance: 100
lastTimeMaxDistanceCalced: 638957156454619363
lastTimeMaxDistanceCalced: 638959466865216895
--- !u!82 &675942809
AudioSource:
m_ObjectHideFlags: 0

View File

@@ -44,12 +44,14 @@ public enum Place
Guangxi_Guilin_Gongcheng_Shijixincheng = 26,
Guangdong_Shenzhen_Guangming_Wanda = 27,
Gansu_Jinchang_Jinchuan_Shijiguangchang = 28,
Gansu_Jinchang_Jinchuan_Shijiguangchang_Shiwai = -28,
Jiangsu_Xvzhou_Fengxian_Wuyueguangchang = 29,
Hebei_Tangshan_Qianan_Tianyuangu = 30,
Guangdong_Guangzhou_Yanghaiyan = 31,
Zhejiang_Hangzhou_Linping_Yintaicheng = 32,
Zhejiang_Hangzhou_Linping_Yintaicheng_Shinei = -32,
Henan_Xinxiang_Wandaguangchang =33,
Yangzhou_Hanjiang_TansuoZhongxin_Waidai=34,
}
public class GameLocal : MonoBehaviour
@@ -153,6 +155,8 @@ public class GameLocal : MonoBehaviour
authInfo.shop = 24;
if (place == Place.Yunnan_Lincang_Linxiang_Hengji_Dixia)
authInfo.shop = 25;
if (place == Place.Gansu_Jinchang_Jinchuan_Shijiguangchang_Shiwai)
authInfo.shop = 28;
if (place == Place.Zhejiang_Hangzhou_Linping_Yintaicheng_Shinei)
authInfo.shop = 32;
#endif

View File

@@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 9cc6a8174e6aeea429cd1cdb048bcf04
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 1406302ec1fc14b469e92179dcf2d2c3
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -5,7 +5,7 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 1
- enabled: 0
path: Assets/_DefendNJ/Scenes/Company1Floor.unity
guid: 386a8fdea01af8a4e8d4a9835407ddec
- enabled: 0
@@ -15,32 +15,53 @@ EditorBuildSettings:
path: Assets/_DefendNJ/Scenes/Hunan_Jishou_Qianzhou_Tianhong.unity
guid: 15bec8e23f1f06d49b8084000e731910
- enabled: 0
path: Assets/_DefendNJ/Scenes/Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang.unity
guid: 526bb168d35701b4e93732c35c91281f
path: Assets/_DefendNJ/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang.unity
guid: 3c141df7b52e0144385878e9b9b150a4
- enabled: 0
path: Assets/_DefendNJ/Scenes/Anhui_Suzhou_Yueshan_Guchengshangyejie.unity
guid: 3e32348f02568284193bf2d26d81663e
path: Assets/_DefendNJ/Scenes/Anhui_Wuhu_Guanwei.unity
guid: 93f169c3e51949a42bef931c4e963461
- enabled: 0
path: Assets/_DefendNJ/Scenes/Liaoning_AnShan_Lishan_Dayuecheng.unity
guid: 6fbdad0310441094a8abaef5f607549a
path: Assets/_DefendNJ/Scenes/Yangzhou_Hanjiang_TansuoZhongxin_wai.unity
guid: 94d8d7ac0e35bd14c9283f95bb9696b2
- enabled: 0
path: Assets/_DefendNJ/Scenes/Jiangsu_Xvzhou_Fengxian_Wuyueguangchang.unity
guid: e6db36e7e5816924e8e3f8deb9e6a876
path: Assets/_DefendNJ/Scenes/Zhejiang_Jinhua_KeJiGuan.unity
guid: ee8ac8ae5da286746b4c88a31ee3ab9b
- enabled: 0
path: Assets/_DefendNJ/Scenes/Yunnan_Lincang_Linxiang_Hengji_Dixia.unity
guid: b5e8b773833e3c6428add186d3377dc7
path: Assets/_DefendNJ/Scenes/Hunan_Hengyang_Zhuhui_Dongzhoudao.unity
guid: 74cfb82e575878345bc314a057f7cdb1
- enabled: 0
path: Assets/_DefendNJ/Scenes/Xinjiang_Yili_Yining_Wanrong.unity
guid: 3665dcc7f499345429417291b4906d10
path: Assets/_DefendNJ/Scenes/Hebei_Tangshan_Qianan_Tianyuangu.unity
guid: e0a10c7260a1b4d4f9fcc45d7358208a
- enabled: 0
path: Assets/_DefendNJ/Scenes/Yunnan_Mile_Jinchen_Shidaiguangchang.unity
guid: 0006e0aed8a54134fa3b578eeef1cf11
path: Assets/_DefendNJ/Scenes/Yangzhou_Hanjiang_TansuoZhongxin.unity
guid: 1bdd47f14a3e3a646a8c6a0857e7a2d9
- enabled: 0
path: Assets/_DefendNJ/Scenes/Wulanhaote_Ouya_Shangchang.unity
guid: 331973b43fed1604b865a3c3301bf234
path: Assets/_DefendNJ/Scenes/Zhejiang_Hangzhou_Linping_Yintaicheng.unity
guid: 5eb1fc4253341904ebb72f140bcc7256
- enabled: 0
path: Assets/_DefendNJ/Scenes/Guangxi_Guilin_Gongcheng_Shijixincheng.unity
guid: b86ec6dd71d2ec1419aff5bfea1d40cd
- enabled: 0
path: Assets/_DefendNJ/Scenes/Gansu_Jinchang_Jinchuan_Shijiguangchang.unity
guid: c58dd3cb24df2a54d9892ef936e7a33f
- enabled: 0
path: Assets/_DefendNJ/Scenes/Wulanhaote_Wanda_Shangchang.unity
guid: ff3aac23b099ee24ead32467d6440a6d
- enabled: 0
path: Assets/_DefendNJ/Scenes/Henan_Xinxiang_Wandaguangchang.unity
guid: 1bcf1014ef734a84ebb8299d97f116c0
- enabled: 0
path: Assets/_DefendNJ/Scenes/Zhejiang_Hangzhou_Linping_Yintaicheng_Shinei.unity
guid: fb54f32cfb20d284faaa1f29ffd58371
- enabled: 0
path: Assets/_DefendNJ/Scenes/Yunnan_Lincang_Linxiang_Hengji_Dixia.unity
guid: dc51f151175283c4e9315b04d47ec85b
- enabled: 0
path: Assets/_DefendNJ/Scenes/Gansu_Jinchang_Jinchuan_Shijiguangchang_Shiwai.unity
guid: 8acc03c01fa495e46ab61cbd7b6f277f
- enabled: 1
path: Assets/_DefendNJ/Scenes/Yangzhou_Hanjiang_TansuoZhongxin_Waidai.unity
guid: 0fe651c1fb955904688361a328dc07f7
m_configObjects:
Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
type: 2}

View File

@@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: pineappletech
productName: "\u4FDD\u536B\u91D1\u9675"
productName: "\u4FDD\u536B\u91D1\u9675_\u5916\u5E26"
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -163,7 +163,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.pineappletech.defendjinling.gongsi1lou
Android: com.pineappletech.defendjinling.yangzhouhanjiangtansuozhongxinwaidai
Standalone: com.DefaultCompany.com.unity.template.ar
buildNumber:
Standalone: 0