duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game

Browse Source
This commit is contained in:
Chomper9981
2026-02-07 14:58:00 +07:00
parent f9c7d0f04c 0702571c04
commit fc39addf5f
4 changed files with 361 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ModelRenderer/Art/Models/litmodels/a61/6/CCDBrush.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: aa2ec4fb3e3ae4843bcc25ec13c56761
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/ModelRenderer/Art/Models/litmodels/a61/6/CCDBrush/litmodel_1858.bmd.mesh
+167
View File
File diff suppressed because one or more lines are too long
Assets/ModelRenderer/Art/Models/litmodels/a61/6/CCDBrush/litmodel_1858.bmd.mesh.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7ef57348cc14e2c44b0d93d82309fb45
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4300000
userData:
assetBundleName:
assetBundleVariant:
Assets/ModelRenderer/Art/Models/litmodels/a61/6/litmodel_1858.bmd.prefab
+178 -80
View File
@@ -9,12 +9,13 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6620715533904588879}
- component: {fileID: 8971906507328977954}
m_Layer: 0
m_Name: litmodel_1858.bmd
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6620715533904588879
Transform:
@@ -26,7 +27,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.6009749, y: 0.60097486, z: 0.60097486}
m_LocalScale: {x: 0.60097486, y: 0.60097486, z: 0.60097486}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3802196365371919653}
@@ -34,8 +35,24 @@ Transform:
- {fileID: 642723427162609800}
- {fileID: 5468985526413160933}
- {fileID: 4305396298280240728}
- {fileID: 2374675958549553526}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8971906507328977954
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2314062561766911216}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59e5e7b3dc884d92a21aa09f5a2c208d, type: 3}
m_Name:
m_EditorClassIdentifier:
_modelPath: litmodels/a61/6/litmodel_1858.bmd
_buildingMeshRenderer: {fileID: 483505391458485963, guid: 028823e57276945c4a8c11c1d6067394, type: 3}
_halfSpacePrefab: {fileID: 0}
--- !u!1 &2339233178148791680
GameObject:
m_ObjectHideFlags: 0
@@ -45,15 +62,15 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4305396298280240728}
- component: {fileID: 5018183914019923839}
- component: {fileID: 7601683473776944617}
- component: {fileID: 7598424356279927743}
- component: {fileID: 2766007181529087648}
m_Layer: 0
m_Name: Plane07
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4305396298280240728
Transform:
@@ -70,6 +87,21 @@ Transform:
m_Children: []
m_Father: {fileID: 6620715533904588879}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5018183914019923839
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2339233178148791680}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ce1edacf192a4339b2b54396daf5feb0, type: 3}
m_Name:
m_EditorClassIdentifier:
_meshFilter: {fileID: 7601683473776944617}
_meshRenderer: {fileID: 7598424356279927743}
_material: {fileID: 2100000, guid: 38603659d794349f6abdd4959b09ee3c, type: 2}
--- !u!33 &7601683473776944617
MeshFilter:
m_ObjectHideFlags: 0
@@ -123,28 +155,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &2766007181529087648
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2339233178148791680}
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: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4300000, guid: debea84a7d6595643a53de1dd566971e, type: 2}
--- !u!1 &3485809628087161448
GameObject:
m_ObjectHideFlags: 0
@@ -157,13 +167,12 @@ GameObject:
- component: {fileID: 4376806984282474990}
- component: {fileID: 6386291787311475679}
- component: {fileID: 3930127726212162846}
- component: {fileID: 3212405443933505398}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &3802196365371919653
Transform:
@@ -254,28 +263,6 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!64 &3212405443933505398
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3485809628087161448}
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: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4300000, guid: 9fa5ff3c3e448134eb7e3ce9c089ef4a, type: 2}
--- !u!1 &3638618787983965184
GameObject:
m_ObjectHideFlags: 0
@@ -285,15 +272,15 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5468985526413160933}
- component: {fileID: 8855383621233754012}
- component: {fileID: 3682369117625429100}
- component: {fileID: 933992426169001204}
- component: {fileID: 2323754348112517762}
m_Layer: 0
m_Name: Box76
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5468985526413160933
Transform:
@@ -310,6 +297,21 @@ Transform:
m_Children: []
m_Father: {fileID: 6620715533904588879}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8855383621233754012
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3638618787983965184}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ce1edacf192a4339b2b54396daf5feb0, type: 3}
m_Name:
m_EditorClassIdentifier:
_meshFilter: {fileID: 3682369117625429100}
_meshRenderer: {fileID: 933992426169001204}
_material: {fileID: 2100000, guid: 38603659d794349f6abdd4959b09ee3c, type: 2}
--- !u!33 &3682369117625429100
MeshFilter:
m_ObjectHideFlags: 0
@@ -363,13 +365,100 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &2323754348112517762
--- !u!1 &4363002964825893588
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2374675958549553526}
- component: {fileID: 4527544251728066118}
- component: {fileID: 5311223652641166228}
- component: {fileID: 3754629199141232990}
m_Layer: 0
m_Name: CDBrushCollider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2374675958549553526
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4363002964825893588}
serializedVersion: 2
m_LocalRotation: {x: -0.009164956, y: -0.35673073, z: 0.033771332, w: 0.93355167}
m_LocalPosition: {x: 593.935, y: 8.849079, z: 1059.9131}
m_LocalScale: {x: 1.6639633, y: 1.6639631, z: 1.6639628}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6620715533904588879}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4527544251728066118
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4363002964825893588}
m_Mesh: {fileID: 4300000, guid: 7ef57348cc14e2c44b0d93d82309fb45, type: 2}
--- !u!23 &5311223652641166228
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4363002964825893588}
m_Enabled: 0
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_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
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &3754629199141232990
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3638618787983965184}
m_GameObject: {fileID: 4363002964825893588}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
@@ -384,7 +473,7 @@ MeshCollider:
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4300000, guid: c08d860dbee1fc04982548760a3e6772, type: 2}
m_Mesh: {fileID: 4300000, guid: 7ef57348cc14e2c44b0d93d82309fb45, type: 2}
--- !u!1 &4972250255338124789
GameObject:
m_ObjectHideFlags: 0
@@ -394,15 +483,15 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 642723427162609800}
- component: {fileID: 9097665641590201619}
- component: {fileID: 5167380396376929393}
- component: {fileID: 4925996912478658442}
- component: {fileID: 2968994200318392227}
m_Layer: 0
m_Name: Object3420
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &642723427162609800
Transform:
@@ -419,6 +508,21 @@ Transform:
m_Children: []
m_Father: {fileID: 6620715533904588879}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &9097665641590201619
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4972250255338124789}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ce1edacf192a4339b2b54396daf5feb0, type: 3}
m_Name:
m_EditorClassIdentifier:
_meshFilter: {fileID: 5167380396376929393}
_meshRenderer: {fileID: 4925996912478658442}
_material: {fileID: 2100000, guid: 38603659d794349f6abdd4959b09ee3c, type: 2}
--- !u!33 &5167380396376929393
MeshFilter:
m_ObjectHideFlags: 0
@@ -472,28 +576,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &2968994200318392227
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4972250255338124789}
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: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4300000, guid: 8f3249ba302780d439604a8adbef43a0, type: 2}
--- !u!1 &9179223615275914270
GameObject:
m_ObjectHideFlags: 0
@@ -503,6 +585,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8430704228723251584}
- component: {fileID: 7012760499325483412}
- component: {fileID: 5934929730268457527}
- component: {fileID: 5803992813184748586}
m_Layer: 0
@@ -510,7 +593,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8430704228723251584
Transform:
@@ -527,6 +610,21 @@ Transform:
m_Children: []
m_Father: {fileID: 6620715533904588879}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7012760499325483412
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9179223615275914270}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ce1edacf192a4339b2b54396daf5feb0, type: 3}
m_Name:
m_EditorClassIdentifier:
_meshFilter: {fileID: 5934929730268457527}
_meshRenderer: {fileID: 5803992813184748586}
_material: {fileID: 2100000, guid: 38603659d794349f6abdd4959b09ee3c, type: 2}
--- !u!33 &5934929730268457527
MeshFilter:
m_ObjectHideFlags: 0