Skip to content

B
BattleMuscle
Commit cc11110e authored by czy's avatar czy
Browse files
Options

修复boss动画，跳舞，爆食物。

parent b24f623e
Show whitespace changes
Inline Side-by-side
Showing with 56512 additions and 240 deletions
BattleMuscle/Assets/#A2_Scripts/Battle/BattleCtrl.cs
View file @ cc11110e
...@@ -201,7 +201,7 @@ public class BattleCtrl : MonoBehaviour ...@@ -201,7 +201,7 @@ public class BattleCtrl : MonoBehaviour
/// <param name="levelIndex"></param> /// <param name="levelIndex"></param>
void LoadLevel(int levelIndex) void LoadLevel(int levelIndex)
{ {
print("加载关卡："+levelIndex); //print("加载关卡："+levelIndex);
m_levelManager.LoadLevel(levelIndex); m_levelManager.LoadLevel(levelIndex);
} }
......
BattleMuscle/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @ cc11110e
...@@ -133,7 +133,7 @@ public class BattleUI : MonoBehaviour ...@@ -133,7 +133,7 @@ public class BattleUI : MonoBehaviour
void LoadCurLevel() void LoadCurLevel()
{ {
LoadSceneLevel1(); LoadSceneLevel1();
//print("隐藏战斗UI");
//UI的显示和隐藏 //UI的显示和隐藏
m_loseObj.SetActive(false); m_loseObj.SetActive(false);
m_battleObj.SetActive(false); m_battleObj.SetActive(false);
...@@ -150,6 +150,7 @@ public class BattleUI : MonoBehaviour ...@@ -150,6 +150,7 @@ public class BattleUI : MonoBehaviour
void TryAgainLevel() void TryAgainLevel()
{ {
LoadSceneLevel1(); LoadSceneLevel1();
//print("隐藏战斗UI");
//UI的显示和隐藏 //UI的显示和隐藏
m_loseObj.SetActive(false); m_loseObj.SetActive(false);
...@@ -175,6 +176,8 @@ public class BattleUI : MonoBehaviour ...@@ -175,6 +176,8 @@ public class BattleUI : MonoBehaviour
} }
public void NextLevel() public void NextLevel()
{ {
//print("隐藏战斗UI");
m_successObj.SetActive(false); m_successObj.SetActive(false);
m_battleObj.SetActive(false); m_battleObj.SetActive(false);
m_startLogoObj.SetActive(true); m_startLogoObj.SetActive(true);
...@@ -191,7 +194,7 @@ public class BattleUI : MonoBehaviour ...@@ -191,7 +194,7 @@ public class BattleUI : MonoBehaviour
//开始游戏 //开始游戏
void StartBtn() void StartBtn()
{ {
print("点击开始按钮"); //print("点击开始按钮");
onStartBtn?.Invoke(); onStartBtn?.Invoke();
//m_startBtn.gameObject.SetActive(false); //m_startBtn.gameObject.SetActive(false);
m_startLogoObj.SetActive(false); m_startLogoObj.SetActive(false);
...@@ -368,6 +371,14 @@ public class BattleUI : MonoBehaviour ...@@ -368,6 +371,14 @@ public class BattleUI : MonoBehaviour
//设置战斗UI状态 //设置战斗UI状态
public void SetBattleObjState(bool bool_) public void SetBattleObjState(bool bool_)
{ {
//if (bool_)
//{
// print("显示战斗UI");
//}
//else
//{
// print("隐藏战斗UI");
//}
//print("显示m_battleObj:"+bool_); //print("显示m_battleObj:"+bool_);
m_battleObj.SetActive(bool_); m_battleObj.SetActive(bool_);
//m_successResultObj.SetActive(bool_); //m_successResultObj.SetActive(bool_);
......
BattleMuscle/Assets/#A2_Scripts/Battle/UI/TestGestureAround.cs
View file @ cc11110e
using System.Collections; //using System.Collections;
using System.Collections.Generic; //using System.Collections.Generic;
using UnityEngine; //using UnityEngine;
public class TestGestureAround : MonoBehaviour //public class TestGestureAround : MonoBehaviour
{ //{
public BattleUI m_battleUi; // public BattleUI m_battleUi;
public bool bIsClockWise; // public bool bIsClockWise;
//public Camera camGestureTest; // //public Camera camGestureTest;
//public GameObject objRotateTarget; // //public GameObject objRotateTarget;
public float fGestureRadius = 50; // public float fGestureRadius = 50;
public float fGestureRadiusFix = 10; // public float fGestureRadiusFix = 10;
public float fRotateFactor = 500f;//旋转系数 // public float fRotateFactor = 500f;//旋转系数
private Vector3 _v3AroundCenterPoint = new Vector3(Screen.width/2,Screen.height-100,0); // private Vector3 _v3AroundCenterPoint = new Vector3(Screen.width/2,Screen.height-100,0);
private bool _bGesturing; // private bool _bGesturing;
private Vector3 _v3LastStarPoint; // private Vector3 _v3LastStarPoint;
private float _fSampleDisThreshold; // private float _fSampleDisThreshold;
private List<Vector3> _inputGesturePhases = new List<Vector3>(); // private List<Vector3> _inputGesturePhases = new List<Vector3>();
private float _fTotalRotate; // private float _fTotalRotate;
private int m_index = 0; // private int m_index = 0;
System.Action OnRotateFinish; // System.Action OnRotateFinish;
// Use this for initialization // // Use this for initialization
void Awake() // void Awake()
{ // {
_fSampleDisThreshold = 10;//(2*PI/24),PI~=3 // _fSampleDisThreshold = 10;//(2*PI/24),PI~=3
//_v3AroundCenterPoint = camGestureTest.WorldToScreenPoint(objRotateTarget.transform.position); // //_v3AroundCenterPoint = camGestureTest.WorldToScreenPoint(objRotateTarget.transform.position);
_fTotalRotate = 0; // _fTotalRotate = 0;
} // }
// Update is called once per frame // // Update is called once per frame
void Update() // void Update()
{ // {
if (Input.GetMouseButtonDown(0)) // if (Input.GetMouseButtonDown(0))
{ // {
_bGesturing = true; // _bGesturing = true;
_v3LastStarPoint = Input.mousePosition; // _v3LastStarPoint = Input.mousePosition;
} // }
else if (Input.GetMouseButtonUp(0)) // else if (Input.GetMouseButtonUp(0))
{ // {
_bGesturing = false; // _bGesturing = false;
_fTotalRotate = 0; // _fTotalRotate = 0;
_inputGesturePhases.Clear(); // _inputGesturePhases.Clear();
} // }
if (_bGesturing) // if (_bGesturing)
{ // {
//支持一个大概的圆形区,空心处理的小一点,就用修正值了 // //支持一个大概的圆形区,空心处理的小一点,就用修正值了
if (Vector3.Distance(_v3AroundCenterPoint, Input.mousePosition) < fGestureRadius + fGestureRadiusFix && // if (Vector3.Distance(_v3AroundCenterPoint, Input.mousePosition) < fGestureRadius + fGestureRadiusFix &&
Vector3.Distance(_v3AroundCenterPoint, Input.mousePosition) > fGestureRadiusFix) // Vector3.Distance(_v3AroundCenterPoint, Input.mousePosition) > fGestureRadiusFix)
{ // {
var deltaVec = Input.mousePosition - _v3LastStarPoint; // var deltaVec = Input.mousePosition - _v3LastStarPoint;
if (deltaVec.sqrMagnitude > _fSampleDisThreshold * _fSampleDisThreshold)//超过阈值,记录一下 // if (deltaVec.sqrMagnitude > _fSampleDisThreshold * _fSampleDisThreshold)//超过阈值,记录一下
{ // {
_inputGesturePhases.Add(deltaVec); // _inputGesturePhases.Add(deltaVec);
if (_inputGesturePhases.Count > 1) // if (_inputGesturePhases.Count > 1)
{ // {
int curCount = _inputGesturePhases.Count; // int curCount = _inputGesturePhases.Count;
float multiDot = Vector3.Dot(_inputGesturePhases[curCount - 1], _inputGesturePhases[curCount - 2]); // float multiDot = Vector3.Dot(_inputGesturePhases[curCount - 1], _inputGesturePhases[curCount - 2]);
Vector3 multiCross = Vector3.Cross(_inputGesturePhases[curCount - 1], _inputGesturePhases[curCount - 2]); // Vector3 multiCross = Vector3.Cross(_inputGesturePhases[curCount - 1], _inputGesturePhases[curCount - 2]);
if (multiDot <= 0)//画圆只能是锐角 // if (multiDot <= 0)//画圆只能是锐角
{ // {
_inputGesturePhases.Clear(); // _inputGesturePhases.Clear();
} // }
else if (multiCross.z == 0 || (multiCross.z > 0 && !bIsClockWise) || (multiCross.z < 0 && bIsClockWise))//叉积右手法则,顺时针后一条叉前一条,z应该是正,z是0表示平行 // else if (multiCross.z == 0 || (multiCross.z > 0 && !bIsClockWise) || (multiCross.z < 0 && bIsClockWise))//叉积右手法则,顺时针后一条叉前一条,z应该是正,z是0表示平行
{ // {
_inputGesturePhases.Clear(); // _inputGesturePhases.Clear();
} // }
else // else
{ // {
//通过上面几个条件测试表示是正在画一个圆,可以转动物体了 // //通过上面几个条件测试表示是正在画一个圆,可以转动物体了
float rotateZ = bIsClockWise ? -1 * fRotateFactor * Time.deltaTime : 1 * fRotateFactor * Time.deltaTime; // float rotateZ = bIsClockWise ? -1 * fRotateFactor * Time.deltaTime : 1 * fRotateFactor * Time.deltaTime;
_fTotalRotate += rotateZ; // _fTotalRotate += rotateZ;
//objRotateTarget.transform.Rotate(new Vector3(0, 0, rotateZ)); // //objRotateTarget.transform.Rotate(new Vector3(0, 0, rotateZ));
_v3LastStarPoint = Input.mousePosition; // _v3LastStarPoint = Input.mousePosition;
//Debug.LogError(_fTotalRotate); // //Debug.LogError(_fTotalRotate);
if (Mathf.Abs(_fTotalRotate) > 360) // if (Mathf.Abs(_fTotalRotate) > 360)
{ // {
m_index++; // m_index++;
if (m_index % 2 == 0) // if (m_index % 2 == 0)
{ // {
m_battleUi.SetBattleObjState(true); // m_battleUi.SetBattleObjState(true);
} // }
else // else
{ // {
m_battleUi.SetBattleObjState(false); // print("隐藏战斗UI，111111111111111:"+gameObject.name);
} // m_battleUi.SetBattleObjState(false);
_fTotalRotate = 0; // }
} // _fTotalRotate = 0;
} // }
} // }
} // }
} // }
else // }
{ // else
_inputGesturePhases.Clear();//乱画就清除路径,重新来过 // {
} // _inputGesturePhases.Clear();//乱画就清除路径,重新来过
} // }
} // }
} // }
//}
BattleMuscle/Assets/Art_Assets/Animation/Animation/Player/HouseDancing.anim 0 → 100644
View file @ cc11110e
This source diff could not be displayed because it is too large. You can view the blob instead.
BattleMuscle/Assets/Art_Assets/Animation/Animation/Player/HouseDancing.anim.meta 0 → 100644
View file @ cc11110e
fileFormatVersion: 2
guid: 4f3a36da34894464997934ed2e3c201d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Art_Assets/Animation/AnimationController/Running2.controller
View file @ cc11110e
...@@ -14,10 +14,10 @@ AnimatorStateMachine: ...@@ -14,10 +14,10 @@ AnimatorStateMachine:
m_Position: {x: -30, y: 550, z: 0} m_Position: {x: -30, y: 550, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 4471307210666310047} m_State: {fileID: 4471307210666310047}
m_Position: {x: -270, y: 340, z: 0} m_Position: {x: -670, y: 250, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -340101015679708446} m_State: {fileID: -340101015679708446}
m_Position: {x: -580, y: 350, z: 0} m_Position: {x: -890, y: 180, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -5355840141299690807} m_State: {fileID: -5355840141299690807}
m_Position: {x: -440, y: 500, z: 0} m_Position: {x: -440, y: 500, z: 0}
...@@ -26,7 +26,7 @@ AnimatorStateMachine: ...@@ -26,7 +26,7 @@ AnimatorStateMachine:
m_Position: {x: -30, y: 350, z: 0} m_Position: {x: -30, y: 350, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 5232131748971255912} m_State: {fileID: 5232131748971255912}
m_Position: {x: -260, y: 240, z: 0} m_Position: {x: -460, y: 300, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: m_AnyStateTransitions:
- {fileID: -5157424812580719683} - {fileID: -5157424812580719683}
...@@ -35,7 +35,7 @@ AnimatorStateMachine: ...@@ -35,7 +35,7 @@ AnimatorStateMachine:
m_EntryTransitions: [] m_EntryTransitions: []
m_StateMachineTransitions: {} m_StateMachineTransitions: {}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_AnyStatePosition: {x: -430, y: 200, z: 0} m_AnyStatePosition: {x: -440, y: 70, z: 0}
m_EntryPosition: {x: -10, y: 120, z: 0} m_EntryPosition: {x: -10, y: 120, z: 0}
m_ExitPosition: {x: -420, y: 610, z: 0} m_ExitPosition: {x: -420, y: 610, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
...@@ -258,31 +258,31 @@ AnimatorController: ...@@ -258,31 +258,31 @@ AnimatorController:
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 0} m_Controller: {fileID: 9100000}
- m_Name: LegSweep - m_Name: LegSweep
m_Type: 4 m_Type: 4
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 0} m_Controller: {fileID: 9100000}
- m_Name: HurricaneKick - m_Name: HurricaneKick
m_Type: 4 m_Type: 4
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 0} m_Controller: {fileID: 9100000}
- m_Name: HurricaneKickBefor - m_Name: HurricaneKickBefor
m_Type: 4 m_Type: 4
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 0} m_Controller: {fileID: 9100000}
- m_Name: IsFirstHurricaneKickBefor - m_Name: IsFirstHurricaneKickBefor
m_Type: 4 m_Type: 4
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 0} m_Controller: {fileID: 9100000}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Base Layer
...@@ -499,6 +499,20 @@ AnimatorStateTransition: ...@@ -499,6 +499,20 @@ AnimatorStateTransition:
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1109 &8345979401215440795
AnimatorTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!1101 &8973507764031670339 --- !u!1101 &8973507764031670339
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
BattleMuscle/Assets/Art_Assets/Animation/AnimationController/Running3.controller
View file @ cc11110e
...@@ -49,9 +49,13 @@ AnimatorStateMachine: ...@@ -49,9 +49,13 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -5151482140390748444} m_State: {fileID: -5151482140390748444}
m_Position: {x: 770, y: 10, z: 0} m_Position: {x: 770, y: 10, z: 0}
- serializedVersion: 1
m_State: {fileID: 1869662755880985605}
m_Position: {x: 1020, y: 10, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: m_AnyStateTransitions:
- {fileID: 7789786087314244433} - {fileID: 7789786087314244433}
- {fileID: 4811124763911306419}
m_EntryTransitions: [] m_EntryTransitions: []
m_StateMachineTransitions: {} m_StateMachineTransitions: {}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
...@@ -160,6 +164,31 @@ AnimatorStateTransition: ...@@ -160,6 +164,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1101 &-5510134768283849233
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: HouseDancing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.99044585
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-5151482140390748444 --- !u!1102 &-5151482140390748444
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 5
...@@ -377,37 +406,43 @@ AnimatorController: ...@@ -377,37 +406,43 @@ AnimatorController:
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: MoveSpeed - m_Name: MoveSpeed
m_Type: 1 m_Type: 1
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: Push - m_Name: Push
m_Type: 4 m_Type: 4
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: Grounded - m_Name: Grounded
m_Type: 4 m_Type: 4
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: Vertigo - m_Name: Vertigo
m_Type: 4 m_Type: 4
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: Power - m_Name: Power
m_Type: 1 m_Type: 1
m_DefaultFloat: 1.001 m_DefaultFloat: 1.001
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: HouseDancing
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Base Layer
...@@ -565,6 +600,33 @@ AnimatorStateTransition: ...@@ -565,6 +600,33 @@ AnimatorStateTransition:
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1102 &1869662755880985605
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: HouseDancing
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -5510134768283849233}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 4f3a36da34894464997934ed2e3c201d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &2643154680664092511 --- !u!1102 &2643154680664092511
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 5
...@@ -606,6 +668,31 @@ AnimatorTransition: ...@@ -606,6 +668,31 @@ AnimatorTransition:
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
serializedVersion: 1 serializedVersion: 1
--- !u!1101 &4811124763911306419
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: HouseDancing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1869662755880985605}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.019352159
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &5239871436706073785 --- !u!1101 &5239871436706073785
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
BattleMuscle/Assets/Art_Assets/Animation/AnimationModel/House Dancing.fbx.meta 0 → 100644
View file @ cc11110e
fileFormatVersion: 2
guid: 03b55f63188250c43b1991ecb3df2aa6
ModelImporter:
serializedVersion: 19300
internalIDToNameTable:
- first:
74: -203655887218126122
second: mixamo.com
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Levels/Level 1.unity
View file @ cc11110e
...@@ -122,6 +122,99 @@ NavMeshSettings: ...@@ -122,6 +122,99 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1 &86617
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 86618}
- component: {fileID: 86621}
- component: {fileID: 86620}
- component: {fileID: 86619}
m_Layer: 0
m_Name: DancingPlace
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &86618
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 86617}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.57, z: 0.08}
m_LocalScale: {x: 0.19999999, y: 0.02, z: 0.19999999}
m_Children: []
m_Father: {fileID: 142519837}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &86619
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 86617}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &86620
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 86617}
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: 10303, guid: 0000000000000000f000000000000000, type: 0}
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!33 &86621
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 86617}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &9061460 --- !u!1001 &9061460
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1517,6 +1610,101 @@ MeshFilter: ...@@ -1517,6 +1610,101 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 122391221} m_GameObject: {fileID: 122391221}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &127270524
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1266202730}
m_Modifications:
- target: {fileID: 120778, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_Name
value: MysticExplosionWhite
objectReference: {fileID: 0}
- target: {fileID: 120778, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalPosition.y
value: 10.6
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalScale.x
value: 3
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalScale.y
value: 3
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalScale.z
value: 3
objectReference: {fileID: 0}
- target: {fileID: 19818548, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: playOnAwake
value: 0
objectReference: {fileID: 0}
- target: {fileID: 19844352, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: playOnAwake
value: 0
objectReference: {fileID: 0}
- target: {fileID: 19860258, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: playOnAwake
value: 0
objectReference: {fileID: 0}
- target: {fileID: 19860526, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: playOnAwake
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
--- !u!198 &127270525 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 19844352, guid: 632339e29e2ddd64aab6f9dd68facc82,
type: 3}
m_PrefabInstance: {fileID: 127270524}
m_PrefabAsset: {fileID: 0}
--- !u!4 &127651345 stripped --- !u!4 &127651345 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 5957448836641237368, guid: 15d49ef1e12d35a46b7c6fb953021b43, m_CorrespondingSourceObject: {fileID: 5957448836641237368, guid: 15d49ef1e12d35a46b7c6fb953021b43,
...@@ -2838,7 +3026,7 @@ Transform: ...@@ -2838,7 +3026,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 186710579} m_GameObject: {fileID: 186710579}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.8499999, z: 0.8} m_LocalPosition: {x: 0.23000002, y: 1.8499999, z: 0.8}
m_LocalScale: {x: 1.8837, y: 1.84, z: 1.9631765} m_LocalScale: {x: 1.8837, y: 1.84, z: 1.9631765}
m_Children: [] m_Children: []
m_Father: {fileID: 616173308} m_Father: {fileID: 616173308}
...@@ -3331,14 +3519,14 @@ Transform: ...@@ -3331,14 +3519,14 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 231588919} m_GameObject: {fileID: 231588919}
m_LocalRotation: {x: 0.37181228, y: -0.002512246, z: 0.001006226, w: 0.928304} m_LocalRotation: {x: 0.40404713, y: -0.0025458974, z: 0.0009177583, w: 0.9147342}
m_LocalPosition: {x: 0, y: -0.7402992, z: -5.759613} m_LocalPosition: {x: 0, y: 8.959999, z: -12.83}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1129599700} - {fileID: 1129599700}
m_Father: {fileID: 347934362} m_Father: {fileID: 347934362}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 35.788002, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 47.663002, y: -0.333, z: -0.032}
--- !u!1001 &234180842 --- !u!1001 &234180842
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -4854,13 +5042,13 @@ Transform: ...@@ -4854,13 +5042,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 347934360} m_GameObject: {fileID: 347934360}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 17.040298, z: -11.170387} m_LocalPosition: {x: 0, y: 17.040298, z: -11.170387}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 231588921} - {fileID: 231588921}
m_Father: {fileID: 0} m_Father: {fileID: 1289155150}
m_RootOrder: 5 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &351443972 stripped --- !u!4 &351443972 stripped
Transform: Transform:
...@@ -7054,7 +7242,7 @@ Transform: ...@@ -7054,7 +7242,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 557966600} m_GameObject: {fileID: 557966600}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
m_LocalPosition: {x: 0, y: 0.5, z: 80} m_LocalPosition: {x: 0, y: 0.5, z: 79}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1266202730} - {fileID: 1266202730}
...@@ -7074,7 +7262,7 @@ CharacterController: ...@@ -7074,7 +7262,7 @@ CharacterController:
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Height: 25.9 m_Height: 25.9
m_Radius: 4.4 m_Radius: 5.63
m_SlopeLimit: 45 m_SlopeLimit: 45
m_StepOffset: 0.3 m_StepOffset: 0.3
m_SkinWidth: 0.08 m_SkinWidth: 0.08
...@@ -7109,7 +7297,7 @@ MonoBehaviour: ...@@ -7109,7 +7297,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
VSpeed: 10 VSpeed: 10
life: 30 life: 300
scale: 1 scale: 1
MinScale: 0.2 MinScale: 0.2
targetList: targetList:
...@@ -7129,6 +7317,8 @@ MonoBehaviour: ...@@ -7129,6 +7317,8 @@ MonoBehaviour:
isDeltaTime2: 0 isDeltaTime2: 0
ps: {fileID: 1539289411} ps: {fileID: 1539289411}
ps2: {fileID: 1857257943} ps2: {fileID: 1857257943}
TempInjuries: 0
changeModeEffect: {fileID: 127270525}
bossState: 0 bossState: 0
--- !u!114 &557966605 --- !u!114 &557966605
MonoBehaviour: MonoBehaviour:
...@@ -7922,6 +8112,77 @@ Transform: ...@@ -7922,6 +8112,77 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 606470952} m_PrefabInstance: {fileID: 606470952}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &607249723
GameObject:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 607249724}
- component: {fileID: 607249726}
- component: {fileID: 607249725}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &607249724
Transform:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 607249723}
m_LocalRotation: {x: -0.08421922, y: 0.0073964433, z: 0.0016381255, w: 0.9964185}
m_LocalPosition: {x: -2.7422366, y: -29.444946, z: -117.02992}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1980976061}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &607249725
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 607249723}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
m_LookaheadTime: 0
m_LookaheadSmoothing: 0
m_LookaheadIgnoreY: 0
m_HorizontalDamping: 0.5
m_VerticalDamping: 0.5
m_ScreenX: 0.5
m_ScreenY: 0.5
m_DeadZoneWidth: 0
m_DeadZoneHeight: 0
m_SoftZoneWidth: 0.8
m_SoftZoneHeight: 0.8
m_BiasX: 0
m_BiasY: 0
m_CenterOnActivate: 1
--- !u!114 &607249726
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 607249723}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &611230073 stripped --- !u!4 &611230073 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 5957448837824279284, guid: 15d49ef1e12d35a46b7c6fb953021b43, m_CorrespondingSourceObject: {fileID: 5957448837824279284, guid: 15d49ef1e12d35a46b7c6fb953021b43,
...@@ -8009,6 +8270,25 @@ MonoBehaviour: ...@@ -8009,6 +8270,25 @@ MonoBehaviour:
EndPointPos: {fileID: 1481340312} EndPointPos: {fileID: 1481340312}
aiState: 0 aiState: 0
Score: 0 Score: 0
isMyWin: 0
DancingPlace: {fileID: 86617}
foods:
- {fileID: 7118589249583531991, guid: 61ca9b73860feba48894d0354294097c, type: 3}
- {fileID: 4201393565975677940, guid: 94c5599522d8d0c48a06509a13d37241, type: 3}
- {fileID: 6917991767316380469, guid: aa38162f8a2c19d4fb5c26318482cec6, type: 3}
- {fileID: 3273521062333198908, guid: 9adef1e0963c0a3409f59ebe0c8f9b7f, type: 3}
- {fileID: 4488542462492886108, guid: 9f534dd5acbd92d458b4e72f844be881, type: 3}
- {fileID: 1000351953491012978, guid: ddf19e1e57bda6c4cacf36f5f518eb9c, type: 3}
- {fileID: 1382631516678918082, guid: 6307b33e8f14abc4fbf1b3046be8298e, type: 3}
- {fileID: 8308488070836470441, guid: 56ff9deed417e1a40be25461461e5e3a, type: 3}
- {fileID: 7441636673628327258, guid: b2e5216112cc57a4684f0d42270e08ba, type: 3}
- {fileID: 3454478639246554943, guid: f807b417ff1423a46b452854bd45f90e, type: 3}
- {fileID: 2362392358244718184, guid: aac988f8532b5a8429b2f5dce773f0b4, type: 3}
- {fileID: 7521386331040408604, guid: 675050dca65c48c4a9278e8c4f66b53f, type: 3}
- {fileID: 3022100789067994117, guid: 2c0ff28d094cfa444b0b9f9a6738fad0, type: 3}
- {fileID: 6115310891789375738, guid: 7c3ab2ef11fbf654580bc681b1fdb9a1, type: 3}
- {fileID: 322845769827000288, guid: e1a0a14074880e047b25703548f9db04, type: 3}
Force: 100
--- !u!54 &616173311 --- !u!54 &616173311
Rigidbody: Rigidbody:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -9019,7 +9299,7 @@ Transform: ...@@ -9019,7 +9299,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 697166375} m_GameObject: {fileID: 697166375}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0.23000002, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 616173308} m_Father: {fileID: 616173308}
...@@ -10174,23 +10454,6 @@ Transform: ...@@ -10174,23 +10454,6 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 811110516} m_PrefabInstance: {fileID: 811110516}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!114 &813925128
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464676460863996}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14433df62b9b3554e93abbfbc187fc8c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_battleUi: {fileID: 6064464676460863995}
bIsClockWise: 1
fGestureRadius: 400
fGestureRadiusFix: 10
fRotateFactor: 1000
--- !u!4 &819343099 stripped --- !u!4 &819343099 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 5957448837124481078, guid: 15d49ef1e12d35a46b7c6fb953021b43, m_CorrespondingSourceObject: {fileID: 5957448837124481078, guid: 15d49ef1e12d35a46b7c6fb953021b43,
...@@ -11042,6 +11305,25 @@ MonoBehaviour: ...@@ -11042,6 +11305,25 @@ MonoBehaviour:
vertigoTime: 0 vertigoTime: 0
riseBridge: {fileID: 354878099} riseBridge: {fileID: 354878099}
Score: 0 Score: 0
isMyWin: 0
DancingPlace: {fileID: 86617}
foods:
- {fileID: 7118589249583531991, guid: 61ca9b73860feba48894d0354294097c, type: 3}
- {fileID: 4201393565975677940, guid: 94c5599522d8d0c48a06509a13d37241, type: 3}
- {fileID: 6917991767316380469, guid: aa38162f8a2c19d4fb5c26318482cec6, type: 3}
- {fileID: 3273521062333198908, guid: 9adef1e0963c0a3409f59ebe0c8f9b7f, type: 3}
- {fileID: 4488542462492886108, guid: 9f534dd5acbd92d458b4e72f844be881, type: 3}
- {fileID: 1000351953491012978, guid: ddf19e1e57bda6c4cacf36f5f518eb9c, type: 3}
- {fileID: 1382631516678918082, guid: 6307b33e8f14abc4fbf1b3046be8298e, type: 3}
- {fileID: 8308488070836470441, guid: 56ff9deed417e1a40be25461461e5e3a, type: 3}
- {fileID: 7441636673628327258, guid: b2e5216112cc57a4684f0d42270e08ba, type: 3}
- {fileID: 3454478639246554943, guid: f807b417ff1423a46b452854bd45f90e, type: 3}
- {fileID: 2362392358244718184, guid: aac988f8532b5a8429b2f5dce773f0b4, type: 3}
- {fileID: 7521386331040408604, guid: 675050dca65c48c4a9278e8c4f66b53f, type: 3}
- {fileID: 3022100789067994117, guid: 2c0ff28d094cfa444b0b9f9a6738fad0, type: 3}
- {fileID: 6115310891789375738, guid: 7c3ab2ef11fbf654580bc681b1fdb9a1, type: 3}
- {fileID: 322845769827000288, guid: e1a0a14074880e047b25703548f9db04, type: 3}
Force: 100
--- !u!4 &883198006 --- !u!4 &883198006
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -11049,7 +11331,7 @@ Transform: ...@@ -11049,7 +11331,7 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 883198004} m_GameObject: {fileID: 883198004}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
...@@ -12680,8 +12962,8 @@ Transform: ...@@ -12680,8 +12962,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1001386389} m_GameObject: {fileID: 1001386389}
m_LocalRotation: {x: 0.37181228, y: -0.002512246, z: 0.001006226, w: 0.928304} m_LocalRotation: {x: 0.40404713, y: -0.0025458974, z: 0.0009177583, w: 0.9147342}
m_LocalPosition: {x: 0, y: 16.3, z: -16.93} m_LocalPosition: {x: 0, y: 26.000298, z: -24.000387}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
...@@ -13218,14 +13500,14 @@ MonoBehaviour: ...@@ -13218,14 +13500,14 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_Font: {fileID: 12800000, guid: dca7afcde023a8a4a8aa8debbdbd5427, type: 3}
m_FontSize: 14 m_FontSize: 14
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
...@@ -13781,7 +14063,7 @@ Transform: ...@@ -13781,7 +14063,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1074946583} m_GameObject: {fileID: 1074946583}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 3.256, z: 0} m_LocalPosition: {x: 0.23, y: 3.256, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1026936734} - {fileID: 1026936734}
...@@ -14303,7 +14585,7 @@ MonoBehaviour: ...@@ -14303,7 +14585,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_BindingMode: 1 m_BindingMode: 1
m_FollowOffset: {x: 0, y: 15.3, z: -16.93} m_FollowOffset: {x: 0, y: 25.000298, z: -24.000387}
m_XDamping: 1 m_XDamping: 1
m_YDamping: 1 m_YDamping: 1
m_ZDamping: 1 m_ZDamping: 1
...@@ -16032,6 +16314,38 @@ Transform: ...@@ -16032,6 +16314,38 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1285402597} m_PrefabInstance: {fileID: 1285402597}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1289155149
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1289155150}
m_Layer: 0
m_Name: CM
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1289155150
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1289155149}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 347934362}
- {fileID: 1980976061}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1290525173 --- !u!1 &1290525173
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -16713,6 +17027,25 @@ MonoBehaviour: ...@@ -16713,6 +17027,25 @@ MonoBehaviour:
EndPointPos: {fileID: 1481340312} EndPointPos: {fileID: 1481340312}
aiState: 0 aiState: 0
Score: 0 Score: 0
isMyWin: 0
DancingPlace: {fileID: 86617}
foods:
- {fileID: 7118589249583531991, guid: 61ca9b73860feba48894d0354294097c, type: 3}
- {fileID: 4201393565975677940, guid: 94c5599522d8d0c48a06509a13d37241, type: 3}
- {fileID: 6917991767316380469, guid: aa38162f8a2c19d4fb5c26318482cec6, type: 3}
- {fileID: 3273521062333198908, guid: 9adef1e0963c0a3409f59ebe0c8f9b7f, type: 3}
- {fileID: 4488542462492886108, guid: 9f534dd5acbd92d458b4e72f844be881, type: 3}
- {fileID: 1000351953491012978, guid: ddf19e1e57bda6c4cacf36f5f518eb9c, type: 3}
- {fileID: 1382631516678918082, guid: 6307b33e8f14abc4fbf1b3046be8298e, type: 3}
- {fileID: 8308488070836470441, guid: 56ff9deed417e1a40be25461461e5e3a, type: 3}
- {fileID: 7441636673628327258, guid: b2e5216112cc57a4684f0d42270e08ba, type: 3}
- {fileID: 3454478639246554943, guid: f807b417ff1423a46b452854bd45f90e, type: 3}
- {fileID: 2362392358244718184, guid: aac988f8532b5a8429b2f5dce773f0b4, type: 3}
- {fileID: 7521386331040408604, guid: 675050dca65c48c4a9278e8c4f66b53f, type: 3}
- {fileID: 3022100789067994117, guid: 2c0ff28d094cfa444b0b9f9a6738fad0, type: 3}
- {fileID: 6115310891789375738, guid: 7c3ab2ef11fbf654580bc681b1fdb9a1, type: 3}
- {fileID: 322845769827000288, guid: e1a0a14074880e047b25703548f9db04, type: 3}
Force: 100
--- !u!54 &1342203614 --- !u!54 &1342203614
Rigidbody: Rigidbody:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -16965,14 +17298,14 @@ MonoBehaviour: ...@@ -16965,14 +17298,14 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_Font: {fileID: 12800000, guid: dca7afcde023a8a4a8aa8debbdbd5427, type: 3}
m_FontSize: 14 m_FontSize: 14
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
...@@ -17194,8 +17527,8 @@ Transform: ...@@ -17194,8 +17527,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1409872619} m_GameObject: {fileID: 1409872619}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.002, y: 61.5, z: 0.471} m_LocalPosition: {x: 0.002, y: 55.77, z: 0.471}
m_LocalScale: {x: 1, y: 80.3, z: 0.033333335} m_LocalScale: {x: 1, y: 55.84452, z: 0.033333335}
m_Children: [] m_Children: []
m_Father: {fileID: 354878097} m_Father: {fileID: 354878097}
m_RootOrder: 2 m_RootOrder: 2
...@@ -19426,8 +19759,8 @@ Transform: ...@@ -19426,8 +19759,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1593448804} m_GameObject: {fileID: 1593448804}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.002, y: 61.5, z: -0.486} m_LocalPosition: {x: 0.002, y: 55.77, z: -0.486}
m_LocalScale: {x: 1, y: 80.3, z: 0.033333335} m_LocalScale: {x: 1, y: 55.84452, z: 0.033333335}
m_Children: [] m_Children: []
m_Father: {fileID: 354878097} m_Father: {fileID: 354878097}
m_RootOrder: 1 m_RootOrder: 1
...@@ -21326,14 +21659,14 @@ MonoBehaviour: ...@@ -21326,14 +21659,14 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_Font: {fileID: 12800000, guid: dca7afcde023a8a4a8aa8debbdbd5427, type: 3}
m_FontSize: 14 m_FontSize: 14
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
...@@ -22670,7 +23003,7 @@ GameObject: ...@@ -22670,7 +23003,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!1 &1810808132 --- !u!1 &1810808132
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -24879,6 +25212,76 @@ Transform: ...@@ -24879,6 +25212,76 @@ Transform:
m_Father: {fileID: 1628104038} m_Father: {fileID: 1628104038}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1980976059
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1980976061}
- component: {fileID: 1980976060}
m_Layer: 0
m_Name: CM vcam2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!114 &1980976060
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1980976059}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ExcludedPropertiesInInspector:
- m_Script
m_LockStageInInspector:
m_StreamingVersion: 20170927
m_Priority: 10
m_StandbyUpdate: 2
m_LookAt: {fileID: 0}
m_Follow: {fileID: 0}
m_Lens:
FieldOfView: 60
OrthographicSize: 5
NearClipPlane: 0.3
FarClipPlane: 1000
Dutch: 0
ModeOverride: 0
LensShift: {x: 0, y: 0}
GateFit: 2
m_SensorSize: {x: 0.5625, y: 1}
m_Transitions:
m_BlendHint: 0
m_InheritPosition: 0
m_OnCameraLive:
m_PersistentCalls:
m_Calls: []
m_LegacyBlendHint: 0
m_ComponentOwner: {fileID: 607249724}
--- !u!4 &1980976061
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1980976059}
m_LocalRotation: {x: 0.06474847, y: 0.0046115066, z: -0.0025597445, w: 0.9978877}
m_LocalPosition: {x: -0.48149696, y: 8.954155, z: 135}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 607249724}
m_Father: {fileID: 1289155150}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1989666873 stripped --- !u!4 &1989666873 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 5957448837798309923, guid: 15d49ef1e12d35a46b7c6fb953021b43, m_CorrespondingSourceObject: {fileID: 5957448837798309923, guid: 15d49ef1e12d35a46b7c6fb953021b43,
...@@ -25736,17 +26139,17 @@ PrefabInstance: ...@@ -25736,17 +26139,17 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: c219f3651d3c9d94bbb025aba0f6cd5e, - target: {fileID: -4216859302048453862, guid: c219f3651d3c9d94bbb025aba0f6cd5e,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: c219f3651d3c9d94bbb025aba0f6cd5e, - target: {fileID: -4216859302048453862, guid: c219f3651d3c9d94bbb025aba0f6cd5e,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: c219f3651d3c9d94bbb025aba0f6cd5e, - target: {fileID: -4216859302048453862, guid: c219f3651d3c9d94bbb025aba0f6cd5e,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: c219f3651d3c9d94bbb025aba0f6cd5e, - target: {fileID: -4216859302048453862, guid: c219f3651d3c9d94bbb025aba0f6cd5e,
type: 3} type: 3}
...@@ -31214,7 +31617,7 @@ PrefabInstance: ...@@ -31214,7 +31617,7 @@ PrefabInstance:
- target: {fileID: 2384245972812640027, guid: c0584c7c6c5cb2f448487b9cb51f45fc, - target: {fileID: 2384245972812640027, guid: c0584c7c6c5cb2f448487b9cb51f45fc,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2396026485699160655, guid: c0584c7c6c5cb2f448487b9cb51f45fc, - target: {fileID: 2396026485699160655, guid: c0584c7c6c5cb2f448487b9cb51f45fc,
type: 3} type: 3}
...@@ -31548,7 +31951,7 @@ Transform: ...@@ -31548,7 +31951,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4293134567266825926} m_GameObject: {fileID: 4293134567266825926}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: -0.46}
m_LocalScale: {x: 0.08, y: 3, z: 0.04} m_LocalScale: {x: 0.08, y: 3, z: 0.04}
m_Children: m_Children:
- {fileID: 8632894472853752057} - {fileID: 8632894472853752057}
...@@ -33895,7 +34298,7 @@ GameObject: ...@@ -33895,7 +34298,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!114 &3302539920389624020 --- !u!114 &3302539920389624020
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -34559,6 +34962,8 @@ GameObject: ...@@ -34559,6 +34962,8 @@ GameObject:
- component: {fileID: 677156980660358842} - component: {fileID: 677156980660358842}
- component: {fileID: 7601619694980572967} - component: {fileID: 7601619694980572967}
- component: {fileID: 542950075212659023} - component: {fileID: 542950075212659023}
- component: {fileID: 4293134567266825927}
- component: {fileID: 4293134567266825928}
m_Layer: 1 m_Layer: 1
m_Name: "\u7EC8\u70B9" m_Name: "\u7EC8\u70B9"
m_TagString: Untagged m_TagString: Untagged
...@@ -34566,6 +34971,80 @@ GameObject: ...@@ -34566,6 +34971,80 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!114 &4293134567266825927
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4293134567266825926}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e46ac8d61dc065848bd5a1aa7cd8c006, type: 3}
m_Name:
m_EditorClassIdentifier:
m_LayerMask:
serializedVersion: 2
m_Bits: 1
m_WithTag: Player
m_WithoutTag:
m_SkipFirst: 0
m_Repeating: 1
m_OnObjectEnter:
m_Action: 2
m_Target: {fileID: 1980976059}
m_BoostAmount: 0
m_StartTime: 0
m_Mode: 0
m_Event:
m_PersistentCalls:
m_Calls: []
m_OnObjectExit:
m_Action: 0
m_Target: {fileID: 0}
m_BoostAmount: 0
m_StartTime: 0
m_Mode: 0
m_Event:
m_PersistentCalls:
m_Calls: []
--- !u!114 &4293134567266825928
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4293134567266825926}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e46ac8d61dc065848bd5a1aa7cd8c006, type: 3}
m_Name:
m_EditorClassIdentifier:
m_LayerMask:
serializedVersion: 2
m_Bits: 1
m_WithTag: Competitor
m_WithoutTag:
m_SkipFirst: 0
m_Repeating: 1
m_OnObjectEnter:
m_Action: 2
m_Target: {fileID: 1980976059}
m_BoostAmount: 0
m_StartTime: 0
m_Mode: 0
m_Event:
m_PersistentCalls:
m_Calls: []
m_OnObjectExit:
m_Action: 0
m_Target: {fileID: 0}
m_BoostAmount: 0
m_StartTime: 0
m_Mode: 0
m_Event:
m_PersistentCalls:
m_Calls: []
--- !u!222 &4299381712527612412 --- !u!222 &4299381712527612412
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -35689,7 +36168,6 @@ GameObject: ...@@ -35689,7 +36168,6 @@ GameObject:
- component: {fileID: 6064464676460863993} - component: {fileID: 6064464676460863993}
- component: {fileID: 6064464676460863998} - component: {fileID: 6064464676460863998}
- component: {fileID: 6064464676460863995} - component: {fileID: 6064464676460863995}
- component: {fileID: 813925128}
m_Layer: 5 m_Layer: 5
m_Name: BattleUI m_Name: BattleUI
m_TagString: Untagged m_TagString: Untagged
...@@ -39737,7 +40215,7 @@ GameObject: ...@@ -39737,7 +40215,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!1 &7905703234072332949 --- !u!1 &7905703234072332949
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -40675,4 +41153,4 @@ GameObject: ...@@ -40675,4 +41153,4 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
BattleMuscle/Assets/My/Scripts/AI/AIMove.cs
View file @ cc11110e
...@@ -52,6 +52,11 @@ public class AIMove : MonoBehaviour ...@@ -52,6 +52,11 @@ public class AIMove : MonoBehaviour
private float vertigoTime = 0.0f; private float vertigoTime = 0.0f;
private AnimationManager animationManager; private AnimationManager animationManager;
public int Score=0; public int Score=0;
public bool isMyWin = false;
public GameObject DancingPlace;
public List<GameObject> foods;
public float Force = 100;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
...@@ -123,7 +128,7 @@ public class AIMove : MonoBehaviour ...@@ -123,7 +128,7 @@ public class AIMove : MonoBehaviour
{ {
hit.gameObject.GetComponent<Rigidbody>().AddForce(new Vector3(0, 0, 100)); hit.gameObject.GetComponent<Rigidbody>().AddForce(new Vector3(0, 0, 100));
scale -= reduceStep; scale -= reduceStep;
ReduceIsPlayChangeModeEffect(); ReduceIsPlayChangeModeEffect("PushWall");
} }
else else
{ {
...@@ -148,7 +153,8 @@ public class AIMove : MonoBehaviour ...@@ -148,7 +153,8 @@ public class AIMove : MonoBehaviour
RefreshVertigo(hurt); RefreshVertigo(hurt);
} }
ChangeAnimationscaleState(scale); ChangeAnimationscaleState(scale);
ReduceIsPlayChangeModeEffect(); ReduceIsPlayChangeModeEffect("Hurt");
//Scale(scale, scale, scale); //Scale(scale, scale, scale);
} }
...@@ -166,15 +172,19 @@ public class AIMove : MonoBehaviour ...@@ -166,15 +172,19 @@ public class AIMove : MonoBehaviour
/// <summary> /// <summary>
/// 减少时，判断是否播放改变模型特效 /// 减少时，判断是否播放改变模型特效
/// </summary> /// </summary>
public void ReduceIsPlayChangeModeEffect() public void ReduceIsPlayChangeModeEffect(string type)
{ {
int tempFood = CurrentFood; int tempFood = CurrentFood;
CurrentFood = (int)((scale - 1.0f) / addScale); CurrentFood = (int)((scale - 1.0f) / addScale);
if (tempFood != CurrentFood && (CurrentFood == 0 || CurrentFood == 5 || CurrentFood == 10 || CurrentFood == 15 || CurrentFood == 20)) if (tempFood != CurrentFood && (CurrentFood == 0||CurrentFood == 5 || CurrentFood == 10 || CurrentFood == 15 || CurrentFood == 20))
{ {
Scale(scale, scale, scale); Scale(scale, scale, scale);
ParticleSystem ps = Instantiate(changeModeEffect, transform.position, transform.rotation); ParticleSystem ps = Instantiate(changeModeEffect, transform.position, transform.rotation);
ps.gameObject.AddComponent<DestroyMySel>(); ps.gameObject.AddComponent<DestroyMySel>();
if (type == "Hurt")
{
GenerateRandomFoodAroundPos(5, transform.position, 5);//生成5个食物距离为5
}
} }
} }
...@@ -322,7 +332,8 @@ public class AIMove : MonoBehaviour ...@@ -322,7 +332,8 @@ public class AIMove : MonoBehaviour
} }
if (!BattleCtrl.instance.IsScoreSettlementStatus)
{
xDelta = speed.x * Time.deltaTime; xDelta = speed.x * Time.deltaTime;
zDelta = speed.z * Time.deltaTime; zDelta = speed.z * Time.deltaTime;
if (vertigoTime > 0) if (vertigoTime > 0)
...@@ -343,6 +354,40 @@ public class AIMove : MonoBehaviour ...@@ -343,6 +354,40 @@ public class AIMove : MonoBehaviour
animationManager.VertigoToAwake(); animationManager.VertigoToAwake();
Move(); Move();
} }
}
else
{
print(transform.name+":进入分数结算状态。");
if (isMyWin)
{
//走向跳舞台，并播放跳舞动画
//DancingPlace
Vector3 pos1 = new Vector3(transform.position.x, 0, transform.position.z);
Vector3 pos2 = new Vector3(DancingPlace.transform.position.x, 0, DancingPlace.transform.position.z);
if (Vector3.Distance(pos1, pos2) < 1)
{
BattleCtrl.instance.ExitScoreSettlementStatus();
print("播放跳舞动画。");
transform.localEulerAngles = new Vector3(0, 180, 0);
animationManager.ChangeAnimatorState(AnimationState.HouseDancing);
}
else
{
print("走向跳舞台。");
transform.LookAt(new Vector3(DancingPlace.transform.position.x, transform.position.y, DancingPlace.transform.position.z));
xDelta = transform.forward.x * VSpeed * Time.deltaTime;
zDelta = transform.forward.z * VSpeed * Time.deltaTime;
characterController.Move(new Vector3(xDelta, yDelta, zDelta));//移动
}
MoveSpeed = Vector3.Distance(Vector3.zero, characterController.velocity);
//是否在地面
Grounded = characterController.isGrounded;
//print("MoveSpeed:" + MoveSpeed+ "characterController.velocity:" + characterController.velocity);
animator.SetFloat("MoveSpeed", MoveSpeed);
animator.SetBool("Grounded", Grounded);
}
}
...@@ -424,7 +469,31 @@ public class AIMove : MonoBehaviour ...@@ -424,7 +469,31 @@ public class AIMove : MonoBehaviour
return array; return array;
} }
/// <summary>
/// 生成number个随机食物，距离targetPos点距离为radius.
/// </summary>
/// <param name="number"></param>
/// <param name="targetPos"></param>
/// <param name="radius"></param>
public void GenerateRandomFoodAroundPos(int number, Vector3 targetPos, float radius)
{
//return;
for (int i = 0; i < number; i++)
{
GameObject obj = foods[UnityEngine.Random.Range(0, foods.Count)];
GameObject go = Instantiate(obj);
go.GetComponent<BoxCollider>().isTrigger = false;
Rigidbody rig = go.GetComponent<Rigidbody>();
rig.isKinematic = false;
rig.useGravity = true;
Vector3 randomPos = targetPos + new Vector3(0, 2, 0);// + Quaternion.Euler(new Vector3(0, UnityEngine.Random.Range(0, 360), 0)) * Vector3.forward * radius;
//Vector3 randomPos = targetPos;
go.transform.position = randomPos;
go.tag = "Untagged";
go.GetComponent<Food>().isUnNomalFood = true;
rig.AddForce(Quaternion.Euler(new Vector3(UnityEngine.Random.Range(-80, -20), UnityEngine.Random.Range(0, 360), 0)) * Vector3.forward * Force);
}
}
private void OnDestroy() private void OnDestroy()
{ {
......
BattleMuscle/Assets/My/Scripts/AI/BossAnimationManager.cs
View file @ cc11110e
...@@ -35,7 +35,7 @@ public class BossAnimationManager : MonoBehaviour ...@@ -35,7 +35,7 @@ public class BossAnimationManager : MonoBehaviour
public void ChangeAnimatorState(BossAnimationState state) public void ChangeAnimatorState(BossAnimationState state)
{ {
print(gameObject.name + "，ChangeAnimatorState：" + state); //print(gameObject.name + "，ChangeAnimatorState：" + state);
switch (state) switch (state)
{ {
......
BattleMuscle/Assets/My/Scripts/AI/BossAttack.cs
View file @ cc11110e
...@@ -63,7 +63,7 @@ public class BossAttack : MonoBehaviour ...@@ -63,7 +63,7 @@ public class BossAttack : MonoBehaviour
public void ChangeAttackType(int i) public void ChangeAttackType(int i)
{ {
attackType = (AttackType)i; attackType = (AttackType)i;
print("改变boss攻击状态为："+attackType); //print("改变boss攻击状态为："+attackType);
} }
public void HurricaneKickBeforEnable() public void HurricaneKickBeforEnable()
......
BattleMuscle/Assets/My/Scripts/AI/BossMove.cs
View file @ cc11110e
...@@ -53,12 +53,15 @@ public class BossMove : MonoBehaviour ...@@ -53,12 +53,15 @@ public class BossMove : MonoBehaviour
private bool LegSweepIsFinsh = false; private bool LegSweepIsFinsh = false;
private bool HurricaneKickIsFinsh = false; private bool HurricaneKickIsFinsh = false;
private bool HurricaneKickBeforIsFinsh = false;
private bool IsCanRotate = true; private bool IsCanRotate = true;
private bool IsCanMove = true; private bool IsCanMove = true;
private bool isHurricaneKick = false; private bool isHurricaneKick = false;
public ParticleSystem ps; public ParticleSystem ps;
public ParticleSystem ps2; public ParticleSystem ps2;
public int TempInjuries = 0;//受到的伤害
public ParticleSystem changeModeEffect;
...@@ -116,11 +119,18 @@ public class BossMove : MonoBehaviour ...@@ -116,11 +119,18 @@ public class BossMove : MonoBehaviour
{ {
transform.localScale = new Vector3(x, y, x); transform.localScale = new Vector3(x, y, x);
} }
private void PlayChangeModeEffect()
{
//ParticleSystem ps = Instantiate(changeModeEffect, transform.position, transform.rotation);
//ps.gameObject.AddComponent<DestroyMySel>();
changeModeEffect.Play();
}
//受到伤害 //受到伤害
public void Hurt(int hurt) public void Hurt(int hurt)
{ {
life-=hurt; life-=hurt;
if (life <=0) if (life <=0)
{ {
//Boos死亡 //Boos死亡
...@@ -130,7 +140,14 @@ public class BossMove : MonoBehaviour ...@@ -130,7 +140,14 @@ public class BossMove : MonoBehaviour
{ {
scale=MinScale+ (1 - MinScale) / MaxLife * life; scale=MinScale+ (1 - MinScale) / MaxLife * life;
} }
TempInjuries += hurt;
if (TempInjuries >= 5)
{
TempInjuries = 0;
Scale(scale, scale, scale); Scale(scale, scale, scale);
PlayChangeModeEffect();
}
} }
...@@ -162,11 +179,11 @@ public class BossMove : MonoBehaviour ...@@ -162,11 +179,11 @@ public class BossMove : MonoBehaviour
if (isDeltaTime2) if (isDeltaTime2)
{ {
//扫腿处于冷却中。 //扫腿处于冷却中。
print("扫腿冷却中"); //print("扫腿冷却中");
CurrentLegSweepCoolingTime += Time.deltaTime; CurrentLegSweepCoolingTime += Time.deltaTime;
if (CurrentLegSweepCoolingTime >= LegSweepCoolingTime) if (CurrentLegSweepCoolingTime >= LegSweepCoolingTime)
{ {
print("扫腿冷却完毕"); //print("扫腿冷却完毕");
CurrentLegSweepCoolingTime = 0; CurrentLegSweepCoolingTime = 0;
isDeltaTime2 = false; isDeltaTime2 = false;
} }
...@@ -265,7 +282,7 @@ public class BossMove : MonoBehaviour ...@@ -265,7 +282,7 @@ public class BossMove : MonoBehaviour
} }
else if (dic < 10 && !isDeltaTime2) else if (dic < 10 && !isDeltaTime2)
{ {
print("扫腿"); //print("扫腿");
IsCanRotate = true; IsCanRotate = true;
//注意的是，技能一开始使用，就进入了冷却计时。所以当前技能释放完成到下一次释放技能时间间隔会小于冷却时间。 //注意的是，技能一开始使用，就进入了冷却计时。所以当前技能释放完成到下一次释放技能时间间隔会小于冷却时间。
isDeltaTime2 = true; isDeltaTime2 = true;
...@@ -275,7 +292,7 @@ public class BossMove : MonoBehaviour ...@@ -275,7 +292,7 @@ public class BossMove : MonoBehaviour
} }
else else
{ {
print("追击目标"); //print("追击目标");
bossAnimationManager.ChangeAnimatorState(BossAnimationState.NotAttack); bossAnimationManager.ChangeAnimatorState(BossAnimationState.NotAttack);
} }
...@@ -310,7 +327,7 @@ public class BossMove : MonoBehaviour ...@@ -310,7 +327,7 @@ public class BossMove : MonoBehaviour
if (targetObj!= null&&IsCanRotate) if (targetObj!= null&&IsCanRotate)
{ {
//是否可以旋转 //是否可以旋转
print("Boss旋转"); //print("Boss旋转");
Vector3 speed = Vector3.zero; Vector3 speed = Vector3.zero;
Vector3 pos1 = new Vector3(transform.position.x, 0, transform.position.z); Vector3 pos1 = new Vector3(transform.position.x, 0, transform.position.z);
Vector3 pos2 = new Vector3(targetObj.transform.position.x, 0, targetObj.transform.position.z); Vector3 pos2 = new Vector3(targetObj.transform.position.x, 0, targetObj.transform.position.z);
...@@ -328,6 +345,22 @@ public class BossMove : MonoBehaviour ...@@ -328,6 +345,22 @@ public class BossMove : MonoBehaviour
} }
transform.localEulerAngles = new Vector3(0, angle, 0); transform.localEulerAngles = new Vector3(0, angle, 0);
} }
//在可以移动的情况下，这几个动画没有播放完成，依旧不可以移动。
LegSweepIsFinsh = !animator.GetCurrentAnimatorStateInfo(0).IsName("Leg Sweep");
HurricaneKickIsFinsh = !animator.GetCurrentAnimatorStateInfo(0).IsName("Hurricane Kick");
HurricaneKickBeforIsFinsh= !animator.GetCurrentAnimatorStateInfo(0).IsName("HurricaneKickBefor");
//print("LegSweepIsFinsh:" + LegSweepIsFinsh+ "HurricaneKickIsFinsh:" + HurricaneKickIsFinsh+ "IsCanMove:" + IsCanMove);
if (IsCanMove&LegSweepIsFinsh && HurricaneKickIsFinsh&& HurricaneKickBeforIsFinsh)
{
//动画播放完成后才可以移动
IsCanMove = true;
}
else
{
IsCanMove = false;
}
if (IsCanMove) if (IsCanMove)
{ {
//是否可以移动 //是否可以移动
......
BattleMuscle/Assets/My/Scripts/AnimationManager.cs
View file @ cc11110e
...@@ -9,6 +9,7 @@ public enum AnimationState ...@@ -9,6 +9,7 @@ public enum AnimationState
Push = 3, Push = 3,
Idle=4, Idle=4,
Run=5, Run=5,
HouseDancing=6,
} }
public class AnimationManager : MonoBehaviour public class AnimationManager : MonoBehaviour
{ {
...@@ -64,6 +65,17 @@ public class AnimationManager : MonoBehaviour ...@@ -64,6 +65,17 @@ public class AnimationManager : MonoBehaviour
animator.SetBool("Punch", false); animator.SetBool("Punch", false);
animator.SetLayerWeight(1, 0); animator.SetLayerWeight(1, 0);
break; break;
case AnimationState.HouseDancing:
animator.SetBool("Vertigo", false);
animator.SetBool("Push", false);
animator.SetBool("Punch", false);
animator.SetBool("HouseDancing", true);
animator.SetLayerWeight(1, 0);
break;
default: default:
Debug.LogError(state); Debug.LogError(state);
...@@ -102,7 +114,7 @@ public class AnimationManager : MonoBehaviour ...@@ -102,7 +114,7 @@ public class AnimationManager : MonoBehaviour
{ {
if (!IsCanResetPunch) return; if (!IsCanResetPunch) return;
IsCanResetPunch = false; IsCanResetPunch = false;
print("ResetPunch"); //print("ResetPunch");
animator.SetBool("Punch", false); animator.SetBool("Punch", false);
animator.SetLayerWeight(1, 0); animator.SetLayerWeight(1, 0);
} }
......
BattleMuscle/Assets/My/Scripts/EndPoint.cs
View file @ cc11110e
...@@ -27,15 +27,17 @@ public class EndPoint : MonoBehaviour ...@@ -27,15 +27,17 @@ public class EndPoint : MonoBehaviour
{ {
//游戏胜利 //游戏胜利
print("Player先到终点"); print("Player先到终点");
BattleCtrl.instance.OnBattleWin(); //BattleCtrl.instance.OnBattleWin();
//BattleCtrl.instance.EnterScoreSettlementStatus("Win"); other.gameObject.GetComponent<PlayerMove>().isMyWin = true;
BattleCtrl.instance.EnterScoreSettlementStatus("Win");
} }
else if (other.tag == "Competitor") else if (other.tag == "Competitor")
{ {
//游戏失败 //游戏失败
print("Competitor先到终点"); print("Competitor先到终点");
BattleCtrl.instance.OnBattleFail(); other.gameObject.GetComponent<AIMove>().isMyWin = true;
//BattleCtrl.instance.EnterScoreSettlementStatus("Fail"); //BattleCtrl.instance.OnBattleFail();
BattleCtrl.instance.EnterScoreSettlementStatus("Fail");
} }
} }
public void gameWin() public void gameWin()
......
BattleMuscle/Assets/My/Scripts/Food/Food.cs
View file @ cc11110e
...@@ -10,26 +10,23 @@ public class Food : MonoBehaviour ...@@ -10,26 +10,23 @@ public class Food : MonoBehaviour
private float xDelta = 0; private float xDelta = 0;
private float zDelta = 0; private float zDelta = 0;
private RandomFood randomFood; private RandomFood randomFood;
public bool isUnNomalFood = false;//不是普通的食物
private Rigidbody rig;
private Collider collider;
private float timer = 0;
private void Start() private void Start()
{ {
//randomFood = transform.parent.parent.GetComponent<RandomFood>(); //randomFood = transform.parent.parent.GetComponent<RandomFood>();
rig= GetComponent<Rigidbody>();
collider=GetComponent<Collider>();
} }
//private void OnTriggerEnter(Collider other)
//{
// if (other.tag == "Player")
// {
// other.gameObject.GetComponentInChildren<PlayerMove>().EatFood();
// }else if (other.tag == "Competitor")
// {
// }
//}
private void Update() private void Update()
{ {
if (!BattleCtrl.instance.isStartBattle) if (!BattleCtrl.instance.isStartBattle)
{ {
//游戏没有开始 //游戏没有开始
...@@ -42,6 +39,29 @@ public class Food : MonoBehaviour ...@@ -42,6 +39,29 @@ public class Food : MonoBehaviour
} }
if (isUnNomalFood)
{
timer += Time.deltaTime;
if (timer >= 1)
{
if (rig.velocity.magnitude <= 0.1f)
{
rig.velocity = Vector3.zero;
//rig.useGravity = true;
rig.isKinematic = true;
collider.isTrigger = true;
gameObject.tag = "Food";
isUnNomalFood = false;
}
}
}
else
{
if (targetObj == null) if (targetObj == null)
{ {
xDelta = 0; xDelta = 0;
...@@ -49,16 +69,26 @@ public class Food : MonoBehaviour ...@@ -49,16 +69,26 @@ public class Food : MonoBehaviour
} }
else else
{ {
//Vector3 speed = (targetObj.transform.position - transform.position).normalized * VSpeed;
Vector3 speed = (targetObj.transform.position - transform.position).normalized * VSpeed; Vector3 speed = (targetObj.transform.position - transform.position).normalized * VSpeed;
xDelta = speed.x * Time.deltaTime; xDelta = speed.x * Time.deltaTime;
zDelta = speed.z * Time.deltaTime; zDelta = speed.z * Time.deltaTime;
} }
transform.Translate(new Vector3(xDelta, 0, zDelta)); transform.Translate(new Vector3(xDelta, 0, zDelta), Space.World);
}
} }
private void OnDestroy() private void OnDestroy()
{
if (transform.parent != null)
{
if (transform.parent.parent != null)
{ {
randomFood = transform.parent.parent.GetComponent<RandomFood>(); randomFood = transform.parent.parent.GetComponent<RandomFood>();
randomFood.AddFoodPos(transform.parent); randomFood.AddFoodPos(transform.parent);
} }
}
}
} }
BattleMuscle/Assets/My/Scripts/Food/RandomFood.cs
View file @ cc11110e
...@@ -86,4 +86,7 @@ public class RandomFood : MonoBehaviour ...@@ -86,4 +86,7 @@ public class RandomFood : MonoBehaviour
//print("生成食物："+ addFood); //print("生成食物："+ addFood);
GenerateRandomFood(addFood); GenerateRandomFood(addFood);
} }
} }
BattleMuscle/Assets/My/Scripts/Player/PlayerMove.cs
View file @ cc11110e
...@@ -51,6 +51,12 @@ public class PlayerMove : MonoBehaviour ...@@ -51,6 +51,12 @@ public class PlayerMove : MonoBehaviour
public RiseBridge riseBridge; public RiseBridge riseBridge;
public int Score = 0; public int Score = 0;
public bool isMyWin=false;
public GameObject DancingPlace;
public List<GameObject> foods;
public float Force = 100;
...@@ -111,7 +117,7 @@ public class PlayerMove : MonoBehaviour ...@@ -111,7 +117,7 @@ public class PlayerMove : MonoBehaviour
//print("推墙"); //print("推墙");
hit.gameObject.GetComponent<Rigidbody>().AddForce(new Vector3(0, 0, 100)); hit.gameObject.GetComponent<Rigidbody>().AddForce(new Vector3(0, 0, 100));
scale -= reduceStep; scale -= reduceStep;
ReduceIsPlayChangeModeEffect(); ReduceIsPlayChangeModeEffect("PushWall");
} }
else else
{ {
...@@ -133,7 +139,8 @@ public class PlayerMove : MonoBehaviour ...@@ -133,7 +139,8 @@ public class PlayerMove : MonoBehaviour
RefreshVertigo(hurt); RefreshVertigo(hurt);
} }
ChangeAnimationscaleState(scale); ChangeAnimationscaleState(scale);
ReduceIsPlayChangeModeEffect(); ReduceIsPlayChangeModeEffect("Hurt");
} }
//食物增加时，判断是否播放改变模型特效 //食物增加时，判断是否播放改变模型特效
public void AddIsPlayChangeModeEffect() public void AddIsPlayChangeModeEffect()
...@@ -149,15 +156,19 @@ public class PlayerMove : MonoBehaviour ...@@ -149,15 +156,19 @@ public class PlayerMove : MonoBehaviour
/// <summary> /// <summary>
/// 减少时，判断是否播放改变模型特效 /// 减少时，判断是否播放改变模型特效
/// </summary> /// </summary>
public void ReduceIsPlayChangeModeEffect() public void ReduceIsPlayChangeModeEffect(string type)
{ {
int tempFood = CurrentFood; int tempFood = CurrentFood;
CurrentFood = (int)((scale - 1.0f) / addScale); CurrentFood = (int)((scale - 1.0f) / addScale);
if (tempFood != CurrentFood && (CurrentFood == 0 || CurrentFood == 5 || CurrentFood == 10 || CurrentFood == 15 || CurrentFood == 20)) if (tempFood != CurrentFood && (CurrentFood == 0||CurrentFood == 5 || CurrentFood == 10 || CurrentFood == 15 || CurrentFood == 20))
{ {
Scale(scale, scale, scale); Scale(scale, scale, scale);
ParticleSystem ps = Instantiate(changeModeEffect, transform.position, transform.rotation); ParticleSystem ps = Instantiate(changeModeEffect, transform.position, transform.rotation);
ps.gameObject.AddComponent<DestroyMySel>(); ps.gameObject.AddComponent<DestroyMySel>();
if (type == "Hurt")
{
GenerateRandomFoodAroundPos(5, transform.position, 5);//生成5个食物距离为5
}
} }
} }
...@@ -245,6 +256,8 @@ public class PlayerMove : MonoBehaviour ...@@ -245,6 +256,8 @@ public class PlayerMove : MonoBehaviour
{ {
//print("游戏是否开始："+ BattleCtrl.instance.isStartBattle); //print("游戏是否开始："+ BattleCtrl.instance.isStartBattle);
//print("游戏是否结束："+ BattleCtrl.instance.isEndBattle); //print("游戏是否结束："+ BattleCtrl.instance.isEndBattle);
reduceStep = 0.023f / 0.1f * addScale; reduceStep = 0.023f / 0.1f * addScale;
if (!BattleCtrl.instance.isStartBattle) if (!BattleCtrl.instance.isStartBattle)
{ {
...@@ -311,6 +324,40 @@ public class PlayerMove : MonoBehaviour ...@@ -311,6 +324,40 @@ public class PlayerMove : MonoBehaviour
UpdateJoystick(); UpdateJoystick();
} }
}
else
{
print("Player进入分数结算状态。");
if (isMyWin)
{
//走向跳舞台，并播放跳舞动画
//DancingPlace
Vector3 pos1 = new Vector3(transform.position.x,0, transform.position.z);
Vector3 pos2 = new Vector3(DancingPlace.transform.position.x, 0, DancingPlace.transform.position.z);
if (Vector3.Distance(pos1, pos2) <1)
{
BattleCtrl.instance.ExitScoreSettlementStatus();
print("播放跳舞动画。");
children.transform.localEulerAngles = new Vector3(0,180,0);
animationManager.ChangeAnimatorState(AnimationState.HouseDancing);
}
else
{
print("走向跳舞台。");
transform.LookAt(new Vector3(DancingPlace.transform.position.x, transform.position.y, DancingPlace.transform.position.z));
xDelta = transform.forward.x * VSpeed * Time.deltaTime;
zDelta = transform.forward.z * VSpeed * Time.deltaTime;
characterController.Move(new Vector3(xDelta, yDelta, zDelta));//移动
}
MoveSpeed = Vector3.Distance(Vector3.zero, characterController.velocity);
//是否在地面
Grounded = characterController.isGrounded;
//print("MoveSpeed:" + MoveSpeed+ "characterController.velocity:" + characterController.velocity);
animator.SetFloat("MoveSpeed", MoveSpeed);
animator.SetBool("Grounded", Grounded);
}
} }
//调用一次性方法 //调用一次性方法
if (targetWall == null) if (targetWall == null)
...@@ -377,8 +424,31 @@ public class PlayerMove : MonoBehaviour ...@@ -377,8 +424,31 @@ public class PlayerMove : MonoBehaviour
} }
/// <summary>
/// 生成number个随机食物，距离targetPos点距离为radius.
/// </summary>
/// <param name="number"></param>
/// <param name="targetPos"></param>
/// <param name="radius"></param>
public void GenerateRandomFoodAroundPos(int number, Vector3 targetPos,float radius)
{
//return;
for (int i = 0; i < number; i++)
{
GameObject obj = foods[UnityEngine.Random.Range(0, foods.Count)];
GameObject go= Instantiate(obj);
go.GetComponent<BoxCollider>().isTrigger = false;
Rigidbody rig= go.GetComponent<Rigidbody>();
rig.isKinematic = false;
rig.useGravity = true;
Vector3 randomPos = targetPos+new Vector3(0,2,0);// + Quaternion.Euler(new Vector3(0, UnityEngine.Random.Range(0, 360), 0)) * Vector3.forward * radius;
//Vector3 randomPos = targetPos;
go.transform.position = randomPos;
go.tag = "Untagged";
go.GetComponent<Food>().isUnNomalFood = true;
rig.AddForce(Quaternion.Euler(new Vector3(UnityEngine.Random.Range(-80, -20), UnityEngine.Random.Range(0, 360), 0)) * Vector3.forward * Force);
}
}
void OnDestroy() void OnDestroy()
......
BattleMuscle/Assets/My/Test/Food.meta 0 → 100644
View file @ cc11110e
fileFormatVersion: 2
guid: a226bc0f0f6fc6648bdf5ff48c5f6f00
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/My/Test/TestCharacterC.cs
View file @ cc11110e
...@@ -18,7 +18,12 @@ public class TestCharacterC : MonoBehaviour ...@@ -18,7 +18,12 @@ public class TestCharacterC : MonoBehaviour
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
characterController.Move(new Vector3(xDelta,yDelta,zDelta)*Time.deltaTime);
//characterController.Move(new Vector3(xDelta,0,zDelta)*Time.deltaTime);
characterController.SimpleMove(new Vector3(xDelta, yDelta, zDelta));
transform.position += new Vector3(0, yDelta, 0) * Time.deltaTime;
print("isGround:"+characterController.isGrounded); print("isGround:"+characterController.isGrounded);
} }
} }
BattleMuscle/Assets/My/Test/TestCharacterC.unity
View file @ cc11110e
...@@ -311,12 +311,12 @@ GameObject: ...@@ -311,12 +311,12 @@ GameObject:
- component: {fileID: 1449232318} - component: {fileID: 1449232318}
- component: {fileID: 1449232319} - component: {fileID: 1449232319}
m_Layer: 0 m_Layer: 0
m_Name: Cube1 m_Name: Competitor
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!143 &1449232314 --- !u!143 &1449232314
CharacterController: CharacterController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -421,7 +421,7 @@ BoxCollider: ...@@ -421,7 +421,7 @@ BoxCollider:
m_GameObject: {fileID: 1449232313} m_GameObject: {fileID: 1449232313}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 0
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 1, y: 7.156974, z: 1} m_Size: {x: 1, y: 7.156974, z: 1}
m_Center: {x: 0, y: 3.078487, z: 0} m_Center: {x: 0, y: 3.078487, z: 0}
...@@ -441,12 +441,12 @@ GameObject: ...@@ -441,12 +441,12 @@ GameObject:
- component: {fileID: 1576685845} - component: {fileID: 1576685845}
- component: {fileID: 1576685846} - component: {fileID: 1576685846}
m_Layer: 0 m_Layer: 0
m_Name: Cube2 m_Name: Player
m_TagString: Untagged m_TagString: Competitor
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!143 &1576685840 --- !u!143 &1576685840
CharacterController: CharacterController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -520,7 +520,7 @@ Transform: ...@@ -520,7 +520,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1576685839} m_GameObject: {fileID: 1576685839}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 2.99, z: 0} m_LocalPosition: {x: 0, y: 3.558, z: 0}
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
...@@ -533,7 +533,7 @@ MonoBehaviour: ...@@ -533,7 +533,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1576685839} m_GameObject: {fileID: 1576685839}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe9b447ccc15eb24cbbc1299f715233c, type: 3} m_Script: {fileID: 11500000, guid: fe9b447ccc15eb24cbbc1299f715233c, type: 3}
m_Name: m_Name:
...@@ -566,7 +566,7 @@ BoxCollider: ...@@ -566,7 +566,7 @@ BoxCollider:
m_GameObject: {fileID: 1576685839} m_GameObject: {fileID: 1576685839}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 0
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1} m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
...@@ -583,7 +583,7 @@ GameObject: ...@@ -583,7 +583,7 @@ GameObject:
- component: {fileID: 1928161228} - component: {fileID: 1928161228}
- component: {fileID: 1928161227} - component: {fileID: 1928161227}
m_Layer: 0 m_Layer: 0
m_Name: Quad m_Name: Ground
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
...@@ -659,7 +659,7 @@ Transform: ...@@ -659,7 +659,7 @@ Transform:
m_GameObject: {fileID: 1928161226} m_GameObject: {fileID: 1928161226}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 5, y: 5, z: 1} m_LocalScale: {x: 20, y: 20, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 2
......
BattleMuscle/Assets/My/Test/TestIsGround.cs 0 → 100644
View file @ cc11110e
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class TestIsGround : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}
BattleMuscle/Assets/My/Test/TestIsGround.cs.meta 0 → 100644
View file @ cc11110e
fileFormatVersion: 2
guid: b5b3e51fac851fd46822f00483263377
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
BattleMuscle/Assets/Prefabs/Props/Food/banana Variant.prefab
View file @ cc11110e
...@@ -30,6 +30,19 @@ MonoBehaviour: ...@@ -30,6 +30,19 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
VSpeed: 5 VSpeed: 5
targetObj: {fileID: 0} targetObj: {fileID: 0}
--- !u!65 &8037287731998634036
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4201393565975677940}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.28066528, y: 0.15644814, z: 0.05805028}
m_Center: {x: 0.00033928454, y: 0.041200146, z: -0.0000009201467}
--- !u!1001 &4199887864893652916 --- !u!1001 &4199887864893652916
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -111,7 +124,8 @@ PrefabInstance: ...@@ -111,7 +124,8 @@ PrefabInstance:
propertyPath: m_IsTrigger propertyPath: m_IsTrigger
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents:
- {fileID: 64570622328545086, guid: 5d3dafc3b20484eb1971092f27cac145, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 5d3dafc3b20484eb1971092f27cac145, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5d3dafc3b20484eb1971092f27cac145, type: 3}
--- !u!1 &4201393565975677940 stripped --- !u!1 &4201393565975677940 stripped
GameObject: GameObject:
......
BattleMuscle/Assets/Prefabs/Props/Food/corn Variant.prefab
View file @ cc11110e
...@@ -30,6 +30,19 @@ MonoBehaviour: ...@@ -30,6 +30,19 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
VSpeed: 5 VSpeed: 5
targetObj: {fileID: 0} targetObj: {fileID: 0}
--- !u!65 &3424539357758085125
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4488542462492886108}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.12390807, y: 0.34718618, z: 0.123094276}
m_Center: {x: 0.0004448779, y: 0.14200105, z: -0.0003015045}
--- !u!1001 &4489775756594035602 --- !u!1001 &4489775756594035602
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -106,6 +119,11 @@ PrefabInstance: ...@@ -106,6 +119,11 @@ PrefabInstance:
propertyPath: m_IsTrigger propertyPath: m_IsTrigger
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 136792103230944734, guid: 5b6062007637241e0b729ae8d458864b,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5b6062007637241e0b729ae8d458864b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5b6062007637241e0b729ae8d458864b, type: 3}
--- !u!1 &4488542462492886108 stripped --- !u!1 &4488542462492886108 stripped
......
BattleMuscle/Assets/Prefabs/Props/Food/hotdog Variant.prefab
View file @ cc11110e
...@@ -30,6 +30,19 @@ MonoBehaviour: ...@@ -30,6 +30,19 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
VSpeed: 5 VSpeed: 5
targetObj: {fileID: 0} targetObj: {fileID: 0}
--- !u!65 &3943766374620641027
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8308488070836470441}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.10713473, y: 0.07358828, z: 0.2171973}
m_Center: {x: 0.00047181733, y: 0.02690774, z: 0}
--- !u!1001 &2242307830803790759 --- !u!1001 &2242307830803790759
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -42,6 +55,11 @@ PrefabInstance: ...@@ -42,6 +55,11 @@ PrefabInstance:
propertyPath: m_IsTrigger propertyPath: m_IsTrigger
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3719633197606633771, guid: e8fe085ad223d6d4a91a90ace7502cf8,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7805840925051200814, guid: e8fe085ad223d6d4a91a90ace7502cf8, - target: {fileID: 7805840925051200814, guid: e8fe085ad223d6d4a91a90ace7502cf8,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
......
BattleMuscle/Assets/Prefabs/Props/Food/ice-cream-cone Variant.prefab
View file @ cc11110e
...@@ -30,6 +30,19 @@ MonoBehaviour: ...@@ -30,6 +30,19 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
VSpeed: 5 VSpeed: 5
targetObj: {fileID: 0} targetObj: {fileID: 0}
--- !u!65 &4032240151389544320
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7441636673628327258}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.07430576, y: 0.1936519, z: 0.07483297}
m_Center: {x: 0.00042974018, y: 0.08309094, z: 0.0013698749}
--- !u!1001 &6580752451347437921 --- !u!1001 &6580752451347437921
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -122,6 +135,11 @@ PrefabInstance: ...@@ -122,6 +135,11 @@ PrefabInstance:
propertyPath: m_IsTrigger propertyPath: m_IsTrigger
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6487572058764796183, guid: 13b6c374cc44590419d9532924576e3c,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 13b6c374cc44590419d9532924576e3c, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 13b6c374cc44590419d9532924576e3c, type: 3}
--- !u!1 &7441636673628327258 stripped --- !u!1 &7441636673628327258 stripped
......
BattleMuscle/Assets/Prefabs/Props/Food/pizza-cheese Variant.prefab
View file @ cc11110e
...@@ -30,6 +30,7 @@ MonoBehaviour: ...@@ -30,6 +30,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
VSpeed: 5 VSpeed: 5
targetObj: {fileID: 0} targetObj: {fileID: 0}
isUnNomalFood: 0
--- !u!1001 &3455431711706918031 --- !u!1001 &3455431711706918031
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -106,6 +107,31 @@ PrefabInstance: ...@@ -106,6 +107,31 @@ PrefabInstance:
propertyPath: m_IsTrigger propertyPath: m_IsTrigger
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 65200516367806258, guid: 5bb6b4f8ded274f819001be2cefca495,
type: 3}
propertyPath: m_Size.y
value: 0.06546607
objectReference: {fileID: 0}
- target: {fileID: 65200516367806258, guid: 5bb6b4f8ded274f819001be2cefca495,
type: 3}
propertyPath: m_Size.z
value: 0.39999995
objectReference: {fileID: 0}
- target: {fileID: 65200516367806258, guid: 5bb6b4f8ded274f819001be2cefca495,
type: 3}
propertyPath: m_Center.x
value: 0.000000011920929
objectReference: {fileID: 0}
- target: {fileID: 65200516367806258, guid: 5bb6b4f8ded274f819001be2cefca495,
type: 3}
propertyPath: m_Center.y
value: 0.0043073385
objectReference: {fileID: 0}
- target: {fileID: 65200516367806258, guid: 5bb6b4f8ded274f819001be2cefca495,
type: 3}
propertyPath: m_Center.z
value: -0.000000023841858
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5bb6b4f8ded274f819001be2cefca495, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5bb6b4f8ded274f819001be2cefca495, type: 3}
--- !u!1 &3454478639246554943 stripped --- !u!1 &3454478639246554943 stripped
......
BattleMuscle/Assets/Prefabs/Props/Food/pizza-cheese-slice Variant.prefab
View file @ cc11110e
...@@ -30,6 +30,7 @@ MonoBehaviour: ...@@ -30,6 +30,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
VSpeed: 5 VSpeed: 5
targetObj: {fileID: 0} targetObj: {fileID: 0}
isUnNomalFood: 0
--- !u!1001 &2363739819044374914 --- !u!1001 &2363739819044374914
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -106,6 +107,31 @@ PrefabInstance: ...@@ -106,6 +107,31 @@ PrefabInstance:
propertyPath: m_IsTrigger propertyPath: m_IsTrigger
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 65758245174541938, guid: da3e1ddc94dfc431b8d3039c6c1db3f9,
type: 3}
propertyPath: m_Size.x
value: 0.1855558
objectReference: {fileID: 0}
- target: {fileID: 65758245174541938, guid: da3e1ddc94dfc431b8d3039c6c1db3f9,
type: 3}
propertyPath: m_Size.y
value: 0.07571416
objectReference: {fileID: 0}
- target: {fileID: 65758245174541938, guid: da3e1ddc94dfc431b8d3039c6c1db3f9,
type: 3}
propertyPath: m_Center.x
value: -0.0052498938
objectReference: {fileID: 0}
- target: {fileID: 65758245174541938, guid: da3e1ddc94dfc431b8d3039c6c1db3f9,
type: 3}
propertyPath: m_Center.y
value: 0.014499498
objectReference: {fileID: 0}
- target: {fileID: 65758245174541938, guid: da3e1ddc94dfc431b8d3039c6c1db3f9,
type: 3}
propertyPath: m_Center.z
value: -0.020998036
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: da3e1ddc94dfc431b8d3039c6c1db3f9, type: 3} m_SourcePrefab: {fileID: 100100000, guid: da3e1ddc94dfc431b8d3039c6c1db3f9, type: 3}
--- !u!1 &2362392358244718184 stripped --- !u!1 &2362392358244718184 stripped
......
BattleMuscle/Assets/Prefabs/Props/Food/pizza-mozzarella Variant.prefab
View file @ cc11110e
...@@ -30,6 +30,7 @@ MonoBehaviour: ...@@ -30,6 +30,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
VSpeed: 5 VSpeed: 5
targetObj: {fileID: 0} targetObj: {fileID: 0}
isUnNomalFood: 0
--- !u!1001 &7522318039351925760 --- !u!1001 &7522318039351925760
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -106,6 +107,26 @@ PrefabInstance: ...@@ -106,6 +107,26 @@ PrefabInstance:
propertyPath: m_IsTrigger propertyPath: m_IsTrigger
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 65453196210429450, guid: 7dbdd11837d8b494e8ef6ae74e7a62dd,
type: 3}
propertyPath: m_Size.y
value: 0.07534217
objectReference: {fileID: 0}
- target: {fileID: 65453196210429450, guid: 7dbdd11837d8b494e8ef6ae74e7a62dd,
type: 3}
propertyPath: m_Center.x
value: -0.00020016432
objectReference: {fileID: 0}
- target: {fileID: 65453196210429450, guid: 7dbdd11837d8b494e8ef6ae74e7a62dd,
type: 3}
propertyPath: m_Center.y
value: 0.016618965
objectReference: {fileID: 0}
- target: {fileID: 65453196210429450, guid: 7dbdd11837d8b494e8ef6ae74e7a62dd,
type: 3}
propertyPath: m_Center.z
value: 0.00018343926
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7dbdd11837d8b494e8ef6ae74e7a62dd, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 7dbdd11837d8b494e8ef6ae74e7a62dd, type: 3}
--- !u!1 &7521386331040408604 stripped --- !u!1 &7521386331040408604 stripped
......
BattleMuscle/Assets/Prefabs/Props/Food/pizza-mozzarella-slice Variant.prefab
View file @ cc11110e
...@@ -30,6 +30,7 @@ MonoBehaviour: ...@@ -30,6 +30,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
VSpeed: 5 VSpeed: 5
targetObj: {fileID: 0} targetObj: {fileID: 0}
isUnNomalFood: 0
--- !u!1001 &3023360021173592083 --- !u!1001 &3023360021173592083
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -111,6 +112,31 @@ PrefabInstance: ...@@ -111,6 +112,31 @@ PrefabInstance:
propertyPath: m_IsTrigger propertyPath: m_IsTrigger
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 65897771054261046, guid: 9a33cf4e45bbf4d7a876bb8606c3ada2,
type: 3}
propertyPath: m_Size.x
value: 0.1855558
objectReference: {fileID: 0}
- target: {fileID: 65897771054261046, guid: 9a33cf4e45bbf4d7a876bb8606c3ada2,
type: 3}
propertyPath: m_Size.y
value: 0.09474945
objectReference: {fileID: 0}
- target: {fileID: 65897771054261046, guid: 9a33cf4e45bbf4d7a876bb8606c3ada2,
type: 3}
propertyPath: m_Center.x
value: -0.0052498938
objectReference: {fileID: 0}
- target: {fileID: 65897771054261046, guid: 9a33cf4e45bbf4d7a876bb8606c3ada2,
type: 3}
propertyPath: m_Center.y
value: 0.0035380365
objectReference: {fileID: 0}
- target: {fileID: 65897771054261046, guid: 9a33cf4e45bbf4d7a876bb8606c3ada2,
type: 3}
propertyPath: m_Center.z
value: -0.020998036
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9a33cf4e45bbf4d7a876bb8606c3ada2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9a33cf4e45bbf4d7a876bb8606c3ada2, type: 3}
--- !u!1 &3022100789067994117 stripped --- !u!1 &3022100789067994117 stripped
......
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