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

fix：公司楼下场地修改

Browse Source
This commit is contained in:
bzx
2025-07-18 18:11:39 +08:00
parent 4ae0e54c04
commit 0e430fc3a9
4 changed files with 272 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/_Valheim/Resources/Maps/GongSi1Lou.json
View File

File diff suppressed because one or more lines are too long

60
Assets/_Valheim/Scenes/EditMap/GongSi1Lou.unity
View File

@@ -3849,7 +3849,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1086889758311421088, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1571928108714607048, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_LocalPosition.x
@@ -8334,6 +8334,63 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2642722680881691403, guid: 335d318bb5e4cea40a046c3fd3d312eb, type: 3}
m_PrefabInstance: {fileID: 1589494071}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1593833488
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalPosition.x
value: -2.5
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalPosition.z
value: 5.54
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8974173482434486718, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_Name
value: "\u697C\u4E0B\u5927\u5385"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
--- !u!1001 &1630270065
PrefabInstance:
m_ObjectHideFlags: 0
@@ -12405,3 +12462,4 @@ SceneRoots:
- {fileID: 1562089325}
- {fileID: 1825352046}
- {fileID: 2031358208}
- {fileID: 1593833488}

162
Assets/_Valheim/Scenes/NanJing_GongSi1Lou.unity
View File

@@ -66721,6 +66721,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 1342700418081356413, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1342700418081356413, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -67009,6 +67013,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 2249515747370199601, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2249515747370199601, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -67089,6 +67097,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 2501851477618392138, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2501851477618392138, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -67357,6 +67369,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 3583424231931086410, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3583424231931086410, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -67517,6 +67533,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 4232705036038658993, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4232705036038658993, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -67625,6 +67645,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 4700461133031833398, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4700461133031833398, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -67841,6 +67865,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 5834845674733958388, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5834845674733958388, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -68013,6 +68041,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 6564400549440818340, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6564400549440818340, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -68025,10 +68057,18 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 6584353032983476993, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6584353032983476993, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 6599591546035740237, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6599591546035740237, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -68157,6 +68197,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 7272961969513745094, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7272961969513745094, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -68229,6 +68273,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 7558807960011847722, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7558807960011847722, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -68377,6 +68425,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 8188916472789586121, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8188916472789586121, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -68541,6 +68593,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 8922744412129024460, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8922744412129024460, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
@@ -68602,7 +68658,45 @@ PrefabInstance:
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_RemovedGameObjects:
- {fileID: 7406067910975627251, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 62116166447063451, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 8127251404636468954, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 2676471982365625855, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 8090802457222088187, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 1520343592348652248, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 5844069736145412949, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 4420956914164218227, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 4702952735826156864, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 4886165147321891411, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 7174538088539535476, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 3556615973240208401, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 4173348512990640454, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 8735182967056606578, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 2388033011590784075, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 5042924309550994696, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 5312047535844032076, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 7230359468557850385, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 354016716954351584, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 8171700325033910585, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 8238295783345522842, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 3191085118232128654, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 8922744412129024460, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 6564400549440818340, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 1342700418081356413, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 7558807960011847722, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 7272961969513745094, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 5834845674733958388, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 2249515747370199601, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 1648099847010176272, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 6584353032983476993, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 4232705036038658993, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 3583424231931086410, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 799404267987914238, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 5151428317211779352, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 7701102682663403409, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 4373303294382937779, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
- {fileID: 6599591546035740237, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4e3961fbc3c221a43a07f3db6fe95560, type: 3}
@@ -87547,6 +87641,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6012074113014655496, guid: 81c0e9bb152331c4d84e6f558cab5b11, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -107810,6 +107908,67 @@ MonoBehaviour:
soundPlayedCustomEvent:
willCleanUpDelegatesAfterStop: 1
frames: 182
--- !u!1001 &1028619366
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalPosition.x
value: -2.5
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalPosition.z
value: 5.54
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8974173482434486718, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_Name
value: "\u697C\u4E0B\u5927\u5385"
objectReference: {fileID: 0}
- target: {fileID: 8974173482434486718, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3}
--- !u!1 &1029327862
GameObject:
m_ObjectHideFlags: 0
@@ -238008,6 +238167,7 @@ SceneRoots:
- {fileID: 1511208667}
- {fileID: 4504842964232407134}
- {fileID: 514640002}
- {fileID: 1028619366}
- {fileID: 327597842}
- {fileID: 136934191}
- {fileID: 949052346}

102
Assets/_Valheim/Scripts/Weapons/IceStaff.cs
View File

@@ -126,57 +126,57 @@ public class IceStaff : Weapon
UserWeapon(false);
}
#else
bool isTrigger = false;
if (_rightHandDevice != null)
{
_rightHandDevice.TryGetFeatureValue(CommonUsages.triggerButton, out isTrigger);
if (isTrigger && !_isClick)
{
_isClick = true;
}
else if (!isTrigger)
{
_isClick = false;
}
}
// 一直按
if (isTrigger && !IsIceing)
{
if (GameManager.Ins.isPlayPetWorld)
{
//Charge();
}
}
// 按下
if (_isClick && !IsIceing)
{
if (GameManager.Ins.isPlayPetWorld)
{
// 显示蓄力粒子
//ShowEffect();
//MasterAudio.PlaySound3DFollowTransform(chargedEnergSound, transform);
}
else
{
GameManager.Ins.SelectCard();
}
UserWeapon(true);
}
// 抬起
if (!_isClick && !IsIceing)
{
if (GameManager.Ins.isPlayPetWorld)
{
_frame = 0;
//HideEffect();
//MasterAudio.StopAllOfSound(chargedEnergSound);
if (_areaIns != null && !IsIceing)
{
_areaIns.SetActive(false);
}
}
UserWeapon(false);
}
// bool isTrigger = false;
// if (_rightHandDevice != null)
// {
// _rightHandDevice.TryGetFeatureValue(CommonUsages.triggerButton, out isTrigger);
// if (isTrigger && !_isClick)
// {
// _isClick = true;
// }
// else if (!isTrigger)
// {
// _isClick = false;
// }
// }
// // 一直按
// if (isTrigger && !IsIceing)
// {
// if (GameManager.Ins.isPlayPetWorld)
// {
// //Charge();
// }
// }
// // 按下
// if (_isClick && !IsIceing)
// {
// if (GameManager.Ins.isPlayPetWorld)
// {
// // 显示蓄力粒子
// //ShowEffect();
// //MasterAudio.PlaySound3DFollowTransform(chargedEnergSound, transform);
// }
// else
// {
// GameManager.Ins.SelectCard();
// }
// UserWeapon(true);
// }
// // 抬起
// if (!_isClick && !IsIceing)
// {
// if (GameManager.Ins.isPlayPetWorld)
// {
// _frame = 0;
// //HideEffect();
// //MasterAudio.StopAllOfSound(chargedEnergSound);
// if (_areaIns != null && !IsIceing)
// {
// _areaIns.SetActive(false);
// }
// }
// UserWeapon(false);
// }
#endif
}