Skip to content

S
SteelBall
Commit 8d15d6bf authored by wanqing's avatar wanqing
Browse files
Options

关卡逻辑修改

parent c6d19620
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2402 additions and 321 deletions
SteelBall/Assets/0A1_Scenes/DemoScenes.unity
View file @ 8d15d6bf
...@@ -455,11 +455,6 @@ PrefabInstance: ...@@ -455,11 +455,6 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 6064464676810081128, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458, - target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
......
SteelBall/Assets/0A2_Scripts/Battle/BattleCtrl.cs
View file @ 8d15d6bf
...@@ -177,7 +177,7 @@ public class BattleCtrl : MonoBehaviour ...@@ -177,7 +177,7 @@ public class BattleCtrl : MonoBehaviour
{ {
m_levelManager.LoadLevel(levelIndex); m_levelManager.LoadLevel(levelIndex);
} }
public GameObject GetFromPool(Transform parent) public void GetFromPool(Transform parent)
{ {
GameObject varGo = null; GameObject varGo = null;
if (m_cubeObjStack.Count > 0) if (m_cubeObjStack.Count > 0)
...@@ -195,12 +195,18 @@ public class BattleCtrl : MonoBehaviour ...@@ -195,12 +195,18 @@ public class BattleCtrl : MonoBehaviour
varGo.transform.localPosition = Vector3.zero; varGo.transform.localPosition = Vector3.zero;
//for (int i = 0; i < varGo.transform.childCount; i++) //for (int i = 0; i < varGo.transform.childCount; i++)
//{ //{
//varGo.transform.GetChild(i).GetComponent<Rigidbody>().mass = 0.1f; // varGo.transform.GetChild(i).GetComponent<Rigidbody>().mass = 0.1f;
//varGo.transform.GetChild(i).GetComponent<Rigidbody>().AddForce(Vector3.down * 20000000.0f, ForceMode.Force); // varGo.transform.GetChild(i).GetComponent<Rigidbody>().AddForce(Vector3.down * 20000000.0f, ForceMode.Force);
//} //}
varGo.SetActive(true); varGo.SetActive(true);
GameServices.timerServices.Push(this, 2.0f, delegate
{
if (varGo)
{
BackToPool(varGo);
}
});
} }
return varGo;
} }
public void BackToPool(GameObject go) public void BackToPool(GameObject go)
{ {
......
SteelBall/Assets/0A2_Scripts/Battle/Collision/SixLevelCollision.cs
View file @ 8d15d6bf
...@@ -5,6 +5,7 @@ using UnityEngine; ...@@ -5,6 +5,7 @@ using UnityEngine;
public class SixLevelCollision : MonoBehaviour public class SixLevelCollision : MonoBehaviour
{ {
public SixthLevelTrigger m_sixLevel; public SixthLevelTrigger m_sixLevel;
//public GameObject m_cubeObj;
private bool m_bCollider = true; private bool m_bCollider = true;
private MeshRenderer m_render; private MeshRenderer m_render;
private BoxCollider m_collider; private BoxCollider m_collider;
...@@ -14,6 +15,9 @@ public class SixLevelCollision : MonoBehaviour ...@@ -14,6 +15,9 @@ public class SixLevelCollision : MonoBehaviour
{ {
m_render = GetComponent<MeshRenderer>(); m_render = GetComponent<MeshRenderer>();
m_collider = GetComponent<BoxCollider>(); m_collider = GetComponent<BoxCollider>();
//m_cacheObj = GameObject.Instantiate(m_cubeObj);
//m_cacheObj.transform.SetParent(transform, false);
//m_cacheObj.SetActive(false);
//for (int i = 0; i < 4; i++) //for (int i = 0; i < 4; i++)
//{ //{
// for (int j = 0; j < 4; j++) // for (int j = 0; j < 4; j++)
...@@ -36,31 +40,32 @@ public class SixLevelCollision : MonoBehaviour ...@@ -36,31 +40,32 @@ public class SixLevelCollision : MonoBehaviour
m_bCollider = false; m_bCollider = false;
m_render.enabled = false; m_render.enabled = false;
m_collider.enabled = false; m_collider.enabled = false;
m_cacheObj = BattleCtrl.instance.GetFromPool(transform); BattleCtrl.instance.GetFromPool(transform);
if(m_sixLevel) //if(m_cacheObj)
//{
// m_cacheObj.SetActive(true);
//}
if (m_sixLevel)
{ {
m_sixLevel.SetCollision(); m_sixLevel.SetCollision();
} }
GameServices.timerServices.Push(this, 2.0f, delegate BattleCtrl.instance.battleUI.SetSymbolPos(0, 0);
{ //GameServices.timerServices.Push(this, 2.0f, delegate
if(m_cacheObj) //{
{ // if(m_cacheObj)
BattleCtrl.instance.BackToPool(m_cacheObj); // {
} // BattleCtrl.instance.BackToPool(m_cacheObj);
}); // //m_cacheObj.SetActive(false);
// }
//});
} }
} }
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
} }
private void OnDestroy() private void OnDestroy()
{ {
if (m_cacheObj)
{
BattleCtrl.instance.BackToPool(m_cacheObj);
}
} }
} }
SteelBall/Assets/0A2_Scripts/Battle/Trigger/SixthLevelTrigger.cs
View file @ 8d15d6bf
...@@ -56,10 +56,11 @@ public class SixthLevelTrigger : MonoBehaviour ...@@ -56,10 +56,11 @@ public class SixthLevelTrigger : MonoBehaviour
// } // }
//} //}
//第二种方案 //第二种方案
public Transform m_targetBoxParent;
public Transform m_parent; public Transform m_parent;
public BoxCollider[] m_boxCollider;
public Transform m_player; public Transform m_player;
public GameObject[] m_obstract; public GameObject[] m_obstract;
public BoxCollider[] m_boxCollider;
private Rigidbody[] m_rigidArray; private Rigidbody[] m_rigidArray;
private float m_moveSpeed = 1.0f; private float m_moveSpeed = 1.0f;
private float m_minHeight = -2.0f; private float m_minHeight = -2.0f;
...@@ -71,15 +72,18 @@ public class SixthLevelTrigger : MonoBehaviour ...@@ -71,15 +72,18 @@ public class SixthLevelTrigger : MonoBehaviour
private Rigidbody m_playerRigid; private Rigidbody m_playerRigid;
private Animator m_animator; private Animator m_animator;
private Transform m_topTrans; private Transform m_topTrans;
private Rigidbody m_topRigidBody;
private int m_index = 0; private int m_index = 0;
private void Awake() private void Awake()
{ {
m_rigidArray = m_parent.GetComponentsInChildren<Rigidbody>(); m_rigidArray = m_parent.GetComponentsInChildren<Rigidbody>();
m_boxCollider = m_targetBoxParent.GetComponentsInChildren<BoxCollider>();
for (int i = 0; i < m_rigidArray.Length; i++) for (int i = 0; i < m_rigidArray.Length; i++)
{ {
if (m_rigidArray[i].gameObject.name == "Cube (54)") if (m_rigidArray[i].gameObject.name == "Cube (54)")
{ {
m_topTrans = m_rigidArray[i].transform; m_topTrans = m_rigidArray[i].transform;
m_topRigidBody = m_rigidArray[i];
break; break;
} }
} }
...@@ -120,7 +124,7 @@ public class SixthLevelTrigger : MonoBehaviour ...@@ -120,7 +124,7 @@ public class SixthLevelTrigger : MonoBehaviour
} }
private void Update() private void Update()
{ {
if (m_bControl && m_index >= 3) if (m_bControl && m_index >= 10)
{ {
m_bControl = false; m_bControl = false;
for (int i = 0; i < m_rigidArray.Length; i++) for (int i = 0; i < m_rigidArray.Length; i++)
...@@ -134,6 +138,7 @@ public class SixthLevelTrigger : MonoBehaviour ...@@ -134,6 +138,7 @@ public class SixthLevelTrigger : MonoBehaviour
{ {
m_obstract[i].SetActive(false); m_obstract[i].SetActive(false);
} }
m_topRigidBody.AddForce(Vector3.down * 1000, ForceMode.Impulse);
} }
if (m_topTrans.localPosition.y <= 2.0f && m_bControlWin) if (m_topTrans.localPosition.y <= 2.0f && m_bControlWin)
{ {
......
SteelBall/Assets/0A2_Scripts/Battle/UI/BattleUI.cs
View file @ 8d15d6bf
...@@ -35,6 +35,7 @@ public class BattleUI : MonoBehaviour ...@@ -35,6 +35,7 @@ public class BattleUI : MonoBehaviour
public GameObject m_successResultMaskObj;//胜利结算maskobj public GameObject m_successResultMaskObj;//胜利结算maskobj
public GameObject m_ShowMouseObj;//显示手指图标obj public GameObject m_ShowMouseObj;//显示手指图标obj
public GameObject m_HideMouseObj;//隐藏手指图标obj public GameObject m_HideMouseObj;//隐藏手指图标obj
public GameObject m_symbolObj;//十字架图标
public Action onStartBtn; public Action onStartBtn;
public Action onPosUpBtn; public Action onPosUpBtn;
public Action onPosDownBtn; public Action onPosDownBtn;
...@@ -63,7 +64,7 @@ public class BattleUI : MonoBehaviour ...@@ -63,7 +64,7 @@ public class BattleUI : MonoBehaviour
//m_fieldNearBtn.onClick.AddListener(FieldNearBtn); //m_fieldNearBtn.onClick.AddListener(FieldNearBtn);
//m_ShowOrHideMouseText = m_ShowOrHideMouseObj.GetComponentInChildren<Text>(); //m_ShowOrHideMouseText = m_ShowOrHideMouseObj.GetComponentInChildren<Text>();
GameServices.audioServices.PlayBgm(GameServices.configService.audioConfig.GameBgm); GameServices.audioServices.PlayBgm(GameServices.configService.audioConfig.GameBgm);
GameServices.configService.playerConfig.ClawMoveSpeed = 0.4f;//开始默认值 GameServices.configService.playerConfig.ClawMoveSpeed = 1.0f;//开始默认值
GameServices.configService.playerConfig.SteelBallMass = 13.0f; GameServices.configService.playerConfig.SteelBallMass = 13.0f;
GameServices.configService.playerConfig.HandleMoveSpeed = 3.3f; GameServices.configService.playerConfig.HandleMoveSpeed = 3.3f;
} }
...@@ -301,6 +302,15 @@ public class BattleUI : MonoBehaviour ...@@ -301,6 +302,15 @@ public class BattleUI : MonoBehaviour
} }
m_recordRayFireList.Clear(); m_recordRayFireList.Clear();
} }
//设置十字架图标位置
public void SetSymbolPos(float x,float y)
{
m_symbolObj.SetActive((x != 0 || y != 0));
Vector2 varVec2 = m_symbolObj.transform.localPosition;
varVec2.x = x;
varVec2.y = y;
m_symbolObj.transform.localPosition = varVec2;
}
private void OnDestroy() private void OnDestroy()
{ {
DestroyRayFire(); DestroyRayFire();
......
SteelBall/Assets/0A2_Scripts/Battle/View/ChainHandle.cs
View file @ 8d15d6bf
...@@ -14,11 +14,14 @@ public class ChainHandle : MonoBehaviour ...@@ -14,11 +14,14 @@ public class ChainHandle : MonoBehaviour
private Vector2 m_DragPos; private Vector2 m_DragPos;
private Rigidbody m_rigidBody;//自身body private Rigidbody m_rigidBody;//自身body
private float m_topColliderPosY;//Y位置 private float m_topColliderPosY;//Y位置
private Vector3 m_maxHeightBallPos = new Vector3(2.075f, 3.0f, -3.1f);//铁球最大高度
private Transform m_parentTrans;//父节点
// Start is called before the first frame update // Start is called before the first frame update
private void Awake() private void Awake()
{ {
m_rigidBody = gameObject.GetComponent<Rigidbody>(); m_rigidBody = gameObject.GetComponent<Rigidbody>();
m_topColliderPosY = transform.position.y; m_topColliderPosY = transform.position.y;
m_parentTrans = transform.parent;
//Lightmapping.giWorkflowMode = Lightmapping.GIWorkflowMode.Legacy; //Lightmapping.giWorkflowMode = Lightmapping.GIWorkflowMode.Legacy;
} }
private void OnCollisionEnter(Collision other) private void OnCollisionEnter(Collision other)
...@@ -46,9 +49,11 @@ public class ChainHandle : MonoBehaviour ...@@ -46,9 +49,11 @@ public class ChainHandle : MonoBehaviour
m_thumbRT = GameServices.inputService.joyStick.thumb; m_thumbRT = GameServices.inputService.joyStick.thumb;
m_steelBallRigidBody.mass = GameServices.configService.playerConfig.SteelBallMass; m_steelBallRigidBody.mass = GameServices.configService.playerConfig.SteelBallMass;
//第六关特殊处理 //第六关特殊处理
if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelSixIndex) if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelSixIndex)
{ {
GameServices.inputService.joyStick.activated = false; GameServices.inputService.joyStick.activated = false;
m_steelBallRigidBody.mass = 5;
BattleCtrl.instance.battleUI.SetSymbolPos(0, 0);
} }
else else
{ {
...@@ -148,6 +153,10 @@ public class ChainHandle : MonoBehaviour ...@@ -148,6 +153,10 @@ public class ChainHandle : MonoBehaviour
{ {
return; return;
} }
if (Input.GetMouseButtonDown(0) && BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelSixIndex)
{
Clicked();
}
if (Input.GetMouseButton(0)) if (Input.GetMouseButton(0))
{ {
//float varX = Input.mousePosition.x - Screen.width / 2f; //float varX = Input.mousePosition.x - Screen.width / 2f;
...@@ -173,13 +182,47 @@ public class ChainHandle : MonoBehaviour ...@@ -173,13 +182,47 @@ public class ChainHandle : MonoBehaviour
// OnMove(varVec2); // OnMove(varVec2);
// m_StartPos = m_DragPos; // m_StartPos = m_DragPos;
//} //}
float varMinX = GameServices.configService.playerConfig.xDirMinDis; //第六关特殊处理
float varMaxX = GameServices.configService.playerConfig.xDirMaxDis; //if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelSixIndex)
float varMinY = GameServices.configService.playerConfig.yDirMinDis; //{
float varMaxY = GameServices.configService.playerConfig.yDirMaxDis; // float varMinX = GameServices.configService.playerConfig.xDirMinDis;
transform.position = new Vector3(Mathf.Clamp(transform.position.x, varMinX, varMaxX), // float varMaxX = GameServices.configService.playerConfig.xDirMaxDis;
m_topColliderPosY, // float varMinY = GameServices.configService.playerConfig.yDirMinDis;
Mathf.Clamp(transform.position.z, varMinY, varMaxY)); // float varMaxY = GameServices.configService.playerConfig.yDirMaxDis;
// transform.position = new Vector3(Mathf.Clamp(transform.position.x, varMinX, varMaxX),
// m_topColliderPosY,
// Mathf.Clamp(transform.position.z, varMinY, varMaxY));
//}
}
void Clicked()
{
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
RaycastHit hit = new RaycastHit();
if (Physics.Raycast(ray, out hit))
{
if (hit.collider.gameObject.CompareTag("Target"))
{
//十字架位置
float varX = (Input.mousePosition.x - Screen.width / 2f) / (Screen.width / GlobalConfig.NormalWidth);
float varY = (Input.mousePosition.y - Screen.height / 2f) / (Screen.width / GlobalConfig.NormalWidth);
BattleCtrl.instance.battleUI.SetSymbolPos(varX, varY);
//设置铁球位置
m_steelBallRigidBody.isKinematic = true;
m_steelBallRigidBody.Sleep();
m_steelBallRigidBody.transform.localPosition = m_maxHeightBallPos;
m_steelBallRigidBody.transform.localRotation = Quaternion.identity;
Vector3 varVec3 = m_parentTrans.position;
varVec3.x = hit.point.x - m_maxHeightBallPos.x;
varVec3.y = hit.point.y;
m_parentTrans.position = varVec3;
GameServices.timerServices.Push(this, 1, delegate
{
m_steelBallRigidBody.isKinematic = false;
});
}
}
} }
} }
SteelBall/Assets/0A3_Prefabs/BattleUI.prefab
View file @ 8d15d6bf
...@@ -115,6 +115,80 @@ MonoBehaviour: ...@@ -115,6 +115,80 @@ MonoBehaviour:
m_soundImageObj: {fileID: 3547942051849127089} m_soundImageObj: {fileID: 3547942051849127089}
m_bgmImageObj: {fileID: 3362225173612737158} m_bgmImageObj: {fileID: 3362225173612737158}
m_settingObj: {fileID: 2041063827} m_settingObj: {fileID: 2041063827}
--- !u!1 &634235204
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 634235207}
- component: {fileID: 634235206}
- component: {fileID: 634235205}
m_Layer: 5
m_Name: Symbol
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &634235207
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 634235204}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 1}
m_Children: []
m_Father: {fileID: 6064464677632144690}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 256, y: 256}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &634235206
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 634235204}
m_CullTransparentMesh: 0
--- !u!114 &634235205
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 634235204}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: ded052ccdf3c38f43905c10b9c5e4f21, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &647498885 --- !u!1 &647498885
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -6489,6 +6563,7 @@ RectTransform: ...@@ -6489,6 +6563,7 @@ RectTransform:
- {fileID: 4852413556718236688} - {fileID: 4852413556718236688}
- {fileID: 647498889} - {fileID: 647498889}
- {fileID: 9048927093243070911} - {fileID: 9048927093243070911}
- {fileID: 634235207}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -6597,6 +6672,7 @@ MonoBehaviour: ...@@ -6597,6 +6672,7 @@ MonoBehaviour:
m_successResultMaskObj: {fileID: 5927221786089016403} m_successResultMaskObj: {fileID: 5927221786089016403}
m_ShowMouseObj: {fileID: 647498885} m_ShowMouseObj: {fileID: 647498885}
m_HideMouseObj: {fileID: 8052859672645981793} m_HideMouseObj: {fileID: 8052859672645981793}
m_symbolObj: {fileID: 634235204}
--- !u!114 &1995691973 --- !u!114 &1995691973
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
SteelBall/Assets/0B1_UIs/Symbol.png.meta 0 → 100644
View file @ 8d15d6bf
fileFormatVersion: 2
guid: ded052ccdf3c38f43905c10b9c5e4f21
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
SteelBall/Assets/0C3_Materials/Texture Bricks 'n Blocks/Materials/Brick_Shiny 2.mat
View file @ 8d15d6bf
...@@ -7,11 +7,11 @@ Material: ...@@ -7,11 +7,11 @@ Material:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Brick_Shiny m_Name: Brick_Shiny 2
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: m_ShaderKeywords:
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: {} stringTagMap: {}
...@@ -37,11 +37,11 @@ Material: ...@@ -37,11 +37,11 @@ Material:
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _EmissionMap: - _EmissionMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 0.25, y: 0.25} m_Scale: {x: 0.05, y: 0.05}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 2800000, guid: bb4def3467aaf224fa3d84ea39bb882b, type: 3} m_Texture: {fileID: 2800000, guid: bb4def3467aaf224fa3d84ea39bb882b, type: 3}
m_Scale: {x: 0.25, y: 0.25} m_Scale: {x: 0.05, y: 0.05}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
......
SteelBall/Assets/0C3_Materials/Texture Bricks 'n Blocks/Materials/Brick_Shiny.mat
View file @ 8d15d6bf
...@@ -11,7 +11,7 @@ Material: ...@@ -11,7 +11,7 @@ Material:
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: m_ShaderKeywords:
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: {} stringTagMap: {}
......
SteelBall/Assets/0E1_Plugins/Obi/Samples/RopeAndRod/SampleResources/Blueprints/Chain 1.asset.meta 0 → 100644
View file @ 8d15d6bf
fileFormatVersion: 2
guid: 686dbb99e2b5b8143aa966684d550a46
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
SteelBall/Assets/0E1_Plugins/Obi/Samples/RopeAndRod/SampleResources/Blueprints/Chain.asset
View file @ 8d15d6bf
...@@ -44,16 +44,16 @@ MonoBehaviour: ...@@ -44,16 +44,16 @@ MonoBehaviour:
m_ActiveParticleCount: 8 m_ActiveParticleCount: 8
m_InitialActiveParticleCount: 8 m_InitialActiveParticleCount: 8
_bounds: _bounds:
m_Center: {x: 0.5, y: -0.76117766, z: -0.008222401} m_Center: {x: 0.5, y: -0.7460282, z: -0.008222401}
m_Extent: {x: 0.5, y: 0.76117766, z: 0.008222401} m_Extent: {x: 0.5, y: 0.7460282, z: 0.008222401}
positions: positions:
- {x: 0.97538733, y: -1.5223553, z: -0.016444802} - {x: 0.97538733, y: -1.4920564, z: -0.016444802}
- {x: 0.9768468, y: -1.3054888, z: -0.014867007} - {x: 0.97684383, y: -1.2795131, z: -0.014869508}
- {x: 0.9799389, y: -1.0880035, z: -0.012413079} - {x: 0.9799401, y: -1.0663465, z: -0.012412249}
- {x: 0.9834062, y: -0.8700917, z: -0.009809915} - {x: 0.98341304, y: -0.85277194, z: -0.009804867}
- {x: 0.98710275, y: -0.65231925, z: -0.007162294} - {x: 0.98711544, y: -0.6393396, z: -0.007153402}
- {x: 0.99099785, y: -0.43473804, z: -0.0045292014} - {x: 0.9910159, y: -0.42606223, z: -0.0045174165}
- {x: 0.9951545, y: -0.21644306, z: -0.0019818298} - {x: 0.9951733, y: -0.21215883, z: -0.001971242}
- {x: 1, y: 0, z: 0} - {x: 1, y: 0, z: 0}
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
...@@ -156,13 +156,13 @@ MonoBehaviour: ...@@ -156,13 +156,13 @@ MonoBehaviour:
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
restPositions: restPositions:
- {x: 0.97538733, y: -1.5223553, z: -0.016444802, w: 1} - {x: 0.97538733, y: -1.4920564, z: -0.016444802, w: 1}
- {x: 0.9768468, y: -1.3054888, z: -0.014867007, w: 1} - {x: 0.97684383, y: -1.2795131, z: -0.014869508, w: 1}
- {x: 0.9799389, y: -1.0880035, z: -0.012413079, w: 1} - {x: 0.9799401, y: -1.0663465, z: -0.012412249, w: 1}
- {x: 0.9834062, y: -0.8700917, z: -0.009809915, w: 1} - {x: 0.98341304, y: -0.85277194, z: -0.009804867, w: 1}
- {x: 0.98710275, y: -0.65231925, z: -0.007162294, w: 1} - {x: 0.98711544, y: -0.6393396, z: -0.007153402, w: 1}
- {x: 0.99099785, y: -0.43473804, z: -0.0045292014, w: 1} - {x: 0.9910159, y: -0.42606223, z: -0.0045174165, w: 1}
- {x: 0.9951545, y: -0.21644306, z: -0.0019818298, w: 1} - {x: 0.9951733, y: -0.21215883, z: -0.001971242, w: 1}
- {x: 1, y: 0, z: 0, w: 1} - {x: 1, y: 0, z: 0, w: 1}
- {x: 0, y: 0, z: 0, w: 0} - {x: 0, y: 0, z: 0, w: 0}
- {x: 0, y: 0, z: 0, w: 0} - {x: 0, y: 0, z: 0, w: 0}
...@@ -379,7 +379,7 @@ MonoBehaviour: ...@@ -379,7 +379,7 @@ MonoBehaviour:
invMasses: invMasses:
- 10 - 10
- 10.000001 - 10.000001
- 10.000001 - 10
- 10.000001 - 10.000001
- 10 - 10
- 10 - 10
...@@ -490,7 +490,7 @@ MonoBehaviour: ...@@ -490,7 +490,7 @@ MonoBehaviour:
principalRadii: principalRadii:
- {x: 0.1, y: 0.1, z: 0.1} - {x: 0.1, y: 0.1, z: 0.1}
- {x: 0.099999994, y: 0.099999994, z: 0.099999994} - {x: 0.099999994, y: 0.099999994, z: 0.099999994}
- {x: 0.099999994, y: 0.099999994, z: 0.099999994} - {x: 0.1, y: 0.1, z: 0.1}
- {x: 0.099999994, y: 0.099999994, z: 0.099999994} - {x: 0.099999994, y: 0.099999994, z: 0.099999994}
- {x: 0.1, y: 0.1, z: 0.1} - {x: 0.1, y: 0.1, z: 0.1}
- {x: 0.1, y: 0.1, z: 0.1} - {x: 0.1, y: 0.1, z: 0.1}
...@@ -599,7 +599,7 @@ MonoBehaviour: ...@@ -599,7 +599,7 @@ MonoBehaviour:
colors: colors:
- {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1}
- {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 0.99999994} - {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 0.99999994}
- {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 0.99999994} - {r: 1, g: 1, b: 1, a: 1}
- {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 0.99999994} - {r: 0.99999994, g: 0.99999994, b: 0.99999994, a: 0.99999994}
- {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1}
- {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1}
...@@ -718,10 +718,10 @@ MonoBehaviour: ...@@ -718,10 +718,10 @@ MonoBehaviour:
serializedContents: [] serializedContents: []
restLengths: restLengths:
serializedContents: serializedContents:
- 0.21687715 - 0.21255408
- 0.21795496 - 0.21361874
- 0.21763201 - 0.21332934
- 0.21650636 - 0.21222289
- 0 - 0
- 0 - 0
- 0 - 0
...@@ -839,9 +839,9 @@ MonoBehaviour: ...@@ -839,9 +839,9 @@ MonoBehaviour:
serializedContents: [] serializedContents: []
restLengths: restLengths:
serializedContents: serializedContents:
- 0.21752113 - 0.21320324
- 0.21781988 - 0.21348089
- 0.21834941 - 0.21395895
- 0 - 0
- 0 - 0
- 0 - 0
...@@ -960,9 +960,9 @@ MonoBehaviour: ...@@ -960,9 +960,9 @@ MonoBehaviour:
serializedContents: [] serializedContents: []
restBends: restBends:
serializedContents: serializedContents:
- 0.0006512133 - 0.0006545316
- 0.00009206598 - 0.00008393256
- 0.3426313 - 0.34232736
- 0 - 0
- 0 - 0
- 0 - 0
...@@ -1045,8 +1045,8 @@ MonoBehaviour: ...@@ -1045,8 +1045,8 @@ MonoBehaviour:
serializedContents: [] serializedContents: []
restBends: restBends:
serializedContents: serializedContents:
- 0.00019571374 - 0.00019164979
- 0.0002549954 - 0.00022752064
- 0.33333334 - 0.33333334
- 0 - 0
- 0 - 0
...@@ -1128,8 +1128,8 @@ MonoBehaviour: ...@@ -1128,8 +1128,8 @@ MonoBehaviour:
serializedContents: [] serializedContents: []
restBends: restBends:
serializedContents: serializedContents:
- 0.00009071473 - 0.00009118698
- 0.0006850526 - 0.0006516626
- 0 - 0
- 0 - 0
- 0 - 0
...@@ -1227,7 +1227,7 @@ MonoBehaviour: ...@@ -1227,7 +1227,7 @@ MonoBehaviour:
data: data:
- tangentMode: 0 - tangentMode: 0
inTangent: {x: 0.0113946125, y: -0.24967644, z: 0.005638841} inTangent: {x: 0.0113946125, y: -0.24967644, z: 0.005638841}
position: {x: 0.97538733, y: -1.5223553, z: -0.016444802} position: {x: 0.97538733, y: -1.4920564, z: -0.016444802}
outTangent: {x: -0.0031749322, y: 0.06956855, z: -0.0015711784} outTangent: {x: -0.0031749322, y: 0.06956855, z: -0.0015711784}
- tangentMode: 0 - tangentMode: 0
inTangent: {x: -0.0045979144, y: -0.14056955, z: 0} inTangent: {x: -0.0045979144, y: -0.14056955, z: 0}
...@@ -1258,28 +1258,28 @@ MonoBehaviour: ...@@ -1258,28 +1258,28 @@ MonoBehaviour:
m_Closed: 0 m_Closed: 0
m_ArcLengthTable: m_ArcLengthTable:
- 0 - 0
- 0.018134685 - 0.017935136
- 0.051608868 - 0.050836787
- 0.09886374 - 0.09718546
- 0.15833603 - 0.15545717
- 0.22846162 - 0.22412707
- 0.3076762 - 0.3016701
- 0.39441526 - 0.38656098
- 0.48711425 - 0.47727445
- 0.5842086 - 0.5722852
- 0.6841338 - 0.6700679
- 0.7853253 - 0.76909727
- 0.8862183 - 0.86784786
- 0.9852483 - 0.96479434
- 1.0808508 - 1.0584114
- 1.1714611 - 1.1471736
- 1.2555146 - 1.2295557
- 1.3314468 - 1.3040323
- 1.3976929 - 1.3690782
- 1.4526887 - 1.423168
- 1.4948697 - 1.4647765
- 1.522672 - 1.4923793
m_TotalSplineLenght: 1.522672 m_TotalSplineLenght: 1.4923793
OnPathChanged: OnPathChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
...@@ -1294,116 +1294,116 @@ MonoBehaviour: ...@@ -1294,116 +1294,116 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
thickness: 0.1 thickness: 0.1
resolution: 0.43 resolution: 0.43
m_InterParticleDistance: 0.21752457 m_InterParticleDistance: 0.21319704
totalParticles: 108 totalParticles: 108
m_RestLength: 23.275146 m_RestLength: 22.812086
restLengths: restLengths:
- 0.21687715 - 0.21255408
- 0.21752113 - 0.21320324
- 0.21795496 - 0.21361874
- 0.21781988 - 0.21348089
- 0.21763201 - 0.21332934
- 0.21834941 - 0.21395895
- 0.21650636 - 0.21222289
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0.21752457 - 0.21319704
- 0 - 0
pooledParticles: 100 pooledParticles: 100
SteelBall/Assets/Res/Prefabs/Levels/Level01.prefab
View file @ 8d15d6bf
...@@ -2192,6 +2192,91 @@ PrefabInstance: ...@@ -2192,6 +2192,91 @@ PrefabInstance:
propertyPath: linkInstances.Array.data[107] propertyPath: linkInstances.Array.data[107]
value: value:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.size
value: 9
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: restLength_
value: 2.081487
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[0].restLength
value: 0.23009601
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[1].restLength
value: 0.23132303
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[2].restLength
value: 0.23200482
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[3].restLength
value: 0.23153521
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[4].restLength
value: 0.23164707
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[5].restLength
value: 0.23152328
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[6].restLength
value: 0.23082496
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[7].particle1
value: 7
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[7].particle2
value: 8
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[7].restLength
value: 0.23221718
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[7].tearResistance
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[8].particle1
value: 8
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[8].particle2
value: 9
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[8].restLength
value: 0.23031533
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786113, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: elements.Array.data[8].tearResistance
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786137, guid: 026b5780346325e4b98d62d9430fe8e1, - target: {fileID: 5063288113430786137, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
......
SteelBall/ProjectSettings/ProjectSettings.asset
View file @ 8d15d6bf
...@@ -360,7 +360,7 @@ PlayerSettings: ...@@ -360,7 +360,7 @@ PlayerSettings:
m_DynamicBatching: 0 m_DynamicBatching: 0
- m_BuildTarget: Android - m_BuildTarget: Android
m_StaticBatching: 1 m_StaticBatching: 1
m_DynamicBatching: 0 m_DynamicBatching: 1
- m_BuildTarget: iPhone - m_BuildTarget: iPhone
m_StaticBatching: 1 m_StaticBatching: 1
m_DynamicBatching: 0 m_DynamicBatching: 0
......
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