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

fix：游玩时间调回15分钟，调整过关流程

Browse Source
This commit is contained in:
bzx
2025-07-23 14:22:20 +08:00
parent 0e430fc3a9
commit 616d01c3f2
10 changed files with 186650 additions and 186130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

372708
Assets/FR2_Cache.asset
View File

File diff suppressed because it is too large Load Diff

2
Assets/_Valheim/Resources/UI/HUD.prefab
View File

@@ -399,7 +399,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 10:00
m_text: 15:00
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 09cbb2b2cd276b0449d8a3d48e1b3083, type: 2}
m_sharedMaterial: {fileID: 1612330459029087759, guid: 09cbb2b2cd276b0449d8a3d48e1b3083, type: 2}

17
Assets/_Valheim/Scenes/Anhui_Wuhu_Guanwei.unity
View File

@@ -31893,7 +31893,8 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_RemovedGameObjects:
- {fileID: 5003751624981588199, guid: a4cd9391d0854ed4abdc408cb7f6a9ef, type: 3}
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 3977494989974979045, guid: a4cd9391d0854ed4abdc408cb7f6a9ef, type: 3}
insertIndex: -1
@@ -34461,11 +34462,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}
@@ -128126,7 +128122,6 @@ MonoBehaviour:
MRBgm: {fileID: 1786744903}
MRLeftControl: {fileID: 638622008}
MRRightControl: {fileID: 1237138834}
PXRManager: {fileID: 0}
FakeTree: {fileID: 501244322}
WorkTree:
- {fileID: 0}
@@ -128139,7 +128134,6 @@ MonoBehaviour:
- {fileID: 206978299}
aiDrPos: {fileID: 1540725355}
doorPos: {fileID: 848928229}
initPos: {fileID: 0}
petPos: {fileID: 162241289}
badges:
- {fileID: 206978306}
@@ -128156,11 +128150,8 @@ MonoBehaviour:
- {fileID: 23800000, guid: 93d45f4cded3ac448921d7805c5f1888, type: 2}
- {fileID: 23800000, guid: cdb565319bcbc54458e432699a2e8d6b, type: 2}
winLightBgm: {fileID: 1875134527}
guideList:
- {fileID: 307754484}
goEffect: {fileID: 327597843}
Version: 1.2.1
place: 6
place: 8
--- !u!1 &1289206090
GameObject:
m_ObjectHideFlags: 0
@@ -163278,7 +163269,7 @@ MonoBehaviour:
IncludeChildColliders: 0
RuntimeFollower: {fileID: 0}
colliderMaxDistance: 100
lastTimeMaxDistanceCalced: 638870631283531604
lastTimeMaxDistanceCalced: 638888669765079542
--- !u!1 &1878003003
GameObject:
m_ObjectHideFlags: 0

11
Assets/_Valheim/Scripts/GameManager.cs
View File

@@ -101,7 +101,7 @@ namespace Valheim
[SyncVar]
public long vistEnd = 0;
// 总游玩时长
private int vistAllTime = (int)(60 * 10F);
private int vistAllTime = (int)(60 * 15F);
// 游戏是否结束
[NonSerialized]
[SyncVar]
@@ -350,7 +350,7 @@ namespace Valheim
}
public bool isShowPetWorld;
public void ShowPetWorld(GameObject door)
public void ShowPetWorld(GameObject door=null)
{
if(isShowPetWorld)
return;
@@ -382,8 +382,8 @@ namespace Valheim
});
UserJoinPet();
}
//other.gameObject.GetComponent<SphereCollider>().enabled = false;
NetworkServer.Destroy(door);
if(door!=null)
NetworkServer.Destroy(door);
});
}
@@ -404,6 +404,7 @@ namespace Valheim
public void CreateBadge(Vector3 pos,bool isRotate)
{
isShowPetWorld = false;
GameObject obj = Instantiate(badgePres[curMapId]);
NetworkServer.Spawn(obj);
obj.transform.position = pos+new Vector3(0,1,0);
@@ -1926,7 +1927,7 @@ namespace Valheim
{
if(isShowBattleArea)
return;
isShowPetWorld = true;
isShowBattleArea = true;
//触发区域怪物
GameInit.Ins.self.ClosePathGuide();
StartCoroutine(CreateBattleAreaEnemy());

3
Assets/_Valheim/Scripts/HUD.cs
View File

@@ -91,8 +91,5 @@ public class HUD : UIBehaviour
{
}
// Debug.Log("3333333:" + );
}
}

26
Assets/_Valheim/Scripts/Item/Badge.cs
View File

@@ -12,13 +12,24 @@ public class Badge : MonoBehaviour
public bool isFly;
private bool _isEnd;
public void Init(bool curIsRotate)
{
isRotate=curIsRotate;
CoroutineTaskManager.Instance.WaitSecondTodo(() =>
{
isFly = true;
MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
{
if(_isEnd)
return;
_isEnd = true;
GameManager.Ins.ShowPetWorld();
NetworkServer.Destroy(gameObject);
},6f);
}, 6f);
_isEnd = false;
}
private void Update()
{
@@ -34,12 +45,11 @@ public class Badge : MonoBehaviour
{
if (other.CompareTag("Weapon")|| other.CompareTag("Player"))
{
GameObject obj= GameManager.Ins.CreateDoorCoiider(new Vector3(transform.position.x,0,transform.position.z), Vector3.zero);
NetworkServer.Destroy(gameObject);
MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
{
GameManager.Ins.ShowPetWorld(obj);
},5f);
if(_isEnd)
return;
_isEnd = true;
GameManager.Ins.ShowPetWorld();
}
}
@@ -49,9 +59,13 @@ public class Badge : MonoBehaviour
Vector3 newPos = MRNetworkManager.Ins.roomSlots[0].transform.position;
newPos.y = 0.8f;
transform.position = Vector3.MoveTowards(transform.position, newPos, 4f * Time.deltaTime);
if ( Vector3.Distance(transform.position, newPos) < 0.3f)
{
if(_isEnd)
return;
_isEnd = true;
GameManager.Ins.ShowPetWorld();
NetworkServer.Destroy(gameObject);
}
}

3
Assets/_Valheim/Scripts/Laboratory/AiDr.cs
View File

@@ -83,7 +83,7 @@ public class AiDr : NetworkBehaviour
MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
{
ToGameState();
},4f);
},8f);
MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
{
if (curState == 1)
@@ -104,7 +104,6 @@ public class AiDr : NetworkBehaviour
{
ChangeState(-1);
CreateDoor();
},8f);
}

2
Assets/_Valheim/Scripts/Player.cs
View File

@@ -71,7 +71,7 @@ namespace Valheim
GameInit.Ins.self = this;
GameManager.Ins.AddTeamCmd(index);
//PickUpWeapon(WeaponType.LoveStuff, -999);
PickUpWeapon(WeaponType.Hand, -999,30);
PickUpWeapon(WeaponType.Hand, -999,50);
CreatePathGuide();
}
else if (isServer)

6
ProjectSettings/EditorBuildSettings.asset
View File

@@ -5,7 +5,7 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 1
- enabled: 0
path: Assets/_Valheim/Scenes/NanJing_GongSi1Lou.unity
guid: dab1cc15df348a84f8a2662c2b6311b2
- enabled: 0
@@ -32,7 +32,7 @@ EditorBuildSettings:
- enabled: 0
path: Assets/_Valheim/Scenes/Guangzhou_Panyv_Zhanting.unity
guid: 9ab657e700df3a44b8dd0b50c2481f73
- enabled: 0
- enabled: 1
path: Assets/_Valheim/Scenes/Anhui_Wuhu_Guanwei.unity
guid: 5e769a2c0b25fd945830d640b1ff0cf1
- enabled: 0
@@ -44,7 +44,7 @@ EditorBuildSettings:
- enabled: 0
path: Assets/_Valheim/Scenes/Shandong_Jining_Wanhuicheng_nei.unity
guid: f05abb5f4580e3b499666be942a8d0e1
- enabled: 1
- enabled: 0
path: Assets/_Valheim/Scenes/Hubei_Xiangyang_Kejiguan.unity
guid: a311fcd2d52cf8042924fc004a838fa9
m_configObjects:

2
ProjectSettings/ProjectSettings.asset
View File

@@ -162,7 +162,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.pineappletech.valheim.gongsiyilou
Android: com.pineappletech.valheim.anhuiwuhuguanwei
Standalone: com.DefaultCompany.DinosaurAge
buildNumber:
Standalone: 0