Commit cf8de590 authored by czy's avatar czy

修改道具模型

parent 8e83677e
...@@ -38,7 +38,7 @@ RenderSettings: ...@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &4 --- !u!157 &4
LightmapSettings: LightmapSettings:
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 07bc4aa2b407c40499b42787f745effa guid: 317d19313d1d7204e9bbc37122116e7f
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
......
fileFormatVersion: 2
guid: ca40beb7fc6998f40a6e15a59c6ab599
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 325c11e064841204bbd6de7c85bebef6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: aa43ce62596b0784081ec9bd0abc8516
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 2e117c0bfc6741e4ebc4a8c8aebc0b8a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 55c4962f2a6593c4b9c1bb6003b1ff08
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -5,7 +5,7 @@ using UnityEngine; ...@@ -5,7 +5,7 @@ using UnityEngine;
public class Gold : MonoBehaviour public class Gold : MonoBehaviour
{ {
public ParticleSystem particleGetGold;//获取金币特效 public ParticleSystem particleGetGold;//获取金币特效
private ParticleSystem copyParticle;
//private void OnTriggerEnter(Collider other) //private void OnTriggerEnter(Collider other)
//{ //{
// if (other.tag == "Player") // if (other.tag == "Player")
...@@ -20,11 +20,19 @@ public class Gold : MonoBehaviour ...@@ -20,11 +20,19 @@ public class Gold : MonoBehaviour
{ {
} }
//播放吃金币特效
public void PlayParticle() public void PlayParticle()
{ {
ParticleSystem copyParticle = Instantiate(particleGetGold, particleGetGold.transform.position, particleGetGold.transform.rotation); copyParticle = Instantiate(particleGetGold, particleGetGold.transform.position, particleGetGold.transform.rotation);
copyParticle.Play(); copyParticle.Play();
//Invoke("DestoryGetGoldParticle", 2);
} }
//销毁实例化的吃金币特效。
//public void DestoryGetGoldParticle()
//{
// print("开始销毁吃金币特效。");
// Destroy(copyParticle);
//}
} }
...@@ -12,11 +12,11 @@ public class Prop : MonoBehaviour ...@@ -12,11 +12,11 @@ public class Prop : MonoBehaviour
[Header("打手")] [Header("打手")]
public GameObject enemy3AI; public GameObject enemy3AI;
public float disZ = 50; public float disZ = 50;
public Material Enemy_VertigoMat; public GameObject Enemy_VertigoObj;
[Header("巨石")] [Header("巨石")]
//public GameObject giantRockObj; //public GameObject giantRockObj;
public List<GameObject> rockList; public List<GameObject> rockList;
public Material GiantRockMat; public GameObject GiantRockObj;
private PropType propType; private PropType propType;
...@@ -40,8 +40,8 @@ public class Prop : MonoBehaviour ...@@ -40,8 +40,8 @@ public class Prop : MonoBehaviour
{ {
switch (propType) switch (propType)
{ {
case PropType.Enemy_Vertigo: GetComponent<MeshRenderer>().material = Enemy_VertigoMat; break; case PropType.Enemy_Vertigo: Enemy_VertigoObj.SetActive(true); break;
case PropType.GiantRock: GetComponent<MeshRenderer>().material = GiantRockMat; break; case PropType.GiantRock: GiantRockObj.SetActive(true); break;
} }
} }
...@@ -69,7 +69,8 @@ public class Prop : MonoBehaviour ...@@ -69,7 +69,8 @@ public class Prop : MonoBehaviour
{ {
//print("出现打手。"); //print("出现打手。");
//print(DoRanking._instance.rankingList[2].name + "---" + other.gameObject.name+" "+ (DoRanking._instance.rankingList[2]== other.gameObject).ToString()); //print(DoRanking._instance.rankingList[2].name + "---" + other.gameObject.name+" "+ (DoRanking._instance.rankingList[2]== other.gameObject).ToString());
enemy3AI.transform.position = DoRanking._instance.rankingList[2].transform.position + new Vector3(0, 0, disZ);//new Vector3(0,0, 100) Vector3 tartetPos = DoRanking._instance.rankingList[2].transform.position;
enemy3AI.transform.position = new Vector3(enemy3AI.transform.position.x, enemy3AI.transform.position.y, tartetPos.z+ disZ);//new Vector3(0,0, 100)
enemy3AI.SetActive(true); enemy3AI.SetActive(true);
Destroy(gameObject); Destroy(gameObject);
} }
......
This diff is collapsed.
This diff is collapsed.
...@@ -10,17 +10,17 @@ PrefabInstance: ...@@ -10,17 +10,17 @@ PrefabInstance:
- target: {fileID: 7402254125602564801, guid: 622a228e8b911d540b952a2eeda63b42, - target: {fileID: 7402254125602564801, guid: 622a228e8b911d540b952a2eeda63b42,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 1.1669 value: -2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7402254125602564801, guid: 622a228e8b911d540b952a2eeda63b42, - target: {fileID: 7402254125602564801, guid: 622a228e8b911d540b952a2eeda63b42,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0.89438 value: 1.67
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7402254125602564801, guid: 622a228e8b911d540b952a2eeda63b42, - target: {fileID: 7402254125602564801, guid: 622a228e8b911d540b952a2eeda63b42,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 69.714 value: 161
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7402254125602564801, guid: 622a228e8b911d540b952a2eeda63b42, - target: {fileID: 7402254125602564801, guid: 622a228e8b911d540b952a2eeda63b42,
type: 3} type: 3}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment