Skip to content

S
SteelBall
Commit a1e5e9c6 authored by Yuyang's avatar Yuyang
Browse files
Options

Merge remote-tracking branch 'origin/master' into YuYang 

# Conflicts:
#	SteelBall/Assets/Res/Prefabs/Levels/Level03.prefab
#	SteelBall/Assets/Res/Prefabs/Levels/Level04.prefab
parents d36ac4af 90cbbd48
Show whitespace changes
Inline Side-by-side
Showing with 17713 additions and 1493 deletions
SteelBall/Assembly-CSharp-Editor.csproj
View file @ a1e5e9c6
...@@ -297,12 +297,12 @@ ...@@ -297,12 +297,12 @@
<Reference Include="SyntaxTree.VisualStudio.Unity.Bridge"> <Reference Include="SyntaxTree.VisualStudio.Unity.Bridge">
<HintPath>C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath> <HintPath>C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath>
</Reference> </Reference>
<Reference Include="DOTweenEditor">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/Editor/DOTweenEditor.dll</HintPath>
</Reference>
<Reference Include="DOTween"> <Reference Include="DOTween">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/DOTween.dll</HintPath> <HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/DOTween.dll</HintPath>
</Reference> </Reference>
<Reference Include="DOTweenEditor">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/Editor/DOTweenEditor.dll</HintPath>
</Reference>
<Reference Include="nunit.framework"> <Reference Include="nunit.framework">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath> <HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference> </Reference>
......
SteelBall/Assets/0A1_Scenes/DemoScenes.unity
View file @ a1e5e9c6
...@@ -166,6 +166,10 @@ MonoBehaviour: ...@@ -166,6 +166,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
levelPrefs: levelPrefs:
- {fileID: 7132143057902326427, guid: a09b8b8b695f00c429343f067902169b, type: 3} - {fileID: 7132143057902326427, guid: a09b8b8b695f00c429343f067902169b, type: 3}
- {fileID: 641847574482041699, guid: b9343f2adfbad3d45910efa7d0677584, type: 3}
- {fileID: 8744738608159344848, guid: ede9ddf15b410904798bc74f3ca63a8c, type: 3}
- {fileID: 4567337292791389910, guid: 7a841727d29832047bb76befac15a6c3, type: 3}
- {fileID: 7109006367036189340, guid: bc146b9b911d9494faeb6d77dbe34891, type: 3}
--- !u!1 &707446923 --- !u!1 &707446923
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
SteelBall/Assets/0A2_Scripts/Battle/Trigger/FifthLevelTrigger.cs
View file @ a1e5e9c6
...@@ -5,65 +5,92 @@ using Obi; ...@@ -5,65 +5,92 @@ using Obi;
public class FifthLevelTrigger : MonoBehaviour public class FifthLevelTrigger : MonoBehaviour
{ {
//public Transform m_topTrans; ////public Transform m_topTrans;
//private Rigidbody[] m_rigidBody; ////private Rigidbody[] m_rigidBody;
//private bool m_bControl = true; ////private bool m_bControl = true;
public Transform m_mousePosTrans; //public Transform m_mousePosTrans;
public float m_speed = 1.0f; //public float m_speed = 1.0f;
private bool m_bEnterGround = true; //private bool m_bEnterGround = true;
private bool m_bEnterSuccessTarget = false; //private bool m_bEnterSuccessTarget = false;
private Rigidbody m_mouseRigidBody; //private Rigidbody m_mouseRigidBody;
private Vector3 m_DefaultPos = new Vector3(2.18f,1.61f,-1.13f); //private Vector3 m_DefaultPos = new Vector3(2.18f,1.61f,-1.13f);
private Vector3 m_dirPos = new Vector3(1.19f, 0, -2.11f); //private Vector3 m_dirPos = new Vector3(1.19f, 0, -2.11f);
private void Start() //private void Start()
{ //{
m_mouseRigidBody = m_mousePosTrans.gameObject.GetComponent<Rigidbody>(); // m_mouseRigidBody = m_mousePosTrans.gameObject.GetComponent<Rigidbody>();
BattleCtrl.instance.levelManager.curLevel.chainRopeView.onBalloonEnterTarget += onBalloonEnterTarget; // BattleCtrl.instance.levelManager.curLevel.chainRopeView.onBalloonEnterTarget += onBalloonEnterTarget;
BattleCtrl.instance.levelManager.curLevel.chainRopeView.onBalloonEnterGround += onBalloonEnterGround; // BattleCtrl.instance.levelManager.curLevel.chainRopeView.onBalloonEnterGround += onBalloonEnterGround;
BattleCtrl.instance.levelManager.curLevel.chainRopeView.onBalloonEnterSuccessTarget += onBalloonEnterSuccessTarget; // BattleCtrl.instance.levelManager.curLevel.chainRopeView.onBalloonEnterSuccessTarget += onBalloonEnterSuccessTarget;
//m_rigidBody = gameObject.GetComponentsInChildren<Rigidbody>(); // //m_rigidBody = gameObject.GetComponentsInChildren<Rigidbody>();
} //}
void onBalloonEnterTarget() //void onBalloonEnterTarget()
{ //{
m_bEnterGround = false; // m_bEnterGround = false;
} //}
void onBalloonEnterGround() //void onBalloonEnterGround()
{ //{
m_bEnterGround = true; // m_bEnterGround = true;
} //}
void onBalloonEnterSuccessTarget() //void onBalloonEnterSuccessTarget()
{ //{
m_bEnterSuccessTarget = true; // m_bEnterSuccessTarget = true;
} //}
// Update is called once per frame //// Update is called once per frame
void Update() //void Update()
{
//if(m_bControl)
//{ //{
// if(m_topTrans.position.y < 6) // //if(m_bControl)
// //{
// // if(m_topTrans.position.y < 6)
// // {
// // m_bControl = false;
// // BattleCtrl.instance.OnBattleWin();
// // }
// //}
// if(m_bEnterGround)
// {
// transform.Translate(Vector3.up * Time.deltaTime * m_speed, Space.World);
// }
// if(m_bEnterSuccessTarget)
// {
// m_bEnterSuccessTarget = false;
// m_mouseRigidBody.isKinematic = true;
// m_mousePosTrans.localPosition = m_DefaultPos;
// }
// else
// {
// if(m_mouseRigidBody.isKinematic)
// { // {
// m_bControl = false; // //transform.Translate(Vector3.up * Time.deltaTime * m_speed, Space.World);
// BattleCtrl.instance.OnBattleWin(); // transform.localPosition = Vector3.Lerp(transform.localPosition, m_dirPos, 0.03f);
// transform.rotation = Quaternion.Slerp(transform.rotation, Quaternion.identity, 0.03f);
// }
// } // }
//} //}
if(m_bEnterGround) public Transform m_targetTrans;
public Transform m_buildTrans;
public Transform m_buttonTrans;
public float m_speed = 1.0f;
private bool m_bControl = true;
protected virtual void OnTriggerEnter(Collider collider)
{ {
transform.Translate(Vector3.up * Time.deltaTime * m_speed, Space.World); if (collider.gameObject.CompareTag("Player") && m_bControl)
}
if(m_bEnterSuccessTarget)
{ {
m_bEnterSuccessTarget = false; m_bControl = false;
m_mouseRigidBody.isKinematic = true; }
m_mousePosTrans.localPosition = m_DefaultPos;
} }
else private void Update()
{ {
if(m_mouseRigidBody.isKinematic) if(m_buildTrans && m_targetTrans && m_buttonTrans && !m_bControl)
{
if(m_buttonTrans.localPosition.y >= 0.0f)
{
m_buttonTrans.Translate(-Vector3.up * Time.deltaTime * m_speed, Space.World);
}
if (m_buildTrans.localPosition.y <= 10.1f)
{ {
//transform.Translate(Vector3.up * Time.deltaTime * m_speed, Space.World); m_buildTrans.Translate(Vector3.up * Time.deltaTime * m_speed, Space.World);
transform.localPosition = Vector3.Lerp(transform.localPosition, m_dirPos, 0.03f); m_targetTrans.Translate(Vector3.up * Time.deltaTime * m_speed, Space.World);
transform.rotation = Quaternion.Slerp(transform.rotation, Quaternion.identity, 0.03f);
} }
} }
} }
......
SteelBall/Assets/0A2_Scripts/Battle/Trigger/FirstLevelTrigger.cs
View file @ a1e5e9c6
...@@ -5,7 +5,7 @@ using UnityEngine; ...@@ -5,7 +5,7 @@ using UnityEngine;
public class FirstLevelTrigger : MonoBehaviour public class FirstLevelTrigger : MonoBehaviour
{ {
//public Transform m_targetTrans; //public Transform m_targetTrans;
private Vector3 m_pos = new Vector3(-2.15f, 0.22f, 0); private Vector3 m_pos = new Vector3(-1.61f, 0.22f, 0);
private Quaternion m_rotation = Quaternion.identity; private Quaternion m_rotation = Quaternion.identity;
private bool m_bControl = true; private bool m_bControl = true;
private Transform m_targetTrans; private Transform m_targetTrans;
......
SteelBall/Assets/0A2_Scripts/Battle/Trigger/TargetTrigger.cs
View file @ a1e5e9c6
...@@ -4,14 +4,44 @@ using UnityEngine; ...@@ -4,14 +4,44 @@ using UnityEngine;
public class TargetTrigger : MonoBehaviour public class TargetTrigger : MonoBehaviour
{ {
private Vector3 m_pos = new Vector3(-1.61f, 0.22f, 0);
private Vector3 m_posLevelFive = new Vector3(-1.61f, 10.24f, 0);
private Quaternion m_rotation = Quaternion.identity;
private bool m_bControl = true; private bool m_bControl = true;
private void OnTriggerEnter(Collider other) private Transform m_targetTrans;
//private void OnTriggerEnter(Collider other)
//{
// if (other.gameObject.CompareTag("Target") && m_bControl)
// {
// m_bControl = false;
// BattleCtrl.instance.OnBattleWin();
// BattleCtrl.instance.levelManager.curLevel.chainRopeView.CatchObjEnterTarget();
// }
//}
protected virtual void OnTriggerEnter(Collider collider)
{ {
if (other.gameObject.CompareTag("Target") && m_bControl) Rigidbody rb = collider.GetComponent<Rigidbody>();
if (collider.gameObject.CompareTag("Target") && m_bControl && rb)
{ {
m_bControl = false; m_bControl = false;
m_targetTrans = collider.transform;
rb.constraints = RigidbodyConstraints.FreezePositionX | RigidbodyConstraints.FreezePositionY | RigidbodyConstraints.FreezePositionZ |
RigidbodyConstraints.FreezeRotationX | RigidbodyConstraints.FreezeRotationY;
BattleCtrl.instance.OnBattleWin(); BattleCtrl.instance.OnBattleWin();
BattleCtrl.instance.levelManager.curLevel.chainRopeView.CatchObjEnterTarget(); }
}
private void Update()
{
if (!m_bControl && m_targetTrans)
{
if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
{
m_targetTrans.localPosition = Vector3.Lerp(m_targetTrans.localPosition, m_posLevelFive, 0.03f);
}
else
{
m_targetTrans.localPosition = Vector3.Lerp(m_targetTrans.localPosition, m_pos, 0.03f);
}
} }
} }
} }
SteelBall/Assets/0A3_Prefabs/BattleUI.prefab
View file @ a1e5e9c6
...@@ -6365,7 +6365,7 @@ MonoBehaviour: ...@@ -6365,7 +6365,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3} m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -6382,7 +6382,7 @@ MonoBehaviour: ...@@ -6382,7 +6382,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677571250785} m_GameObject: {fileID: 6064464677571250785}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3} m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name: m_Name:
...@@ -6396,7 +6396,7 @@ MonoBehaviour: ...@@ -6396,7 +6396,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677571250785} m_GameObject: {fileID: 6064464677571250785}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name: m_Name:
...@@ -6863,7 +6863,7 @@ MonoBehaviour: ...@@ -6863,7 +6863,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3} m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -6880,7 +6880,7 @@ MonoBehaviour: ...@@ -6880,7 +6880,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677866441003} m_GameObject: {fileID: 6064464677866441003}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name: m_Name:
...@@ -6934,7 +6934,7 @@ MonoBehaviour: ...@@ -6934,7 +6934,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677866441003} m_GameObject: {fileID: 6064464677866441003}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3} m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name: m_Name:
...@@ -9541,7 +9541,7 @@ MonoBehaviour: ...@@ -9541,7 +9541,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 6 m_Text: '?'
--- !u!1 &6598198701575155059 --- !u!1 &6598198701575155059
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -10145,7 +10145,7 @@ MonoBehaviour: ...@@ -10145,7 +10145,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 7 m_Text: '?'
--- !u!1 &6598198701691947572 --- !u!1 &6598198701691947572
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -10237,7 +10237,7 @@ GameObject: ...@@ -10237,7 +10237,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!224 &6598198701825853662 --- !u!224 &6598198701825853662
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -11827,7 +11827,7 @@ GameObject: ...@@ -11827,7 +11827,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!224 &6598198702637423844 --- !u!224 &6598198702637423844
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
SteelBall/Assets/0A3_Prefabs/holeTrigger.prefab
View file @ a1e5e9c6
...@@ -10,7 +10,7 @@ GameObject: ...@@ -10,7 +10,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 6343910780052995144} - component: {fileID: 6343910780052995144}
- component: {fileID: 2065023536690103948} - component: {fileID: 2065023536690103948}
- component: {fileID: 4229059551681026877} - component: {fileID: 3377637630895402974}
m_Layer: 8 m_Layer: 8
m_Name: magnet m_Name: magnet
m_TagString: Untagged m_TagString: Untagged
...@@ -45,7 +45,7 @@ SphereCollider: ...@@ -45,7 +45,7 @@ SphereCollider:
serializedVersion: 2 serializedVersion: 2
m_Radius: 0.6 m_Radius: 0.6
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &4229059551681026877 --- !u!114 &3377637630895402974
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -54,7 +54,7 @@ MonoBehaviour: ...@@ -54,7 +54,7 @@ MonoBehaviour:
m_GameObject: {fileID: 2931525949271872164} m_GameObject: {fileID: 2931525949271872164}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7aa9cd085e519b545b88a1e2def2d692, type: 3} m_Script: {fileID: 11500000, guid: 36894c5933a000a4c8c535683dba6c65, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &2986675907246666288 --- !u!1 &2986675907246666288
...@@ -287,7 +287,7 @@ Transform: ...@@ -287,7 +287,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8977900385761036646} m_GameObject: {fileID: 8977900385761036646}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.888, y: 1.531, z: 0.46822} m_LocalPosition: {x: -2.9, y: 1.531, z: 0.46822}
m_LocalScale: {x: 1, y: 0.5118, z: 1} m_LocalScale: {x: 1, y: 0.5118, z: 1}
m_Children: m_Children:
- {fileID: 5041089129542579046} - {fileID: 5041089129542579046}
......
SteelBall/Assets/Res/Prefabs/Levels/Level01.prefab
View file @ a1e5e9c6
...@@ -607,7 +607,7 @@ GameObject: ...@@ -607,7 +607,7 @@ GameObject:
- component: {fileID: 4053580056330658240} - component: {fileID: 4053580056330658240}
- component: {fileID: 7132143057902326427} - component: {fileID: 7132143057902326427}
m_Layer: 0 m_Layer: 0
m_Name: Level0 m_Name: Level01
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
...@@ -1267,11 +1267,6 @@ PrefabInstance: ...@@ -1267,11 +1267,6 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 4053580056445237778} m_TransformParent: {fileID: 4053580056445237778}
m_Modifications: m_Modifications:
- target: {fileID: 2223166408088548867, guid: 54c939b922ce3e742b9aecc128cdd154,
type: 3}
propertyPath: m_LocalPosition.x
value: -2.9
objectReference: {fileID: 0}
- target: {fileID: 2986675907246666288, guid: 54c939b922ce3e742b9aecc128cdd154, - target: {fileID: 2986675907246666288, guid: 54c939b922ce3e742b9aecc128cdd154,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
...@@ -1580,7 +1575,7 @@ PrefabInstance: ...@@ -1580,7 +1575,7 @@ PrefabInstance:
- target: {fileID: 5063288113430786112, guid: 026b5780346325e4b98d62d9430fe8e1, - target: {fileID: 5063288113430786112, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3} type: 3}
propertyPath: linkInstances.Array.size propertyPath: linkInstances.Array.size
value: 108 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5063288113430786112, guid: 026b5780346325e4b98d62d9430fe8e1, - target: {fileID: 5063288113430786112, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3} type: 3}
......
SteelBall/Assets/Res/Prefabs/Levels/Level03.prefab
View file @ a1e5e9c6
This source diff could not be displayed because it is too large. You can view the blob instead.
SteelBall/Assets/Res/Prefabs/Levels/Level04.prefab
View file @ a1e5e9c6
This source diff could not be displayed because it is too large. You can view the blob instead.
SteelBall/Assets/Res/Prefabs/Levels/Level05.prefab
View file @ a1e5e9c6
...@@ -1005,34 +1005,6 @@ Rigidbody: ...@@ -1005,34 +1005,6 @@ Rigidbody:
m_Interpolate: 0 m_Interpolate: 0
m_Constraints: 0 m_Constraints: 0
m_CollisionDetection: 0 m_CollisionDetection: 0
--- !u!54 &3764952696080104432
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4040573734206883611}
serializedVersion: 2
m_Mass: 1
m_Drag: 10
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 120
m_CollisionDetection: 0
--- !u!114 &3963560938386471807
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4040573734206883611}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6a2be9d8415dce84daf5f1b6b777d5bd, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1871120857907397383 --- !u!1 &1871120857907397383
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -4320,6 +4292,34 @@ Transform: ...@@ -4320,6 +4292,34 @@ Transform:
m_Father: {fileID: 4040573733812686658} m_Father: {fileID: 4040573733812686658}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &3764952696080104432
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4040573734206883611}
serializedVersion: 2
m_Mass: 1
m_Drag: 10
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 120
m_CollisionDetection: 0
--- !u!114 &3963560938386471807
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4040573734206883611}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6a2be9d8415dce84daf5f1b6b777d5bd, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &4040573734231294484 --- !u!1 &4040573734231294484
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -4349,6 +4349,7 @@ Transform: ...@@ -4349,6 +4349,7 @@ Transform:
m_Children: m_Children:
- {fileID: 6757988877416697573} - {fileID: 6757988877416697573}
- {fileID: 1871549070046122665} - {fileID: 1871549070046122665}
- {fileID: 7319091445216978047}
m_Father: {fileID: 4040573735186831815} m_Father: {fileID: 4040573735186831815}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -4628,7 +4629,7 @@ MeshRenderer: ...@@ -4628,7 +4629,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 7b4263242b2c89f45b7088968eac46ef, type: 2} - {fileID: 2100000, guid: 51a49656bff65b3488577fead51b83df, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -4841,7 +4842,68 @@ MonoBehaviour: ...@@ -4841,7 +4842,68 @@ MonoBehaviour:
m_chainRopeView: {fileID: 0} m_chainRopeView: {fileID: 0}
m_chainHandle: {fileID: 3963560938386471807} m_chainHandle: {fileID: 3963560938386471807}
m_camera: {fileID: 0} m_camera: {fileID: 0}
curLevelIndex: 1 curLevelIndex: 4
--- !u!1 &7603134056601248193
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7319091445216978047}
- component: {fileID: 8547343705252056802}
- component: {fileID: 4607332715907448271}
m_Layer: 0
m_Name: buttonTrigger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7319091445216978047
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7603134056601248193}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.46, y: 0.07, z: -0.1314039}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4040573734231294485}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &8547343705252056802
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7603134056601248193}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &4607332715907448271
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7603134056601248193}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 622119790b3ecdf479dd087fef5e6923, type: 3}
m_Name:
m_EditorClassIdentifier:
m_targetTrans: {fileID: 23140263829358294}
m_buildTrans: {fileID: 4035800303001616775}
m_buttonTrans: {fileID: 1871549070046122665}
m_speed: 1
--- !u!1001 &1871120857418378013 --- !u!1001 &1871120857418378013
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -5150,6 +5212,11 @@ PrefabInstance: ...@@ -5150,6 +5212,11 @@ PrefabInstance:
value: value:
objectReference: {fileID: 5932101836730060332, guid: b9343f2adfbad3d45910efa7d0677584, objectReference: {fileID: 5932101836730060332, guid: b9343f2adfbad3d45910efa7d0677584,
type: 3} type: 3}
- target: {fileID: 5063288112137550278, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
- target: {fileID: 5063288112137550297, guid: 026b5780346325e4b98d62d9430fe8e1, - target: {fileID: 5063288112137550297, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3} type: 3}
propertyPath: m_Mass propertyPath: m_Mass
...@@ -5729,15 +5796,15 @@ PrefabInstance: ...@@ -5729,15 +5796,15 @@ PrefabInstance:
- {fileID: 5063288112813874807, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3} - {fileID: 5063288112813874807, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
- {fileID: 5063288112813874806, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3} - {fileID: 5063288112813874806, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
--- !u!4 &4566462821820411514 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
m_PrefabInstance: {fileID: 9103861518316231015}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4040573734206883611 stripped --- !u!1 &4040573734206883611 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 5063288112813874812, guid: 026b5780346325e4b98d62d9430fe8e1, m_CorrespondingSourceObject: {fileID: 5063288112813874812, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3} type: 3}
m_PrefabInstance: {fileID: 9103861518316231015} m_PrefabInstance: {fileID: 9103861518316231015}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &4566462821820411514 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
m_PrefabInstance: {fileID: 9103861518316231015}
m_PrefabAsset: {fileID: 0}
SteelBall/Obi.Editor.csproj
View file @ a1e5e9c6
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
<None Include="Assets\0E1_Plugins\Obi\Editor\Resources\UVSpaceColor.shader" /> <None Include="Assets\0E1_Plugins\Obi\Editor\Resources\UVSpaceColor.shader" />
<None Include="Assets\0E1_Plugins\Obi\Editor\Resources\DistanceFieldPreview.shader" /> <None Include="Assets\0E1_Plugins\Obi\Editor\Resources\DistanceFieldPreview.shader" />
<None Include="Assets\0E1_Plugins\Obi\Editor\Resources\TopologyBorders.shader" /> <None Include="Assets\0E1_Plugins\Obi\Editor\Resources\TopologyBorders.shader" />
<None Include="Assets\0E1_Plugins\Obi\Editor\Obi.Editor.asmdef" />
<None Include="Assets\0E1_Plugins\Obi\Editor\Resources\PaddingShader.shader" /> <None Include="Assets\0E1_Plugins\Obi\Editor\Resources\PaddingShader.shader" />
<Reference Include="UnityEngine"> <Reference Include="UnityEngine">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath> <HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
...@@ -340,12 +341,12 @@ ...@@ -340,12 +341,12 @@
<Reference Include="SyntaxTree.VisualStudio.Unity.Bridge"> <Reference Include="SyntaxTree.VisualStudio.Unity.Bridge">
<HintPath>C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath> <HintPath>C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath>
</Reference> </Reference>
<Reference Include="DOTweenEditor">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/Editor/DOTweenEditor.dll</HintPath>
</Reference>
<Reference Include="DOTween"> <Reference Include="DOTween">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/DOTween.dll</HintPath> <HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/DOTween.dll</HintPath>
</Reference> </Reference>
<Reference Include="DOTweenEditor">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/Editor/DOTweenEditor.dll</HintPath>
</Reference>
<Reference Include="nunit.framework"> <Reference Include="nunit.framework">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath> <HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference> </Reference>
......
SteelBall/Obi.csproj
View file @ a1e5e9c6
...@@ -365,6 +365,7 @@ ...@@ -365,6 +365,7 @@
<Compile Include="Assets\0E1_Plugins\Obi\Scripts\RopeAndRod\Rendering\ObiRopeMeshRenderer.cs" /> <Compile Include="Assets\0E1_Plugins\Obi\Scripts\RopeAndRod\Rendering\ObiRopeMeshRenderer.cs" />
<Compile Include="Assets\0E1_Plugins\Obi\Scripts\RopeAndRod\Utils\ObiRopeAttach.cs" /> <Compile Include="Assets\0E1_Plugins\Obi\Scripts\RopeAndRod\Utils\ObiRopeAttach.cs" />
<Compile Include="Assets\0E1_Plugins\Obi\Scripts\RopeAndRod\Utils\ObiRopePrefabPlugger.cs" /> <Compile Include="Assets\0E1_Plugins\Obi\Scripts\RopeAndRod\Utils\ObiRopePrefabPlugger.cs" />
<None Include="Assets\0E1_Plugins\Obi\Scripts\Obi.asmdef" />
<Reference Include="UnityEngine"> <Reference Include="UnityEngine">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath> <HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
</Reference> </Reference>
...@@ -566,12 +567,12 @@ ...@@ -566,12 +567,12 @@
<Reference Include="SyntaxTree.VisualStudio.Unity.Bridge"> <Reference Include="SyntaxTree.VisualStudio.Unity.Bridge">
<HintPath>C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath> <HintPath>C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath>
</Reference> </Reference>
<Reference Include="DOTweenEditor">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/Editor/DOTweenEditor.dll</HintPath>
</Reference>
<Reference Include="DOTween"> <Reference Include="DOTween">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/DOTween.dll</HintPath> <HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/DOTween.dll</HintPath>
</Reference> </Reference>
<Reference Include="DOTweenEditor">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/Editor/DOTweenEditor.dll</HintPath>
</Reference>
<Reference Include="netstandard"> <Reference Include="netstandard">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath> <HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>
</Reference> </Reference>
......
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