diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 29730a3d19..e2f0b0d762 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 712e3991f28e549e7a56ee582a977810 m_currentHash: serializedVersion: 2 - Hash: d7ea27f22d507888a9e5476f10563211 + Hash: 00000000000000000000000000000000 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/models.asset b/Assets/AddressableAssetsData/AssetGroups/models.asset index 90cb01caf4..0916183d61 100644 --- a/Assets/AddressableAssetsData/AssetGroups/models.asset +++ b/Assets/AddressableAssetsData/AssetGroups/models.asset @@ -1699,6 +1699,12 @@ MonoBehaviour: - equipment - models FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 1442e7dcfba1366488f9abeab708864a + m_Address: "models/npcs/\u602A\u7269/32\u7269\u54C1\u5996/\u9B54\u6CD5\u5C01\u5370\u7684\u5B9D\u7BB1/\u9B54\u6CD5\u5C01\u5370\u7684\u5B9D\u7BB1\u5C0F.ecm" + m_ReadOnly: 0 + m_SerializedLabels: + - models + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 14581b8af110f2547a48143cb80e5798 m_Address: "models/players/\u88C5\u5907/\u5973/13b\u6B66\u4FA0\u804C\u4E1A\u88C5\u4E0A\u8863/\u5973\u901A\u752813b\u6B66\u4FA0\u804C\u4E1A\u88C5\u4E0A\u8863.ecm" m_ReadOnly: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖.meta b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖.meta new file mode 100644 index 0000000000..b5298be289 --- /dev/null +++ b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e91d249ceb608ee4bb7b880be5e7a448 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱.meta b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱.meta new file mode 100644 index 0000000000..1ead6ef743 --- /dev/null +++ b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4bd1ac89ebb2164ab48076ee3cbb56b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱.meta b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱.meta new file mode 100644 index 0000000000..c9f6be6fbe --- /dev/null +++ b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 390d29f03a8935448bef8884b836b7d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.mat b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.mat new file mode 100644 index 0000000000..d0e4cb77fa --- /dev/null +++ b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3115309107172234749 +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: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Box01_0 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 914f1d1ec5673224388f8ae4eb93958a, 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} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 914f1d1ec5673224388f8ae4eb93958a, 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} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.001 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.mat.meta b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.mat.meta new file mode 100644 index 0000000000..275d336650 --- /dev/null +++ b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5722cad6c9220a248b32d02be1e7015f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.mesh b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.mesh new file mode 100644 index 0000000000..b9b34d3e52 --- /dev/null +++ b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.mesh @@ -0,0 +1,203 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!43 &4300000 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Box01_0 + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 66 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 32 + localAABB: + m_Center: {x: 0.004867792, y: 0.29433393, z: 0.000000014901161} + m_Extent: {x: 0.4090197, y: 0.2940315, z: 0.27242136} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: + - e00: -0.016946318 + e01: 0.9998566 + e02: 0.000000029802326 + e03: -0.039453417 + e10: -0.00000008940697 + e11: -0.00000011920929 + e12: 1 + e13: 0.000000006428704 + e20: 0.9998565 + e21: 0.016946256 + e22: 0 + e23: -0.0006686648 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: + - m_Min: {x: -0.046164893, y: -0.27242136, z: -0.40475747} + m_Max: {x: 0.55567646, y: 0.27242136, z: 0.42313} + - m_Min: {x: Infinity, y: Infinity, z: Infinity} + m_Max: {x: -Infinity, y: -Infinity, z: -Infinity} + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 0200010000000000030002000600050004000400070006000a00090008000c000b000a000d000c000a000d000a0008000e000d000800110010000f000f00120011001500140013001700160015001800170015001800150013001900180013001c001b001a001a001d001c0002001f001e001e00010002001f001c001d001d001e001f00 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 32 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 2 + offset: 0 + format: 0 + dimension: 4 + - stream: 2 + offset: 16 + format: 10 + dimension: 4 + m_DataSize: 2048 + _typelessdata: 00edcebe4ecbb83ecb7a8b3e22830bb47a3b0b3f8cd3563fffeccebea1b7093fe477213e02bde6b3d783443f0f11243f0ee9d33ea1b7093fed77213e3dfbdcb3d783443f0f11243f0de9d33e4ecbb83ecf7a8b3e3e4e03b4793b0b3f8cd3563f0de9d33e73949e39d17a8b3ef29643b46878b1330000803f00edcebe73949e39cb7a8b3e22b56ab4000000000000803f00edcebe4ecbb83ecb7a8b3ef29643b46878b1330000803f0de9d33e4ecbb83ecf7a8b3ec2781cb4687831340000803f00edcebe73949e39cb7a8b3e000080bff5e251329c3230b4fdeccebea1919e39cf7a8bbe000080bfb94b74a89c3230b4fdeccebe4ecbb83ed07a8bbe000080bf99531bb2aeb51db4feeccebea1b7093fed7721be000080bfed6278b3441637b4ffeccebe1e9f163f6db8a3b3000080bf5ddb1fb403f0cab3ffeccebea1b7093fe477213e000080bfc8802bb2ac1a20b400edcebe4ecbb83ecb7a8b3e000080bf00000000f0728bb4fdeccebea1919e39cf7a8bbec1781c346778b1b3000080bf10e9d33ea1919e39cb7a8bbec1781c346778b1b3000080bf10e9d33e4ecbb83ecc7a8bbec1781c346778b1b3000080bffdeccebe4ecbb83ed07a8bbec1781c346778b1b3000080bf10e9d33ea1919e39cb7a8bbe0000803f0de351329d3230340de9d33e73949e39d17a8b3e0000803fba4bf4289c3230340de9d33e4ecbb83ecf7a8b3e0000803f89531bb2b1b51d340ee9d33ea1b7093fed77213e0000803ff66278b3421637340fe9d33e1e9f163f589d82330000803f5edb1fb403f0ca330fe9d33ea1b7093fe57721be0000803fc1802bb2ad1a203410e9d33e4ecbb83ecc7a8bbe0000803f1b58c128ef728b34fdeccebe4ecbb83ed07a8bbe0ff6fe337c3b0b3f8cd356bf10e9d33e4ecbb83ecc7a8bbe0ff6fe337c3b0b3f8cd356bf0fe9d33ea1b7093fe57721be80b2de33a404313f19ef38bffeeccebea1b7093fed7721bedfe3ab33b908573f4be90abfffeccebe1e9f163f6db8a3b3d802b9b2128f7e3f5300d93d0fe9d33e1e9f163f589d823375ae7632128f7e3f5300d9bd0000013f000000000000013f0000d03d00007f3f0000d03d00007f3f000000000000fe3e00007f3f0000803b00007f3f0000803b0000433f0000fe3e0000433f0000013f0000803f00007f3f0000803f00007f3f0000463f0000633f00002a3f00003f3f0000233f00001a3f00002a3f0000013f0000463f0000013f0000203f00007f3f0000203f00007f3f0000c43e0000013f0000c43e0000013f0000803f00007f3f0000803f00007f3f0000463f0000633f00002a3f00003f3f0000233f00001a3f00002a3f0000013f0000463f0000013f0000c43e00007f3f0000c43e00007f3f0000923e0000013f0000923e0000013f0000443e00007f3f0000443e0000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f000000000000000000000000000000000000000000000000000000000000803f00000000000000000000000000000000000000000000000000000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0.004867792, y: 0.29433393, z: 0.000000014901161} + m_Extent: {x: 0.4090197, y: 0.2940315, z: 0.27242136} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: diff --git a/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.mesh.meta b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.mesh.meta new file mode 100644 index 0000000000..2644c989c9 --- /dev/null +++ b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.mesh.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58c1a2d10ae2b914a88a2281bb5bf96a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4300000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.prefab b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.prefab new file mode 100644 index 0000000000..6f15d27837 --- /dev/null +++ b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.prefab @@ -0,0 +1,119 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6140007671914382511 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8903825486503764437} + - component: {fileID: 8750203408594128925} + - component: {fileID: 5166826509143948991} + - component: {fileID: 5459939725609795997} + m_Layer: 0 + m_Name: Box01_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8903825486503764437 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6140007671914382511} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8750203408594128925 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6140007671914382511} + m_Mesh: {fileID: 4300000, guid: 58c1a2d10ae2b914a88a2281bb5bf96a, type: 2} +--- !u!137 &5166826509143948991 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6140007671914382511} + 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: 3 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5722cad6c9220a248b32d02be1e7015f, type: 2} + 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 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 4300000, guid: 58c1a2d10ae2b914a88a2281bb5bf96a, type: 2} + m_Bones: + - {fileID: 0} + - {fileID: 0} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 0} + m_AABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_DirtyAABB: 0 +--- !u!114 &5459939725609795997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6140007671914382511} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2189a384460241f89635c90802d6c270, type: 3} + m_Name: + m_EditorClassIdentifier: + _skeletonBuilder: {fileID: 0} + _meshFilter: {fileID: 8750203408594128925} + _skinnedMeshRenderer: {fileID: 5166826509143948991} + BoneNames: + - Bone02 diff --git a/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.prefab.meta b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.prefab.meta new file mode 100644 index 0000000000..1cf58a4f14 --- /dev/null +++ b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱/Box01_0.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3ea4854beb922e24fb53875ae9bb6740 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱小.prefab b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱小.prefab new file mode 100644 index 0000000000..f609e73e24 --- /dev/null +++ b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱小.prefab @@ -0,0 +1,380 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2142465482498032316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9116329449756975279} + - component: {fileID: 5602719492404425111} + m_Layer: 0 + m_Name: "\u9B54\u6CD5\u5C01\u5370\u7684\u5B9D\u7BB1" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9116329449756975279 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142465482498032316} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1682221397893027975} + - {fileID: 2287142222681038928} + - {fileID: 6560746386147567036} + m_Father: {fileID: 2504815096422338851} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!95 &5602719492404425111 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142465482498032316} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &2342673677820808233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5751786341065879054} + m_Layer: 0 + m_Name: HH_fx01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5751786341065879054 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2342673677820808233} + serializedVersion: 2 + m_LocalRotation: {x: -0.0000000305647, y: 0.70108974, z: 0.00000003005105, w: 0.7130731} + m_LocalPosition: {x: 0.27565014, y: 8.647188e-11, z: 0.003151229} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4632241631221141121} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4838574376121939473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1682221397893027975} + - component: {fileID: 2675749075624738704} + - component: {fileID: 6676038990753274020} + m_Layer: 0 + m_Name: CustomMeshRender + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1682221397893027975 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4838574376121939473} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9116329449756975279} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2675749075624738704 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4838574376121939473} + m_Mesh: {fileID: 0} +--- !u!137 &6676038990753274020 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4838574376121939473} + 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: 3 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + 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 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 0} + m_Bones: [] + m_BlendShapeWeights: [] + m_RootBone: {fileID: 0} + m_AABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_DirtyAABB: 0 +--- !u!1 &5034815621241663843 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2504815096422338851} + - component: {fileID: 2886303939034520672} + m_Layer: 0 + m_Name: "\u9B54\u6CD5\u5C01\u5370\u7684\u5B9D\u7BB1\u5C0F" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2504815096422338851 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5034815621241663843} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9116329449756975279} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2886303939034520672 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5034815621241663843} + 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: 3 + m_Size: {x: 1, y: 0.58143216, z: 0.54702204} + m_Center: {x: 0, y: 0.2912911, z: -0.0027312338} +--- !u!1 &8235708353750757754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2287142222681038928} + m_Layer: 0 + m_Name: 000 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2287142222681038928 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8235708353750757754} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4632241631221141121} + m_Father: {fileID: 9116329449756975279} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &9203708403987941035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4632241631221141121} + m_Layer: 0 + m_Name: Bone02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4632241631221141121 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9203708403987941035} + serializedVersion: 2 + m_LocalRotation: {x: 0.49574533, y: 0.50421876, z: 0.5042188, w: 0.49574536} + m_LocalPosition: {x: -0.000000018803775, y: 0.039459076, z: -0.0000000017248172} + m_LocalScale: {x: 0.99999994, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5751786341065879054} + m_Father: {fileID: 2287142222681038928} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2349975245296796777 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9116329449756975279} + m_Modifications: + - target: {fileID: 5166826509143948991, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 2287142222681038928} + - target: {fileID: 5166826509143948991, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: 'm_Bones.Array.data[0]' + value: + objectReference: {fileID: 4632241631221141121} + - target: {fileID: 5166826509143948991, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: 'm_Bones.Array.data[1]' + value: + objectReference: {fileID: 2287142222681038928} + - target: {fileID: 6140007671914382511, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: m_Name + value: Box01_0 + objectReference: {fileID: 0} + - target: {fileID: 8903825486503764437, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8903825486503764437, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8903825486503764437, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8903825486503764437, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8903825486503764437, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8903825486503764437, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8903825486503764437, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8903825486503764437, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8903825486503764437, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8903825486503764437, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 5459939725609795997, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} +--- !u!4 &6560746386147567036 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8903825486503764437, guid: 3ea4854beb922e24fb53875ae9bb6740, type: 3} + m_PrefabInstance: {fileID: 2349975245296796777} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱小.prefab.meta b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱小.prefab.meta new file mode 100644 index 0000000000..931a318554 --- /dev/null +++ b/Assets/ModelRenderer/Art/Models/models/npcs/怪物/32物品妖/魔法封印的宝箱/魔法封印的宝箱小.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1442e7dcfba1366488f9abeab708864a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖.meta b/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖.meta new file mode 100644 index 0000000000..7e84fb5860 --- /dev/null +++ b/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87f438b49a50c704f89eb173bedc5588 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖/魔法封印的宝箱.meta b/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖/魔法封印的宝箱.meta new file mode 100644 index 0000000000..90ebd3a166 --- /dev/null +++ b/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖/魔法封印的宝箱.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 56f4c39291f183847bd5aaaf3fb10d28 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖/魔法封印的宝箱/textures.meta b/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖/魔法封印的宝箱/textures.meta new file mode 100644 index 0000000000..c47657312e --- /dev/null +++ b/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖/魔法封印的宝箱/textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26996bc8b154b9a4db3ac53deae61246 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖/魔法封印的宝箱/textures/魔法封印的宝箱.png b/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖/魔法封印的宝箱/textures/魔法封印的宝箱.png new file mode 100644 index 0000000000..bbbc9e2c35 Binary files /dev/null and b/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖/魔法封印的宝箱/textures/魔法封印的宝箱.png differ diff --git a/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖/魔法封印的宝箱/textures/魔法封印的宝箱.png.meta b/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖/魔法封印的宝箱/textures/魔法封印的宝箱.png.meta new file mode 100644 index 0000000000..cb57ed0ad5 --- /dev/null +++ b/Assets/ModelRenderer/Art/Textures/models/npcs/怪物/32物品妖/魔法封印的宝箱/textures/魔法封印的宝箱.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 914f1d1ec5673224388f8ae4eb93958a +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: 4 + 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: 4 + 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: 4 + 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 + - serializedVersion: 4 + buildTarget: iOS + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PerfectWorld/Prefab/UI/JumpBtn.prefab b/Assets/PerfectWorld/Prefab/UI/JumpBtn.prefab new file mode 100644 index 0000000000..1db10eff5a --- /dev/null +++ b/Assets/PerfectWorld/Prefab/UI/JumpBtn.prefab @@ -0,0 +1,272 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6426564401230013186 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3325367652782365102} + - component: {fileID: 6868997766477093256} + - component: {fileID: 2867419621240194058} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3325367652782365102 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6426564401230013186} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 266017875005995358} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.9228058, y: 0.69200134} + m_SizeDelta: {x: -78.8826, y: -78.8826} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6868997766477093256 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6426564401230013186} + m_CullTransparentMesh: 1 +--- !u!114 &2867419621240194058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6426564401230013186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: JUMP + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 44.7 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6792439420010771896 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 266017875005995358} + - component: {fileID: 5557092053757495849} + - component: {fileID: 3695308113943472152} + - component: {fileID: 1194531703109065144} + - component: {fileID: 4432331937269434665} + m_Layer: 5 + m_Name: JumpBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &266017875005995358 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6792439420010771896} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3325367652782365102} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -61, y: 46} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 1, y: 0} +--- !u!222 &5557092053757495849 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6792439420010771896} + m_CullTransparentMesh: 1 +--- !u!114 &3695308113943472152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6792439420010771896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1194531703109065144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6792439420010771896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3695308113943472152} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4432331937269434665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6792439420010771896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6149141837cadc4baae427c4864833e, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/PerfectWorld/Prefab/UI/JumpBtn.prefab.meta b/Assets/PerfectWorld/Prefab/UI/JumpBtn.prefab.meta new file mode 100644 index 0000000000..6f0963e6b7 --- /dev/null +++ b/Assets/PerfectWorld/Prefab/UI/JumpBtn.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0104938c092195b40ab7f3b6e5bf342e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs b/Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs index 7ebe15b0b9..2ce3d28d84 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs @@ -19,27 +19,7 @@ namespace BrewMonster } if (Input.GetKeyDown(KeyCode.Space)) { - //if (bInAutoMode) return; - if (IsJumpInWater() || IsFlying()) - return; - - if (IsUnderWater()) - { - if (!CanTakeOffWater()) - return; - else if (_JumpTime <= 0) - { - _JumpTime = Time.realtimeSinceStartup; - return; - } - else if ((Time.realtimeSinceStartup - _JumpTime) < 1f) // logic in c++, _JumpTime is milisecond - return; - else - _JumpTime = -1f; - } - - m_GndInfo.bOnGround = GroundCheck(out lastGroundHit); - OnMsgHstJump(); + OnClickBtnJump(); } } @@ -208,5 +188,29 @@ namespace BrewMonster PlayAction((int)PLAYER_ACTION_TYPE.ACT_JUMP_LOOP, false, 0, true); } + public void OnClickBtnJump() + { + //if (bInAutoMode) return; + if (IsJumpInWater() || IsFlying()) + return; + + if (IsUnderWater()) + { + if (!CanTakeOffWater()) + return; + else if (_JumpTime <= 0) + { + _JumpTime = Time.realtimeSinceStartup; + return; + } + else if ((Time.realtimeSinceStartup - _JumpTime) < 1f) // logic in c++, _JumpTime is milisecond + return; + else + _JumpTime = -1f; + } + + m_GndInfo.bOnGround = GroundCheck(out lastGroundHit); + OnMsgHstJump(); + } } } diff --git a/Assets/PerfectWorld/Scripts/Move/EC_CDR.cs b/Assets/PerfectWorld/Scripts/Move/EC_CDR.cs index c32d5ba7c1..a6a60bede3 100644 --- a/Assets/PerfectWorld/Scripts/Move/EC_CDR.cs +++ b/Assets/PerfectWorld/Scripts/Move/EC_CDR.cs @@ -101,34 +101,44 @@ namespace BrewMonster pEnvTrc.fFraction = 100.0f; pEnvTrc.bStartSolid = false; pEnvTrc.dwClsFlag = 0; + Vector3 vStart = EC_Utility.ToVector3(pEnvTrc.vStart); + Vector3 vExt = EC_Utility.ToVector3(pEnvTrc.vExt); + Vector3 vDelta = EC_Utility.ToVector3(pEnvTrc.vDelta); + Vector3 vTerStart = EC_Utility.ToVector3(pEnvTrc.vTerStart); + Vector3 dir = Vector3.zero; + if ((pEnvTrc.dwCheckFlag & CDR_EVN.CDR_BRUSH) == CDR_EVN.CDR_BRUSH) { - BrushTraceInfo bruInfo = new BrushTraceInfo(); - bruInfo.Init(pEnvTrc.vStart, pEnvTrc.vDelta, pEnvTrc.vExt); - if (AABBCollideWithBrush(ref bruInfo)) + dir = vStart + vDelta; + if (Physics.BoxCast(vStart, vExt, dir, out RaycastHit hit, Quaternion.identity, vDelta.magnitude, 1 << 7)) { - pEnvTrc.fFraction = bruInfo.fFraction; - pEnvTrc.vHitNormal = bruInfo.ClipPlane.GetNormal(); - pEnvTrc.bStartSolid = bruInfo.bStartSolid; + pEnvTrc.fFraction = (hit.distance - vExt.x) / vDelta.magnitude; + pEnvTrc.vHitNormal = EC_Utility.ToA3DVECTOR3(hit.normal); pEnvTrc.dwClsFlag = CDR_EVN.CDR_BRUSH; } + else + { + pEnvTrc.fFraction = 1f; + } } if ((pEnvTrc.dwCheckFlag & CDR_EVN.CDR_TERRAIN) == CDR_EVN.CDR_TERRAIN) { - float fFraction = 0f; - A3DVECTOR3 vTerNormal = new A3DVECTOR3(); - bool bStart = false; - if (CollideWithTerrain(pEnvTrc.vTerStart, pEnvTrc.vDelta, ref fFraction, ref vTerNormal, ref bStart) - && (fFraction < pEnvTrc.fFraction)) + float fFractionTerrain = 0f; + dir = vDelta; + if (Physics.Raycast(vTerStart, dir.normalized, out RaycastHit hit, vDelta.magnitude, 1<<6)) { - //assert(fFraction >= 0.0f); - //pEnvTrc.fFraction = a_Max(0.0f, fFraction - 1E-4f); - pEnvTrc.fFraction = fFraction; - pEnvTrc.vHitNormal = vTerNormal; - pEnvTrc.bStartSolid = bStart; + fFractionTerrain = (hit.distance) / vDelta.magnitude; + pEnvTrc.vHitNormal = EC_Utility.ToA3DVECTOR3(hit.normal); pEnvTrc.dwClsFlag = CDR_EVN.CDR_TERRAIN; } - + else + { + fFractionTerrain = 1f; + } + if(fFractionTerrain < pEnvTrc.fFraction) + { + pEnvTrc.fFraction = fFractionTerrain; + } } if ((pEnvTrc.dwCheckFlag & CDR_EVN.CDR_WATER) == CDR_EVN.CDR_WATER) @@ -156,46 +166,6 @@ namespace BrewMonster return (pEnvTrc.fFraction < 1.0f + 1E-4f); } - // == Thay CollideWithEnv (C++) bằng BoxCast == - //static bool CollideWithEnv_BoxCast(Vector3 vStart, Vector3 vDelta, Vector3 vExt, - // LayerMask mask, - // out RaycastHit hit, out float fFraction, out Vector3 vHitNormal, out bool bStartSolid, - // float skin = 0.01f) - //{ - // hit = default; - // vHitNormal = Vector3.up; - // bStartSolid = false; - // fFraction = 0.0f; - - // float dist = vDelta.magnitude; - // if (dist <= 1e-6f) return false; - - // var hasHit = Physics.Raycast(vStart, vDelta,out hit, dist, mask); - // if (hasHit) - // { - // bStartSolid = true; - // fFraction = (t - 5E-4f) / vDelta.Normalize(); - // return true; - // } - // // start-in-solid - // var overlapped = Physics.OverlapBox(vStart, vExt - Vector3.one * skin, Quaternion.identity, mask, QueryTriggerInteraction.Ignore); - // if (overlapped != null && overlapped.Length > 0) - // { - // bStartSolid = true; - // return true; - // } - - // // sweep AABB - // Vector3 dir = vDelta / Mathf.Max(dist, 1e-6f); - // if (Physics.BoxCast(vStart, vExt - Vector3.one * skin, dir, out hit, Quaternion.identity, dist, mask, QueryTriggerInteraction.Ignore)) - // { - // fFraction = Mathf.Clamp01(hit.distance / Mathf.Max(dist, 1e-6f)); - // vHitNormal = hit.normal; - // return true; - // } - // return false; - //} - // == Thay RetrieveSupportPlane (C++) bằng Raycast xuống == static bool DoGroundProbe(Vector3 vStart, Vector3 vExt, float fDeltaY, LayerMask mask, out Vector3 vEnd, out Vector3 vHitNormal, out bool bSupport, @@ -280,6 +250,10 @@ namespace BrewMonster int nTry = 0; LayerMask mask = UsedMask_Ground(); + env_trace_t trcInfo = new env_trace_t(); + trcInfo.dwCheckFlag = CDR_EVN.CDR_TERRAIN | CDR_EVN.CDR_BRUSH; + trcInfo.vExt = CDRInfo.vExtent; + while (nTry < 1) { vDelta = vVelocity * fTime; @@ -290,41 +264,33 @@ namespace BrewMonster //bool hasHit = CollideWithEnv_BoxCast(vStart, vDelta, vExt, mask, // out RaycastHit hit, out float fFraction, out Vector3 hitNormal, out bool bStartSolid); Vector3 posFoot = vStart - Vector3.up * vExt.y; - //if (Physics.BoxCast(vStart, vExt, (vStart + Vector3.down).normalized, out RaycastHit hit1, Quaternion.identity, vExt.y, mask)) - //{ - // if (hit1.point.y > posFoot.y) - // { - // Debug.LogError("hit.point.y > posFoot.y"); - // posFoot.y = hit1.point.y; - // } - //} - if (Physics.Raycast(vStart, (vStart + Vector3.down).normalized, out RaycastHit hit1, vExt.y, mask)) + if (Physics.Raycast(vStart, (vStart + Vector3.down).normalized, out RaycastHit hit, vExt.y, mask)) { - if (hit1.point.y > posFoot.y) + if (hit.point.y > posFoot.y) { - posFoot.y = hit1.point.y; + posFoot.y = hit.point.y; } } - bool bClear = !Physics.Raycast(posFoot, (posFoot + vDelta).normalized, out RaycastHit hit, fDeltaDist, mask); + + bool bClear = !Physics.Raycast(posFoot, (posFoot + vDelta).normalized, out hit, fDeltaDist, mask); + + //trcInfo.vStart = CDRInfo.vCenter; + //trcInfo.vDelta = EC_Utility.ToA3DVECTOR3(vDelta); + //trcInfo.vTerStart = EC_Utility.ToA3DVECTOR3(posFoot); + ////trcInfo.vTerStart.y -= vExt.y; //foot + //bool bClear = !CollideWithEnv(ref trcInfo); nTry++; if (bClear) { - Debug.DrawLine(posFoot, posFoot + vDelta, Color.yellow, 10f); + //Debug.DrawLine(posFoot, posFoot + vDelta, Color.yellow, 10f); vFinalPos = vStart + vDelta; CDRInfo.fMoveDist += fDeltaDist; break; } - //if (trcInfo.bStartSolid) - //{ - // CDRInfo.fMoveDist = 0f; - // if (CDRInfo.vTPNormal.y < CDRInfo.fSlopeThresh) CDRInfo.vTPNormal = Vector3.up; - // return; - //} vStart = hit.point + Vector3.up * vExt.y; + //vStart += vDelta * trcInfo.fFraction + Vector3.up * vExt.y; + vFinalPos = vStart; - //CDRInfo.fMoveDist += (fDeltaDist * fFraction); - //fTime -= fTime * fFraction; - //vNormal = hitNormal; // Step-up (giữ tinh thần bản gốc) if (!bFreeFall && !bTryPull && !bJump) @@ -332,36 +298,38 @@ namespace BrewMonster //float skin = 0.01f; posFoot = vStart - Vector3.up * vExt.y + Vector3.up * CDRInfo.fStepHeight; Vector3 vStartUp = new Vector3(0f, CDRInfo.fStepHeight, 0f); - //if (Physics.Raycast(vStart, (vStart + Vector3.down).normalized, out hit1, vExt.y, mask)) - //{ - // if (hit1.point.y > posFoot.y) - // { - // Debug.LogError("hit.point.y > posFoot.y"); - // posFoot.y = hit1.point.y + CDRInfo.fStepHeight; - // } - //} bPull = !Physics.Raycast(posFoot, (Vector3.up).normalized, out hit, CDRInfo.fStepHeight, mask); + + //env_trace_t tmpInfo = new env_trace_t(); + //tmpInfo.vStart = EC_Utility.ToA3DVECTOR3(vStart); + //tmpInfo.vDelta = new A3DVECTOR3(0.0f, CDRInfo.fStepHeight, 0.0f); + //tmpInfo.vExt = CDRInfo.vExtent; + ////@note : need check terrain?? By Kuiwu[8/10/2005] + //tmpInfo.dwCheckFlag = CDR_EVN.CDR_BRUSH | CDR_EVN.CDR_TERRAIN; + //tmpInfo.vTerStart = EC_Utility.ToA3DVECTOR3(posFoot); + //bPull = !CollideWithEnv(ref tmpInfo); + if (bPull) { vStart += Vector3.up * CDRInfo.fStepHeight; posFoot = vStart - Vector3.up * vExt.y; - //Vector3 vDelta2 = vVelocity; bool bMove = !Physics.Raycast(posFoot, (posFoot + vVelocity).normalized, out hit, fDeltaDist, mask); + + //tmpInfo.vStart = EC_Utility.ToA3DVECTOR3(vStart); + //tmpInfo.vDelta = EC_Utility.ToA3DVECTOR3(vDelta); + //tmpInfo.vTerStart = EC_Utility.ToA3DVECTOR3(posFoot); + //bool bMove = !CollideWithEnv(ref tmpInfo); + if (!bMove) { - //vDelta2 *= frac2; vFinalPos = hit.point + Vector3.up * vExt.y; + //vFinalPos = vStart + vDelta * tmpInfo.fFraction + Vector3.up * vExt.y; } else { Debug.DrawLine(vFinalPos, vFinalPos + vDelta, Color.red, 10f); vFinalPos += vDelta; } - //if (vDelta2.sqrMagnitude < (vExt.x * vExt.x * 4f)) - //{ - // vStart -= Vector3.up * CDRInfo.fStepHeight; - // bPull = false; - //} } bTryPull = true; } @@ -680,7 +648,7 @@ namespace BrewMonster vFinalPos = new A3DVECTOR3(vStart); int nTry = 0; bool bClear = true; - env_trace_t trcInfo; + env_trace_t trcInfo = new env_trace_t(); trcInfo.bWaterSolid = true; trcInfo.dwCheckFlag = CDR_EVN.CDR_TERRAIN | CDR_EVN.CDR_BRUSH | CDR_EVN.CDR_WATER; trcInfo.vExt = vExt; diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/Protocol.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/Protocol.cs index 78495654c6..81aa57a54a 100644 --- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/Protocol.cs +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/Protocol.cs @@ -166,7 +166,19 @@ namespace CSNetwork.Protocols private static bool ValidateProtocol(uint type, uint size) { var stub = _protocolMap.GetValueOrDefault(type); - return stub != null && size <= MaxProtocolSize; + if (stub == null) + { + _logger.Warning($"ValidateProtocol: Protocol type {type} not found. Returning false."); + return false; + } + + if (size > MaxProtocolSize) + { + _logger.Warning($"ValidateProtocol: Protocol type {type} size {size} is greater than MaxProtocolSize {MaxProtocolSize}. Returning false."); + return false; + } + + return true; } private const int MaxProtocolSize = 16 * 1024 * 1024; // 16MB max size diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/getcustomdata_re.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/getcustomdata_re.cs new file mode 100644 index 0000000000..6e8e9e76be --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/getcustomdata_re.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; + +namespace CSNetwork.Protocols +{ + public class getcustomdata_re : Protocol + { + public int Result { get; set; } + public int Roleid { get; set; } + public int Localsid { get; set; } + public Octets UiConfig { get; set; } + + public int retcode { get; set; } + public int roleid { get; set; } + public uint localsid { get; set; } + public uint cus_roleid { get; set; } + public Octets customdata {get; set;} + + public getcustomdata_re() : base(ProtocolType.PROTOCOL_GETCUSTOMDATA_RE) + { + customdata = new Octets(); + } + + public override Protocol Clone() => new getcustomdata_re + { + retcode = retcode, + roleid = roleid, + localsid = localsid, + cus_roleid = cus_roleid, + customdata = customdata + }; + + public override void Marshal(OctetsStream os) + { + os.Write(retcode); + os.Write(roleid); + os.Write(localsid); + os.Write(cus_roleid); + os.Write(customdata); + } + + public override void Unmarshal(OctetsStream os) + { + retcode = os.ReadInt32(); + roleid = os.ReadInt32(); + localsid = os.ReadUInt32(); + cus_roleid = os.ReadUInt32(); + customdata = os.ReadOctets(); + } + + public override int PriorPolicy() => 1; + + public override bool SizePolicy(int size) => size <= 4096; + } +} + diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/getcustomdata_re.cs.meta b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/getcustomdata_re.cs.meta new file mode 100644 index 0000000000..8e5fadc8d8 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/getcustomdata_re.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6fa7e46f896407f499da351c8772b6d2 \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/Objet/CECMatter.cs b/Assets/PerfectWorld/Scripts/Objet/CECMatter.cs index 6934487c26..eb8e77b4cf 100644 --- a/Assets/PerfectWorld/Scripts/Objet/CECMatter.cs +++ b/Assets/PerfectWorld/Scripts/Objet/CECMatter.cs @@ -40,6 +40,10 @@ namespace PerfectWorld.Scripts { var matterType = matterData.GetType(); var fileMatterField = matterType.GetField("file_matter", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); + if (fileMatterField == null) + { + fileMatterField = matterType.GetField("file_model", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); + } if (fileMatterField != null) { @@ -59,7 +63,7 @@ namespace PerfectWorld.Scripts if (matterObject.GetComponent() == null) { var collider = matterObject.AddComponent(); - collider.size = matterObject.GetComponentInChildren().bounds.size; + collider.size = matterObject.GetComponentInChildren().bounds.size; } // Create text object to display item name above the cube diff --git a/Assets/PerfectWorld/Scripts/UI/JumpBtn.cs b/Assets/PerfectWorld/Scripts/UI/JumpBtn.cs new file mode 100644 index 0000000000..e8ecd1d768 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/UI/JumpBtn.cs @@ -0,0 +1,29 @@ +using BrewMonster.Network; +using UnityEngine; +using UnityEngine.UI; + +namespace BrewMonster.UI +{ + public class JumpBtn : MonoBehaviour + { + Button jumpBtn; + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + if(jumpBtn == null) + { + jumpBtn = GetComponent