diff --git a/Assets/_Zombie/Scenes/Henan_Xinzheng_Shuanghudadao_Longhujinyicheng.meta b/Assets/_Zombie/Scenes/Henan_Xinzheng_Shuanghudadao_Longhujinyicheng.meta deleted file mode 100644 index e962f778..00000000 --- a/Assets/_Zombie/Scenes/Henan_Xinzheng_Shuanghudadao_Longhujinyicheng.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 29ebc2ea41abd4941ad6156ffff919b3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Zombie/Scripts/Player.cs b/Assets/_Zombie/Scripts/Player.cs index de910bf4..bf4b5485 100644 --- a/Assets/_Zombie/Scripts/Player.cs +++ b/Assets/_Zombie/Scripts/Player.cs @@ -225,7 +225,7 @@ public class Player : NetworkRoomPlayer,IDamagable if (other.tag == "WeaponProp") { WeaponProp prop = other.transform.GetComponent(); - //prop.Collider(); + if(NowGunIndex==(int)prop.weaponType) return; diff --git a/Assets/_Zombie/Scripts/Prop/ItemProp.cs b/Assets/_Zombie/Scripts/Prop/ItemProp.cs index f0dfb760..fe2ca780 100644 --- a/Assets/_Zombie/Scripts/Prop/ItemProp.cs +++ b/Assets/_Zombie/Scripts/Prop/ItemProp.cs @@ -26,7 +26,8 @@ public class ItemProp : NetworkBehaviour CoroutineTaskManager.Instance.WaitSecondTodo(() => { Collider(); - }, 15f); + NetworkServer.Destroy(transform.gameObject); + }, 8f); } [ClientRpc] @@ -45,6 +46,6 @@ public class ItemProp : NetworkBehaviour isDeal = true; box.enabled = false; transform.gameObject.SetActive(false); - NetworkServer.Destroy(transform.gameObject); + //NetworkServer.Destroy(transform.gameObject); } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index bb6c90ed..d8fe4921 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,10 +5,10 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 0 + - enabled: 1 path: Assets/_Zombie/Scenes/Company1Floor.unity guid: 386a8fdea01af8a4e8d4a9835407ddec - - enabled: 1 + - enabled: 0 path: Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity guid: df8c4c84bf9690442a51ed602038e198 - enabled: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 75bd9090..9e1371c0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -163,7 +163,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.pineappletech.zombie.zhejiangsahoxingshengzhouwuyueguangchang + Android: com.pineappletech.zombie.company1floor Standalone: com.DefaultCompany.com.unity.template.ar buildNumber: Standalone: 0