Skip to content

S
StockRunning
Commit 14c0a833 authored by czy's avatar czy
Browse files
Options

修改Level2金币和特效

parent cc549c23
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 48999 additions and 14012 deletions
StockRunning/Assets/#A1_Scenes/DemoScenes.unity
View file @ 14c0a833
......@@ -121,6 +121,80 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &25944467
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1147898531}
m_Modifications:
- target: {fileID: 8416172305565777436, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_Name
value: Gold
objectReference: {fileID: 0}
- target: {fileID: 8416172305565777436, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8416172305565777439, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_LocalPosition.x
value: 1.61
objectReference: {fileID: 0}
- target: {fileID: 8416172305565777439, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_LocalPosition.y
value: -3.0256503
objectReference: {fileID: 0}
- target: {fileID: 8416172305565777439, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.00594759
objectReference: {fileID: 0}
- target: {fileID: 8416172305565777439, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8416172305565777439, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8416172305565777439, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8416172305565777439, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8416172305565777439, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8416172305565777439, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8416172305565777439, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8416172305565777439, guid: 99130761b55090848869ff6adb785326,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 99130761b55090848869ff6adb785326, type: 3}
--- !u!1001 &39704221
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -1474,6 +1548,12 @@ SkinnedMeshRenderer:
m_Center: {x: -0.000002719462, y: -0.042991553, z: 1.5222116}
m_Extent: {x: 0.20099425, y: 0.13802089, z: 0.18710148}
m_DirtyAABB: 0
--- !u!4 &690225410 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8416172305565777439, guid: 99130761b55090848869ff6adb785326,
type: 3}
m_PrefabInstance: {fileID: 25944467}
m_PrefabAsset: {fileID: 0}
--- !u!1 &707446923
GameObject:
m_ObjectHideFlags: 0
......@@ -2090,6 +2170,7 @@ Transform:
- {fileID: 1052929394}
- {fileID: 1135058816}
- {fileID: 57808292}
- {fileID: 690225410}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -2221,6 +2302,7 @@ MonoBehaviour:
Model1: {fileID: 0}
Model2: {fileID: 0}
Model3: {fileID: 0}
particleChange: {fileID: 0}
MoveSpeed: 0
--- !u!143 &1252711109
CharacterController:
......
StockRunning/Assets/#A2_Scripts/Battle/BattleCtrl.cs
View file @ 14c0a833
......@@ -61,6 +61,9 @@ public class BattleCtrl : MonoBehaviour
//实时更新更新排行榜。
public delegate void UpdateRanking();
public UpdateRanking updateRanking;
//游戏胜利
public delegate void GameWin();
public GameWin gameWin;
private void Awake()
......@@ -157,8 +160,11 @@ public class BattleCtrl : MonoBehaviour
LocalRecord.SetIntRecord(levelManager.CurLevelIndex.ToString(), varCurTime);
}
//curLevel.battleView.playerView.OnWin();
gameWin?.Invoke();
}
/// <summary>
/// 加载关卡前调用
/// </summary>
......
StockRunning/Assets/Art_Assets/0C2_Animations/Unity Export.meta → StockRunning/Assets/#B2_Graphics.meta
View file @ 14c0a833
fileFormatVersion: 2
guid: 07bc4aa2b407c40499b42787f745effa
guid: 317d19313d1d7204e9bbc37122116e7f
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
StockRunning/Assets/Prefabs/Effects.meta → StockRunning/Assets/#Z1_Tabs.meta
View file @ 14c0a833
fileFormatVersion: 2
guid: af8835347db44e34b9a0f93089504ff1
guid: ca40beb7fc6998f40a6e15a59c6ab599
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
StockRunning/Assets/#Z2_Documents.meta 0 → 100644
View file @ 14c0a833
fileFormatVersion: 2
guid: 325c11e064841204bbd6de7c85bebef6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/#Z3_WebAPI.meta 0 → 100644
View file @ 14c0a833
fileFormatVersion: 2
guid: aa43ce62596b0784081ec9bd0abc8516
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/#Z4_Icons.meta 0 → 100644
View file @ 14c0a833
fileFormatVersion: 2
guid: 2e117c0bfc6741e4ebc4a8c8aebc0b8a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/#Z4_Previews.meta 0 → 100644
View file @ 14c0a833
fileFormatVersion: 2
guid: 55c4962f2a6593c4b9c1bb6003b1ff08
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/My/Model/Gold_light3.prefab 0 → 100644
View file @ 14c0a833
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5269546135792715193
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8219168610341880517}
- component: {fileID: 1737222737952525463}
- component: {fileID: 5716962406456944129}
- component: {fileID: 1237059291370167449}
m_Layer: 0
m_Name: Gold_light3 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8219168610341880517
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5269546135792715193}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8858257297076126146}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1737222737952525463
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5269546135792715193}
m_Mesh: {fileID: 4300000, guid: 44042356cd03d904fa501e1014eef3c8, type: 3}
--- !u!23 &5716962406456944129
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5269546135792715193}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 8347c77f52941f44b94ad5ed92c337a7, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!114 &1237059291370167449
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5269546135792715193}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d96c51ee2498d904bb6f7047db052b83, type: 3}
m_Name:
m_EditorClassIdentifier:
Spinswitch: 1
speed: 100
--- !u!1001 &589609591371752542
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8219168610341880517}
m_Modifications:
- target: {fileID: 8268728593117055556, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
propertyPath: m_Name
value: FireFliesBlue (2)
objectReference: {fileID: 0}
- target: {fileID: 8268728593117111708, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8268728593117111708, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8268728593117111708, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8268728593117111708, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8268728593117111708, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8268728593117111708, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8268728593117111708, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8268728593117111708, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8268728593117111708, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8268728593117111708, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8268728593117111708, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e, type: 3}
--- !u!4 &8858257297076126146 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8268728593117111708, guid: 73a66a7fcb0f88a4c8de8e2f99f95e4e,
type: 3}
m_PrefabInstance: {fileID: 589609591371752542}
m_PrefabAsset: {fileID: 0}
StockRunning/Assets/My/Model/Gold_light3.prefab.meta 0 → 100644
View file @ 14c0a833
fileFormatVersion: 2
guid: c22c482d4ec5f344c8c8cc5bfe208b04
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/My/Scripts/AI/AIMove.cs
View file @ 14c0a833
......@@ -32,6 +32,8 @@ public class AIMove : MonoBehaviour
public GameObject Model1;
public GameObject Model2;
public GameObject Model3;
[Header("特效")]
public ParticleSystem particleChange; //变身特效
private RaycastHit RHit;
private CharacterController characterController;
......@@ -91,7 +93,7 @@ public class AIMove : MonoBehaviour
m_thumbRT = GameServices.inputService.joyStick.thumb;
//获取animator组件
animator = GetComponentInChildren<Animator>();
ChangeModel();
//ChangeModel();
}
private void OnTriggerEnter(Collider other)
......@@ -244,7 +246,8 @@ public class AIMove : MonoBehaviour
break;
case AIStrategy.AvoidObstaclesAndPickUp:
DoPickUpPropsAndGold();
DoAvoidObstaclesAndPickUp();
DoAvoidObstaclesAndPickUp("Wall");
DoAvoidObstaclesAndPickUp("Prickle");
break;
default: DoStraightLine();
break;
......@@ -346,7 +349,7 @@ public class AIMove : MonoBehaviour
}
}
//AI策略，需要每一帧都执行放到FixedUpdate中。
public void DoAvoidObstaclesAndPickUp()
public void DoAvoidObstaclesAndPickUp(string obstaclesTag)
{
Debug.DrawRay(raySeeWayPos.position, raySeeWayPos.forward * 10f, Color.red);
RaycastHit seeHit;
......@@ -354,7 +357,7 @@ public class AIMove : MonoBehaviour
if (seeHit.collider != null)
{
//print("看见物体：" + seeHit.collider.tag);
if (seeHit.collider.tag == "Prickle")
if (seeHit.collider.tag == obstaclesTag)//if (seeHit.collider.tag == "Prickle")
{
//前方有障碍物
//deltaX = 0;//将寻金币的横向的位移变为0；
......@@ -640,16 +643,19 @@ public class AIMove : MonoBehaviour
switch (SpeedLevel)
{
case 1:
PlayParticle();
Model1.SetActive(true);
Model2.SetActive(false);
Model3.SetActive(false);
break;
case 2:
PlayParticle();
Model1.SetActive(false);
Model2.SetActive(true);
Model3.SetActive(false);
break;
case 3:
PlayParticle();
Model1.SetActive(false);
Model2.SetActive(false);
Model3.SetActive(true);
......@@ -678,6 +684,10 @@ public class AIMove : MonoBehaviour
}
}
}
public void PlayParticle()
{
particleChange.Play();
}
private void OnDestroy()
{
m_targetTrans = null;
......
StockRunning/Assets/My/Scripts/EndPoint.cs
View file @ 14c0a833
......@@ -4,10 +4,11 @@ using UnityEngine;
public class EndPoint : MonoBehaviour
{
// Start is called before the first frame update
[Header("游戏胜利特效")]
public ParticleSystem particleGameWin;
void Start()
{
BattleCtrl.instance.gameWin += gameWin;
}
// Update is called once per frame
......@@ -29,4 +30,12 @@ public class EndPoint : MonoBehaviour
BattleCtrl.instance.OnBattleFail();
}
}
public void gameWin()
{
particleGameWin.Play();
}
private void OnDestroy()
{
BattleCtrl.instance.gameWin -= gameWin;
}
}
StockRunning/Assets/My/Scripts/Player/PlayerMove.cs
View file @ 14c0a833
......@@ -31,7 +31,8 @@ public class PlayerMove : MonoBehaviour
public GameObject Model1;
public GameObject Model2;
public GameObject Model3;
[Header("特效")]
public ParticleSystem particleChange; //变身特效
private RaycastHit RHit;
private CharacterController characterController;
......@@ -96,7 +97,7 @@ public class PlayerMove : MonoBehaviour
//m_rigidBody = GetComponent<Rigidbody>();
//获取characterController组件
characterController = GetComponent<CharacterController>();
ChangeModel();
}
private void OnTriggerEnter(Collider other)
......@@ -276,7 +277,7 @@ public class PlayerMove : MonoBehaviour
if (m_bIsCanMove && !BattleCtrl.instance.isEndBattle)
{
xDelta = 0;//避免眩晕期间不会执行UpdateJoystick();造成偏移现象。
if (timerVertigo <= 0)
{
timerVertigo = 0;
......@@ -287,7 +288,7 @@ public class PlayerMove : MonoBehaviour
{
//眩晕
timerVertigo -= Time.deltaTime;
xDelta = 0;//避免眩晕期间不会执行UpdateJoystick();造成偏移现象。
}
}
......@@ -384,12 +385,16 @@ public class PlayerMove : MonoBehaviour
}
else if (currentGesture.type == EasyTouch.EvtType.On_TouchUp)
{
//print("鼠标抬起");//眩晕期间不会进来，也会发生飘移现象
//print("On_TouchUp抬起");//眩晕期间不会进来，也会发生飘移现象
xDelta = 0;
}
else if (currentGesture.type == EasyTouch.EvtType.On_DragEnd)
{
//print("On_DragEnd抬起");//眩晕期间不会进来，也会发生飘移现象
xDelta = 0;
}
}
//else if (currentGesture != null && (currentGesture.type == EasyTouch.EvtType.On_DragEnd))
//{
// addXTemp = 0;
......@@ -525,16 +530,19 @@ public class PlayerMove : MonoBehaviour
switch (SpeedLevel)
{
case 1:
PlayParticle();
Model1.SetActive(true);
Model2.SetActive(false);
Model3.SetActive(false);
break;
case 2:
PlayParticle();
Model1.SetActive(false);
Model2.SetActive(true);
Model3.SetActive(false);
break;
case 3:
PlayParticle();
Model1.SetActive(false);
Model2.SetActive(false);
Model3.SetActive(true);
......@@ -565,6 +573,11 @@ public class PlayerMove : MonoBehaviour
}
}
public void PlayParticle()
{
particleChange.Play();
}
private void OnDestroy()
{
m_targetTrans = null;
......
StockRunning/Assets/Prefabs/Level1.prefab
View file @ 14c0a833
This source diff could not be displayed because it is too large. You can view the blob instead.
StockRunning/Assets/Prefabs/Level2My.prefab
View file @ 14c0a833
This diff is collapsed.
StockRunning/Assets/Resources/Gold.prefab
View file @ 14c0a833
This diff is collapsed.
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