Skip to content

B
BoomMaster
Commit 1ffcf381 authored by wanqing's avatar wanqing
Browse files
Options

修改动画

parent b04e2d4e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1823 additions and 1505 deletions
BoomMaster/Assets/#A1_Scenes/DemoScenes.unity
View file @ 1ffcf381
...@@ -166,8 +166,9 @@ MonoBehaviour: ...@@ -166,8 +166,9 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
levelPrefs: levelPrefs:
- {fileID: 8039451421880427360, guid: 3be717467d3392c47b7b4ffc29dad449, type: 3}
- {fileID: 3451800651537292262, guid: 31f084bd887ce134099cf3e3a2d8fdfe, type: 3} - {fileID: 3451800651537292262, guid: 31f084bd887ce134099cf3e3a2d8fdfe, type: 3}
- {fileID: 5172993215029228962, guid: dea24af8619dcf749af7f9f2088520b3, type: 3} - {fileID: 8917163245792337139, guid: dea24af8619dcf749af7f9f2088520b3, type: 3}
--- !u!1 &543166196 --- !u!1 &543166196
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -357,13 +358,13 @@ MonoBehaviour: ...@@ -357,13 +358,13 @@ MonoBehaviour:
type: 3} type: 3}
m_bombRocketEffectObj: {fileID: 4754847857784994706, guid: a84bbde962df02046b0a7fac252d20bc, m_bombRocketEffectObj: {fileID: 4754847857784994706, guid: a84bbde962df02046b0a7fac252d20bc,
type: 3} type: 3}
m_prop1Obj: {fileID: 4347695764793259067, guid: 863353e07104c684ea1ec1f87b455702, m_prop1Obj: {fileID: 8738227612834926235, guid: b6277fb5e272c7d4ca3fe96a5ccc571a,
type: 3} type: 3}
m_prop2Obj: {fileID: 2630166727635670252, guid: 4a06caa1c21cadb45b0586732e11d2c9, m_prop2Obj: {fileID: 613928655656575005, guid: 70bcd958a01d35d46b076a3b8e96ae38,
type: 3} type: 3}
m_prop3Obj: {fileID: 5765396706313039231, guid: ef7be189413111e4b974eaf395cde588, m_prop3Obj: {fileID: 5442833753317127627, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3} type: 3}
m_prop4Obj: {fileID: 8438712675754401916, guid: 2f25afe74da731446a51e24257ce9b3b, m_prop4Obj: {fileID: 3379856167765465296, guid: e5c154c270c589848aaf87c4338775b2,
type: 3} type: 3}
--- !u!1001 &173206295174090797 --- !u!1001 &173206295174090797
PrefabInstance: PrefabInstance:
......
BoomMaster/Assets/#A2_Scripts/Battle/UI/PropSelectUI.cs
View file @ 1ffcf381
...@@ -43,88 +43,101 @@ public class PropSelectUI : MonoBehaviour ...@@ -43,88 +43,101 @@ public class PropSelectUI : MonoBehaviour
} }
public void Show() public void Show()
{ {
//gameObject.SetActive(true); gameObject.SetActive(true);
//int varCoin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey); int varCoin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey);
//m_strengthObj.SetActive(true); m_strengthObj.SetActive(true);
//m_doubleObj.SetActive(true); m_doubleObj.SetActive(true);
//m_coinObj.SetActive(true); m_coinObj.SetActive(true);
//m_KnifeObj.SetActive(true); m_KnifeObj.SetActive(true);
//m_strengthMaskObj.SetActive(varCoin < m_needMoneyOne); m_strengthMaskObj.SetActive(varCoin < m_needMoneyOne);
//m_doubleMaskObj.SetActive(varCoin < m_needMoneyTwo); m_doubleMaskObj.SetActive(varCoin < m_needMoneyTwo);
//m_coinMaskObj.SetActive(varCoin < m_needMoneyThree); m_coinMaskObj.SetActive(varCoin < m_needMoneyThree);
//m_KnifeMaskObj.SetActive(varCoin < m_needMoneyFour); m_KnifeMaskObj.SetActive(varCoin < m_needMoneyFour);
//m_strengthSymbolObj.SetActive(false); m_strengthSymbolObj.SetActive(false);
//m_doubleSymbolObj.SetActive(false); m_doubleSymbolObj.SetActive(false);
//m_coinSymbolObj.SetActive(false); m_coinSymbolObj.SetActive(false);
//if (m_strengthButton) m_KnifeSymbolObj.SetActive(false);
//{ if (m_strengthButton)
// m_strengthButton.enabled = varCoin >= 10; {
//} m_strengthButton.enabled = varCoin >= m_needMoneyOne;
//if (m_doubleButton) }
//{ if (m_doubleButton)
// m_doubleButton.enabled = varCoin >= 100; {
//} m_doubleButton.enabled = varCoin >= m_needMoneyTwo;
//if (m_coinButton) }
//{ if (m_coinButton)
// m_coinButton.enabled = varCoin >= 10; {
//} m_coinButton.enabled = varCoin >= m_needMoneyThree;
////m_bIsBuyOne = false; }
////m_bIsBuyTwo = false; if(m_KnifeButton)
////m_bIsBuyThree = false; {
//m_bIsBuy = false; m_KnifeButton.enabled = varCoin >= m_needMoneyFour;
}
//m_bIsBuyOne = false;
//m_bIsBuyTwo = false;
//m_bIsBuyThree = false;
m_bIsBuy = false;
} }
public void SetState(bool value) public void SetState(bool value)
{ {
int varCoin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey); int varCoin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey);
m_strengthMaskObj.SetActive(!value || varCoin < 10 || m_bIsBuy); m_strengthMaskObj.SetActive(!value || varCoin < m_needMoneyOne || m_bIsBuy);
m_doubleMaskObj.SetActive(!value || varCoin < 100 || m_bIsBuy); m_doubleMaskObj.SetActive(!value || varCoin < m_needMoneyTwo || m_bIsBuy);
m_coinMaskObj.SetActive(!value || varCoin < 10 || m_bIsBuy); m_coinMaskObj.SetActive(!value || varCoin < m_needMoneyThree || m_bIsBuy);
m_strengthButton.enabled = value && varCoin >= 10 && !m_bIsBuy; m_KnifeMaskObj.SetActive(!value || varCoin < m_needMoneyFour || m_bIsBuy);
m_doubleButton.enabled = value && varCoin >= 100 && !m_bIsBuy; m_strengthButton.enabled = value && varCoin >= m_needMoneyOne && !m_bIsBuy;
m_coinButton.enabled = value && varCoin >= 10 && !m_bIsBuy; m_doubleButton.enabled = value && varCoin >= m_needMoneyTwo && !m_bIsBuy;
m_coinButton.enabled = value && varCoin >= m_needMoneyThree && !m_bIsBuy;
m_KnifeButton.enabled = value && varCoin >= m_needMoneyFour && !m_bIsBuy;
} }
//点击加强 //点击加强
public void OnClickStrength() public void OnClickStrength()
{ {
//BattleCtrl.instance.battleUI.SetBombStrength(); //BattleCtrl.instance.battleUI.SetBombStrength();
//BattleCtrl.instance.battleUI.SetCoin(-10); BattleCtrl.instance.battleUI.SetCoin(-m_needMoneyOne);
//m_bIsBuy = true; m_bIsBuy = true;
//SetOpenState(); SetOpenState();
////m_strengthObj.SetActive(false); //m_strengthObj.SetActive(false);
//m_strengthMaskObj.SetActive(true); m_strengthMaskObj.SetActive(true);
//m_strengthButton.enabled = false; m_strengthButton.enabled = false;
//m_strengthSymbolObj.SetActive(true); m_strengthSymbolObj.SetActive(true);
BattleCtrl.instance.levelManager.curLevel.bombView.CreateProp1Model(); BattleCtrl.instance.levelManager.curLevel.bombView.CreateProp1Model();
} }
//点击double //点击double
public void OnClickDouble() public void OnClickDouble()
{ {
//BattleCtrl.instance.battleUI.SetBombDouble(); //BattleCtrl.instance.battleUI.SetBombDouble();
//BattleCtrl.instance.battleUI.SetCoin(-100); BattleCtrl.instance.battleUI.SetCoin(-m_needMoneyTwo);
//m_bIsBuy = true; m_bIsBuy = true;
//SetOpenState(); SetOpenState();
////m_doubleObj.SetActive(false); //m_doubleObj.SetActive(false);
//m_doubleMaskObj.SetActive(true); m_doubleMaskObj.SetActive(true);
//m_doubleButton.enabled = false; m_doubleButton.enabled = false;
//m_doubleSymbolObj.SetActive(true); m_doubleSymbolObj.SetActive(true);
BattleCtrl.instance.levelManager.curLevel.bombView.CreateProp2Model(); BattleCtrl.instance.levelManager.curLevel.bombView.CreateProp2Model();
} }
//点击金币 //点击金币
public void OnClickCoin() public void OnClickCoin()
{ {
//BattleCtrl.instance.battleUI.SetCoinDouble(); //BattleCtrl.instance.battleUI.SetCoinDouble();
//BattleCtrl.instance.battleUI.SetCoin(-10); BattleCtrl.instance.battleUI.SetCoin(-m_needMoneyThree);
//m_bIsBuy = true; m_bIsBuy = true;
//SetOpenState(); SetOpenState();
////m_coinObj.SetActive(false); //m_coinObj.SetActive(false);
//m_coinMaskObj.SetActive(true); m_coinMaskObj.SetActive(true);
//m_coinButton.enabled = false; m_coinButton.enabled = false;
//m_coinSymbolObj.SetActive(true); m_coinSymbolObj.SetActive(true);
BattleCtrl.instance.levelManager.curLevel.bombView.CreateProp3Model(); BattleCtrl.instance.levelManager.curLevel.bombView.CreateProp3Model();
} }
//点击🔪 //点击🔪
public void OnClickKnift() public void OnClickKnift()
{ {
BattleCtrl.instance.battleUI.SetCoin(-m_needMoneyFour);
m_bIsBuy = true;
SetOpenState();
m_KnifeMaskObj.SetActive(true);
m_KnifeButton.enabled = false;
m_KnifeSymbolObj.SetActive(true);
BattleCtrl.instance.levelManager.curLevel.bombView.CreateProp4Model(); BattleCtrl.instance.levelManager.curLevel.bombView.CreateProp4Model();
} }
//开始 //开始
...@@ -153,11 +166,13 @@ public class PropSelectUI : MonoBehaviour ...@@ -153,11 +166,13 @@ public class PropSelectUI : MonoBehaviour
//{ //{
// m_coinObj.SetActive(varCoin >= 10); // m_coinObj.SetActive(varCoin >= 10);
//} //}
m_strengthMaskObj.SetActive(varCoin < 10 || m_bIsBuy); m_strengthMaskObj.SetActive(varCoin < m_needMoneyOne || m_bIsBuy);
m_doubleMaskObj.SetActive(varCoin < 100 || m_bIsBuy); m_doubleMaskObj.SetActive(varCoin < m_needMoneyTwo || m_bIsBuy);
m_coinMaskObj.SetActive(varCoin < 10 || m_bIsBuy); m_coinMaskObj.SetActive(varCoin < m_needMoneyThree || m_bIsBuy);
m_strengthButton.enabled = varCoin >= 10 && !m_bIsBuy; m_KnifeMaskObj.SetActive(varCoin < m_needMoneyThree || m_bIsBuy);
m_doubleButton.enabled = varCoin >= 100 && !m_bIsBuy; m_strengthButton.enabled = varCoin >= m_needMoneyOne && !m_bIsBuy;
m_coinButton.enabled = varCoin >= 10 && !m_bIsBuy; m_doubleButton.enabled = varCoin >= m_needMoneyTwo && !m_bIsBuy;
m_coinButton.enabled = varCoin >= m_needMoneyThree && !m_bIsBuy;
m_KnifeButton.enabled = varCoin >= m_needMoneyFour && !m_bIsBuy;
} }
} }
BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs
View file @ 1ffcf381
...@@ -40,6 +40,8 @@ public class BombView : MonoBehaviour ...@@ -40,6 +40,8 @@ public class BombView : MonoBehaviour
private List<Vector3> m_pathPos = new List<Vector3>();//记录滑动路径点 private List<Vector3> m_pathPos = new List<Vector3>();//记录滑动路径点
private int m_curPathIndex = 0; private int m_curPathIndex = 0;
private bool m_bMouseUpEnd = false; private bool m_bMouseUpEnd = false;
private Vector3 m_hitPoint = Vector3.zero;
private int m_curModelIndex = 0;
private void Awake() private void Awake()
{ {
m_totalChildNum = m_rootTrans.childCount - 1; m_totalChildNum = m_rootTrans.childCount - 1;
...@@ -74,37 +76,46 @@ public class BombView : MonoBehaviour ...@@ -74,37 +76,46 @@ public class BombView : MonoBehaviour
//道具1生成 //道具1生成
public void CreateProp1Model() public void CreateProp1Model()
{ {
m_curModelIndex = 1;
HideAllModel(); HideAllModel();
m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop1Obj); m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop1Obj);
m_curPropAnimator = m_curPropModelObj.GetComponentInChildren<Animator>();
PlayIdle(); PlayIdle();
m_curPropModelObj.transform.position = m_propStartPos[1].position; m_curPropModelObj.transform.position = m_propStartPos[1].position;
} }
//道具2生成 //道具2生成
public void CreateProp2Model() public void CreateProp2Model()
{ {
m_curModelIndex = 2;
HideAllModel(); HideAllModel();
m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop2Obj); m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop2Obj);
m_curPropAnimator = m_curPropModelObj.GetComponentInChildren<Animator>();
PlayIdle(); PlayIdle();
m_curPropModelObj.transform.position = m_propStartPos[2].position; m_curPropModelObj.transform.position = m_propStartPos[2].position;
} }
//道具3生成 //道具3生成
public void CreateProp3Model() public void CreateProp3Model()
{ {
m_curModelIndex = 3;
HideAllModel(); HideAllModel();
m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop3Obj); m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop3Obj);
m_curPropAnimator = m_curPropModelObj.GetComponentInChildren<Animator>();
PlayIdle(); PlayIdle();
m_curPropModelObj.transform.position = m_propStartPos[3].position; m_curPropModelObj.transform.position = m_propStartPos[3].position;
} }
//道具4生成 //道具4生成
public void CreateProp4Model() public void CreateProp4Model()
{ {
m_curModelIndex = 4;
HideAllModel(); HideAllModel();
m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop4Obj); m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop4Obj);
m_curPropAnimator = m_curPropModelObj.GetComponentInChildren<Animator>();
PlayIdle(); PlayIdle();
m_curPropModelObj.transform.position = m_propStartPos[4].position; m_curPropModelObj.transform.position = m_propStartPos[4].position;
} }
void PlayAnim(int value, string argName = "Value") void PlayAnim(int value, string argName = "Value")
{ {
Debug.LogError(m_curPropAnimator);
if (m_curPropAnimator.GetInteger(argName) != value) if (m_curPropAnimator.GetInteger(argName) != value)
{ {
m_curPropAnimator.SetInteger(argName, value); m_curPropAnimator.SetInteger(argName, value);
...@@ -113,17 +124,38 @@ public class BombView : MonoBehaviour ...@@ -113,17 +124,38 @@ public class BombView : MonoBehaviour
//播放待机动画 //播放待机动画
void PlayIdle() void PlayIdle()
{ {
m_curPropAnimator = m_curPropModelObj.GetComponent<Animator>();
PlayAnim(0); PlayAnim(0);
} }
//播放攻击动画 //播放攻击动画
void PlayAttackAnimator() void PlayAttackAnimator()
{ {
Vector3 varPos = m_curPropModelObj.transform.position;
varPos.y = m_hitPoint.y;
//if (m_curModelIndex == 1)
//{
//}
//else if(m_curModelIndex == 2)
//{
//}
//else if (m_curModelIndex == 3)
//{
// varPos.y = m_hitPoint.y - 2.0f;
//}
varPos.z += m_hitPoint.z;
m_curPropModelObj.transform.position = varPos;
PlayAnim(1); PlayAnim(1);
GameServices.timerServices.Push(this, 1.0f, delegate GameServices.timerServices.Push(this, 1.0f, delegate
{ {
PlayIdle(); PlayIdle();
}); });
GameServices.timerServices.Push(this, 2.0f, delegate
{
if(m_curPropModelObj)
{
m_curPropModelObj.transform.position = m_propStartPos[m_curModelIndex].position;
}
});
} }
//隐藏模型 //隐藏模型
...@@ -413,9 +445,9 @@ public class BombView : MonoBehaviour ...@@ -413,9 +445,9 @@ public class BombView : MonoBehaviour
if (Physics.Raycast(ray, out hit)) if (Physics.Raycast(ray, out hit))
{ {
if (hit.collider.tag == "Target" && m_bCanBePlace) if (hit.collider.tag == "Target" && m_bCanBePlace && m_curPropModelObj)
{ {
//BattleCtrl.instance.battleUI.SetSelectUIState(false); BattleCtrl.instance.battleUI.SetSelectUIState(false);
//一个炸弹的 //一个炸弹的
m_bCanBePlace = false; m_bCanBePlace = false;
//GameObject go = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.rayfireBombObj); //GameObject go = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.rayfireBombObj);
...@@ -426,6 +458,7 @@ public class BombView : MonoBehaviour ...@@ -426,6 +458,7 @@ public class BombView : MonoBehaviour
////Vector3 varVec3 = hit.point; ////Vector3 varVec3 = hit.point;
////varVec3.x += 0.1f; ////varVec3.x += 0.1f;
////m_firstBombPos = varVec3; ////m_firstBombPos = varVec3;
m_hitPoint = hit.point;
BattleCtrl.instance.battleUI.SetBomb(); BattleCtrl.instance.battleUI.SetBomb();
//两个炸弹的 //两个炸弹的
//if (!m_bControlDoubleBomb) //if (!m_bControlDoubleBomb)
......
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 1ffcf381
...@@ -12429,7 +12429,7 @@ MonoBehaviour: ...@@ -12429,7 +12429,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3} m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -12446,7 +12446,7 @@ MonoBehaviour: ...@@ -12446,7 +12446,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677418123800} m_GameObject: {fileID: 6064464677418123800}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3} m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name: m_Name:
...@@ -12460,7 +12460,7 @@ MonoBehaviour: ...@@ -12460,7 +12460,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677418123800} m_GameObject: {fileID: 6064464677418123800}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name: m_Name:
...@@ -12695,7 +12695,7 @@ MonoBehaviour: ...@@ -12695,7 +12695,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3} m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -12712,7 +12712,7 @@ MonoBehaviour: ...@@ -12712,7 +12712,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677571250785} m_GameObject: {fileID: 6064464677571250785}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3} m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name: m_Name:
...@@ -12726,7 +12726,7 @@ MonoBehaviour: ...@@ -12726,7 +12726,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677571250785} m_GameObject: {fileID: 6064464677571250785}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name: m_Name:
...@@ -13362,7 +13362,7 @@ MonoBehaviour: ...@@ -13362,7 +13362,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3} m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -13379,7 +13379,7 @@ MonoBehaviour: ...@@ -13379,7 +13379,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677995419504} m_GameObject: {fileID: 6064464677995419504}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3} m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name: m_Name:
...@@ -13393,7 +13393,7 @@ MonoBehaviour: ...@@ -13393,7 +13393,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677995419504} m_GameObject: {fileID: 6064464677995419504}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name: m_Name:
...@@ -20070,7 +20070,7 @@ MonoBehaviour: ...@@ -20070,7 +20070,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 4 m_Text: '?'
--- !u!1 &9212786436021913775 --- !u!1 &9212786436021913775
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -21084,7 +21084,7 @@ MonoBehaviour: ...@@ -21084,7 +21084,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 5 m_Text: '?'
--- !u!1 &9212786436667118674 --- !u!1 &9212786436667118674
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -21318,7 +21318,7 @@ MonoBehaviour: ...@@ -21318,7 +21318,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 6 m_Text: '?'
--- !u!1 &9212786437015815448 --- !u!1 &9212786437015815448
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
BoomMaster/Assets/#C1_Models/Props/Prefab/Props1.prefab
View file @ 1ffcf381
...@@ -183,7 +183,7 @@ Transform: ...@@ -183,7 +183,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4347695764793259067} m_GameObject: {fileID: 4347695764793259067}
m_LocalRotation: {x: 0.6778211, y: -0.5185183, z: 0.28926864, w: 0.43361393} 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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 4445533370482496430} - {fileID: 4445533370482496430}
......
BoomMaster/Assets/#C1_Models/Props/Prefab/Props1Parent.prefab 0 → 100644
View file @ 1ffcf381
This diff is collapsed.
BoomMaster/Assets/#C1_Models/Props/Prefab/Props1Parent.prefab.meta 0 → 100644
View file @ 1ffcf381
fileFormatVersion: 2
guid: b6277fb5e272c7d4ca3fe96a5ccc571a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#C1_Models/Props/Prefab/Props2Parent.prefab 0 → 100644
View file @ 1ffcf381
This diff is collapsed.
BoomMaster/Assets/#C1_Models/Props/Prefab/Props2Parent.prefab.meta 0 → 100644
View file @ 1ffcf381
fileFormatVersion: 2
guid: 70bcd958a01d35d46b076a3b8e96ae38
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#C1_Models/Props/Prefab/Props3Parent.prefab 0 → 100644
View file @ 1ffcf381
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &476998697632879629
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8023086109837078054}
- component: {fileID: 2283859879913537994}
- component: {fileID: 5300854249035989554}
m_Layer: 0
m_Name: polySurface2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8023086109837078054
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 476998697632879629}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.007998543, y: 0.4963619, z: -0.00025957107}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6587643300078511077}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2283859879913537994
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 476998697632879629}
m_Mesh: {fileID: -5597002278806442958, guid: 2c2a26e166a519d49bc0283be19c54f3, type: 3}
--- !u!23 &5300854249035989554
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 476998697632879629}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 0
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: d7e43c599ebcee74a9c8a8b207c0f702, 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
--- !u!1 &911431004118162635
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 911431004118162634}
- component: {fileID: 387083450598674363}
m_Layer: 0
m_Name: Props3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &911431004118162634
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 911431004118162635}
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:
- {fileID: 6587643300078511077}
m_Father: {fileID: 7976174714960084501}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &387083450598674363
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 911431004118162635}
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 &3991337952130251435
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 965997487839596213}
- component: {fileID: 3002107918508256930}
- component: {fileID: 6232126712326591843}
- component: {fileID: 7955002915455487951}
m_Layer: 0
m_Name: polySurface1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &965997487839596213
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3991337952130251435}
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: 6587643300078511077}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3002107918508256930
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3991337952130251435}
m_Mesh: {fileID: 6329158148709259305, guid: 2c2a26e166a519d49bc0283be19c54f3, type: 3}
--- !u!23 &6232126712326591843
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3991337952130251435}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 0
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: d7e43c599ebcee74a9c8a8b207c0f702, 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
--- !u!64 &7955002915455487951
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3991337952130251435}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 6329158148709259305, guid: 2c2a26e166a519d49bc0283be19c54f3, type: 3}
--- !u!1 &5442833753317127627
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7976174714960084501}
m_Layer: 0
m_Name: Props3Parent
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7976174714960084501
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5442833753317127627}
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: 911431004118162634}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7869859433394704886
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6587643300078511077}
m_Layer: 0
m_Name: Props3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6587643300078511077
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7869859433394704886}
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: 965997487839596213}
- {fileID: 8023086109837078054}
m_Father: {fileID: 911431004118162634}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
BoomMaster/Assets/#C1_Models/Props/Prefab/Props3Parent.prefab.meta 0 → 100644
View file @ 1ffcf381
fileFormatVersion: 2
guid: e0ab4bcfef0648e4a9a08c17dbc1316c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#C1_Models/Props/Prefab/Props4Parent.prefab 0 → 100644
View file @ 1ffcf381
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3379856167765465296
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 855241462438040334}
m_Layer: 0
m_Name: Props4Parent
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &855241462438040334
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3379856167765465296}
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: 8010258264794284698}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8010258264613433182
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8010258264613433183}
m_Layer: 0
m_Name: Props4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8010258264613433183
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8010258264613433182}
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: 5238806299995486609}
m_Father: {fileID: 8010258264794284698}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8010258264794284697
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8010258264794284698}
m_Layer: 0
m_Name: Props4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8010258264794284698
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8010258264794284697}
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:
- {fileID: 8010258264613433183}
m_Father: {fileID: 855241462438040334}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &9144738582166621058
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5238806299995486609}
- component: {fileID: 3884631952443048871}
- component: {fileID: 7409676232927477598}
m_Layer: 0
m_Name: Knife
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5238806299995486609
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9144738582166621058}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.16572736, z: 0.009539383}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8010258264613433183}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3884631952443048871
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9144738582166621058}
m_Mesh: {fileID: 4898376589914736847, guid: b8000949872c53948ba6fe5768471d8c, type: 3}
--- !u!23 &7409676232927477598
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9144738582166621058}
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: 4eaaa3032586832468e97a6452e498a4, 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
BoomMaster/Assets/#C1_Models/Props/Prefab/Props4Parent.prefab.meta 0 → 100644
View file @ 1ffcf381
fileFormatVersion: 2
guid: e5c154c270c589848aaf87c4338775b2
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
BoomMaster/Assets/#C2_Animations/Porps1_Idle.anim
View file @ 1ffcf381
...@@ -39,32 +39,7 @@ AnimationClip: ...@@ -39,32 +39,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: path:
m_PositionCurves: m_PositionCurves: []
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 18.83, y: 2.87, z: -1.53}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 18.83, y: 2.87, z: -1.53}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves: m_ScaleCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2
...@@ -116,13 +91,6 @@ AnimationClip: ...@@ -116,13 +91,6 @@ AnimationClip:
typeID: 4 typeID: 4
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 0 path: 0
attribute: 4 attribute: 4
...@@ -236,90 +204,6 @@ AnimationClip: ...@@ -236,90 +204,6 @@ AnimationClip:
path: path:
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 18.83
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 18.83
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 2.87
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 2.87
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -1.53
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -1.53
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
- curve: - curve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
......
BoomMaster/Assets/#C2_Animations/Props1.controller
View file @ 1ffcf381
...@@ -75,7 +75,7 @@ AnimatorStateTransition: ...@@ -75,7 +75,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25 m_TransitionDuration: 0.25
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.75 m_ExitTime: 0.75
m_HasExitTime: 1 m_HasExitTime: 0
m_HasFixedDuration: 1 m_HasFixedDuration: 1
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
...@@ -127,7 +127,7 @@ AnimatorStateTransition: ...@@ -127,7 +127,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25 m_TransitionDuration: 0.25
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.75 m_ExitTime: 0.75
m_HasExitTime: 1 m_HasExitTime: 0
m_HasFixedDuration: 1 m_HasFixedDuration: 1
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
......
BoomMaster/Assets/#C2_Animations/Props2.controller
View file @ 1ffcf381
...@@ -20,7 +20,7 @@ AnimatorStateTransition: ...@@ -20,7 +20,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25 m_TransitionDuration: 0.25
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.95 m_ExitTime: 0.95
m_HasExitTime: 1 m_HasExitTime: 0
m_HasFixedDuration: 1 m_HasFixedDuration: 1
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
...@@ -72,7 +72,7 @@ AnimatorStateTransition: ...@@ -72,7 +72,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25 m_TransitionDuration: 0.25
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.8684211 m_ExitTime: 0.8684211
m_HasExitTime: 1 m_HasExitTime: 0
m_HasFixedDuration: 1 m_HasFixedDuration: 1
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
......
BoomMaster/Assets/#C2_Animations/Props3.controller
View file @ 1ffcf381
...@@ -45,7 +45,7 @@ AnimatorStateTransition: ...@@ -45,7 +45,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25 m_TransitionDuration: 0.25
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.75 m_ExitTime: 0.75
m_HasExitTime: 1 m_HasExitTime: 0
m_HasFixedDuration: 1 m_HasFixedDuration: 1
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
...@@ -125,7 +125,7 @@ AnimatorStateTransition: ...@@ -125,7 +125,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25 m_TransitionDuration: 0.25
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.7580645 m_ExitTime: 0.7580645
m_HasExitTime: 1 m_HasExitTime: 0
m_HasFixedDuration: 1 m_HasFixedDuration: 1
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
......
BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
View file @ 1ffcf381
...@@ -10063,7 +10063,7 @@ MonoBehaviour: ...@@ -10063,7 +10063,7 @@ MonoBehaviour:
m_chainRopeView: {fileID: 0} m_chainRopeView: {fileID: 0}
m_camera: {fileID: 0} m_camera: {fileID: 0}
m_bombView: {fileID: 3451800651537292261} m_bombView: {fileID: 3451800651537292261}
curLevelIndex: 0 curLevelIndex: 1
--- !u!114 &3451800651537292261 --- !u!114 &3451800651537292261
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 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