Skip to content

B
BoomMaster
Commit 02358e3b authored by Yuyang's avatar Yuyang
Browse files
Options

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

parents a6923685 afadc60a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 23932 additions and 5384 deletions
BoomMaster/Assets/#A1_Scenes/DemoScenes.unity
View file @ 02358e3b
......@@ -165,12 +165,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
levelPrefs:
- {fileID: 916316864684617039, guid: c94a0de6085d4e9499aee2b16e3087c8, type: 3}
- {fileID: 7511686585617871288, guid: 3446b365edf0d1a4f94b7e1a98204770, type: 3}
- {fileID: 4014335436679012073, guid: 32bb0c93e3093d24f84958dd7a72c71f, type: 3}
- {fileID: 945570835972455969, guid: af2db092e9ac9a24b81ec302ad910588, type: 3}
- {fileID: 4014335436679012073, guid: 16d73164b8f5c7744892dd5fa4284980, type: 3}
- {fileID: 4176077394338190956, guid: 96ed4cec24368ce4bbc8b31c32895485, type: 3}
- {fileID: 6719220740506513315, guid: 31f084bd887ce134099cf3e3a2d8fdfe, type: 3}
- {fileID: 5172993215029228962, guid: dea24af8619dcf749af7f9f2088520b3, type: 3}
--- !u!1 &543166196
GameObject:
m_ObjectHideFlags: 0
......@@ -356,10 +352,18 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_bombEffectObj: {fileID: 1700217648693119091, guid: c8e49c3b7567ba44c9434bbb6049f364,
type: 3}
m_rayfireBombObj: {fileID: 7079061562166580387, guid: 4a54442bb4207004c9595cc36ec83f59,
m_rayfireBombObj: {fileID: 2121187542943932037, guid: 9d7d423e011aae4478807b6d475cdd8e,
type: 3}
m_bombRocketEffectObj: {fileID: 4754847857784994706, guid: a84bbde962df02046b0a7fac252d20bc,
type: 3}
m_prop1Obj: {fileID: 4347695764793259067, guid: 863353e07104c684ea1ec1f87b455702,
type: 3}
m_prop2Obj: {fileID: 2630166727635670252, guid: 4a06caa1c21cadb45b0586732e11d2c9,
type: 3}
m_prop3Obj: {fileID: 5765396706313039231, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
m_prop4Obj: {fileID: 8438712675754401916, guid: 2f25afe74da731446a51e24257ce9b3b,
type: 3}
--- !u!1001 &173206295174090797
PrefabInstance:
m_ObjectHideFlags: 0
......
BoomMaster/Assets/#A2_Scripts/Battle/UI/PropSelectUI.cs
View file @ 02358e3b
......@@ -34,36 +34,37 @@ public class PropSelectUI : MonoBehaviour
m_strengthButton = m_strengthObj.GetComponent<Button>();
m_doubleButton = m_doubleObj.GetComponent<Button>();
m_coinButton = m_coinObj.GetComponent<Button>();
m_KnifeButton = m_KnifeObj.GetComponent<Button>();
}
public void Show()
{
gameObject.SetActive(true);
int varCoin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey);
m_strengthObj.SetActive(true);
m_doubleObj.SetActive(true);
m_coinObj.SetActive(true);
m_strengthMaskObj.SetActive(varCoin < 10);
m_doubleMaskObj.SetActive(varCoin < 100);
m_coinMaskObj.SetActive(varCoin < 10);
m_strengthSymbolObj.SetActive(false);
m_doubleSymbolObj.SetActive(false);
m_coinSymbolObj.SetActive(false);
if(m_strengthButton)
{
m_strengthButton.enabled = varCoin >= 10;
}
if(m_doubleButton)
{
m_doubleButton.enabled = varCoin >= 100;
}
if(m_coinButton)
{
m_coinButton.enabled = varCoin >= 10;
}
//m_bIsBuyOne = false;
//m_bIsBuyTwo = false;
//m_bIsBuyThree = false;
m_bIsBuy = false;
//gameObject.SetActive(true);
//int varCoin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey);
//m_strengthObj.SetActive(true);
//m_doubleObj.SetActive(true);
//m_coinObj.SetActive(true);
//m_strengthMaskObj.SetActive(varCoin < 10);
//m_doubleMaskObj.SetActive(varCoin < 100);
//m_coinMaskObj.SetActive(varCoin < 10);
//m_strengthSymbolObj.SetActive(false);
//m_doubleSymbolObj.SetActive(false);
//m_coinSymbolObj.SetActive(false);
//if(m_strengthButton)
//{
// m_strengthButton.enabled = varCoin >= 10;
//}
//if(m_doubleButton)
//{
// m_doubleButton.enabled = varCoin >= 100;
//}
//if(m_coinButton)
//{
// m_coinButton.enabled = varCoin >= 10;
//}
////m_bIsBuyOne = false;
////m_bIsBuyTwo = false;
////m_bIsBuyThree = false;
//m_bIsBuy = false;
}
public void SetState(bool value)
{
......@@ -78,38 +79,46 @@ public class PropSelectUI : MonoBehaviour
//点击加强
public void OnClickStrength()
{
BattleCtrl.instance.battleUI.SetBombStrength();
BattleCtrl.instance.battleUI.SetCoin(-10);
m_bIsBuy = true;
SetOpenState();
//m_strengthObj.SetActive(false);
m_strengthMaskObj.SetActive(true);
m_strengthButton.enabled = false;
m_strengthSymbolObj.SetActive(true);
//BattleCtrl.instance.battleUI.SetBombStrength();
//BattleCtrl.instance.battleUI.SetCoin(-10);
//m_bIsBuy = true;
//SetOpenState();
////m_strengthObj.SetActive(false);
//m_strengthMaskObj.SetActive(true);
//m_strengthButton.enabled = false;
//m_strengthSymbolObj.SetActive(true);
BattleCtrl.instance.levelManager.curLevel.bombView.CreateProp1Model();
}
//点击double
public void OnClickDouble()
{
BattleCtrl.instance.battleUI.SetBombDouble();
BattleCtrl.instance.battleUI.SetCoin(-100);
m_bIsBuy = true;
SetOpenState();
//m_doubleObj.SetActive(false);
m_doubleMaskObj.SetActive(true);
m_doubleButton.enabled = false;
m_doubleSymbolObj.SetActive(true);
//BattleCtrl.instance.battleUI.SetBombDouble();
//BattleCtrl.instance.battleUI.SetCoin(-100);
//m_bIsBuy = true;
//SetOpenState();
////m_doubleObj.SetActive(false);
//m_doubleMaskObj.SetActive(true);
//m_doubleButton.enabled = false;
//m_doubleSymbolObj.SetActive(true);
BattleCtrl.instance.levelManager.curLevel.bombView.CreateProp2Model();
}
//点击金币
public void OnClickCoin()
{
BattleCtrl.instance.battleUI.SetCoinDouble();
BattleCtrl.instance.battleUI.SetCoin(-10);
m_bIsBuy = true;
SetOpenState();
//m_coinObj.SetActive(false);
m_coinMaskObj.SetActive(true);
m_coinButton.enabled = false;
m_coinSymbolObj.SetActive(true);
//BattleCtrl.instance.battleUI.SetCoinDouble();
//BattleCtrl.instance.battleUI.SetCoin(-10);
//m_bIsBuy = true;
//SetOpenState();
////m_coinObj.SetActive(false);
//m_coinMaskObj.SetActive(true);
//m_coinButton.enabled = false;
//m_coinSymbolObj.SetActive(true);
BattleCtrl.instance.levelManager.curLevel.bombView.CreateProp3Model();
}
//点击🔪
public void OnClickKnift()
{
BattleCtrl.instance.levelManager.curLevel.bombView.CreateProp4Model();
}
//开始
public void OnClickStart()
......
BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs
View file @ 02358e3b
......@@ -7,12 +7,13 @@ public class BombView : MonoBehaviour
{
public Transform m_cameraTrans;//相机
public Transform m_rootTrans;//root节点
public LineRenderer lineRenderer;//线段渲染器
public Transform m_propPosParent;//道具位置父节点
//public LineRenderer lineRenderer;//线段渲染器
//public GameObject m_bombParticleObj;//炸弹粒子
private GameObject m_curBomb;//当前的炸弹
private BombState1View m_bombStateView;//控制炸弹状态
//private GameObject m_curBombEffect;//当前炸弹特效
private RayfireBomb m_curBomb;//当前的炸弹
//private BombState1View m_bombStateView;//控制炸弹状态
private GameObject m_curBombEffect;//当前炸弹特效
private bool m_bCanBePlace = true;//是否能放置炸弹
private int m_totalChildNum = 0;//总数
private bool m_bControlWin = true;//控制成功
......@@ -31,9 +32,15 @@ public class BombView : MonoBehaviour
private Vector3 m_secondBombPos;//第二个炸弹位置
private bool m_bControlDoubleBomb = false;//控制第二个炸弹的位置
private Vector3 m_recordSecondBombPos;//位置记录
private Transform[] m_propStartPos;
private GameObject m_curPropModelObj;
private Animator m_curPropAnimator;
private void Awake()
{
m_totalChildNum = m_rootTrans.childCount - 1;
m_propStartPos = m_propPosParent.GetComponentsInChildren<Transform>();
}
private void Start()
{
......@@ -58,8 +65,71 @@ public class BombView : MonoBehaviour
//{
// m_rate = 0.2f;
//}
lineRenderer.startWidth = 0.05f;
lineRenderer.endWidth = 0.05f;
//lineRenderer.startWidth = 0.05f;
//lineRenderer.endWidth = 0.05f;
}
//道具1生成
public void CreateProp1Model()
{
HideAllModel();
m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop1Obj);
PauseAnimator();
m_curPropModelObj.transform.position = m_propStartPos[1].position;
}
//道具2生成
public void CreateProp2Model()
{
HideAllModel();
m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop2Obj);
PauseAnimator();
m_curPropModelObj.transform.position = m_propStartPos[2].position;
}
//道具3生成
public void CreateProp3Model()
{
HideAllModel();
m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop3Obj);
PauseAnimator();
m_curPropModelObj.transform.position = m_propStartPos[3].position;
}
//道具4生成
public void CreateProp4Model()
{
HideAllModel();
m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop4Obj);
PauseAnimator();
m_curPropModelObj.transform.position = m_propStartPos[4].position;
}
//暂停动画
void PauseAnimator()
{
m_curPropAnimator = m_curPropModelObj.GetComponent<Animator>();
if (m_curPropAnimator)
{
m_curPropAnimator.enabled = false;
}
}
//播放动画
void PlayAnimator()
{
if(m_curPropAnimator)
{
m_curPropAnimator.enabled = true;
}
if (m_curPropModelObj)
{
m_curPropModelObj.SetActive(false);
m_curPropModelObj.SetActive(true);
}
}
//隐藏模型
void HideAllModel()
{
if (m_curPropModelObj)
{
PoolManager.Instance.ReturnObjectToPool(m_curPropModelObj);
}
}
//移动
void OnMove(Vector3 dir)
......@@ -73,7 +143,7 @@ public class BombView : MonoBehaviour
m_cameraTrans.localRotation = Quaternion.Euler(0, m_curRotateAngle, 0);
}
//设置炸弹
void SetBomb(GameObject go)
void SetBomb(RayfireBomb go)
{
//if(m_bombParticleObj)
//{
......@@ -81,8 +151,8 @@ public class BombView : MonoBehaviour
//}
m_curBomb = go;
m_bombStateView = go.GetComponent<BombState1View>();
m_bombStateView.SetBombModel();
//m_bombStateView = go.GetComponent<BombState1View>();
//m_bombStateView.SetBombModel();
//if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
//{
// m_curBomb.range = 0.5f;
......@@ -96,18 +166,19 @@ public class BombView : MonoBehaviour
//播放动画
public void PlayBombAni()
{
if(m_bombStateView)
{
m_bombStateView.PlayBombAni();
}
//if(m_bombStateView)
//{
// m_bombStateView.PlayBombAni();
//}
BattleCtrl.instance.battleUI.OnClickBoomBtn();
}
//画线
void DrawLine()
{
float varDis = Vector3.Distance(m_firstBombPos, m_secondBombPos);
Vector3 varDir = (m_secondBombPos - m_firstBombPos).normalized;
lineRenderer.positionCount = m_lineIndex + 1;
lineRenderer.SetPosition(m_lineIndex, m_firstBombPos + varDir * m_lineIndex * (varDis / 4.0f));
//lineRenderer.positionCount = m_lineIndex + 1;
//lineRenderer.SetPosition(m_lineIndex, m_firstBombPos + varDir * m_lineIndex * (varDis / 4.0f));
m_lineIndex++;
if (m_lineIndex >= 5)
......@@ -124,19 +195,24 @@ public class BombView : MonoBehaviour
//开始炸
public void StartBomb()
{
//m_curBombEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.bombEffectObj);
//m_curBombEffect.transform.position = m_curBomb.transform.position;
//m_curBomb?.Explode(0);
m_bombStateView.StartBomb();
m_curBomb.SetActive(false);
lineRenderer.positionCount = 0;
m_curBombEffect = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.bombEffectObj);
m_curBombEffect.transform.position = m_curBomb.transform.position;
m_curBomb?.Explode(0);
//m_bombStateView.StartBomb();
m_curBomb.gameObject.SetActive(false);
//lineRenderer.positionCount = 0;
//回收
m_bombStateView.ClearState();
PoolManager.Instance.ReturnObjectToPool(m_curBomb);
//GameServices.timerServices.Push(this, 1.0f, delegate
//{
// PoolManager.Instance.ReturnObjectToPool(m_curBombEffect);
//});
//m_bombStateView.ClearState();
PoolManager.Instance.ReturnObjectToPool(m_curBomb.gameObject);
m_curBomb = null;
GameServices.timerServices.Push(this, 1.0f, delegate
{
if(m_curBombEffect)
{
PoolManager.Instance.ReturnObjectToPool(m_curBombEffect);
m_curBombEffect = null;
}
});
InvokeRepeating("CalculateDamageNum", 0.3f, 0.1f);
}
void CalculateDamageNum()
......@@ -157,18 +233,23 @@ public class BombView : MonoBehaviour
}
private void OnDestroy()
{
if(m_bombStateView)
//if(m_bombStateView)
//{
// m_bombStateView.ClearState();
//}
HideAllModel();
m_curPropModelObj = null;
m_curPropAnimator = null;
if (m_curBomb)
{
m_bombStateView.ClearState();
PoolManager.Instance.ReturnObjectToPool(m_curBomb.gameObject);
m_curBomb = null;
}
if (m_curBomb)
if (m_curBombEffect)
{
PoolManager.Instance.ReturnObjectToPool(m_curBomb);
PoolManager.Instance.ReturnObjectToPool(m_curBombEffect);
m_curBombEffect = null;
}
//if(m_curBombEffect)
//{
// PoolManager.Instance.ReturnObjectToPool(m_curBombEffect);
//}
if (GameServices.inputService != null)
{
GameServices.inputService.pad.onMoveVec3 -= OnMove;
......@@ -277,18 +358,20 @@ public class BombView : MonoBehaviour
{
if (hit.collider.tag == "Target" && m_bCanBePlace)
{
BattleCtrl.instance.battleUI.SetSelectUIState(false);
//BattleCtrl.instance.battleUI.SetSelectUIState(false);
//一个炸弹的
m_bCanBePlace = false;
GameObject go = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.rayfireBombObj);
//m_bCanBePlace = false;
//GameObject go = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.rayfireBombObj);
//go.transform.position = hit.point;
SetBomb(go);
m_bombStateView.SetBombModelPos(hit.point);
m_lastInputPos = Input.mousePosition;
Vector3 varVec3 = hit.point;
varVec3.x += 0.1f;
m_firstBombPos = varVec3;
BattleCtrl.instance.battleUI.SetBomb();
//SetBomb(go.GetComponent<RayfireBomb>());
////m_bombStateView.SetBombModelPos(hit.point);
////m_lastInputPos = Input.mousePosition;
////Vector3 varVec3 = hit.point;
////varVec3.x += 0.1f;
////m_firstBombPos = varVec3;
//BattleCtrl.instance.battleUI.SetBomb();
PauseAnimator();
PlayAnimator();
//两个炸弹的
//if (!m_bControlDoubleBomb)
//{
......
BoomMaster/Assets/#A2_Scripts/Pool/CacheManager.cs
View file @ 02358e3b
......@@ -10,9 +10,21 @@ public class CacheManager : MonoBehaviour
private GameObject m_rayfireBombObj;//炸弹预设
[SerializeField]
private GameObject m_bombRocketEffectObj;//火箭特效
[SerializeField]
private GameObject m_prop1Obj;//道具1
[SerializeField]
private GameObject m_prop2Obj;//道具1
[SerializeField]
private GameObject m_prop3Obj;//道具3
[SerializeField]
private GameObject m_prop4Obj;//道具4
public GameObject bombEffectObj => m_bombEffectObj;
public GameObject rayfireBombObj => m_rayfireBombObj;
public GameObject bombRocketEffectObj => m_bombRocketEffectObj;
public GameObject prop1Obj => m_prop1Obj;
public GameObject prop2Obj => m_prop2Obj;
public GameObject prop3Obj => m_prop3Obj;
public GameObject prop4Obj => m_prop4Obj;
public static CacheManager Instance = null;
void Awake()
{
......
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 02358e3b
......@@ -273,7 +273,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 8857377566680284191}
m_MethodName: OnClickCoin
m_MethodName: OnClickKnift
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
......@@ -351,7 +351,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dca7afcde023a8a4a8aa8debbdbd5427, type: 3}
m_FontSize: 36
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
......@@ -362,7 +362,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: reward
m_Text: props4
--- !u!114 &448931888
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -376,7 +376,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.6132076, g: 0.22596323, b: 0.043387324, a: 1}
m_EffectDistance: {x: 3, y: 3}
m_EffectDistance: {x: 2, y: 1}
m_UseGraphicAlpha: 0
--- !u!114 &448931887
MonoBehaviour:
......@@ -472,7 +472,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 10
m_Text: 100
--- !u!114 &487726070
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -486,7 +486,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.6117647, g: 0.22745098, b: 0.043137256, a: 1}
m_EffectDistance: {x: 3, y: 3}
m_EffectDistance: {x: 2, y: 1}
m_UseGraphicAlpha: 0
--- !u!114 &487726069
MonoBehaviour:
......@@ -706,7 +706,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &767122297
RectTransform:
m_ObjectHideFlags: 0
......@@ -6796,7 +6796,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 100
m_Text: 40
--- !u!114 &3604837355122912000
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -6810,7 +6810,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.6117647, g: 0.22745098, b: 0.043137256, a: 1}
m_EffectDistance: {x: 3, y: 3}
m_EffectDistance: {x: 2, y: 1}
m_UseGraphicAlpha: 0
--- !u!114 &6210583584064052524
MonoBehaviour:
......@@ -7718,6 +7718,8 @@ GameObject:
- component: {fileID: 7306269900758685867}
- component: {fileID: 9131504728214519029}
- component: {fileID: 2058030033752564388}
- component: {fileID: 6422115798634080247}
- component: {fileID: 4103158007345858338}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
......@@ -7785,6 +7787,36 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 9,999
--- !u!114 &6422115798634080247
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3907300991590493250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
m_EffectDistance: {x: 2, y: 1}
m_UseGraphicAlpha: 1
--- !u!114 &4103158007345858338
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3907300991590493250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
m_EffectDistance: {x: 1, y: -2}
m_UseGraphicAlpha: 1
--- !u!1 &3935770658867106780
GameObject:
m_ObjectHideFlags: 0
......@@ -8719,7 +8751,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.6117647, g: 0.22745098, b: 0.043137256, a: 1}
m_EffectDistance: {x: 3, y: 3}
m_EffectDistance: {x: 2, y: 1}
m_UseGraphicAlpha: 0
--- !u!114 &2958025201143021327
MonoBehaviour:
......@@ -10187,7 +10219,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 10
m_Text: 80
--- !u!114 &1318892798673139113
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -10201,7 +10233,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.6117647, g: 0.22745098, b: 0.043137256, a: 1}
m_EffectDistance: {x: 3, y: 3}
m_EffectDistance: {x: 2, y: 1}
m_UseGraphicAlpha: 0
--- !u!114 &1007296593890262393
MonoBehaviour:
......@@ -10311,7 +10343,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
m_EffectDistance: {x: 1, y: 1}
m_EffectDistance: {x: 2, y: 1}
m_UseGraphicAlpha: 1
--- !u!114 &6015653555041537316
MonoBehaviour:
......@@ -10924,7 +10956,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6064464676328073067
RectTransform:
m_ObjectHideFlags: 0
......@@ -12986,7 +13018,7 @@ Animator:
m_GameObject: {fileID: 6064464677660112694}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 014ad115100000000a4ad11510000000, type: 2}
m_Controller: {fileID: 9100000, guid: bb389cc2efde9ef4ba6b88a34ad44400, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
......@@ -15017,7 +15049,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dca7afcde023a8a4a8aa8debbdbd5427, type: 3}
m_FontSize: 36
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
......@@ -15028,7 +15060,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: reward
m_Text: props3
--- !u!114 &4878257523977472478
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -15042,7 +15074,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.6132076, g: 0.22596323, b: 0.043387324, a: 1}
m_EffectDistance: {x: 3, y: 3}
m_EffectDistance: {x: 2, y: 1}
m_UseGraphicAlpha: 0
--- !u!114 &5231073035102175564
MonoBehaviour:
......@@ -15355,7 +15387,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dca7afcde023a8a4a8aa8debbdbd5427, type: 3}
m_FontSize: 36
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
......@@ -15366,7 +15398,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: Power
m_Text: props1
--- !u!114 &9202279382787548348
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -15380,7 +15412,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.6132076, g: 0.22596323, b: 0.043387324, a: 1}
m_EffectDistance: {x: 3, y: 3}
m_EffectDistance: {x: 2, y: 1}
m_UseGraphicAlpha: 0
--- !u!114 &3370412057377077836
MonoBehaviour:
......@@ -17717,7 +17749,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: dca7afcde023a8a4a8aa8debbdbd5427, type: 3}
m_FontSize: 36
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
......@@ -17728,7 +17760,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: bullet
m_Text: props2
--- !u!114 &3984182051010028912
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -17742,7 +17774,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.6132076, g: 0.22596323, b: 0.043387324, a: 1}
m_EffectDistance: {x: 3, y: 3}
m_EffectDistance: {x: 2, y: 1}
m_UseGraphicAlpha: 0
--- !u!114 &37318850945226485
MonoBehaviour:
......
BoomMaster/Assets/#A3_Prefabs/BombPointView.prefab 0 → 100644
View file @ 02358e3b
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2121187542943932037
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8470856532700967690}
- component: {fileID: 197526657868208177}
m_Layer: 0
m_Name: BombPointView
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8470856532700967690
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2121187542943932037}
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!114 &197526657868208177
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2121187542943932037}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dafd0a8e9ee856a49bf432688899df59, type: 3}
m_Name:
m_EditorClassIdentifier:
rangeType: 0
fadeType: 0
range: 0.6
strength: 2
variation: 50
chaos: 20
forceByMass: 1
affectKinematic: 0
heightOffset: 0
delay: 0
applyDamage: 0
damageValue: 200
play: 1
volume: 1
clip: {fileID: 8300000, guid: 1774ce74e86fc75409c76479bf4ad02a, type: 3}
transForm: {fileID: 0}
bombPosition: {x: 1.2883669, y: 2.827, z: 1.0053025}
explPosition: {x: 1.2883669, y: 2.827, z: 1.0053025}
colliders:
- {fileID: 0}
- {fileID: 0}
projectiles:
- positionPivot: {x: 1.0864494, y: 3.662291, z: 1.0486903}
positionClosest: {x: 1.2119195, y: 3.130104, z: 1.0053025}
fade: 0.37480778
rb: {fileID: 0}
scrRigid: {fileID: 0}
rotation: {x: -0, y: -0, z: -0, w: 1}
- positionPivot: {x: 0.3754856, y: 2.0956492, z: 0.3375876}
positionClosest: {x: 1.2119203, y: 2.827, z: 1.0053025}
fade: 0.8471067
rb: {fileID: 0}
scrRigid: {fileID: 0}
rotation: {x: -0, y: -0, z: -0, w: 1}
rigidbodies:
- {fileID: 0}
- {fileID: 0}
showGizmo: 1
mask: -1
tagFilter: Target
BoomMaster/Assets/#A3_Prefabs/BombPointView.prefab.meta 0 → 100644
View file @ 02358e3b
fileFormatVersion: 2
guid: 9d7d423e011aae4478807b6d475cdd8e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#C1_Models/Props/Prefab/Props1.prefab
View file @ 02358e3b
......@@ -167,7 +167,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4347695764793259067}
m_LocalRotation: {x: 0.67781943, y: -0.5185205, z: 0.2892706, w: 0.43361267}
m_LocalRotation: {x: 0.6778211, y: -0.5185183, z: 0.28926864, w: 0.43361393}
m_LocalPosition: {x: 18.53, y: 4.9, z: -3.37}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
......
BoomMaster/Assets/#C1_Models/Props/Prefab/Props3.prefab
View file @ 02358e3b
......@@ -41,6 +41,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5765396706313039230}
- component: {fileID: 6484042383651421711}
m_Layer: 0
m_Name: Props3
m_TagString: Untagged
......@@ -55,7 +56,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5765396706313039231}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 5, y: 5, z: 5}
m_Children:
......@@ -63,6 +64,25 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &6484042383651421711
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5765396706313039231}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 060471b96a3a4e2468bb04066e06083f, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &6501618553391162809
GameObject:
m_ObjectHideFlags: 0
......
BoomMaster/Assets/#C2_Animations/Porps1_Attack.anim
View file @ 02358e3b
......@@ -264,7 +264,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
......
BoomMaster/Assets/#C2_Animations/Porps2_Attack.anim
View file @ 02358e3b
......@@ -195,7 +195,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
......
BoomMaster/Assets/#C2_Animations/Porps3_Attack.anim
View file @ 02358e3b
......@@ -118,7 +118,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
......
BoomMaster/Assets/Res/Prefabs/Levels/Level9.prefab 0 → 100644
View file @ 02358e3b
This diff is collapsed.
BoomMaster/Assets/Res/Prefabs/Levels/Level9.prefab.meta 0 → 100644
View file @ 02358e3b
fileFormatVersion: 2
guid: dea24af8619dcf749af7f9f2088520b3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
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