Commit e14ff79a authored by wanqing's avatar wanqing

逻辑代码

parent 0697f601

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{fc1eab36-3aec-8aac-59a8-3baafe5e5a80}"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{36AB1EFC-EC3A-AC8A-59A8-3BAAFE5E5A80}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NonConvexCollider", "NonConvexCollider.csproj", "{a2bc2b4d-c75c-0396-8901-66edc864bc7e}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NonConvexCollider", "NonConvexCollider.csproj", "{4D2BBCA2-5CC7-9603-8901-66EDC864BC7E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NonConvexColliderRuntimeAPI", "NonConvexColliderRuntimeAPI.csproj", "{7b550465-27a8-b999-2ed5-421ac4bfe102}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{68F13CA4-F99B-7182-3042-A7E33D480627}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RuntimeTestAssembly", "RuntimeTestAssembly.csproj", "{31103648-ae78-6e99-19e4-953073214bf8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NonConvexColliderRuntimeAPI", "NonConvexColliderRuntimeAPI.csproj", "{6504557B-A827-99B9-2ED5-421AC4BFE102}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{fc913842-0979-bfd3-b6a2-209344902e41}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RuntimeTestAssembly", "RuntimeTestAssembly.csproj", "{48361031-78AE-996E-19E4-953073214BF8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NonConvexEditor", "NonConvexEditor.csproj", "{24ac6d9b-cd6a-5815-7302-bf30e22831cc}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{423891FC-7909-D3BF-B6A2-209344902E41}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NonConvexEditor", "NonConvexEditor.csproj", "{9B6DAC24-6ACD-1558-7302-BF30E22831CC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor-firstpass", "Assembly-CSharp-Editor-firstpass.csproj", "{2C2A2B3B-7A2B-14AF-8671-DE27CA784353}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{fc1eab36-3aec-8aac-59a8-3baafe5e5a80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{fc1eab36-3aec-8aac-59a8-3baafe5e5a80}.Debug|Any CPU.Build.0 = Debug|Any CPU
{a2bc2b4d-c75c-0396-8901-66edc864bc7e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{a2bc2b4d-c75c-0396-8901-66edc864bc7e}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7b550465-27a8-b999-2ed5-421ac4bfe102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7b550465-27a8-b999-2ed5-421ac4bfe102}.Debug|Any CPU.Build.0 = Debug|Any CPU
{31103648-ae78-6e99-19e4-953073214bf8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{31103648-ae78-6e99-19e4-953073214bf8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{fc913842-0979-bfd3-b6a2-209344902e41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{fc913842-0979-bfd3-b6a2-209344902e41}.Debug|Any CPU.Build.0 = Debug|Any CPU
{24ac6d9b-cd6a-5815-7302-bf30e22831cc}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{24ac6d9b-cd6a-5815-7302-bf30e22831cc}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36AB1EFC-EC3A-AC8A-59A8-3BAAFE5E5A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36AB1EFC-EC3A-AC8A-59A8-3BAAFE5E5A80}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36AB1EFC-EC3A-AC8A-59A8-3BAAFE5E5A80}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36AB1EFC-EC3A-AC8A-59A8-3BAAFE5E5A80}.Release|Any CPU.Build.0 = Release|Any CPU
{4D2BBCA2-5CC7-9603-8901-66EDC864BC7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4D2BBCA2-5CC7-9603-8901-66EDC864BC7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4D2BBCA2-5CC7-9603-8901-66EDC864BC7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D2BBCA2-5CC7-9603-8901-66EDC864BC7E}.Release|Any CPU.Build.0 = Release|Any CPU
{68F13CA4-F99B-7182-3042-A7E33D480627}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{68F13CA4-F99B-7182-3042-A7E33D480627}.Debug|Any CPU.Build.0 = Debug|Any CPU
{68F13CA4-F99B-7182-3042-A7E33D480627}.Release|Any CPU.ActiveCfg = Release|Any CPU
{68F13CA4-F99B-7182-3042-A7E33D480627}.Release|Any CPU.Build.0 = Release|Any CPU
{6504557B-A827-99B9-2ED5-421AC4BFE102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6504557B-A827-99B9-2ED5-421AC4BFE102}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6504557B-A827-99B9-2ED5-421AC4BFE102}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6504557B-A827-99B9-2ED5-421AC4BFE102}.Release|Any CPU.Build.0 = Release|Any CPU
{48361031-78AE-996E-19E4-953073214BF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{48361031-78AE-996E-19E4-953073214BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{48361031-78AE-996E-19E4-953073214BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{48361031-78AE-996E-19E4-953073214BF8}.Release|Any CPU.Build.0 = Release|Any CPU
{423891FC-7909-D3BF-B6A2-209344902E41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{423891FC-7909-D3BF-B6A2-209344902E41}.Debug|Any CPU.Build.0 = Debug|Any CPU
{423891FC-7909-D3BF-B6A2-209344902E41}.Release|Any CPU.ActiveCfg = Release|Any CPU
{423891FC-7909-D3BF-B6A2-209344902E41}.Release|Any CPU.Build.0 = Release|Any CPU
{9B6DAC24-6ACD-1558-7302-BF30E22831CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9B6DAC24-6ACD-1558-7302-BF30E22831CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9B6DAC24-6ACD-1558-7302-BF30E22831CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9B6DAC24-6ACD-1558-7302-BF30E22831CC}.Release|Any CPU.Build.0 = Release|Any CPU
{2C2A2B3B-7A2B-14AF-8671-DE27CA784353}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C2A2B3B-7A2B-14AF-8671-DE27CA784353}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C2A2B3B-7A2B-14AF-8671-DE27CA784353}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C2A2B3B-7A2B-14AF-8671-DE27CA784353}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -165,15 +165,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
levelPrefs:
- {fileID: 2794140286571742475, guid: 51fec1d60f8d8734ea12c10cf44463f6, type: 3}
- {fileID: 5692076561298177557, guid: 7eed2151487298e4d90c772cc8dbec53, type: 3}
- {fileID: 3398670956349326374, guid: 0b98e1d1882a32142b2a68e39814220b, type: 3}
- {fileID: 1411365057041450796, guid: 4c183562b13ee4f419e4c58c74ca5ae7, type: 3}
- {fileID: 8844811367371711361, guid: 1f30fa336a3b68449b911fbc345b9a9f, type: 3}
- {fileID: 8789034136536622850, guid: 9303a558d2837474098c46be5d5e0cdc, type: 3}
- {fileID: 7901963983170660130, guid: 826e421451c628c43992932a42b401f2, type: 3}
- {fileID: 4869099247009897236, guid: 425b3bf00a47ba34a930c53b748d7aa7, type: 3}
- {fileID: 4535810378384200255, guid: 28d9783f916c9764984f116c496b40d6, type: 3}
- {fileID: 8692181047053733938, guid: 90ed022fa9d48a64f910aad15b7faa2d, type: 3}
--- !u!1 &543166196
GameObject:
m_ObjectHideFlags: 0
......@@ -285,7 +277,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eac3ab1cd8d56dc4fb10ca3966649e25, type: 3}
m_Name:
m_EditorClassIdentifier:
battleUI: {fileID: 2347244092073185524}
battleUI: {fileID: 4757777914183204071}
m_levelManager: {fileID: 186647396}
--- !u!1 &1872965180
GameObject:
......@@ -298,6 +290,7 @@ GameObject:
- component: {fileID: 1872965181}
- component: {fileID: 1872965183}
- component: {fileID: 1872965182}
- component: {fileID: 1872965184}
m_Layer: 0
m_Name: GameServices
m_TagString: Untagged
......@@ -331,7 +324,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 65d718b4fac224944ad7728793e3fdc7, type: 3}
m_Name:
m_EditorClassIdentifier:
pad: {fileID: 2347244091251205803}
pad: {fileID: 4757777914971753144}
--- !u!114 &1872965183
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -344,7 +337,51 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ff376a18ea419e546ba78667f1b5c6b3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1598298138395560401
--- !u!114 &1872965184
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1872965180}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: edb0d13b66926534795d037f8ffc70e4, type: 3}
m_Name:
m_EditorClassIdentifier:
m_lineObj: {fileID: 4311752678208769479, guid: 195a7270fdad9604598b2f2379b81e35,
type: 3}
m_LemonObj: {fileID: 1228172796360835699, guid: 3c2eeba1104224147a0727219a7d0996,
type: 3}
m_OrangeObj: {fileID: 4605942808044338429, guid: 836680285af7bc14aa0d41a5075fcd20,
type: 3}
m_StrawberryObj: {fileID: 4487736285029203363, guid: 377e1c7ad59bf454ea1024ad4b044134,
type: 3}
--- !u!114 &4757777914183204071 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6064464677632144694, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
m_PrefabInstance: {fileID: 7859421868164097006}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 719c0ad6d83af074a83455f6c88d41e0, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &4757777914971753144 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6064464676810081129, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
m_PrefabInstance: {fileID: 7859421868164097006}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e3ca8d9f66bfdf4da1bfb54682c658b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &7859421868164097006
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
......@@ -463,27 +500,3 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
--- !u!114 &2347244091251205803 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6064464676810081129, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
m_PrefabInstance: {fileID: 1598298138395560401}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e3ca8d9f66bfdf4da1bfb54682c658b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2347244092073185524 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6064464677632144694, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
m_PrefabInstance: {fileID: 1598298138395560401}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 719c0ad6d83af074a83455f6c88d41e0, type: 3}
m_Name:
m_EditorClassIdentifier:
This diff is collapsed.
......@@ -102,11 +102,11 @@ public class BattleCtrl : MonoBehaviour
//}
//curLevel.OnStartBattle();
StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
if(varView)
{
varView.OnStartClick();
}
//StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
//if(varView)
//{
// varView.OnStartClick();
//}
}
/// <summary>
......
......@@ -6,49 +6,49 @@ public class TargetCollision : MonoBehaviour
{
private bool m_bControl = true;
private Vector3 m_hitPoint = Vector3.zero;
private void OnCollisionEnter(Collision other)
{
if (other.collider.gameObject.CompareTag("Target"))
{
StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
if(varView && varView.curTargetTrans &&
!string.Equals(varView.curTargetTrans.name, other.collider.name) && m_bControl)
{
m_bControl = false;
varView.SetTargetCollison(other.collider.transform, true);
}
Rigidbody varBody = GetComponent<Rigidbody>();
if(varBody && varView && varView.IsHitTarget)
{
varBody.velocity = Vector3.zero;
}
}
}
private void OnCollisionExit(Collision other)
{
if (other.collider.gameObject.CompareTag("Target"))
{
StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
if (varView && varView.curTargetTrans &&
!string.Equals(varView.curTargetTrans.name, other.collider.name) && !m_bControl)
{
m_bControl = true;
m_hitPoint = other.collider.ClosestPoint(other.transform.position);
}
}
}
//private void OnCollisionEnter(Collision other)
//{
// if (other.collider.gameObject.CompareTag("Target"))
// {
// StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
// if(varView && varView.curTargetTrans &&
// !string.Equals(varView.curTargetTrans.name, other.collider.name) && m_bControl)
// {
// m_bControl = false;
// varView.SetTargetCollison(other.collider.transform, true);
// }
// Rigidbody varBody = GetComponent<Rigidbody>();
// if(varBody && varView && varView.IsHitTarget)
// {
// varBody.velocity = Vector3.zero;
// }
// }
//}
//private void OnCollisionExit(Collision other)
//{
// if (other.collider.gameObject.CompareTag("Target"))
// {
// StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
// if (varView && varView.curTargetTrans &&
// !string.Equals(varView.curTargetTrans.name, other.collider.name) && !m_bControl)
// {
// m_bControl = true;
// m_hitPoint = other.collider.ClosestPoint(other.transform.position);
// }
// }
//}
//退出箱子碰到处理
void UpdateExitBox()
{
if (m_bControl && m_hitPoint != Vector3.zero)
{
StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
if (varView.curTargetTrans && Vector3.SqrMagnitude(varView.curTargetTrans.transform.position - m_hitPoint) >= 3.0f)
{
m_hitPoint = Vector3.zero;
varView.SetTargetCollison(null, false);
}
}
//if (m_bControl && m_hitPoint != Vector3.zero)
//{
// StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
// if (varView.curTargetTrans && Vector3.SqrMagnitude(varView.curTargetTrans.transform.position - m_hitPoint) >= 3.0f)
// {
// m_hitPoint = Vector3.zero;
// varView.SetTargetCollison(null, false);
// }
//}
}
private void Update()
{
......
......@@ -7,30 +7,30 @@ public class FirstLevelTrigger : MonoBehaviour
{
private bool m_bControl = true;
private List<MeshRenderer> m_lst = new List<MeshRenderer>();
private void OnTriggerEnter(Collider other)
{
if (other.gameObject.CompareTag("Target"))
{
StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
MeshRenderer varMesh = other.GetComponent<MeshRenderer>();
if (varMesh &&!m_lst.Contains(varMesh))
{
varView.InsideBox(other);
m_lst.Add(varMesh);
}
}
}
private void OnTriggerExit(Collider other)
{
if (other.gameObject.CompareTag("Target"))
{
StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
MeshRenderer varMesh = other.GetComponent<MeshRenderer>();
if (varMesh && m_lst.Contains(varMesh))
{
varView.ExitBox();
m_lst.Remove(varMesh);
}
}
}
//private void OnTriggerEnter(Collider other)
//{
// if (other.gameObject.CompareTag("Target"))
// {
// StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
// MeshRenderer varMesh = other.GetComponent<MeshRenderer>();
// if (varMesh &&!m_lst.Contains(varMesh))
// {
// varView.InsideBox(other);
// m_lst.Add(varMesh);
// }
// }
//}
//private void OnTriggerExit(Collider other)
//{
// if (other.gameObject.CompareTag("Target"))
// {
// StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
// MeshRenderer varMesh = other.GetComponent<MeshRenderer>();
// if (varMesh && m_lst.Contains(varMesh))
// {
// varView.ExitBox();
// m_lst.Remove(varMesh);
// }
// }
//}
}
......@@ -4,15 +4,15 @@ using UnityEngine;
public class OutTrigger : MonoBehaviour
{
private void OnTriggerEnter(Collider other)
{
if (other.gameObject.CompareTag("Target"))
{
StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
if (varView)
{
varView.EnterOut(other.name);
}
}
}
//private void OnTriggerEnter(Collider other)
//{
// if (other.gameObject.CompareTag("Target"))
// {
// StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
// if (varView)
// {
// varView.EnterOut(other.name);
// }
// }
//}
}
......@@ -6,57 +6,57 @@ public class SecondLevelTrigger : MonoBehaviour
{
private bool m_bControl = true;
private List<MeshRenderer> m_lst = new List<MeshRenderer>();
private void OnTriggerStay(Collider other)
{
if (other.gameObject.CompareTag("Target"))
{
StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
if(varView && !varView.curTargetTrans)
{
Rigidbody varBody = other.GetComponent<Rigidbody>();
if(varBody)
{
if(varBody.velocity.y < 0)
{
return;
}
}
MeshRenderer varMesh = other.GetComponent<MeshRenderer>();
if (varMesh && !m_lst.Contains(varMesh))
{
varView.EnterTopBox(other.name);
m_lst.Add(varMesh);
}
}
}
}
private void OnTriggerExit(Collider other)
{
if (other.gameObject.CompareTag("Target"))
{
StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
if (varView/* && !varView.curTargetTrans*/)
{
MeshRenderer varMesh = other.GetComponent<MeshRenderer>();
if (varMesh && m_lst.Contains(varMesh))
{
varView.ExitTopBox(other.name);
m_lst.Remove(varMesh);
}
}
}
}
//private void OnTriggerStay(Collider other)
//{
// if (other.gameObject.CompareTag("Target"))
// {
// StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
// if(varView && !varView.curTargetTrans)
// {
// Rigidbody varBody = other.GetComponent<Rigidbody>();
// if(varBody)
// {
// if(varBody.velocity.y < 0)
// {
// return;
// }
// }
// MeshRenderer varMesh = other.GetComponent<MeshRenderer>();
// if (varMesh && !m_lst.Contains(varMesh))
// {
// varView.EnterTopBox(other.name);
// m_lst.Add(varMesh);
// }
// }
// }
//}
//private void OnTriggerExit(Collider other)
//{
// if (other.gameObject.CompareTag("Target"))
// {
// StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
// if (varView/* && !varView.curTargetTrans*/)
// {
// MeshRenderer varMesh = other.GetComponent<MeshRenderer>();
// if (varMesh && m_lst.Contains(varMesh))
// {
// varView.ExitTopBox(other.name);
// m_lst.Remove(varMesh);
// }
// }
// }
//}
//设置退出
public void SetExit(MeshRenderer other)
{
StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
if (varView)
{
if (m_lst.Contains(other))
{
varView.ExitTopBox(other.name);
m_lst.Remove(other);
}
}
//StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
//if (varView)
//{
// if (m_lst.Contains(other))
// {
// varView.ExitTopBox(other.name);
// m_lst.Remove(other);
// }
//}
}
}
......@@ -266,12 +266,12 @@ public class BattleUI : MonoBehaviour
m_levelText.text = string.Format("Level {0:D}", BattleCtrl.instance.levelManager.CurLevelIndex + 1);
Camera varCam = BattleCtrl.instance.levelManager.curLevel.cam;
if (varCam)
{
m_cameraPosY.text = string.Format("pos{0:f3}", varCam.transform.position.y);
m_cameraFieldView.text = string.Format("fieldView{0:f1}", varCam.fieldOfView);
}
//Camera varCam = BattleCtrl.instance.levelManager.curLevel.cam;
//if (varCam)
//{
// m_cameraPosY.text = string.Format("pos{0:f3}", varCam.transform.position.y);
// m_cameraFieldView.text = string.Format("fieldView{0:f1}", varCam.fieldOfView);
//}
GameServices.timerServices.Push(this, 1, delegate
{
m_clawMoveSpeed.text = string.Format("系数越小,越快\n{0:f3}", GameServices.configService.playerConfig.ClawMoveSpeed);
......@@ -340,6 +340,11 @@ public class BattleUI : MonoBehaviour
m_colorIndex = 0;
}
}
//刷新
public void RefreshBtn()
{
BattleCtrl.instance.levelManager.curLevel.fruitView.Refresh();
}
//设置炸弹
public void SetBomb()
{
......@@ -378,19 +383,19 @@ public class BattleUI : MonoBehaviour
//{
// BattleCtrl.instance.OnBattleFail();
//}
StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
if(varView)
{
if (varView.hitTopBoxNum > 0)
{
BattleCtrl.instance.OnBattleFail();
}
else
{
BattleCtrl.instance.OnBattleWin();
}
varView.SetResultAnimator(varView.hitTopBoxNum <= 0);
}
//StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
//if(varView)
//{
// if (varView.hitTopBoxNum > 0)
// {
// BattleCtrl.instance.OnBattleFail();
// }
// else
// {
// BattleCtrl.instance.OnBattleWin();
// }
// varView.SetResultAnimator(varView.hitTopBoxNum <= 0);
//}
SetTakeBtnState(false);
}
//设置take按钮状态
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class FruitItemView : MonoBehaviour
{
public FruitType m_type;
public FruitType type => m_type;
private Vector3 m_size;
public Vector3 Size => m_size;
private MeshRenderer m_meshRender;
private GameObject m_childObj;
private MeshRenderer[] m_fragTrans;//碎块
private List<Vector3> m_fragPos = new List<Vector3>();//碎块初始位置
private List<Quaternion> m_fragQua = new List<Quaternion>();//碎块初始旋转
private void Awake()
{
m_size = transform.localScale;
m_meshRender = GetComponent<MeshRenderer>();
m_childObj = transform.GetChild(0).gameObject;
m_fragTrans = m_childObj.GetComponentsInChildren<MeshRenderer>();
for(int i = 0;i<m_fragTrans.Length;i++)
{
Transform varTrans = m_fragTrans[i].transform;
m_fragPos.Add(varTrans.localPosition);
m_fragQua.Add(varTrans.localRotation);
}
}
//变大动画
public void SetChangeBig()
{
transform.localScale = Vector3.Lerp(transform.localScale, m_size * 1.1f, 1.0f);
}
//变小动画
public void SetChangeSmall()
{
transform.localScale = Vector3.Lerp(transform.localScale, m_size, 1.0f);
}
//生成碎块
public void SetFrag()
{
if(m_meshRender)
{
m_meshRender.enabled = false;
}
if(m_childObj)
{
m_childObj.SetActive(true);
}
}
//重置碎块状态
public void ResetFragState()
{
if (m_meshRender)
{
m_meshRender.enabled = true;
}
if (m_childObj)
{
m_childObj.SetActive(false);
}
for (int i = 0; i < m_fragTrans.Length; i++)
{
m_fragTrans[i].transform.localPosition = m_fragPos[i];
m_fragTrans[i].transform.localRotation = m_fragQua[i];
}
}
}
fileFormatVersion: 2
guid: 9ce0afadfd77b3b40bf16a06353f4b73
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class FruitView : MonoBehaviour
{
public GlassView m_glassView;
public Transform m_fruitParent;
private List<FruitItemView> m_selectLst = new List<FruitItemView>();//选中的水果
private int m_lineIndex = 0;//线段计数
private FruitItemView m_curSelectItem;//当前选中的
private FruitItemView m_lastSelectItem;//上次选中的
private bool m_bIsTouchUp = true;//是否松手
private List<GameObject> m_lineLst = new List<GameObject>();
private int m_SelectNum = 0;//选中数量
void Start()
{
GameServices.inputService.pad.onTouchUp += OnTouchUp;
GlobalConfig.LoadFirstLevelDefaultFruit(m_fruitParent);
}
// 抬起回调
void OnTouchUp()
{
for (int i = 0; i < m_selectLst.Count; i++)
{
HighlightableObject varHO = m_selectLst[i].GetComponent<HighlightableObject>();
if (varHO)
{
varHO.FlashingOff();
}
m_selectLst[i].SetFrag();
}
m_SelectNum = m_selectLst.Count;
Invoke("DelayClear", 0.5f);
m_bIsTouchUp = true;
m_lastSelectItem = null;
for(int i = 0;i< m_lineLst.Count;i++)
{
PoolManager.Instance.ReturnObjectToPool(m_lineLst[i]);
}
m_lineLst.Clear();
}
//延迟删除
void DelayClear()
{
int varStrawberryNum = 0;
int varLemonNum = 0;
for (int i = 0; i < m_selectLst.Count; i++)
{
if(m_selectLst[i].type == FruitType.Strawberry)
{
varStrawberryNum++;
}
else if(m_selectLst[i].type == FruitType.Lemon)
{
varLemonNum++;
}
PoolManager.Instance.ReturnObjectToPool(m_selectLst[i].gameObject);
m_selectLst[i].ResetFragState();
}
m_glassView.SetFruitNum(varStrawberryNum, varLemonNum);
m_selectLst.Clear();
Invoke("DelayCreate", 0.2f);
}
//延迟生成
void DelayCreate()
{
GlobalConfig.LoadFirstRandomFruit(m_SelectNum, m_fruitParent);
}
//refresh
public void Refresh()
{
Rigidbody[] varBody = m_fruitParent.GetComponentsInChildren<Rigidbody>();
for(int i = 0;i<varBody.Length;i++)
{
Transform varTrans = varBody[i].transform;
if(varBody[i].transform.localPosition.x < 0)
{
varBody[i].AddForce((Vector3.up + Vector3.right) * 3.0f, ForceMode.Impulse);
}
else
{
varBody[i].AddForce((Vector3.left) * 3.0f, ForceMode.Impulse);
}
}
}
// Update is called once per frame
void Update()
{
if (!BattleCtrl.instance.isStartBattle || BattleCtrl.instance.isEndBattle)
{
return;
}
if (Input.GetMouseButton(0))
{
Clicked();
}
UpdateSelectSize();
}
void Clicked()
{
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
RaycastHit hit = new RaycastHit();
if (Physics.Raycast(ray, out hit,100.0f,2))
{
if (hit.collider && hit.collider.gameObject.CompareTag("Target"))
{
FruitItemView varHitTrans = hit.collider.transform.GetComponent<FruitItemView>();
if (!m_selectLst.Contains(varHitTrans))
{
m_bIsTouchUp = false;
HighlightableObject varHo = hit.collider.GetComponent<HighlightableObject>();
if (varHo)
{
varHo.FlashingOn(Color.magenta, Color.magenta, 1.0f);
}
m_curSelectItem = varHitTrans;
if(m_selectLst.Count > 0)
{
m_lastSelectItem = m_selectLst[m_selectLst.Count - 1];
}
if(m_lastSelectItem)
{
DrawLS(m_lastSelectItem.transform, m_curSelectItem.transform);
}
m_selectLst.Add(varHitTrans);
}
}
}
}
//选中物体大小变化
void UpdateSelectSize()
{
if (m_curSelectItem)
{
if (m_bIsTouchUp)
{
m_curSelectItem.SetChangeSmall();
}
else
{
m_curSelectItem.SetChangeBig();
}
}
if (m_lastSelectItem)
{
m_lastSelectItem.SetChangeSmall();
}
}
//线段渲染
//void ShowLine(Transform trans)
//{
// lineRenderer.positionCount = m_lineIndex + 1;
// lineRenderer.SetPosition(m_lineIndex, trans.position);
// m_lineIndex++;
//}
void DrawLS(Transform startP, Transform finalP)
{
Vector3 varStart = startP.position;
//varStart.z = 0;
Vector3 varFinal = finalP.position;
//varFinal.z = 0;
Vector3 rightPosition = (varStart + varFinal) / 2;
Vector3 rightRotation = varFinal - varStart;
float HalfLength = Vector3.Distance(varStart, varFinal) / 2;
float LThickness = 0.02f;//线的粗细
//创建圆柱体
GameObject MyLine = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.lineObj);
rightPosition.z = -0.5f;
MyLine.transform.position = rightPosition;
MyLine.transform.rotation = Quaternion.FromToRotation(Vector3.up, rightRotation);
MyLine.transform.localScale = new Vector3(LThickness, HalfLength, LThickness);
m_lineLst.Add(MyLine);
//这里可以设置材质,具体自己设置
//MyLine.GetComponent<MeshRenderer>().material = GetComponent<MeshRenderer>().material;
}
private void OnDestroy()
{
if (GameServices.inputService != null)
{
GameServices.inputService.pad.onTouchUp -= OnTouchUp;
}
m_lineLst.Clear();
m_lineLst = null;
m_selectLst.Clear();
m_selectLst = null;
}
}
fileFormatVersion: 2
guid: f0d7c6ac1127d7f4193bfc642283892a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class GlassView : MonoBehaviour
{
public Transform m_strawberry;//草莓
public Transform m_lemon;//柠檬
private float m_strawberryOffest;
private float m_lemonOffest;
private float m_strawberryNum;
private float m_lemonNum;
private float m_strawberryMaxNum = 3.0f;
private float m_lemonMaxNum = 3.0f;
private bool m_bControl = true;
//数量
public void SetFruitNum(int num1,int num2)
{
m_strawberryNum += num1;
if (m_strawberryNum > m_strawberryMaxNum)
{
m_strawberryNum = m_strawberryMaxNum;
}
m_lemonNum += num2;
if(m_lemonNum > m_lemonMaxNum)
{
m_lemonNum = m_lemonMaxNum;
}
}
private void Update()
{
if (!BattleCtrl.instance.isStartBattle || BattleCtrl.instance.isEndBattle)
{
return;
}
if (m_strawberryOffest < m_strawberryNum)
{
m_strawberryOffest += Time.deltaTime;
Vector3 varSize = m_strawberry.localScale;
varSize.y = m_strawberryOffest/10.0f;
m_strawberry.localScale = varSize;
Vector3 varPos = m_lemon.localPosition;
varPos.y = m_strawberry.localScale.y / 10.0f + m_strawberry.localScale.y / 60.0f;
m_lemon.localPosition = varPos;
}
if(m_lemonOffest < m_lemonNum)
{
m_lemonOffest += Time.deltaTime;
Vector3 varSize = m_lemon.localScale;
varSize.y = m_lemonOffest/10.0f;
m_lemon.localScale = varSize;
Vector3 varPos = m_lemon.localPosition;
varPos.y = m_strawberry.localScale.y / 10.0f + m_strawberry.localScale.y / 60.0f;
m_lemon.localPosition = varPos;
}
if(m_strawberryOffest >= m_strawberryMaxNum && m_lemonOffest >= m_lemonMaxNum
&& m_bControl)
{
m_bControl = false;
BattleCtrl.instance.OnBattleWin();
}
}
}
fileFormatVersion: 2
guid: 3ae43ccbd5b7ffc4bba8ca035230fccf
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class FpsShow : MonoBehaviour
{
public float updateInterval = 0.5F;
public Text m_fps;
private double lastInterval;
private int frames = 0;
private float fps;
void Start()
{
lastInterval = Time.realtimeSinceStartup;
frames = 0;
}
//void OnGUI()
//{
// GUILayout.Label(" " + fps.ToString("f2"));
//}
void Update()
{
++frames;
float timeNow = Time.realtimeSinceStartup;
if (timeNow > lastInterval + updateInterval)
{
fps = (float)(frames / (timeNow - lastInterval));
frames = 0;
lastInterval = timeNow;
m_fps.text = fps.ToString("f2");
}
}
}
fileFormatVersion: 2
guid: dc557fb5a8a59854d95c7de847226ecb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -12,9 +12,10 @@ public class LevelCtrl : MonoBehaviour
private ChainView m_chainView;//爪钩view
private ChainRopeView m_chainRopeView;//娃娃机爪钩
public Camera m_camera;
private Camera m_camera;
private CarView m_carView;//车
public StorageView m_storageView;
private StorageView m_storageView;
public FruitView m_fruitView;
//public TargetView m_targetView;//触发器
public ChainView chainView => m_chainView;
public ChainRopeView chainRopeView => m_chainRopeView;
......@@ -22,6 +23,7 @@ public class LevelCtrl : MonoBehaviour
public CarView carView => m_carView;
public StorageView storageView => m_storageView;
//public TargetView targetView => m_targetView;
public FruitView fruitView => m_fruitView;
BattleCtrl _BattleCtrl;
[Header("当前是第几关,从0开始。例如第一关则填0")]
......
......@@ -5,11 +5,17 @@ using UnityEngine;
public class CacheManager : MonoBehaviour
{
[SerializeField]
private GameObject m_bombEffectObj;//炸弹特效
private GameObject m_lineObj;//线
[SerializeField]
private GameObject m_rayfireBombObj;//炸弹预设
public GameObject bombEffectObj => m_bombEffectObj;
public GameObject rayfireBombObj => m_rayfireBombObj;
private GameObject m_LemonObj;//柠檬
[SerializeField]
private GameObject m_OrangeObj;//橙子
[SerializeField]
private GameObject m_StrawberryObj;//草莓
public GameObject lineObj => m_lineObj;
public GameObject LemonObj => m_LemonObj;
public GameObject OrangeObj => m_OrangeObj;
public GameObject StrawberryObj => m_StrawberryObj;
public static CacheManager Instance = null;
void Awake()
{
......
......@@ -57,6 +57,10 @@ class Pool
}
public void DestroyObj()
{
for (int i = 0; i < m_objList.Count; i++)
{
GameObject.Destroy(m_objList[i]);
}
GameObject.Destroy(m_rootObj);
m_rootObj = null;
m_objList.Clear();
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class GlobalConfig
{
......@@ -164,6 +165,44 @@ public class GlobalConfig
}
return varPosZ;
}
//加载第一关默认的水果
public static void LoadFirstLevelDefaultFruit(Transform parent)
{
for(int i = 0;i<3;i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i, 2.5f,0.0f);
varObj.transform.localRotation = Quaternion.identity;
}
for (int i = 0; i < 3; i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.LemonObj);
varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i, 3.0f, 0.0f);
varObj.transform.localRotation = Quaternion.identity;
}
}
//第一关随机加载水果
public static void LoadFirstRandomFruit(int num,Transform parent)
{
for (int i = 0; i < num; i++)
{
int varRand = Random.Range(0, 2);
GameObject varObj;
if (varRand == 0)
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
}
else
{
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.LemonObj);
}
varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * (i % 3), 2.5f+0.5f*(i / 3), 0.0f);
varObj.transform.localRotation = Quaternion.identity;
}
}
}
public enum LangeType
......@@ -171,3 +210,11 @@ public enum LangeType
Chinese,
English
}
public enum FruitType
{
Orange,
Strawberry,
Apple,
Lemon,
Watermelon,
}
This diff is collapsed.
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4311752678208769479
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6571615196451314677}
- component: {fileID: 123137844615961587}
- component: {fileID: 6756740437291609695}
m_Layer: 0
m_Name: CylinderLine
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6571615196451314677
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4311752678208769479}
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: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &123137844615961587
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4311752678208769479}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &6756740437291609695
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4311752678208769479}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9576509a84a074930b0b9adcfb752204, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
fileFormatVersion: 2
guid: 51fec1d60f8d8734ea12c10cf44463f6
guid: 195a7270fdad9604598b2f2379b81e35
PrefabImporter:
externalObjects: {}
userData:
......
fileFormatVersion: 2
guid: 84a6cf6a677d17a4e9a8fba9be1147df
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: c4c1726b1f0899340b70b7d59f8a64bd
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: f3d35b282d97120439545e7164d4b65d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: e0c046ee1a0faae418643c6229854611
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 328ad776c848d244f9eff93baa19f0fa
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 3c2eeba1104224147a0727219a7d0996
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 836680285af7bc14aa0d41a5075fcd20
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 377e1c7ad59bf454ea1024ad4b044134
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8156791527631756886
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1418271418063517064}
- component: {fileID: 4712266388886584607}
m_Layer: 0
m_Name: line
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1418271418063517064
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8156791527631756886}
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: []
m_Father: {fileID: 8076275843556061785}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!120 &4712266388886584607
LineRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8156791527631756886}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9576509a84a074930b0b9adcfb752204, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 1}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
shadowBias: 0.5
generateLightingData: 0
m_UseWorldSpace: 1
m_Loop: 0
--- !u!1 &9188418354993655357
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8076275843556061785}
m_Layer: 0
m_Name: "\u7EBF\u6BB5"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8076275843556061785
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9188418354993655357}
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: 1418271418063517064}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
fileFormatVersion: 2
guid: a34215a84722b644eac7aa839f8e54a8
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 317d19313d1d7204e9bbc37122116e7f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -377,7 +377,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
......
......@@ -9,16 +9,24 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: LiquidBottle 2
m_Shader: {fileID: 4800000, guid: ef722c40702bdfc47a4082f7e7d1d70a, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_ShaderKeywords: _STATICHIGHLIGHTS_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 2450
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BackTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
......@@ -35,14 +43,26 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Diffuse:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _LightTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
......@@ -55,43 +75,110 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Ramp:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _texcoord:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- PixelSnap: 0
- _AlphaScale: 1
- _BackCut: 0.165
- _BaseCellOffset: 0
- _BaseCellSharpness: 0.9469953
- _BlendOp: 0
- _BottleSpecularGloss: 1
- _BottleThickness: 0.001
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 0
- _FillAmount: 1
- _EmissionEnabled: 0
- _EnableExternalAlpha: 0
- _Exposure: 1
- _Extrusion: 1
- _FillAmount: 0.222
- _FlipbookMode: 0
- _FoamLineWidth: 0.0051
- _FresnelPower: 10
- _FresnelScale: 10
- _Gloss: 20
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HighlightCellOffset: -0.5789518
- _IndirectDiffuseContribution: 1
- _IndirectSpecularContribution: 1
- _InnerRimPower: 3
- _InvFade: 1
- _LightWidth: 1
- _LightingEnabled: 1
- _LiquidRimIntensity: 0
- _LiquidRimPower: 2
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _PannerXSpeed: 0
- _Parallax: 0.02
- _Rim: 0.02
- _RimPower: 1.04
- _RimIntensity: 10
- _RimMulitpiler: 10
- _RimOffset: 0.24
- _RimPower: 1
- _Rotation: 0
- _ShadowContribution: 1
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SpeedX: 0
- _SpeedY: 0
- _SrcBlend: 1
- _StaticHighLights: 1
- _UVSec: 0
- _WobbleX: 0
- _WobbleZ: 0
- _ZWrite: 1
- __dirty: 1
m_Colors:
- _BottleColor: {r: 0.9528302, g: 0.9528302, b: 0.9528302, a: 0.09803922}
- _BackColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseTint: {r: 1, g: 1, b: 1, a: 0}
- _BlockColor: {r: 0, g: 0.5, b: 1, a: 1}
- _BottleColor: {r: 1, g: 1, b: 1, a: 1}
- _BottleSpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 0.6037736, g: 0.33891064, b: 0.33891064, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FoamColor: {r: 1, g: 0.8820755, b: 0.8820755, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _FoamColor: {r: 1, g: 1, b: 1, a: 1}
- _HColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
- _HighlightTint: {r: 1, g: 1, b: 1, a: 1}
- _LiquidColor: {r: 1, g: 0.5235849, b: 0.5235849, a: 1}
- _LiquidFoamColor: {r: 1, g: 1, b: 1, a: 1}
- _LiquidRimColor: {r: 0.25943398, g: 1, b: 0.7759454, a: 1}
- _LiquidTopColor: {r: 1, g: 1, b: 1, a: 1}
- _RimColor: {r: 1, g: 0.43867922, b: 0.49131963, a: 1}
- _MainColor: {r: 1, g: 1, b: 1, a: 1}
- _MoveLightColor: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
- _RimColor: {r: 0, g: 0, b: 0, a: 0}
- _SColor: {r: 0.3, g: 0.3, b: 0.3, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _Specular: {r: 1, g: 1, b: 1, a: 1}
- _Tint: {r: 0.88235295, g: 0.101960786, b: 0.09803922, a: 1}
- _TopColor: {r: 0.9811321, g: 0.21212356, b: 0.2082592, a: 1}
- _TopColor: {r: 1, g: 1, b: 1, a: 1}
......@@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 2450
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
......@@ -62,7 +62,7 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _FillAmount: 1
- _FillAmount: 0.1
- _FoamLineWidth: 0.0051
- _GlossMapScale: 1
- _Glossiness: 0.5
......@@ -92,6 +92,6 @@ Material:
- _LiquidFoamColor: {r: 1, g: 1, b: 1, a: 1}
- _LiquidRimColor: {r: 0.25943398, g: 1, b: 0.7759454, a: 1}
- _LiquidTopColor: {r: 1, g: 1, b: 1, a: 1}
- _RimColor: {r: 1, g: 0.43867922, b: 0.49131963, a: 1}
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
- _Tint: {r: 0.17657915, g: 0.88235295, b: 0.09803921, a: 1}
- _TopColor: {r: 0.40408695, g: 0.98039216, b: 0.20784315, a: 1}
......@@ -4,14 +4,16 @@
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: 1
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_CustomRenderQueue: -1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
......@@ -23,4 +25,4 @@ Material:
m_Offset: {x: 0, y: 0}
m_Floats: []
m_Colors:
- _Color: {r: 0.8117648, g: 0.5137255, b: 0.043137256, a: 1}
- _Color: {r: 1, g: 1, b: 0, a: 1}
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: 2
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats: []
m_Colors:
- _Color: {r: 0.88235295, g: 0.101960786, b: 0.09803922, a: 1}
fileFormatVersion: 2
guid: abaa6c8f0890f264d96dad4f831045db
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment