diff --git a/Assets/Art/Models/LouDi/fanwei/ShuKoufanwei.fbx b/Assets/Art/Models/LouDi/fanwei/ShuKoufanwei.fbx new file mode 100644 index 00000000..90330108 Binary files /dev/null and b/Assets/Art/Models/LouDi/fanwei/ShuKoufanwei.fbx differ diff --git a/Assets/Art/Models/LouDi/fanwei/ShuKoufanwei.fbx.meta b/Assets/Art/Models/LouDi/fanwei/ShuKoufanwei.fbx.meta new file mode 100644 index 00000000..42d65bde --- /dev/null +++ b/Assets/Art/Models/LouDi/fanwei/ShuKoufanwei.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 0aa51c373e5e7f44691889b98f96a245 +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: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index e9f1a6bc..4e9ba90c 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 1 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.13296545, g: 0.19145328, b: 0.33962262, a: 1} - m_SkyboxMaterial: {fileID: 2100000, guid: 0ffaa0b7117ba8c47a9d05ae701d4b4d, type: 2} + m_SkyboxMaterial: {fileID: 2100000, guid: db2797f054deeeb45a608c8d7b861909, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.5649007, g: 0.6356403, b: 0.72393775, a: 1} + m_IndirectSpecularColor: {r: 0.54292166, g: 0.5874881, b: 0.6115494, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: diff --git a/Assets/Scenes/Scene.unity b/Assets/Scenes/Scene.unity index 52813538..a7c571b7 100644 --- a/Assets/Scenes/Scene.unity +++ b/Assets/Scenes/Scene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.2529467, g: 0.30024895, b: 0.3282956, a: 1} + m_IndirectSpecularColor: {r: 0.5399966, g: 0.58405226, b: 0.60827893, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -3481,6 +3481,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 11.1722145 objectReference: {fileID: 0} + - target: {fileID: 2552101155883228445, guid: 749b015076c3753429774cf3f3daaffe, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2572430707552764563, guid: 749b015076c3753429774cf3f3daaffe, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 23.638388 @@ -5041,6 +5045,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -112.5156 objectReference: {fileID: 0} + - target: {fileID: 5478539109256845586, guid: 749b015076c3753429774cf3f3daaffe, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5491707465751642179, guid: 749b015076c3753429774cf3f3daaffe, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -0 @@ -5265,6 +5273,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5938842816027772198, guid: 749b015076c3753429774cf3f3daaffe, type: 3} + propertyPath: m_LocalPosition.y + value: 0.398 + objectReference: {fileID: 0} - target: {fileID: 5950545595170813821, guid: 749b015076c3753429774cf3f3daaffe, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0.7337303 @@ -6369,6 +6381,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -6.174034 objectReference: {fileID: 0} + - target: {fileID: 7517063111699424198, guid: 749b015076c3753429774cf3f3daaffe, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7523638595046932481, guid: 749b015076c3753429774cf3f3daaffe, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -1.0735705 @@ -7489,11 +7505,45 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9197810279863276835, guid: 749b015076c3753429774cf3f3daaffe, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 9197810279863276835, guid: 749b015076c3753429774cf3f3daaffe, type: 3} + insertIndex: -1 + addedObject: {fileID: 1671566006} m_SourcePrefab: {fileID: 100100000, guid: 749b015076c3753429774cf3f3daaffe, type: 3} +--- !u!1 &1671566005 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9197810279863276835, guid: 749b015076c3753429774cf3f3daaffe, type: 3} + m_PrefabInstance: {fileID: 1671566004} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1671566006 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671566005} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -5324419339400740268, guid: ca7c2d311a9415b4d94a18f5978ce78b, type: 3} --- !u!1 &1711889687 GameObject: m_ObjectHideFlags: 0 diff --git a/Data/App.xml b/Data/App.xml index 4fd0ba9a..513e8d3a 100644 --- a/Data/App.xml +++ b/Data/App.xml @@ -5,17 +5,17 @@ - + - + - + - + - + - + diff --git a/Data/Audio/Zhu/TengTongShiJiaoSheng.mp3 b/Data/Audio/Zhu/TengTongShiJiaoSheng.mp3 index c17845c9..080834fa 100644 Binary files a/Data/Audio/Zhu/TengTongShiJiaoSheng.mp3 and b/Data/Audio/Zhu/TengTongShiJiaoSheng.mp3 differ diff --git a/Data/Audio/Zhu/Z053.mp3 b/Data/Audio/Zhu/Z053.mp3 new file mode 100644 index 00000000..78801a67 Binary files /dev/null and b/Data/Audio/Zhu/Z053.mp3 differ diff --git a/Data/Xml/Pig1.xml b/Data/Xml/Pig1.xml index b7caaf28..6748a6ad 100644 --- a/Data/Xml/Pig1.xml +++ b/Data/Xml/Pig1.xml @@ -301,7 +301,7 @@ - + @@ -376,7 +376,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -432,13 +432,8 @@ - - - - - - - + + @@ -491,7 +486,7 @@ - + @@ -627,7 +622,7 @@ - + @@ -642,10 +637,12 @@ + + - + @@ -659,7 +656,7 @@ - + @@ -673,7 +670,7 @@ - + @@ -689,7 +686,7 @@ - + @@ -722,7 +719,7 @@ - + @@ -762,7 +759,7 @@ - + @@ -828,7 +825,7 @@ - + @@ -890,9 +887,10 @@ + - + @@ -912,20 +910,14 @@ - - - - - + @@ -947,12 +939,11 @@ - - + @@ -975,13 +966,12 @@ - - + @@ -1007,7 +997,7 @@ - + @@ -1036,7 +1026,7 @@ - + @@ -1049,8 +1039,14 @@ + + + + + + + - @@ -1150,7 +1146,7 @@ - + @@ -1163,7 +1159,7 @@ - + @@ -1175,7 +1171,7 @@ - + @@ -1192,7 +1188,7 @@ - + - + @@ -1306,7 +1302,7 @@ - + @@ -1417,7 +1413,7 @@ - + @@ -1549,7 +1545,7 @@ - + @@ -1566,7 +1562,7 @@ - + @@ -1637,7 +1633,7 @@ - + @@ -1656,7 +1652,7 @@ - + @@ -1689,7 +1685,7 @@ - + diff --git a/Data/Xml/Pig4.xml b/Data/Xml/Pig4.xml index b913f720..c7a4358f 100644 --- a/Data/Xml/Pig4.xml +++ b/Data/Xml/Pig4.xml @@ -30,6 +30,10 @@ + + + +