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

Merge pull request 'update layer water in prefab.' (#116) from feature/hp_swim into develop

Browse Source 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/116
This commit is contained in:
tungdv
2026-01-09 10:38:18 +00:00
parent 4dfa0f3c1b 5f12ace1bd
commit ecd948c2f1
12 changed files with 286 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ModelRenderer/Art/Models/maps/a61/waters/14.prefab
+24 -1
View File
@@ -11,7 +11,8 @@ GameObject:
- component: {fileID: 8870675310055835121}
- component: {fileID: 1032798951918398042}
- component: {fileID: 7301032545156009848}
m_Layer: 0
- component: {fileID: 462207276974431652}
m_Layer: 8
m_Name: 14
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -86,6 +87,28 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &462207276974431652
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2583190483620898206}
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: b659accf661a837479218c29e2eb3529, type: 2}
--- !u!1 &5209988378375773062
GameObject:
m_ObjectHideFlags: 0
Assets/ModelRenderer/Art/Models/maps/a61/waters/24.prefab
+24 -1
View File
@@ -11,7 +11,8 @@ GameObject:
- component: {fileID: 6162223966912026141}
- component: {fileID: 965572838707464366}
- component: {fileID: 2799419047870559492}
m_Layer: 0
- component: {fileID: 3416380344146776827}
m_Layer: 8
m_Name: WaterMeshRenderer(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -86,6 +87,28 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &3416380344146776827
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1158422796600389547}
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: fc25f780d25e0ef4ea66bd04e30ed658, type: 2}
--- !u!1 &5766366828536359331
GameObject:
m_ObjectHideFlags: 0
Assets/ModelRenderer/Art/Models/maps/a61/waters/2663.prefab
+23
View File
@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 1106703170944066569}
- component: {fileID: 5489700157768253589}
- component: {fileID: 4298657190085613173}
- component: {fileID: 1609863900414086204}
m_Layer: 8
m_Name: WaterMeshRenderer(Clone)
m_TagString: Untagged
@@ -88,6 +89,28 @@ MeshRenderer:
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &4298657190085613173
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2129434667301194551}
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: ce83280d624f8e74789ed3cdeb08e76e, type: 2}
--- !u!64 &1609863900414086204
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Assets/ModelRenderer/Art/Models/maps/a61/waters/47.prefab
+24 -1
View File
@@ -11,7 +11,8 @@ GameObject:
- component: {fileID: 2077347467210120610}
- component: {fileID: 2965316739725448086}
- component: {fileID: 1576250916172009662}
m_Layer: 0
- component: {fileID: 4019614048923385075}
m_Layer: 8
m_Name: WaterMeshRenderer(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -86,6 +87,28 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &4019614048923385075
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5533184014301445498}
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: 044737b6cc6aab9428ff497cc85b34fa, type: 2}
--- !u!1 &8220570836172173197
GameObject:
m_ObjectHideFlags: 0
Assets/ModelRenderer/Art/Models/maps/a61/waters/4737.prefab
+23
View File
@@ -44,6 +44,7 @@ GameObject:
- component: {fileID: 1085622182787639888}
- component: {fileID: 116834778258431673}
- component: {fileID: 3317247844365150934}
- component: {fileID: 3543540647331422299}
m_Layer: 8
m_Name: WaterMeshRenderer(Clone)
m_TagString: Untagged
@@ -141,3 +142,25 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4300000, guid: 9c42325bdd3279f40b20a5c67aea773a, type: 2}
--- !u!64 &3543540647331422299
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1278964582912123360}
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: 9c42325bdd3279f40b20a5c67aea773a, type: 2}
Assets/ModelRenderer/Art/Models/maps/a61/waters/4821.prefab
+24 -1
View File
@@ -43,7 +43,8 @@ GameObject:
- component: {fileID: 7062665856913133189}
- component: {fileID: 5252691402266366719}
- component: {fileID: 8181785019207413421}
m_Layer: 0
- component: {fileID: 2607412906901198044}
m_Layer: 8
m_Name: WaterMeshRenderer(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -118,3 +119,25 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &2607412906901198044
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4719748383613153397}
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: ac223a98475ce5040878ad73deeb960a, type: 2}
Assets/ModelRenderer/Art/Models/maps/a61/waters/4823.prefab
+24 -1
View File
@@ -43,7 +43,8 @@ GameObject:
- component: {fileID: 1478712142538266266}
- component: {fileID: 2131850469933741979}
- component: {fileID: 6697441912009192607}
m_Layer: 0
- component: {fileID: 770633596912448150}
m_Layer: 8
m_Name: WaterMeshRenderer(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -118,3 +119,25 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &770633596912448150
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6077317593588673797}
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: b2f7526b9b6eb6d4b976678628fec85d, type: 2}
Assets/ModelRenderer/Art/Models/maps/a61/waters/4838.prefab
+24 -1
View File
@@ -43,7 +43,8 @@ GameObject:
- component: {fileID: 4941995905154783035}
- component: {fileID: 8834982675719581640}
- component: {fileID: 4008051189880721500}
m_Layer: 0
- component: {fileID: 2927931621078331128}
m_Layer: 8
m_Name: WaterMeshRenderer(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -118,3 +119,25 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &2927931621078331128
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8870165540406502598}
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: 5221555d479145f4098a1a90d443d25f, type: 2}
Assets/ModelRenderer/Art/Models/maps/a61/waters/4853.prefab
+24 -1
View File
@@ -11,7 +11,8 @@ GameObject:
- component: {fileID: 4601054390393476764}
- component: {fileID: 8898356444586392207}
- component: {fileID: 3768077324547372759}
m_Layer: 0
- component: {fileID: 1187865960676330687}
m_Layer: 8
m_Name: WaterMeshRenderer(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -86,6 +87,28 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &1187865960676330687
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2908047605614509929}
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: 71432f5f083a6eb46bd2e86c544240fe, type: 2}
--- !u!1 &8693206018944694632
GameObject:
m_ObjectHideFlags: 0
Assets/ModelRenderer/Art/Models/maps/a61/waters/4855.prefab
+24 -1
View File
@@ -43,7 +43,8 @@ GameObject:
- component: {fileID: 636089995233464392}
- component: {fileID: 2080258521648944025}
- component: {fileID: 3480335849606063585}
m_Layer: 0
- component: {fileID: 227664486918571123}
m_Layer: 8
m_Name: WaterMeshRenderer(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -118,3 +119,25 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &227664486918571123
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8682860827833279859}
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: 7b8eb8acdca70014c8fb0b4690909469, type: 2}
Assets/ModelRenderer/Art/Models/maps/a61/waters/49.prefab
+24 -1
View File
@@ -43,7 +43,8 @@ GameObject:
- component: {fileID: 6182866067743937211}
- component: {fileID: 6890386030446961812}
- component: {fileID: 3007527381162661553}
m_Layer: 0
- component: {fileID: 6960099531645814751}
m_Layer: 8
m_Name: WaterMeshRenderer(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -118,3 +119,25 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &6960099531645814751
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8634685187563485881}
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: 1417b7dbba8d24c4b8fcc930a31ea1ca, type: 2}
Assets/ModelRenderer/Art/Models/maps/a61/waters/65.prefab
+24 -1
View File
@@ -11,7 +11,8 @@ GameObject:
- component: {fileID: 2020333967464460385}
- component: {fileID: 2497554547442989164}
- component: {fileID: 8596635813813102696}
m_Layer: 0
- component: {fileID: 3281521522256558373}
m_Layer: 8
m_Name: WaterMeshRenderer(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -86,6 +87,28 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &3281521522256558373
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189273667865298136}
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: e869fae75abcd0d439c281909363035a, type: 2}
--- !u!1 &3653160677674576190
GameObject:
m_ObjectHideFlags: 0