bg cats + zoom toggle
This commit is contained in:
Rapandrasmus
parent
7360ffd3a1
commit
456b11a827
|
|
@ -30384,6 +30384,19 @@ MonoBehaviour:
|
|||
- {fileID: 7551078816062909441}
|
||||
_particleHitPoint: {fileID: 6412579525062198344}
|
||||
_particleCutPoint: {fileID: 912007196473728721}
|
||||
_bgCats:
|
||||
- {fileID: 1739315288943556113}
|
||||
- {fileID: 1517603019905813077}
|
||||
- {fileID: 4212073193618832432}
|
||||
- {fileID: 4153990083344497476}
|
||||
- {fileID: 1403047326910222335}
|
||||
- {fileID: 8094886338918589958}
|
||||
- {fileID: 8732278713592103888}
|
||||
- {fileID: 5207470240605564431}
|
||||
- {fileID: 1946208913683988545}
|
||||
- {fileID: 4541619397523910160}
|
||||
- {fileID: 2441224063005478318}
|
||||
- {fileID: 5469916501946480897}
|
||||
_smallLogCutParticle: {fileID: 7462153235099924466}
|
||||
_bigLogHitParticle: {fileID: 3979740605485083186}
|
||||
_bigLogCutParticle: {fileID: 2750562534684413619}
|
||||
|
|
@ -30654,6 +30667,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 3909255085184453611}
|
||||
- component: {fileID: 2873817323772088378}
|
||||
- component: {fileID: 2262789283509180886}
|
||||
m_Layer: 0
|
||||
m_Name: Tree
|
||||
m_TagString: Untagged
|
||||
|
|
@ -30728,6 +30742,17 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!210 &2262789283509180886
|
||||
SortingGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3698736975930100620}
|
||||
m_Enabled: 1
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
--- !u!1 &3743669511610230641
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -61806,6 +61831,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5046786283028669412}
|
||||
m_Modifications:
|
||||
- target: {fileID: 14258192005344558, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
|
|
@ -61890,6 +61919,10 @@ PrefabInstance:
|
|||
propertyPath: _otherPoint
|
||||
value:
|
||||
objectReference: {fileID: 3502128156805934089}
|
||||
- target: {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: _startAtOther
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855434573853191878, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.33
|
||||
|
|
@ -61918,14 +61951,30 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
--- !u!4 &6430541534744109237 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 500211444229205037}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &7955857289707203929 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7537329938738626932, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 500211444229205037}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1739315288943556113
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7955857289707203929}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622e8db4bfec4d441bf18fd631559238, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &839973794089554723
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -62111,6 +62160,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5046786283028669412}
|
||||
m_Modifications:
|
||||
- target: {fileID: 14258192005344558, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: -2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
|
|
@ -62195,6 +62248,10 @@ PrefabInstance:
|
|||
propertyPath: _otherPoint
|
||||
value:
|
||||
objectReference: {fileID: 3502128156805934089}
|
||||
- target: {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: _startAtOther
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855434573853191878, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.33
|
||||
|
|
@ -62223,14 +62280,30 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
--- !u!4 &5446725143550164630 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 1466593982496797198}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &8990199507847000954 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7537329938738626932, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 1466593982496797198}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &8094886338918589958
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8990199507847000954}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622e8db4bfec4d441bf18fd631559238, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &2574215485148474433
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -62420,6 +62493,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5046786283028669412}
|
||||
m_Modifications:
|
||||
- target: {fileID: 14258192005344558, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
|
|
@ -62504,6 +62581,10 @@ PrefabInstance:
|
|||
propertyPath: _otherPoint
|
||||
value:
|
||||
objectReference: {fileID: 3502128156805934089}
|
||||
- target: {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: _startAtOther
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855434573853191878, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.33
|
||||
|
|
@ -62532,9 +62613,25 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
--- !u!1 &4644451340165853324 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7537329938738626932, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 2949187362573447672}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1517603019905813077
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4644451340165853324}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622e8db4bfec4d441bf18fd631559238, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!4 &8584241990610091360 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
|
|
@ -62547,6 +62644,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5046786283028669412}
|
||||
m_Modifications:
|
||||
- target: {fileID: 14258192005344558, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
|
|
@ -62631,6 +62732,10 @@ PrefabInstance:
|
|||
propertyPath: _otherPoint
|
||||
value:
|
||||
objectReference: {fileID: 3502128156805934089}
|
||||
- target: {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: _startAtOther
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855434573853191878, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.33
|
||||
|
|
@ -62659,9 +62764,25 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
--- !u!1 &5913840008047743789 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7537329938738626932, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 4218702431913185881}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &4153990083344497476
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5913840008047743789}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622e8db4bfec4d441bf18fd631559238, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!4 &7297823017995837121 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
|
|
@ -62674,6 +62795,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5046786283028669412}
|
||||
m_Modifications:
|
||||
- target: {fileID: 14258192005344558, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: -3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
|
|
@ -62758,6 +62883,10 @@ PrefabInstance:
|
|||
propertyPath: _otherPoint
|
||||
value:
|
||||
objectReference: {fileID: 3502128156805934089}
|
||||
- target: {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: _startAtOther
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855434573853191878, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.33
|
||||
|
|
@ -62786,9 +62915,25 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
--- !u!1 &6066963924208808848 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7537329938738626932, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 4371823358212158180}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1403047326910222335
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6066963924208808848}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622e8db4bfec4d441bf18fd631559238, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!4 &7162714564976524924 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
|
|
@ -62801,6 +62946,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5046786283028669412}
|
||||
m_Modifications:
|
||||
- target: {fileID: 14258192005344558, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
|
|
@ -62885,6 +63034,10 @@ PrefabInstance:
|
|||
propertyPath: _otherPoint
|
||||
value:
|
||||
objectReference: {fileID: 3502128156805934089}
|
||||
- target: {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: _startAtOther
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855434573853191878, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.33
|
||||
|
|
@ -62913,14 +63066,30 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
--- !u!4 &2196494410851919957 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 4735324844222653645}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2967513157223310777 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7537329938738626932, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 4735324844222653645}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &4212073193618832432
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2967513157223310777}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622e8db4bfec4d441bf18fd631559238, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &5675994946000434659
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -62928,6 +63097,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5046786283028669412}
|
||||
m_Modifications:
|
||||
- target: {fileID: 14258192005344558, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
|
|
@ -63012,6 +63185,10 @@ PrefabInstance:
|
|||
propertyPath: _otherPoint
|
||||
value:
|
||||
objectReference: {fileID: 3502128156805934089}
|
||||
- target: {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: _startAtOther
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855434573853191878, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.33
|
||||
|
|
@ -63040,14 +63217,30 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
--- !u!4 &1227771345757550971 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 5675994946000434659}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2764320604930339991 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7537329938738626932, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 5675994946000434659}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &4541619397523910160
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2764320604930339991}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622e8db4bfec4d441bf18fd631559238, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &6161304700271328133
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -63055,6 +63248,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5046786283028669412}
|
||||
m_Modifications:
|
||||
- target: {fileID: 14258192005344558, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: -3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
|
|
@ -63139,6 +63336,10 @@ PrefabInstance:
|
|||
propertyPath: _otherPoint
|
||||
value:
|
||||
objectReference: {fileID: 3502128156805934089}
|
||||
- target: {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: _startAtOther
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855434573853191878, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.33
|
||||
|
|
@ -63167,14 +63368,30 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
--- !u!4 &742422304592590621 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 6161304700271328133}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4402444961576073969 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7537329938738626932, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 6161304700271328133}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1946208913683988545
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4402444961576073969}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622e8db4bfec4d441bf18fd631559238, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &6579355396493069628
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -63182,6 +63399,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5046786283028669412}
|
||||
m_Modifications:
|
||||
- target: {fileID: 14258192005344558, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: -3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
|
|
@ -63266,6 +63487,10 @@ PrefabInstance:
|
|||
propertyPath: _otherPoint
|
||||
value:
|
||||
objectReference: {fileID: 3502128156805934089}
|
||||
- target: {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: _startAtOther
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855434573853191878, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.33
|
||||
|
|
@ -63294,14 +63519,30 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
--- !u!4 &324914498694037924 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 6579355396493069628}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &3735570392298425416 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7537329938738626932, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 6579355396493069628}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &8732278713592103888
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3735570392298425416}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622e8db4bfec4d441bf18fd631559238, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &6781269634489078735
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -63309,6 +63550,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5046786283028669412}
|
||||
m_Modifications:
|
||||
- target: {fileID: 14258192005344558, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: -3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
|
|
@ -63393,6 +63638,10 @@ PrefabInstance:
|
|||
propertyPath: _otherPoint
|
||||
value:
|
||||
objectReference: {fileID: 3502128156805934089}
|
||||
- target: {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: _startAtOther
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855434573853191878, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.33
|
||||
|
|
@ -63421,14 +63670,30 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
--- !u!4 &132623169311858519 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 6781269634489078735}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &3927720967030411963 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7537329938738626932, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 6781269634489078735}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &5469916501946480897
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3927720967030411963}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622e8db4bfec4d441bf18fd631559238, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &8027124172937511170
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -63436,6 +63701,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5046786283028669412}
|
||||
m_Modifications:
|
||||
- target: {fileID: 14258192005344558, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: -2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
|
|
@ -63520,6 +63789,10 @@ PrefabInstance:
|
|||
propertyPath: _otherPoint
|
||||
value:
|
||||
objectReference: {fileID: 3502128156805934089}
|
||||
- target: {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: _startAtOther
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855434573853191878, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.33
|
||||
|
|
@ -63548,9 +63821,25 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
--- !u!1 &576437949492265078 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7537329938738626932, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 8027124172937511170}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2441224063005478318
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 576437949492265078}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622e8db4bfec4d441bf18fd631559238, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!4 &3506850812140244378 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
|
|
@ -63563,6 +63852,10 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5046786283028669412}
|
||||
m_Modifications:
|
||||
- target: {fileID: 14258192005344558, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 1
|
||||
|
|
@ -63647,6 +63940,10 @@ PrefabInstance:
|
|||
propertyPath: _otherPoint
|
||||
value:
|
||||
objectReference: {fileID: 3502128156805934089}
|
||||
- target: {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: _startAtOther
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8855434573853191878, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.33
|
||||
|
|
@ -63675,9 +63972,25 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8767186862898821743, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
--- !u!1 &1591769245645962171 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7537329938738626932, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
m_PrefabInstance: {fileID: 9119472685170080463}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &5207470240605564431
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1591769245645962171}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 622e8db4bfec4d441bf18fd631559238, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!4 &2396518406086735447 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6903108778393898136, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3}
|
||||
|
|
|
|||
|
|
@ -1650,6 +1650,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 6903108778393898136}
|
||||
- component: {fileID: 8767186862898821743}
|
||||
- component: {fileID: 14258192005344558}
|
||||
m_Layer: 0
|
||||
m_Name: Cat
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1686,6 +1687,18 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_otherPoint: {fileID: 0}
|
||||
_startAtOther: 0
|
||||
--- !u!210 &14258192005344558
|
||||
SortingGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7537329938738626932}
|
||||
m_Enabled: 1
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 1
|
||||
--- !u!1 &7816188901787332666
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
43
Assets/Scripts/Games/LumBEARjack/LBJBGCat.cs
Normal file
43
Assets/Scripts/Games/LumBEARjack/LBJBGCat.cs
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
using HeavenStudio.Util;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace HeavenStudio.Games.Scripts_LumBEARjack
|
||||
{
|
||||
public class LBJBGCat : MonoBehaviour
|
||||
{
|
||||
private Animator _anim;
|
||||
private LBJCatMove _moveScript;
|
||||
|
||||
private double _danceBeat = double.MaxValue;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
_moveScript = GetComponent<LBJCatMove>();
|
||||
_anim = transform.GetChild(0).GetComponent<Animator>();
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (_danceBeat > Conductor.instance.songPositionInBeatsAsDouble)
|
||||
{
|
||||
_anim.Play("CatIdle");
|
||||
return;
|
||||
}
|
||||
float normalized = Conductor.instance.GetPositionFromBeat(_danceBeat, 2, false) % 1;
|
||||
_anim.DoNormalizedAnimation("CatDance", normalized);
|
||||
}
|
||||
|
||||
public void Activate(double beat, double length, bool inToScene, bool instant)
|
||||
{
|
||||
_moveScript.Move(beat, instant ? 0 : length, inToScene);
|
||||
|
||||
double overflowBeat = (beat + 0.5) % 2;
|
||||
_danceBeat = beat - overflowBeat + (instant ? 0 : 2);
|
||||
|
||||
if (!inToScene) _danceBeat = double.MaxValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
11
Assets/Scripts/Games/LumBEARjack/LBJBGCat.cs.meta
Normal file
11
Assets/Scripts/Games/LumBEARjack/LBJBGCat.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 622e8db4bfec4d441bf18fd631559238
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -24,6 +24,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack
|
|||
private LBJBear _bear;
|
||||
private LumBEARjack.HugeType _type;
|
||||
private bool _right = true;
|
||||
private bool _zoom = true;
|
||||
|
||||
private PlayerActionEvent[] _soundsToDeleteIfMiss = new PlayerActionEvent[3];
|
||||
|
||||
|
|
@ -37,11 +38,12 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack
|
|||
_peachSR.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
public void Init(LBJBear bear, double beat, double length, LumBEARjack.HugeType type, bool right, double startUpBeat = -1)
|
||||
public void Init(LBJBear bear, double beat, double length, LumBEARjack.HugeType type, bool right, bool zoom, double startUpBeat = -1)
|
||||
{
|
||||
_bear = bear;
|
||||
_type = type;
|
||||
_right = right;
|
||||
_zoom = zoom;
|
||||
|
||||
switch (type)
|
||||
{
|
||||
|
|
@ -178,7 +180,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack
|
|||
_ => throw new System.NotImplementedException(),
|
||||
};
|
||||
SoundByte.PlayOneShotGame("lumbearjack/" + cutSound);
|
||||
_bear.Cut(caller.startBeat + caller.timer, false, false, true);
|
||||
_bear.Cut(caller.startBeat + caller.timer, false, false, _zoom);
|
||||
Destroy(gameObject);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -88,14 +88,15 @@ namespace HeavenStudio.Games.Loaders
|
|||
function = delegate
|
||||
{
|
||||
var e = eventCaller.currentEntity;
|
||||
LumBEARjack.instance.SpawnHugeObject(e.beat, e.length, (LumBEARjack.HugeType)e["type"], (LumBEARjack.CatPutChoice)e["cat"]);
|
||||
LumBEARjack.instance.SpawnHugeObject(e.beat, e.length, (LumBEARjack.HugeType)e["type"], (LumBEARjack.CatPutChoice)e["cat"], e["zoom"]);
|
||||
},
|
||||
defaultLength = 6,
|
||||
parameters = new()
|
||||
{
|
||||
new("type", LumBEARjack.HugeType.log, "Type"),
|
||||
new("sound", true, "Cue Sound"),
|
||||
new("cat", LumBEARjack.CatPutChoice.Alternate, "Side")
|
||||
new("cat", LumBEARjack.CatPutChoice.Alternate, "Side"),
|
||||
new("zoom", true, "Zoom-In")
|
||||
}
|
||||
},
|
||||
new("cats", "Cats Presence")
|
||||
|
|
@ -104,6 +105,7 @@ namespace HeavenStudio.Games.Loaders
|
|||
parameters = new()
|
||||
{
|
||||
new("main", LumBEARjack.MainCatChoice.Right, "Main Cats"),
|
||||
new("bg", new EntityTypes.Integer(0, 12), "Background Cats"),
|
||||
new("instant", false, "Instant")
|
||||
}
|
||||
},
|
||||
|
|
@ -180,14 +182,15 @@ namespace HeavenStudio.Games.Loaders
|
|||
function = delegate
|
||||
{
|
||||
var e = eventCaller.currentEntity;
|
||||
LumBEARjack.instance.SpawnHugeObject(e.beat, e.length, (LumBEARjack.HugeType)e["type"], (LumBEARjack.CatPutChoice)e["cat"]);
|
||||
LumBEARjack.instance.SpawnHugeObject(e.beat, e.length, (LumBEARjack.HugeType)e["type"], (LumBEARjack.CatPutChoice)e["cat"], e["zoom"]);
|
||||
},
|
||||
defaultLength = 6,
|
||||
parameters = new()
|
||||
{
|
||||
new("type", LumBEARjack.HugeType.log, "Type"),
|
||||
new("sound", true, "Cue Sound"),
|
||||
new("cat", LumBEARjack.CatPutChoice.Alternate, "Side")
|
||||
new("cat", LumBEARjack.CatPutChoice.Alternate, "Side"),
|
||||
new("zoom", true, "Zoom-In")
|
||||
},
|
||||
resizable = true
|
||||
},
|
||||
|
|
@ -274,6 +277,8 @@ namespace HeavenStudio.Games
|
|||
[SerializeField] private Transform _particleHitPoint;
|
||||
[SerializeField] private Transform _particleCutPoint;
|
||||
|
||||
[SerializeField] private LBJBGCat[] _bgCats = new LBJBGCat[12];
|
||||
|
||||
[Header("Particles")]
|
||||
[SerializeField] private ParticleSystem _smallLogCutParticle;
|
||||
[SerializeField] private ParticleSystem _bigLogHitParticle;
|
||||
|
|
@ -291,6 +296,8 @@ namespace HeavenStudio.Games
|
|||
private Dictionary<double, MainCatChoice> _mainCatPresences = new();
|
||||
private MainCatChoice _startMainCat = MainCatChoice.Right;
|
||||
|
||||
private Dictionary<double, int> _bgCatPresences = new();
|
||||
|
||||
public static LumBEARjack instance;
|
||||
|
||||
private void Awake()
|
||||
|
|
@ -339,14 +346,14 @@ namespace HeavenStudio.Games
|
|||
});
|
||||
}
|
||||
|
||||
public void SpawnHugeObject(double beat, double length, HugeType type, CatPutChoice cat, double startUpBeat = -1)
|
||||
public void SpawnHugeObject(double beat, double length, HugeType type, CatPutChoice cat, bool zoom, double startUpBeat = -1)
|
||||
{
|
||||
BeatAction.New(this, new()
|
||||
{
|
||||
new(beat + (length / 6), delegate
|
||||
{
|
||||
LBJHugeObject spawnedObject = Instantiate(_hugeObjectPrefab, _cutObjectHolder);
|
||||
spawnedObject.Init(_bear, beat, length, type, ObjectShouldBeRight(beat, cat), startUpBeat);
|
||||
spawnedObject.Init(_bear, beat, length, type, ObjectShouldBeRight(beat, cat), zoom, startUpBeat);
|
||||
})
|
||||
});
|
||||
}
|
||||
|
|
@ -411,8 +418,8 @@ namespace HeavenStudio.Games
|
|||
|
||||
foreach (var e in allPresences)
|
||||
{
|
||||
if (_mainCatPresences.ContainsKey(e.beat)) continue;
|
||||
_mainCatPresences.Add(e.beat, (MainCatChoice)e["main"]);
|
||||
if (!_bgCatPresences.ContainsKey(e.beat)) _bgCatPresences.Add(e.beat, e["bg"]);
|
||||
if (!_mainCatPresences.ContainsKey(e.beat)) _mainCatPresences.Add(e.beat, (MainCatChoice)e["main"]);
|
||||
}
|
||||
|
||||
_startMainCat = CatPresenceBeforeBeat(beat);
|
||||
|
|
@ -433,11 +440,22 @@ namespace HeavenStudio.Games
|
|||
break;
|
||||
}
|
||||
|
||||
SetBGCats(beat, BGCatPresenceBeforeBeat(beat), BGCatPresenceBeforeBeat(beat), true);
|
||||
|
||||
var allPresencesAfterBeat = allPresences.FindAll(x => x.beat >= beat);
|
||||
List<BeatAction.Action> actions = new();
|
||||
foreach (var e in allPresencesAfterBeat)
|
||||
{
|
||||
double eventBeat = e.beat;
|
||||
bool instant = e["instant"];
|
||||
|
||||
int beforeBG = BGCatPresenceBeforeBeat(e.beat);
|
||||
int atBG = e["bg"];
|
||||
actions.Add(new(e.beat, delegate
|
||||
{
|
||||
SetBGCats(eventBeat, atBG, beforeBG, instant);
|
||||
}));
|
||||
|
||||
MainCatChoice beforeCats = CatPresenceBeforeBeat(e.beat);
|
||||
MainCatChoice atCats = (MainCatChoice)e["main"];
|
||||
if (beforeCats == atCats) continue;
|
||||
|
|
@ -445,8 +463,7 @@ namespace HeavenStudio.Games
|
|||
switch (atCats)
|
||||
{
|
||||
case MainCatChoice.Right:
|
||||
BeatAction.New(this, new()
|
||||
{
|
||||
actions.Add(
|
||||
new(e.beat, delegate
|
||||
{
|
||||
if (beforeCats == MainCatChoice.Both)
|
||||
|
|
@ -458,11 +475,10 @@ namespace HeavenStudio.Games
|
|||
ActivateCatVisualPresence(eventBeat, true, true, instant);
|
||||
ActivateCatVisualPresence(eventBeat, false, false, instant);
|
||||
})
|
||||
});
|
||||
);
|
||||
break;
|
||||
case MainCatChoice.Left:
|
||||
BeatAction.New(this, new()
|
||||
{
|
||||
actions.Add(
|
||||
new(e.beat, delegate
|
||||
{
|
||||
if (beforeCats == MainCatChoice.Both)
|
||||
|
|
@ -474,20 +490,20 @@ namespace HeavenStudio.Games
|
|||
ActivateCatVisualPresence(eventBeat, false, true, instant);
|
||||
ActivateCatVisualPresence(eventBeat, true, false, instant);
|
||||
})
|
||||
});
|
||||
);
|
||||
break;
|
||||
case MainCatChoice.Both:
|
||||
BeatAction.New(this, new()
|
||||
{
|
||||
actions.Add(
|
||||
new(e.beat, delegate
|
||||
{
|
||||
ActivateCatVisualPresence(eventBeat, true, true, (beforeCats == MainCatChoice.Right) ? true : instant);
|
||||
ActivateCatVisualPresence(eventBeat, true, false, (beforeCats == MainCatChoice.Left) ? true : instant);
|
||||
})
|
||||
});
|
||||
);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (actions.Count > 0) BeatAction.New(this, actions);
|
||||
}
|
||||
|
||||
private void PersistObjects(double beat)
|
||||
|
|
@ -513,7 +529,7 @@ namespace HeavenStudio.Games
|
|||
case "huge":
|
||||
case "hugeS":
|
||||
HugeObjectSound(e.beat, e.length, (HugeType)e["type"], beat);
|
||||
SpawnHugeObject(e.beat, e.length, (HugeType)e["type"], (CatPutChoice)e["cat"], beat);
|
||||
SpawnHugeObject(e.beat, e.length, (HugeType)e["type"], (CatPutChoice)e["cat"], e["zoom"], beat);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -882,6 +898,29 @@ namespace HeavenStudio.Games
|
|||
move.Move(beat, instant ? 0 : _catMoveLength, inToScene);
|
||||
}
|
||||
|
||||
private void SetBGCats(double beat, int bgCats, int beforeBgCats, bool instant)
|
||||
{
|
||||
bgCats = Math.Clamp(bgCats, 0, 12);
|
||||
bgCats -= 1;
|
||||
beforeBgCats -= 1;
|
||||
|
||||
for (int i = 0; i < _bgCats.Length; i++)
|
||||
{
|
||||
if (bgCats < beforeBgCats)
|
||||
{
|
||||
_bgCats[i].Activate(beat, _catMoveLength, bgCats >= i, instant || !(i > bgCats && i <= beforeBgCats));
|
||||
}
|
||||
else if (bgCats > beforeBgCats)
|
||||
{
|
||||
_bgCats[i].Activate(beat, _catMoveLength, bgCats >= i, instant || !(i > beforeBgCats && i <= bgCats));
|
||||
}
|
||||
else
|
||||
{
|
||||
_bgCats[i].Activate(beat, _catMoveLength, bgCats >= i, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private MainCatChoice CatPresenceAtBeat(double beat)
|
||||
{
|
||||
MainCatChoice cat = MainCatChoice.Right;
|
||||
|
|
@ -904,6 +943,28 @@ namespace HeavenStudio.Games
|
|||
return cat;
|
||||
}
|
||||
|
||||
private int BGCatPresenceAtBeat(double beat)
|
||||
{
|
||||
int amount = 0;
|
||||
foreach (var p in _bgCatPresences)
|
||||
{
|
||||
if (p.Key > beat) break;
|
||||
amount = p.Value;
|
||||
}
|
||||
return amount;
|
||||
}
|
||||
|
||||
private int BGCatPresenceBeforeBeat(double beat)
|
||||
{
|
||||
int amount = 0;
|
||||
foreach (var p in _bgCatPresences)
|
||||
{
|
||||
if (p.Key >= beat) break;
|
||||
amount = p.Value;
|
||||
}
|
||||
return amount;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Particles and Effects
|
||||
|
|
|
|||
|
|
@ -294,5 +294,6 @@ MonoBehaviour:
|
|||
- Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs
|
||||
- Assets/Scripts/Games/LumBEARjack/LBJCatMove.cs
|
||||
- Assets/Scripts/Util/ParticleSystemHelpers.cs
|
||||
- Assets/Scripts/Games/LumBEARjack/LBJBGCat.cs
|
||||
PathsToSkipImportEvent: []
|
||||
PathsToIgnoreOverwriteSettingOnAttribute: []
|
||||
|
|
|
|||
Loading…
Reference in a new issue