PineappleTech/valheim
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Huang' into main_ZYT

Browse Source 
# Conflicts:
#	Assets/_Valheim/Resources/~$小小幻宠_Shandong_Weihai_Jingqu_W37.xlsm.meta
#	Assets/_Valheim/Resources/小小幻宠_Hunan_Xiangxi_Yongshun_XintiandiShangchang.xlsm.meta
#	Assets/_Valheim/Scenes/Beijing_Tongzhou_Luyijie_XiangrikuiGuangchang.unity.meta
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
This commit is contained in:
ZYT
2026-01-27 10:59:41 +08:00
parent 0c208c268f aec62c8f71
commit bebbb59921
10 changed files with 309043 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/_Valheim/Resources/小小幻宠_Hunan_Xiangxi_Yongshun_XintiandiShangchang.xlsm.meta
View File

@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/_Valheim/Resources/小小幻宠_Hunan_Xiangxi_Yongshun_XintiandiShangchang.xlsm.meta
guid: 4008fd2b440c61447aae88a0040ffdae
========
guid: 887afb4e81d3f324a9c2334b70b5a31e
>>>>>>>> origin/Huang:Assets/_Valheim/Scenes/Beijing_Tongzhou_Luyijie_XiangrikuiGuangchang.unity.meta
DefaultImporter:
externalObjects: {}
userData:

46
Assets/_Valheim/Scenes/Anhui_Manshan_XingyueGuangchang.unity
View File

@ -43269,6 +43269,50 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &391939913
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 391939915}
- component: {fileID: 391939914}
m_Layer: 0
m_Name: HttpServer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &391939914
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 391939913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 61fbd59abecedaa41b1a41080bb5716b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &391939915
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 391939913}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -9.727531, y: -6.6948857, z: -0.64432454}
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!1 &393013546
GameObject:
m_ObjectHideFlags: 0
@ -127623,6 +127667,7 @@ MonoBehaviour:
winLightBgm: {fileID: 1875134527}
goEffect: {fileID: 327597843}
place: 50
gameId: 0
--- !u!1 &1289206090
GameObject:
m_ObjectHideFlags: 0
@ -235973,3 +236018,4 @@ SceneRoots:
- {fileID: 697050083}
- {fileID: 1675573370}
- {fileID: 2076119386}
- {fileID: 391939915}

308737
Assets/_Valheim/Scenes/Beijing_Tongzhou_Luyijie_XiangrikuiGuangchang.unity Normal file
View File

File diff suppressed because it is too large Load Diff

45
Assets/_Valheim/Scenes/EditMap/Liaoning_Anshan_Lishan_Dayuecheng.unity
View File

@ -9624,6 +9624,50 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2642722680881691403, guid: 335d318bb5e4cea40a046c3fd3d312eb, type: 3}
m_PrefabInstance: {fileID: 1785225357}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1802738192
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1802738194}
- component: {fileID: 1802738193}
m_Layer: 0
m_Name: HttpServer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1802738193
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1802738192}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 61fbd59abecedaa41b1a41080bb5716b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1802738194
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1802738192}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -9.727531, y: -6.6948857, z: -0.64432454}
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!1001 &1811928998
PrefabInstance:
m_ObjectHideFlags: 0
@ -12539,3 +12583,4 @@ SceneRoots:
- {fileID: 8343905173428871449}
- {fileID: 5938582860901305962}
- {fileID: 1847834465}
- {fileID: 1802738194}

45
Assets/_Valheim/Scenes/EditMap/Shandong_Jinan_Huaiyin_Shengfutongshangmao.unity
View File

@ -7864,6 +7864,50 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2642722680881691403, guid: 335d318bb5e4cea40a046c3fd3d312eb, type: 3}
m_PrefabInstance: {fileID: 1488089725}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1521890937
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1521890939}
- component: {fileID: 1521890938}
m_Layer: 0
m_Name: HttpServer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1521890938
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1521890937}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 61fbd59abecedaa41b1a41080bb5716b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1521890939
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1521890937}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -9.727531, y: -6.6948857, z: -0.64432454}
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!1 &1542935432
GameObject:
m_ObjectHideFlags: 0
@ -12469,3 +12513,4 @@ SceneRoots:
- {fileID: 409912122}
- {fileID: 1694692700}
- {fileID: 202906792}
- {fileID: 1521890939}

45
Assets/_Valheim/Scenes/EditMap/Shandong_Jinan_Huaiyin_Shengfutongshangmao_wai.unity
View File

@ -1509,6 +1509,50 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2642722680881691403, guid: 335d318bb5e4cea40a046c3fd3d312eb, type: 3}
m_PrefabInstance: {fileID: 350877381}
m_PrefabAsset: {fileID: 0}
--- !u!1 &359745477
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 359745479}
- component: {fileID: 359745478}
m_Layer: 0
m_Name: HttpServer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &359745478
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359745477}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 61fbd59abecedaa41b1a41080bb5716b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &359745479
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359745477}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -9.727531, y: -6.6948857, z: -0.64432454}
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!1001 &370356306
PrefabInstance:
m_ObjectHideFlags: 0
@ -12673,3 +12717,4 @@ SceneRoots:
- {fileID: 785961812}
- {fileID: 765568261}
- {fileID: 1845473654}
- {fileID: 359745479}

16
Assets/_Valheim/Scenes/Henanshangqiu 1_InteractionMode.asset Normal file
View File

@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: a9550f0d385ae6a489b85692509add4e, type: 3}
m_Name: Henanshangqiu 1_InteractionMode
m_EditorClassIdentifier:
autoAddManager: 1
addedManager: 1

8
Assets/_Valheim/Scenes/Henanshangqiu 1_InteractionMode.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6e79f2e06816f6549af512104eba3026
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

46
Assets/_Valheim/Scenes/Jilin_Changchun_Beihu_WuyueGuangchang.unity
View File

@ -83967,6 +83967,50 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &853860423
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 853860425}
- component: {fileID: 853860424}
m_Layer: 0
m_Name: HttpServer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &853860424
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 853860423}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 61fbd59abecedaa41b1a41080bb5716b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &853860425
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 853860423}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -9.727531, y: -6.6948857, z: -0.64432454}
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!1 &855511453
GameObject:
m_ObjectHideFlags: 0
@ -127807,6 +127851,7 @@ MonoBehaviour:
winLightBgm: {fileID: 1875134527}
goEffect: {fileID: 327597843}
place: 41
gameId: 0
--- !u!1 &1289206090
GameObject:
m_ObjectHideFlags: 0
@ -235562,3 +235607,4 @@ SceneRoots:
- {fileID: 1675573370}
- {fileID: 2076119386}
- {fileID: 299790302}
- {fileID: 853860425}

65
Assets/_Valheim/Scenes/LiaoNing_AnShan.unity
View File

@ -265,7 +265,7 @@ MonoBehaviour:
m_OverrideTileSize: 0
m_TileSize: 256
m_OverrideVoxelSize: 0
m_VoxelSize: 0.033333335
m_VoxelSize: 0.06666667
m_MinRegionArea: 2
m_NavMeshData: {fileID: 23800000, guid: d51bc5121ac5c0945913e36998470dad, type: 2}
m_BuildHeightMesh: 0
@ -38920,11 +38920,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 304812137}
m_Mesh: {fileID: 3009663438640755768, guid: fdf4b83ef17c23b49a3d8fab838f3243, type: 3}
--- !u!1 &307754484 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5272062138220848758, guid: 9c7768417d6550a4b8072cd4c416c948, type: 3}
m_PrefabInstance: {fileID: 1930671925}
m_PrefabAsset: {fileID: 0}
--- !u!4 &307754486 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7620068714920723655, guid: 9c7768417d6550a4b8072cd4c416c948, type: 3}
@ -65330,7 +65325,7 @@ MonoBehaviour:
m_OverrideTileSize: 0
m_TileSize: 256
m_OverrideVoxelSize: 0
m_VoxelSize: 0.033333335
m_VoxelSize: 0.06666667
m_MinRegionArea: 2
m_NavMeshData: {fileID: 23800000, guid: b2be833fd1c311540800233a75f0edf9, type: 2}
m_BuildHeightMesh: 0
@ -71190,7 +71185,7 @@ MonoBehaviour:
m_OverrideTileSize: 0
m_TileSize: 256
m_OverrideVoxelSize: 0
m_VoxelSize: 0.033333335
m_VoxelSize: 0.06666667
m_MinRegionArea: 2
m_NavMeshData: {fileID: 23800000, guid: 47102d3444769c34a9569603e0ebdd5c, type: 2}
m_BuildHeightMesh: 0
@ -127897,7 +127892,7 @@ MonoBehaviour:
m_OverrideTileSize: 0
m_TileSize: 256
m_OverrideVoxelSize: 0
m_VoxelSize: 0.033333335
m_VoxelSize: 0.06666667
m_MinRegionArea: 2
m_NavMeshData: {fileID: 23800000, guid: 437e8dfe27d610644b689d00b7bb97d7, type: 2}
m_BuildHeightMesh: 0
@ -131741,7 +131736,6 @@ MonoBehaviour:
MRBgm: {fileID: 1786744903}
MRLeftControl: {fileID: 638622008}
MRRightControl: {fileID: 1237138834}
PXRManager: {fileID: 0}
FakeTree: {fileID: 501244322}
WorkTree:
- {fileID: 0}
@ -131754,7 +131748,6 @@ MonoBehaviour:
- {fileID: 1631395831}
aiDrPos: {fileID: 1540725355}
doorPos: {fileID: 848928229}
initPos: {fileID: 0}
petPos: {fileID: 1149393397}
badges:
- {fileID: 1631395833}
@ -131771,11 +131764,9 @@ MonoBehaviour:
- {fileID: 23800000, guid: 437e8dfe27d610644b689d00b7bb97d7, type: 2}
- {fileID: 23800000, guid: 47102d3444769c34a9569603e0ebdd5c, type: 2}
winLightBgm: {fileID: 1875134527}
guideList:
- {fileID: 307754484}
goEffect: {fileID: 327597843}
Version: 1.2.1
place: 1
gameId: 0
--- !u!1 &1289206090
GameObject:
m_ObjectHideFlags: 0
@ -144495,6 +144486,7 @@ MonoBehaviour:
- {fileID: 2046448524}
- {fileID: 304812140}
- {fileID: 488519524}
isGetPet: 0
--- !u!1 &1493929178
GameObject:
m_ObjectHideFlags: 0
@ -147293,6 +147285,50 @@ MonoBehaviour:
soundPlayedCustomEvent:
willCleanUpDelegatesAfterStop: 1
frames: 184
--- !u!1 &1558757063
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1558757065}
- component: {fileID: 1558757064}
m_Layer: 0
m_Name: HttpServer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1558757064
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1558757063}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 61fbd59abecedaa41b1a41080bb5716b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1558757065
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1558757063}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -9.727531, y: -6.6948857, z: -0.64432454}
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!1 &1587760209
GameObject:
m_ObjectHideFlags: 0
@ -242186,3 +242222,4 @@ SceneRoots:
- {fileID: 1219617076}
- {fileID: 697050083}
- {fileID: 1675573370}
- {fileID: 1558757065}