...
This commit is contained in:
parent
45b3bca807
commit
233ed30b6a
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c1ac54e49cbc3a043a7ec60fbb88fbb1
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 82828043f6549ea4085211aeaad63808
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c0d79afe979731b42955b3dbf7f15c80
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
|
|
@ -254,9 +254,9 @@ Animation:
|
||||||
m_GameObject: {fileID: 2215201551116974392}
|
m_GameObject: {fileID: 2215201551116974392}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_Animation: {fileID: 7400000, guid: f98ed2e93dec5c24ea44776650a16dce, type: 2}
|
m_Animation: {fileID: 7400000, guid: c0d79afe979731b42955b3dbf7f15c80, type: 2}
|
||||||
m_Animations:
|
m_Animations:
|
||||||
- {fileID: 7400000, guid: f98ed2e93dec5c24ea44776650a16dce, type: 2}
|
- {fileID: 7400000, guid: c0d79afe979731b42955b3dbf7f15c80, type: 2}
|
||||||
m_WrapMode: 0
|
m_WrapMode: 0
|
||||||
m_PlayAutomatically: 1
|
m_PlayAutomatically: 1
|
||||||
m_AnimatePhysics: 0
|
m_AnimatePhysics: 0
|
||||||
|
|
@ -399,9 +399,9 @@ Animation:
|
||||||
m_GameObject: {fileID: 2900701582995778971}
|
m_GameObject: {fileID: 2900701582995778971}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_Animation: {fileID: 7400000, guid: f98ed2e93dec5c24ea44776650a16dce, type: 2}
|
m_Animation: {fileID: 7400000, guid: 82828043f6549ea4085211aeaad63808, type: 2}
|
||||||
m_Animations:
|
m_Animations:
|
||||||
- {fileID: 7400000, guid: f98ed2e93dec5c24ea44776650a16dce, type: 2}
|
- {fileID: 7400000, guid: 82828043f6549ea4085211aeaad63808, type: 2}
|
||||||
m_WrapMode: 0
|
m_WrapMode: 0
|
||||||
m_PlayAutomatically: 1
|
m_PlayAutomatically: 1
|
||||||
m_AnimatePhysics: 0
|
m_AnimatePhysics: 0
|
||||||
|
|
@ -433,7 +433,7 @@ Transform:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 4329466203985881991}
|
m_GameObject: {fileID: 4329466203985881991}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0.38268346, z: 0, w: 0.9238795}
|
||||||
m_LocalPosition: {x: -8.2, y: 0, z: -8.1}
|
m_LocalPosition: {x: -8.2, y: 0, z: -8.1}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
|
|
@ -660,9 +660,9 @@ Animation:
|
||||||
m_GameObject: {fileID: 5206921637442519064}
|
m_GameObject: {fileID: 5206921637442519064}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_Animation: {fileID: 7400000, guid: f98ed2e93dec5c24ea44776650a16dce, type: 2}
|
m_Animation: {fileID: 7400000, guid: c1ac54e49cbc3a043a7ec60fbb88fbb1, type: 2}
|
||||||
m_Animations:
|
m_Animations:
|
||||||
- {fileID: 7400000, guid: f98ed2e93dec5c24ea44776650a16dce, type: 2}
|
- {fileID: 7400000, guid: c1ac54e49cbc3a043a7ec60fbb88fbb1, type: 2}
|
||||||
m_WrapMode: 0
|
m_WrapMode: 0
|
||||||
m_PlayAutomatically: 1
|
m_PlayAutomatically: 1
|
||||||
m_AnimatePhysics: 0
|
m_AnimatePhysics: 0
|
||||||
|
|
@ -1077,7 +1077,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8,
|
- target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalEulerAnglesHint.y
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
value: 45
|
value: 180
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8,
|
- target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
@ -1625,7 +1625,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8,
|
- target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalEulerAnglesHint.y
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
value: 135
|
value: 140
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8,
|
- target: {fileID: 6506258205088307131, guid: 60c2ace5e29f85444ab0910a783b3ed8,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,7 @@ public class SceneInfo : MonoBehaviour
|
||||||
IEnumerator Co_Control_AddScene(BattleMapConfigTableData _stagedata, bool _add, Action addloadend)
|
IEnumerator Co_Control_AddScene(BattleMapConfigTableData _stagedata, bool _add, Action addloadend)
|
||||||
{
|
{
|
||||||
ActorInfo.Ins.Destroy_All();
|
ActorInfo.Ins.Destroy_All();
|
||||||
|
IndicatorInfo.Ins.All_Off_Imm();
|
||||||
if (_add)
|
if (_add)
|
||||||
{
|
{
|
||||||
DSUtil.StartStopWatch();
|
DSUtil.StartStopWatch();
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,16 @@ public class IndicatorInfo : MonoBehaviourSingletonTemplate<IndicatorInfo>
|
||||||
|
|
||||||
Dictionary<string, List<GameObject>> dic_indicator = new Dictionary<string, List<GameObject>>();
|
Dictionary<string, List<GameObject>> dic_indicator = new Dictionary<string, List<GameObject>>();
|
||||||
|
|
||||||
|
public void All_Off_Imm()
|
||||||
|
{
|
||||||
|
foreach (var pair in dic_indicator)
|
||||||
|
{
|
||||||
|
List<GameObject> objList = pair.Value;
|
||||||
|
for (int i = 0; i < objList.Count; i++)
|
||||||
|
objList[i].SetActive(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void Make_Indicator(string indicatorName, Action<GameObject> action)
|
public void Make_Indicator(string indicatorName, Action<GameObject> action)
|
||||||
{
|
{
|
||||||
if (dic_indicator.ContainsKey(indicatorName))
|
if (dic_indicator.ContainsKey(indicatorName))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue