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

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

Browse Source
This commit is contained in:
ZYT
2025-09-02 18:26:35 +08:00
parent dd0f8f0f74 aa4ba610ef
commit d7ff78707a
9 changed files with 70114 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33126
Assets/_Zombie/Scenes/Henan_Xinzheng_Shuanghudadao_Longhujinyicheng.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/_Zombie/Scenes/Henan_Xinzheng_Shuanghudadao_Longhujinyicheng.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 948dace22d0fecd40bb702fb7e5774e2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

36963
Assets/_Zombie/Scenes/Shandong_Langfang_QingzhouTaihuacheng.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/_Zombie/Scenes/Shandong_Langfang_QingzhouTaihuacheng.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e0c90b79158dec949be7c3689ebd8533
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/_Zombie/Scripts/Guns/NewGun/Gun2.cs
View File

@@ -95,7 +95,7 @@ public class Gun2 : Launcher
}
#endif
if (isTrigger||isGrip)
if ((isTrigger||isGrip)&&!GameLocal.Ins.self.isDie&& GameManager.Ins.isStart)
{
CmdShot();
}

2
Assets/_Zombie/Scripts/Guns/NewGun/Gun3.cs
View File

@@ -78,7 +78,7 @@ public class Gun3 : Launcher
}
#endif
if (isTrigger||isGrip)
if ((isTrigger||isGrip)&&!GameLocal.Ins.self.isDie&& GameManager.Ins.isStart)
{
CmdShot();
}

2
Assets/_Zombie/Scripts/MRInput.cs
View File

@@ -104,6 +104,8 @@ public class MRInput : MonoBehaviour
{
if(GameLocal.Ins.self==null||GameLocal.Ins.self.isDie)
return;
if(GameManager.Ins==null|| !GameManager.Ins.isStart)
return;
#if !UNITY_EDITOR && UNITY_ANDROID && PICO
if (_leftHandDevice != null)
{

6
ProjectSettings/EditorBuildSettings.asset
View File

@@ -23,6 +23,12 @@ EditorBuildSettings:
- enabled: 0
path: Assets/_Zombie/Scenes/Zhejiang_Jinhua_Kejiguan.unity
guid: 745618b4d2230094fae3279122f05891
- enabled: 0
path: Assets/_Zombie/Scenes/Henan_Xinzheng_Shuanghudadao_Longhujinyicheng.unity
guid: 948dace22d0fecd40bb702fb7e5774e2
- enabled: 1
path: Assets/_Zombie/Scenes/Shandong_Langfang_QingzhouTaihuacheng.unity
guid: e0c90b79158dec949be7c3689ebd8533
m_configObjects:
Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
type: 2}

2
ProjectSettings/ProjectSettings.asset
View File

@@ -163,7 +163,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.pineappletech.zombie.zhejiangshaoxingshengzhouwuyueguangchang
Android: com.pineappletech.zombie.shandonglangfangqingzhouTaihuacheng
Standalone: com.DefaultCompany.com.unity.template.ar
buildNumber:
Standalone: 0