Compare commits
4 Commits
implementi
...
damianCont
| Author | SHA1 | Date | |
|---|---|---|---|
| 50c1144e83 | |||
| 88d03773a7 | |||
| 8d41356418 | |||
| e1f62a0fa1 |
@@ -419,11 +419,4 @@ AnimationClip:
|
||||
flags: 0
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events:
|
||||
- time: 0
|
||||
functionName: AnimStarted
|
||||
data:
|
||||
objectReferenceParameter: {fileID: 0}
|
||||
floatParameter: 0
|
||||
intParameter: 0
|
||||
messageOptions: 0
|
||||
m_Events: []
|
||||
|
||||
@@ -690,13 +690,6 @@ AnimationClip:
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events:
|
||||
- time: 0.33333334
|
||||
functionName: Flash
|
||||
data:
|
||||
objectReferenceParameter: {fileID: 0}
|
||||
floatParameter: 0
|
||||
intParameter: 0
|
||||
messageOptions: 0
|
||||
- time: 1.7833333
|
||||
functionName: PhotoTaken
|
||||
data:
|
||||
|
||||
@@ -26,7 +26,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: 4728896231509914993, guid: 27419b0e3639a3e4184d676890da073a, type: 3}
|
||||
_audio: {fileID: 8300000, guid: f189b8a044a8ae94fb38d99dbfc7deed, type: 3}
|
||||
- rid: 4008004961021984848
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -34,7 +33,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -1125559343802010594, guid: 46b2fe6896b27cc4c8bd9f0da3f0de50, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 3f542c523460c5148a53ca2d5476a545, type: 3}
|
||||
- rid: 4008004961021984849
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -42,7 +40,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -642587728066523507, guid: 95d6dbee5cb1f694c971791ee60cad14, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 195905675bf639f458a88f7567a3adc1, type: 3}
|
||||
- rid: 4008004961021984850
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -50,7 +47,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -8438005379329254897, guid: fe735eb4f8856904caec179520dcb92f, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 95e98023d04bb6043967626c1b05833e, type: 3}
|
||||
- rid: 4008004961021984866
|
||||
type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor}
|
||||
data:
|
||||
|
||||
@@ -424,7 +424,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -454384845472657506, guid: bbfabe7e36be4f341a775b4323900b5b, type: 3}
|
||||
_audio: {fileID: 8300000, guid: edff293418f52fe4badb4f8ba8e770ab, type: 3}
|
||||
- rid: 4008004961314799721
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -436,7 +435,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -5941552768301239376, guid: 300528d856c15824989bade57a7e04e4, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 69b3ae7103725d843b45b91cd31c0a4a, type: 3}
|
||||
- rid: 4008004961314799723
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -448,7 +446,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -5941552768301239376, guid: 300528d856c15824989bade57a7e04e4, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 9cd155aba23b8ca4394ea3ecec4a0792, type: 3}
|
||||
- rid: 4008004961314799725
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
|
||||
@@ -479,7 +479,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -3811075571101519331, guid: cf5af87e6a25e9442b89f069b894a5fd, type: 3}
|
||||
_audio: {fileID: 8300000, guid: e479d4c09170f7c4998db6919a1900ef, type: 3}
|
||||
- rid: 4008004961314799811
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -491,7 +490,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -5941552768301239376, guid: 300528d856c15824989bade57a7e04e4, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 9cd155aba23b8ca4394ea3ecec4a0792, type: 3}
|
||||
- rid: 4008004961314799813
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -503,7 +501,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -5941552768301239376, guid: 300528d856c15824989bade57a7e04e4, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 69b3ae7103725d843b45b91cd31c0a4a, type: 3}
|
||||
- rid: 4008004961314799815
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
|
||||
@@ -51,7 +51,7 @@ MonoBehaviour:
|
||||
x: 754
|
||||
y: 722
|
||||
width: 1209
|
||||
height: 706
|
||||
height: 646
|
||||
m_GraphElementMetaData:
|
||||
- m_Guid:
|
||||
m_Value0: 2073825529632823756
|
||||
@@ -479,7 +479,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: 21300000, guid: 34b9ddb77aae2df4ab489b7bb8f16cff, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 81198916f8cd0134fafe4cc46c1d020f, type: 3}
|
||||
- rid: 4008004961314799855
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -491,7 +490,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -5941552768301239376, guid: 300528d856c15824989bade57a7e04e4, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 9cd155aba23b8ca4394ea3ecec4a0792, type: 3}
|
||||
- rid: 4008004961314799857
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -503,7 +501,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -5941552768301239376, guid: 300528d856c15824989bade57a7e04e4, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 69b3ae7103725d843b45b91cd31c0a4a, type: 3}
|
||||
- rid: 4008004961314799859
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
|
||||
@@ -479,7 +479,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -8203946286166492161, guid: 6cb19dd8ad625c543abe9aa233cd676d, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 9503ed836f046914395f0ece800a4d83, type: 3}
|
||||
- rid: 4008004961314799899
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -491,7 +490,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -5941552768301239376, guid: 300528d856c15824989bade57a7e04e4, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 69b3ae7103725d843b45b91cd31c0a4a, type: 3}
|
||||
- rid: 4008004961314799901
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -503,7 +501,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -5941552768301239376, guid: 300528d856c15824989bade57a7e04e4, type: 3}
|
||||
_audio: {fileID: 8300000, guid: 9cd155aba23b8ca4394ea3ecec4a0792, type: 3}
|
||||
- rid: 4008004961314799903
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
|
||||
@@ -89,7 +89,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: 1487011052474782424, guid: f489e2c9ce64ff34aa3c7a91a4edbd77, type: 3}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 4008004961314799763
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -168,7 +167,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: 1487011052474782424, guid: f489e2c9ce64ff34aa3c7a91a4edbd77, type: 3}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7772910664224079994
|
||||
type: {class: GraphModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: Unity.GraphToolkit.Editor}
|
||||
data:
|
||||
|
||||
@@ -1123,7 +1123,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: Hey boy, go on and pick up that ass over there!
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976304
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -1131,7 +1130,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: "Go on, it's right there!\t\t"
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976305
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -1139,7 +1137,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: I need ASS!
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976306
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -1147,7 +1144,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: C'mon, don't be like this!
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976307
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -1155,7 +1151,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: Yessss, that's the stuff, now chop it!
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976308
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -1163,7 +1158,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: 6282751622250221668, guid: 204325ac88be74d4d882a078c64cf5e1, type: 3}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976309
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -1171,7 +1165,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: Chop it!!
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976310
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -1179,7 +1172,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: Good, shit now cook!
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976311
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -1187,7 +1179,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: 6282751622250221668, guid: 204325ac88be74d4d882a078c64cf5e1, type: 3}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976312
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -1195,7 +1186,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: What exactly are you cooking?!
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976313
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -1203,7 +1193,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: What exactly are you cooking?!
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976314
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -1211,4 +1200,3 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: Yessssss, thanks!
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
|
||||
@@ -656,7 +656,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: Some other test
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976295
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -664,7 +663,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: Some much longer text in here etc.
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976296
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -672,7 +670,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: Some oooother text
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976297
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -680,7 +677,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -765527507412255412, guid: f70246e6148769846aaea223ec0c2a55, type: 3}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976298
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -688,7 +684,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: Now it's text
|
||||
_image: {fileID: -9213056636207805707, guid: 00354ded9d8f8d643acc14837a229544, type: 3}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976301
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -696,7 +691,6 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: Psst, I'm just testing some stuff df
|
||||
_image: {fileID: 0}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976302
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -704,7 +698,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -9213056636207805707, guid: 00354ded9d8f8d643acc14837a229544, type: 3}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976322
|
||||
type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -744,7 +737,6 @@ MonoBehaviour:
|
||||
_contentType: 1
|
||||
_text:
|
||||
_image: {fileID: -9213056636207805707, guid: 00354ded9d8f8d643acc14837a229544, type: 3}
|
||||
_audio: {fileID: 0}
|
||||
- rid: 7545629632211976324
|
||||
type: {class: 'Constant`1[[Dialogue.DialogueContent, AppleHillsScripts]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor}
|
||||
data:
|
||||
@@ -752,4 +744,3 @@ MonoBehaviour:
|
||||
_contentType: 0
|
||||
_text: Now it's text again and it should loop!
|
||||
_image: {fileID: -9213056636207805707, guid: 00354ded9d8f8d643acc14837a229544, type: 3}
|
||||
_audio: {fileID: 0}
|
||||
|
||||
@@ -11,44 +11,33 @@ namespace Dialogue.Editor
|
||||
{
|
||||
// Height constants
|
||||
private const float TypeSelectorHeight = 20f;
|
||||
private const float PropertySpacing = 2f; // Reduced spacing for tighter layout
|
||||
private const float PropertySpacing = 2f;
|
||||
private const float TextFieldHeight = 40f; // Taller for multi-line text
|
||||
private const float ImageFieldHeight = 18f;
|
||||
private const float AudioFieldHeight = 18f;
|
||||
private const float PreviewHeight = 64f;
|
||||
|
||||
// Track the last assigned sprite to detect changes
|
||||
private static Sprite lastAssignedSprite;
|
||||
private static string lastAssignedPropertyPath;
|
||||
|
||||
public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
|
||||
{
|
||||
var contentTypeProperty = property.FindPropertyRelative("_contentType");
|
||||
var imageProperty = property.FindPropertyRelative("_image");
|
||||
|
||||
// Start with base height for type selector
|
||||
var height = TypeSelectorHeight + PropertySpacing;
|
||||
|
||||
// Add height based on content type
|
||||
if (contentTypeProperty.enumValueIndex == (int)DialogueContentType.Text)
|
||||
{
|
||||
height += TextFieldHeight + PropertySpacing;
|
||||
height += TextFieldHeight;
|
||||
}
|
||||
else // Image
|
||||
{
|
||||
height += ImageFieldHeight + PropertySpacing;
|
||||
height += ImageFieldHeight;
|
||||
|
||||
// Add preview height if an image is assigned - make sure it's AFTER the image field
|
||||
// but BEFORE the audio field
|
||||
// Add preview height if an image is assigned
|
||||
var imageProperty = property.FindPropertyRelative("_image");
|
||||
if (imageProperty.objectReferenceValue != null)
|
||||
{
|
||||
height += PreviewHeight + PropertySpacing;
|
||||
height += PropertySpacing + PreviewHeight;
|
||||
}
|
||||
}
|
||||
|
||||
// Add height for audio field (always displayed)
|
||||
height += AudioFieldHeight;
|
||||
|
||||
return height;
|
||||
}
|
||||
|
||||
@@ -65,58 +54,15 @@ namespace Dialogue.Editor
|
||||
var contentTypeProperty = property.FindPropertyRelative("_contentType");
|
||||
var textProperty = property.FindPropertyRelative("_text");
|
||||
var imageProperty = property.FindPropertyRelative("_image");
|
||||
var audioProperty = property.FindPropertyRelative("_audio");
|
||||
|
||||
// Check for sprite changes and force repaint if needed
|
||||
var currentSprite = imageProperty.objectReferenceValue as Sprite;
|
||||
if (currentSprite != lastAssignedSprite && property.propertyPath == lastAssignedPropertyPath)
|
||||
{
|
||||
// Sprite changed, force a layout recalculation
|
||||
EditorUtility.SetDirty(property.serializedObject.targetObject);
|
||||
GUI.changed = true;
|
||||
}
|
||||
|
||||
// Track current y position as we add controls
|
||||
float currentY = contentRect.y;
|
||||
|
||||
// Calculate type rect
|
||||
var typeRect = new Rect(contentRect.x, currentY, contentRect.width, TypeSelectorHeight);
|
||||
currentY += TypeSelectorHeight + PropertySpacing;
|
||||
|
||||
// Calculate content field rect based on the content type
|
||||
var contentHeight = contentTypeProperty.enumValueIndex == (int)DialogueContentType.Text ?
|
||||
TextFieldHeight : ImageFieldHeight;
|
||||
|
||||
// Calculate rects
|
||||
var typeRect = new Rect(contentRect.x, contentRect.y, contentRect.width, TypeSelectorHeight);
|
||||
var contentFieldRect = new Rect(
|
||||
contentRect.x,
|
||||
currentY,
|
||||
contentRect.y + TypeSelectorHeight + PropertySpacing,
|
||||
contentRect.width,
|
||||
contentHeight);
|
||||
|
||||
currentY += contentHeight + PropertySpacing;
|
||||
contentTypeProperty.enumValueIndex == (int)DialogueContentType.Text ? TextFieldHeight : ImageFieldHeight);
|
||||
|
||||
// If we have an image and it's selected, calculate preview rect
|
||||
Rect previewRect = Rect.zero;
|
||||
if (contentTypeProperty.enumValueIndex == (int)DialogueContentType.Image &&
|
||||
imageProperty.objectReferenceValue != null)
|
||||
{
|
||||
previewRect = new Rect(
|
||||
contentRect.x,
|
||||
currentY,
|
||||
contentRect.width,
|
||||
PreviewHeight);
|
||||
|
||||
currentY += PreviewHeight + PropertySpacing;
|
||||
}
|
||||
|
||||
// Calculate audio field rect
|
||||
var audioFieldRect = new Rect(
|
||||
contentRect.x,
|
||||
currentY,
|
||||
contentRect.width,
|
||||
AudioFieldHeight);
|
||||
|
||||
// Now draw all the controls
|
||||
// Draw the content type dropdown
|
||||
EditorGUI.PropertyField(typeRect, contentTypeProperty, GUIContent.none);
|
||||
|
||||
@@ -132,27 +78,8 @@ namespace Dialogue.Editor
|
||||
}
|
||||
else // Image
|
||||
{
|
||||
// Store the sprite before drawing the field to detect changes
|
||||
var previousSprite = imageProperty.objectReferenceValue as Sprite;
|
||||
|
||||
// Draw the image field
|
||||
EditorGUI.BeginChangeCheck();
|
||||
EditorGUI.PropertyField(contentFieldRect, imageProperty, GUIContent.none);
|
||||
if (EditorGUI.EndChangeCheck())
|
||||
{
|
||||
// Image changed, store the property path so we can detect which property changed
|
||||
lastAssignedPropertyPath = property.propertyPath;
|
||||
lastAssignedSprite = imageProperty.objectReferenceValue as Sprite;
|
||||
|
||||
// Force an inspector update to recalculate layout
|
||||
EditorUtility.SetDirty(property.serializedObject.targetObject);
|
||||
// Mark the scene as dirty to ensure serialization and proper layout refresh
|
||||
if (!EditorApplication.isPlaying)
|
||||
{
|
||||
UnityEditor.SceneManagement.EditorSceneManager.MarkSceneDirty(
|
||||
UnityEditor.SceneManagement.EditorSceneManager.GetActiveScene());
|
||||
}
|
||||
}
|
||||
|
||||
// Draw a preview if an image is assigned
|
||||
if (imageProperty.objectReferenceValue != null)
|
||||
@@ -160,58 +87,44 @@ namespace Dialogue.Editor
|
||||
var sprite = imageProperty.objectReferenceValue as Sprite;
|
||||
if (sprite != null)
|
||||
{
|
||||
var previewRect = new Rect(
|
||||
contentRect.x,
|
||||
contentFieldRect.y + contentFieldRect.height + PropertySpacing,
|
||||
contentRect.width,
|
||||
PreviewHeight);
|
||||
|
||||
// Draw the preview with preserved aspect ratio
|
||||
DrawSpritePreview(previewRect, sprite);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Draw the audio field (always displayed regardless of content type)
|
||||
EditorGUI.PropertyField(audioFieldRect, audioProperty, new GUIContent("Audio"));
|
||||
|
||||
// Restore indent
|
||||
EditorGUI.indentLevel = indent;
|
||||
EditorGUI.EndProperty();
|
||||
}
|
||||
|
||||
// Helper method to draw a sprite preview with preserved aspect ratio
|
||||
private void DrawSpritePreview(Rect rect, Sprite sprite)
|
||||
private void DrawSpritePreview(Rect position, Sprite sprite)
|
||||
{
|
||||
if (sprite == null || sprite.texture == null)
|
||||
return;
|
||||
|
||||
var texture = sprite.texture;
|
||||
var spriteRect = sprite.rect;
|
||||
var aspectRatio = spriteRect.width / spriteRect.height;
|
||||
if (sprite == null || sprite.texture == null) return;
|
||||
|
||||
// Calculate preview rect while preserving aspect ratio within our fixed area
|
||||
Rect previewRect = rect;
|
||||
// Calculate aspect-preserved rect
|
||||
float aspectRatio = sprite.rect.width / sprite.rect.height;
|
||||
float targetWidth = Mathf.Min(position.width, position.height * aspectRatio);
|
||||
float targetHeight = targetWidth / aspectRatio;
|
||||
|
||||
// Limit the display size to the allocated space while maintaining aspect ratio
|
||||
if (aspectRatio > 1f) // Wider than tall
|
||||
{
|
||||
previewRect.height = Mathf.Min(rect.width / aspectRatio, rect.height);
|
||||
previewRect.y += (rect.height - previewRect.height) * 0.5f;
|
||||
}
|
||||
else // Taller than wide or square
|
||||
{
|
||||
previewRect.width = Mathf.Min(rect.height * aspectRatio, rect.width);
|
||||
previewRect.x += (rect.width - previewRect.width) * 0.5f;
|
||||
}
|
||||
// Center the preview
|
||||
Rect previewRect = new Rect(
|
||||
position.x + (position.width - targetWidth) * 0.5f,
|
||||
position.y + (position.height - targetHeight) * 0.5f,
|
||||
targetWidth,
|
||||
targetHeight
|
||||
);
|
||||
|
||||
// Constrain the preview to the allocated space
|
||||
previewRect.height = Mathf.Min(previewRect.height, rect.height);
|
||||
previewRect.width = Mathf.Min(previewRect.width, rect.width);
|
||||
// Draw the sprite preview
|
||||
EditorGUI.DrawPreviewTexture(previewRect, sprite.texture, null, ScaleMode.ScaleToFit);
|
||||
|
||||
// Draw preview with a dark background for better visibility
|
||||
EditorGUI.DrawRect(rect, new Color(0.1f, 0.1f, 0.1f, 1f));
|
||||
GUI.DrawTexture(previewRect, texture, ScaleMode.ScaleToFit);
|
||||
|
||||
// Draw sprite bounds
|
||||
EditorGUI.DrawRect(new Rect(previewRect.x, previewRect.y, previewRect.width, 1), Color.gray);
|
||||
EditorGUI.DrawRect(new Rect(previewRect.x, previewRect.y + previewRect.height - 1, previewRect.width, 1), Color.gray);
|
||||
EditorGUI.DrawRect(new Rect(previewRect.x, previewRect.y, 1, previewRect.height), Color.gray);
|
||||
EditorGUI.DrawRect(new Rect(previewRect.x + previewRect.width - 1, previewRect.y, 1, previewRect.height), Color.gray);
|
||||
// Draw a border around the preview
|
||||
GUI.Box(previewRect, GUIContent.none);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,6 @@ GameObject:
|
||||
- component: {fileID: 216298859848564559}
|
||||
- component: {fileID: 7540245671263622866}
|
||||
- component: {fileID: 4324904235553461363}
|
||||
- component: {fileID: 6510906053583315767}
|
||||
m_Layer: 10
|
||||
m_Name: Gardener
|
||||
m_TagString: Untagged
|
||||
@@ -122,24 +121,6 @@ MonoBehaviour:
|
||||
OnLastStateExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &6510906053583315767
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1102400833121127473}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f0f1834ce0c7b0b42b633a6d2bd67698, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: '::'
|
||||
gardenerAudioPlayer: {fileID: 2263287369158035129}
|
||||
mowerAudioPlayer: {fileID: 647208781616539222}
|
||||
mowerStartAudio: {fileID: 8300000, guid: 082fcd5bdadf2884e9aefc6abf4a5cc5, type: 3}
|
||||
mowerLoopAudio: {fileID: 8300000, guid: aed79daa951bce74196ce04da2990b22, type: 3}
|
||||
gardenerFleeAudioClip: {fileID: 6418180475301049370, guid: 4949348ce86bb9e43a4251c06c1cb5d1, type: 2}
|
||||
gardenerChaseAudioClip: {fileID: 6418180475301049370, guid: 97ccaa2fcf396f446aa7fde8586d225a, type: 2}
|
||||
--- !u!1 &1251257928845417300
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -202,8 +183,6 @@ MeshRenderer:
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_ForceMeshLod: -1
|
||||
m_MeshLodSelectionBias: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -225,7 +204,6 @@ MeshRenderer:
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_GlobalIlluminationMeshLod: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
@@ -308,7 +286,6 @@ Transform:
|
||||
- {fileID: 5409891338185859165}
|
||||
- {fileID: 3150182414053579701}
|
||||
- {fileID: 1667791532132169314}
|
||||
- {fileID: 3539173003033760347}
|
||||
m_Father: {fileID: 2264394306674147778}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &20943836391379072
|
||||
@@ -339,9 +316,6 @@ MonoBehaviour:
|
||||
GardenerObject: {fileID: 5409891338185859165}
|
||||
chaseDuration: 2
|
||||
chaseDelay: 0
|
||||
animator: {fileID: 0}
|
||||
lawnMowerRef: {fileID: 0}
|
||||
audioController: {fileID: 0}
|
||||
--- !u!114 &8670311030271649807
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -425,8 +399,6 @@ MeshRenderer:
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_ForceMeshLod: -1
|
||||
m_MeshLodSelectionBias: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -448,7 +420,6 @@ MeshRenderer:
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_GlobalIlluminationMeshLod: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
@@ -530,8 +501,6 @@ SkinnedMeshRenderer:
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_ForceMeshLod: -1
|
||||
m_MeshLodSelectionBias: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -553,7 +522,6 @@ SkinnedMeshRenderer:
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_GlobalIlluminationMeshLod: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
@@ -649,8 +617,6 @@ SkinnedMeshRenderer:
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_ForceMeshLod: -1
|
||||
m_MeshLodSelectionBias: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -672,7 +638,6 @@ SkinnedMeshRenderer:
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_GlobalIlluminationMeshLod: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
@@ -765,8 +730,6 @@ MeshRenderer:
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_ForceMeshLod: -1
|
||||
m_MeshLodSelectionBias: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -788,7 +751,6 @@ MeshRenderer:
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_GlobalIlluminationMeshLod: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
@@ -867,8 +829,6 @@ MeshRenderer:
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_ForceMeshLod: -1
|
||||
m_MeshLodSelectionBias: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -890,7 +850,6 @@ MeshRenderer:
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_GlobalIlluminationMeshLod: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
@@ -907,135 +866,6 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 5980d28f81eb545d78e1d84e1449a10f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &8590192324315186055
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3539173003033760347}
|
||||
- component: {fileID: 647208781616539222}
|
||||
m_Layer: 0
|
||||
m_Name: MowerSFX
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3539173003033760347
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8590192324315186055}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -2.5896003, y: -4.9567494, z: 0}
|
||||
m_LocalScale: {x: 0.7142856, y: 0.7142856, z: 0.7142856}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8242272023601642381}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!82 &647208781616539222
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8590192324315186055}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 1171626333864818265, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_Resource: {fileID: 0}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 20
|
||||
MaxDistance: 50.5
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &9197792684223820912
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1175,7 +1005,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -3.3647113
|
||||
value: -3.364711
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
@@ -1232,9 +1062,6 @@ PrefabInstance:
|
||||
- targetCorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 7341880855800055810}
|
||||
- targetCorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2263287369158035129}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3}
|
||||
--- !u!1 &1789599716509294674 stripped
|
||||
GameObject:
|
||||
@@ -1253,103 +1080,6 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!82 &2263287369158035129
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1789599716509294674}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 3533147658878909314, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_Resource: {fileID: 0}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 20
|
||||
MaxDistance: 50
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!4 &5409891338185859165 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3}
|
||||
|
||||
@@ -427,10 +427,6 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: FootballBird
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1972611059221495588, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3}
|
||||
propertyPath: stepData
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.15
|
||||
|
||||
@@ -518,10 +518,6 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: HammerBird
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1972611059221495588, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3}
|
||||
propertyPath: stepData
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 1.25
|
||||
|
||||
@@ -9,7 +9,6 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 536416456044738252}
|
||||
- component: {fileID: 6629069534496617365}
|
||||
m_Layer: 0
|
||||
m_Name: SoundManager
|
||||
m_TagString: Untagged
|
||||
@@ -32,15 +31,3 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &6629069534496617365
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5034240524438268576}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d8bd90cfc02c8274fac5ce090285ed6a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: '::'
|
||||
|
||||
@@ -223,8 +223,7 @@ GameObject:
|
||||
- component: {fileID: 2071071585578300598}
|
||||
- component: {fileID: 1454372124634854912}
|
||||
- component: {fileID: 4122067414526815177}
|
||||
- component: {fileID: 362100613909257970}
|
||||
m_Layer: 10
|
||||
m_Layer: 6
|
||||
m_Name: Hidden
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@@ -306,33 +305,6 @@ BoxCollider2D:
|
||||
m_AutoTiling: 0
|
||||
m_Size: {x: 5.42, y: 4}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!114 &362100613909257970
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1011363502278351410}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AppleHillsScripts::Interactions.Interactable
|
||||
isOneTime: 0
|
||||
cooldown: -1
|
||||
characterToInteract: 0
|
||||
interactionStarted:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
interactionInterrupted:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
characterArrived:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
interactionComplete:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &1674229500073894281
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -649,8 +621,6 @@ GameObject:
|
||||
- component: {fileID: 2995561023563842343}
|
||||
- component: {fileID: 7053055077639234121}
|
||||
- component: {fileID: 578146208477020881}
|
||||
- component: {fileID: 1193493154550576580}
|
||||
- component: {fileID: 7652960462502122104}
|
||||
m_Layer: 0
|
||||
m_Name: AnneLiseBush
|
||||
m_TagString: Untagged
|
||||
@@ -735,253 +705,6 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 603ecc4a6ab6bb84c8cb9773fa310b69, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: '::'
|
||||
--- !u!114 &1193493154550576580
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5943355783477523754}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: edc43a9f07fedb44abb68b06c71d17ea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: '::'
|
||||
VOPlayer: {fileID: 7652960462502122104}
|
||||
SFXPlayer: {fileID: 5129281429389775297}
|
||||
reactionClipToPlay: {fileID: 0}
|
||||
flashSFXClipToPlay: {fileID: 8300000, guid: 2ac461fcc3f7a014ca716a4f231be004, type: 3}
|
||||
birdCounterClip:
|
||||
- {fileID: 8300000, guid: 60d02b75b267d5949a36f04bb5dfe409, type: 3}
|
||||
- {fileID: 8300000, guid: 86dc2e8f9a1cf7440adccad824209334, type: 3}
|
||||
- {fileID: 8300000, guid: 2446033223f0de14bab42a40b36a5e1a, type: 3}
|
||||
- {fileID: 8300000, guid: 1803dc83ad49a6543882628a46d5701a, type: 3}
|
||||
--- !u!82 &7652960462502122104
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5943355783477523754}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 3533147658878909314, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_Resource: {fileID: 0}
|
||||
m_PlayOnAwake: 0
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &6948354193133336628
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6330838396794415978}
|
||||
- component: {fileID: 5129281429389775297}
|
||||
m_Layer: 0
|
||||
m_Name: SFXAudio
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &6330838396794415978
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6948354193133336628}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 91.058014, y: 38.410133, z: 0}
|
||||
m_LocalScale: {x: -1, y: 0.8928573, z: 0.8928573}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6911087736377923223}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!82 &5129281429389775297
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6948354193133336628}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 1171626333864818265, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_Resource: {fileID: 0}
|
||||
m_PlayOnAwake: 0
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &7019503702609181254
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1217,7 +940,6 @@ Transform:
|
||||
- {fileID: 6292368405587000872}
|
||||
- {fileID: 8296261693726818812}
|
||||
- {fileID: 4304786163860520790}
|
||||
- {fileID: 6330838396794415978}
|
||||
m_Father: {fileID: 8259693476957892150}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &3552553650332385501
|
||||
@@ -1267,36 +989,6 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AppleHillsScripts::TakePhotoState
|
||||
playerTargetObject: {fileID: 4304786163860520790}
|
||||
animFlash:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 1193493154550576580}
|
||||
m_TargetAssemblyTypeName: BushAudioController, AppleHillsScripts
|
||||
m_MethodName: PlayFlashSound
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
animStart:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 1193493154550576580}
|
||||
m_TargetAssemblyTypeName: BushAudioController, AppleHillsScripts
|
||||
m_MethodName: PlayPhotoSoundBite
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!61 &962877523590950341
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -114,14 +114,13 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: AppleHillsScripts::Dialogue.SpeechBubble
|
||||
textDisplay: {fileID: 4573570654593171780}
|
||||
imageDisplay: {fileID: 4814676392695871198}
|
||||
dialoguePromptImage: {fileID: 6481613319593204747}
|
||||
dialogueBubble: {fileID: 1494212192306772670}
|
||||
displayMode: 1
|
||||
typewriterSpeed: 0.05
|
||||
typingSoundSource: {fileID: 0}
|
||||
typingSoundFrequency: 3
|
||||
useRichText: 1
|
||||
dialogueDisplayTime: 3
|
||||
dialoguePromptText: . . .
|
||||
--- !u!1 &3571537114331005905
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -354,81 +353,6 @@ MonoBehaviour:
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &5966238993889414591
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2913690643654480743}
|
||||
- component: {fileID: 5237027710007059819}
|
||||
- component: {fileID: 6481613319593204747}
|
||||
m_Layer: 5
|
||||
m_Name: Prompt
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &2913690643654480743
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5966238993889414591}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3484825090253933040}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 143, y: 74}
|
||||
m_SizeDelta: {x: 245, y: 148}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5237027710007059819
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5966238993889414591}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &6481613319593204747
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5966238993889414591}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -1369078500869033561, guid: d52355bd23697ac4eaad116fb0aec19d, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &6499933157207406972
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -461,7 +385,6 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 8307219291215824345}
|
||||
- {fileID: 2913690643654480743}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -11,14 +11,10 @@ public class GardenerChaseBehavior : MonoBehaviour
|
||||
[SerializeField] private Animator animator;
|
||||
[SerializeField] public GameObject lawnMowerRef;
|
||||
private TweenBase tweenRef;
|
||||
public GardenerAudioController audioController;
|
||||
|
||||
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void Start()
|
||||
{
|
||||
tweenRef = Tween.Spline (ChaseSpline, GardenerObject, 0, 1, false, chaseDuration, chaseDelay, Tween.EaseLinear, Tween.LoopType.None, HandleTweenStarted, HandleTweenFinished);
|
||||
|
||||
}
|
||||
|
||||
void HandleTweenFinished ()
|
||||
|
||||
@@ -9,8 +9,7 @@
|
||||
"Unity.InputSystem",
|
||||
"Unity.TextMeshPro",
|
||||
"OptimizedRope",
|
||||
"Unity.Cinemachine",
|
||||
"AudioSourceEvents"
|
||||
"Unity.Cinemachine"
|
||||
],
|
||||
"includePlatforms": [],
|
||||
"excludePlatforms": [],
|
||||
|
||||
@@ -21,7 +21,6 @@ public class LawnMowerChaseBehaviour : MonoBehaviour
|
||||
public GameObject gardenerRef = null;
|
||||
public Animator gardenerAnimator = null;
|
||||
public bool gardenerChasing = true;
|
||||
public GardenerAudioController gardenerAudioController;
|
||||
|
||||
void Start()
|
||||
{
|
||||
@@ -29,7 +28,6 @@ public class LawnMowerChaseBehaviour : MonoBehaviour
|
||||
|
||||
float distanceToStart = Mathf.Abs(startPercentage - 0f);
|
||||
float distanceToEnd = Mathf.Abs(startPercentage - 1f);
|
||||
gardenerAudioController.StartMowerSound();
|
||||
|
||||
if (distanceToStart < distanceToEnd)
|
||||
{
|
||||
|
||||
@@ -9,7 +9,6 @@ using PuzzleS;
|
||||
namespace Dialogue
|
||||
{
|
||||
[AddComponentMenu("AppleHills/Dialogue/Dialogue Component")]
|
||||
[RequireComponent(typeof(AudioSource))]
|
||||
public class DialogueComponent : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private RuntimeDialogueGraph dialogueGraph;
|
||||
@@ -18,7 +17,6 @@ namespace Dialogue
|
||||
private int currentLineIndex;
|
||||
private bool initialized = false;
|
||||
private SpeechBubble speechBubble;
|
||||
private AudioSource audioSource;
|
||||
|
||||
// Flag to track when a condition has been met but dialogue hasn't advanced yet
|
||||
private bool _conditionSatisfiedPendingAdvance = false;
|
||||
@@ -37,15 +35,6 @@ namespace Dialogue
|
||||
|
||||
private void Start()
|
||||
{
|
||||
// Get required components
|
||||
audioSource = GetComponent<AudioSource>();
|
||||
speechBubble = GetComponentInChildren<SpeechBubble>();
|
||||
|
||||
if (speechBubble == null)
|
||||
{
|
||||
Debug.LogError("SpeechBubble component is missing on Dialogue Component");
|
||||
}
|
||||
|
||||
// Register for global events
|
||||
if (PuzzleManager.Instance != null)
|
||||
PuzzleManager.Instance.OnStepCompleted += OnAnyPuzzleStepCompleted;
|
||||
@@ -60,6 +49,13 @@ namespace Dialogue
|
||||
ItemManager.Instance.OnItemsCombined += OnAnyItemsCombined;
|
||||
}
|
||||
|
||||
speechBubble = GetComponentInChildren<SpeechBubble>();
|
||||
|
||||
if (speechBubble == null)
|
||||
{
|
||||
Debug.LogError("SpeechBubble component is missing on Dialogue Component");
|
||||
}
|
||||
|
||||
// Auto-start the dialogue
|
||||
// StartDialogue();
|
||||
|
||||
@@ -92,9 +88,6 @@ namespace Dialogue
|
||||
// and pass whether there are more lines available for prompt display
|
||||
speechBubble.DisplayDialogueContent(content, HasAnyLines());
|
||||
|
||||
// Play audio if available
|
||||
PlayDialogueAudio(content.Audio);
|
||||
|
||||
// Log the content type for debugging
|
||||
Logging.Debug($"Displaying content type: {content.ContentType} - {(content.ContentType == DialogueContentType.Text ? content.Text : content.Image?.name)}");
|
||||
}
|
||||
@@ -108,28 +101,7 @@ namespace Dialogue
|
||||
Logging.Debug($"Displaying legacy text: {line}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Play the audio clip for the current dialogue content
|
||||
/// </summary>
|
||||
/// <param name="clip">Audio clip to play</param>
|
||||
private void PlayDialogueAudio(AudioClip clip)
|
||||
{
|
||||
// Stop any currently playing audio
|
||||
if (audioSource.isPlaying)
|
||||
{
|
||||
audioSource.Stop();
|
||||
}
|
||||
|
||||
// Play the new clip if it exists
|
||||
if (clip != null)
|
||||
{
|
||||
audioSource.clip = clip;
|
||||
audioSource.Play();
|
||||
Logging.Debug($"Playing dialogue audio: {clip.name}");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Get the current dialogue content (text or image)
|
||||
/// </summary>
|
||||
|
||||
@@ -21,7 +21,6 @@ namespace Dialogue
|
||||
[SerializeField] private DialogueContentType _contentType = DialogueContentType.Text;
|
||||
[SerializeField] private string _text = string.Empty;
|
||||
[SerializeField] private Sprite _image = null;
|
||||
[SerializeField] private AudioClip _audio = null;
|
||||
|
||||
/// <summary>
|
||||
/// The type of content this entry contains
|
||||
@@ -38,23 +37,16 @@ namespace Dialogue
|
||||
/// </summary>
|
||||
public Sprite Image => _image;
|
||||
|
||||
/// <summary>
|
||||
/// The audio clip to play with this content
|
||||
/// </summary>
|
||||
public AudioClip Audio => _audio;
|
||||
|
||||
/// <summary>
|
||||
/// Create text content
|
||||
/// </summary>
|
||||
/// <param name="text">The text to display</param>
|
||||
/// <param name="audio">Optional audio clip to play</param>
|
||||
public static DialogueContent CreateText(string text, AudioClip audio = null)
|
||||
public static DialogueContent CreateText(string text)
|
||||
{
|
||||
return new DialogueContent
|
||||
{
|
||||
_contentType = DialogueContentType.Text,
|
||||
_text = text,
|
||||
_audio = audio
|
||||
_text = text
|
||||
};
|
||||
}
|
||||
|
||||
@@ -62,14 +54,12 @@ namespace Dialogue
|
||||
/// Create image content
|
||||
/// </summary>
|
||||
/// <param name="image">The image to display</param>
|
||||
/// <param name="audio">Optional audio clip to play</param>
|
||||
public static DialogueContent CreateImage(Sprite image, AudioClip audio = null)
|
||||
public static DialogueContent CreateImage(Sprite image)
|
||||
{
|
||||
return new DialogueContent
|
||||
{
|
||||
_contentType = DialogueContentType.Image,
|
||||
_image = image,
|
||||
_audio = audio
|
||||
_image = image
|
||||
};
|
||||
}
|
||||
|
||||
@@ -78,13 +68,9 @@ namespace Dialogue
|
||||
/// </summary>
|
||||
public override string ToString()
|
||||
{
|
||||
string contentDesc = ContentType == DialogueContentType.Text
|
||||
return ContentType == DialogueContentType.Text
|
||||
? $"Text: {_text}"
|
||||
: $"Image: {_image?.name ?? "None"}";
|
||||
|
||||
return _audio != null
|
||||
? $"{contentDesc} (with audio: {_audio.name})"
|
||||
: contentDesc;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,15 +19,14 @@ namespace Dialogue
|
||||
public class SpeechBubble : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private TextMeshProUGUI textDisplay;
|
||||
[SerializeField] private Image imageDisplay; // For displaying images in dialogue
|
||||
[SerializeField] private Image dialoguePromptImage; // NEW: Reference to the dialogue prompt image
|
||||
[SerializeField] private GameObject dialogueBubble; // NEW: Reference to the dialogue bubble container
|
||||
[SerializeField] private Image imageDisplay; // New field for displaying images
|
||||
[SerializeField] private TextDisplayMode displayMode = TextDisplayMode.Typewriter;
|
||||
[SerializeField] private float typewriterSpeed = 0.05f; // Time between characters in seconds
|
||||
[SerializeField] private AudioSource typingSoundSource;
|
||||
[SerializeField] private float typingSoundFrequency = 3; // Play sound every X characters
|
||||
[SerializeField] private bool useRichText = true; // Whether to respect rich text tags
|
||||
[SerializeField] private float dialogueDisplayTime = 1.5f; // Time in seconds to display dialogue before showing prompt
|
||||
[SerializeField] private string dialoguePromptText = ". . ."; // Text to show as a prompt for available dialogue
|
||||
|
||||
private Coroutine typewriterCoroutine;
|
||||
private Coroutine promptUpdateCoroutine;
|
||||
@@ -35,22 +34,15 @@ namespace Dialogue
|
||||
private Sprite currentImage = null;
|
||||
private bool isVisible = false;
|
||||
private DialogueContentType currentContentType = DialogueContentType.Text;
|
||||
private bool isPromptVisible = false; // Track if we're showing the prompt or dialogue
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
// Ensure we have the required components
|
||||
// Ensure we have both components
|
||||
if (textDisplay == null)
|
||||
Debug.LogError("SpeechBubble: TextMeshProUGUI component is not assigned!");
|
||||
|
||||
if (imageDisplay == null)
|
||||
Debug.LogError("SpeechBubble: Image component for dialogue is not assigned!");
|
||||
|
||||
if (dialoguePromptImage == null)
|
||||
Debug.LogError("SpeechBubble: Dialogue prompt image is not assigned!");
|
||||
|
||||
if (dialogueBubble == null)
|
||||
Debug.LogError("SpeechBubble: Dialogue bubble container is not assigned!");
|
||||
Debug.LogError("SpeechBubble: Image component is not assigned!");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -58,28 +50,16 @@ namespace Dialogue
|
||||
/// </summary>
|
||||
public void Show()
|
||||
{
|
||||
// If we're showing the prompt, we only activate the prompt image
|
||||
if (isPromptVisible)
|
||||
{
|
||||
dialogueBubble.SetActive(false);
|
||||
dialoguePromptImage.gameObject.SetActive(true);
|
||||
}
|
||||
else // Otherwise, show the dialogue bubble
|
||||
{
|
||||
dialogueBubble.SetActive(true);
|
||||
dialoguePromptImage.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
gameObject.SetActive(true);
|
||||
isVisible = true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Hide the speech bubble and prompt
|
||||
/// Hide the speech bubble
|
||||
/// </summary>
|
||||
public void Hide()
|
||||
{
|
||||
dialogueBubble.SetActive(false);
|
||||
dialoguePromptImage.gameObject.SetActive(false);
|
||||
gameObject.SetActive(false);
|
||||
isVisible = false;
|
||||
|
||||
// Stop any ongoing typewriter effect
|
||||
@@ -122,7 +102,6 @@ namespace Dialogue
|
||||
|
||||
currentFullText = text;
|
||||
currentContentType = DialogueContentType.Text;
|
||||
isPromptVisible = false; // We're showing dialogue, not a prompt
|
||||
|
||||
// Stop any existing typewriter effect
|
||||
if (typewriterCoroutine != null)
|
||||
@@ -131,7 +110,7 @@ namespace Dialogue
|
||||
typewriterCoroutine = null;
|
||||
}
|
||||
|
||||
// Activate text display, deactivate image display within the dialogue bubble
|
||||
// Activate text display, deactivate image display
|
||||
textDisplay.gameObject.SetActive(true);
|
||||
if (imageDisplay != null)
|
||||
{
|
||||
@@ -171,7 +150,6 @@ namespace Dialogue
|
||||
// Display the dialogue line
|
||||
if (!string.IsNullOrEmpty(line))
|
||||
{
|
||||
isPromptVisible = false; // We're showing dialogue content
|
||||
SetText(line);
|
||||
|
||||
// After a delay, update the prompt visibility
|
||||
@@ -185,24 +163,19 @@ namespace Dialogue
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Update to either show the dialogue prompt image or hide based on dialogue availability
|
||||
/// Update the speech bubble to either show a prompt or hide based on dialogue availability
|
||||
/// </summary>
|
||||
/// <param name="hasDialogueAvailable">Whether dialogue is available</param>
|
||||
public void UpdatePromptVisibility(bool hasDialogueAvailable)
|
||||
{
|
||||
if (hasDialogueAvailable)
|
||||
{
|
||||
isPromptVisible = true; // We're showing the prompt, not dialogue
|
||||
|
||||
// Hide dialogue bubble, show prompt image
|
||||
dialogueBubble.SetActive(false);
|
||||
dialoguePromptImage.gameObject.SetActive(true);
|
||||
|
||||
isVisible = true;
|
||||
Show();
|
||||
SetText(dialoguePromptText);
|
||||
}
|
||||
else
|
||||
{
|
||||
Hide(); // Hide both bubble and prompt
|
||||
Hide();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -318,7 +291,6 @@ namespace Dialogue
|
||||
|
||||
currentImage = sprite;
|
||||
currentContentType = DialogueContentType.Image;
|
||||
isPromptVisible = false; // We're showing dialogue content, not a prompt
|
||||
|
||||
// Activate image display, set the sprite
|
||||
imageDisplay.gameObject.SetActive(true);
|
||||
@@ -392,7 +364,6 @@ namespace Dialogue
|
||||
}
|
||||
|
||||
// Display the content based on its type
|
||||
isPromptVisible = false; // We're showing dialogue content
|
||||
currentContentType = content.ContentType;
|
||||
|
||||
if (content.ContentType == DialogueContentType.Text)
|
||||
@@ -401,10 +372,6 @@ namespace Dialogue
|
||||
textDisplay.gameObject.SetActive(true);
|
||||
if (imageDisplay != null) imageDisplay.gameObject.SetActive(false);
|
||||
|
||||
// Show dialogue bubble, hide prompt
|
||||
dialogueBubble.SetActive(true);
|
||||
dialoguePromptImage.gameObject.SetActive(false);
|
||||
|
||||
// Display the text
|
||||
DisplayDialogueLine(content.Text, hasMoreDialogue);
|
||||
}
|
||||
@@ -414,10 +381,6 @@ namespace Dialogue
|
||||
textDisplay.gameObject.SetActive(false);
|
||||
if (imageDisplay != null) imageDisplay.gameObject.SetActive(true);
|
||||
|
||||
// Show dialogue bubble, hide prompt
|
||||
dialogueBubble.SetActive(true);
|
||||
dialoguePromptImage.gameObject.SetActive(false);
|
||||
|
||||
// Set the image
|
||||
SetImage(content.Image);
|
||||
|
||||
|
||||
@@ -34,7 +34,6 @@ namespace Minigames.DivingForPictures
|
||||
[Tooltip("Reference to the Flash Effect when the picture is taken")]
|
||||
[SerializeField] private GameObject flashRef;
|
||||
|
||||
|
||||
private CameraViewfinderManager viewfinderManager;
|
||||
|
||||
// Settings reference
|
||||
@@ -105,10 +104,7 @@ namespace Minigames.DivingForPictures
|
||||
|
||||
private static DivingGameManager _instance = null;
|
||||
private static bool _isQuitting = false;
|
||||
|
||||
public AudioSource deathAudioPlayer;
|
||||
|
||||
|
||||
|
||||
public static DivingGameManager Instance => _instance;
|
||||
|
||||
private void Awake()
|
||||
@@ -360,7 +356,6 @@ namespace Minigames.DivingForPictures
|
||||
if (currentRopeIndex >= playerRopes.Length)
|
||||
{
|
||||
TriggerGameOver();
|
||||
deathAudioPlayer.Play();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -670,7 +665,6 @@ namespace Minigames.DivingForPictures
|
||||
if (surfacingTimeline != null)
|
||||
{
|
||||
//Instead of surfacingTimeline, play the outro cinematic
|
||||
deathAudioPlayer.Stop();
|
||||
CinematicsManager.Instance.LoadAndPlayCinematic("SurfacingCinematic");
|
||||
CinematicsManager.Instance.ShowCinematicBackground(true);
|
||||
//surfacingTimeline.Play();
|
||||
@@ -877,14 +871,15 @@ namespace Minigames.DivingForPictures
|
||||
// Calculate score based on proximity and depth
|
||||
CalculateScore(_currentPhotoTarget, _capturedProximity);
|
||||
|
||||
|
||||
//Trigger the Flash Effect
|
||||
if (flashRef != null)
|
||||
{
|
||||
|
||||
|
||||
var flash = flashRef.GetComponent<FlashBehaviour>();
|
||||
if (flash != null)
|
||||
{
|
||||
|
||||
|
||||
flash.TriggerFlash();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
using System.Collections;
|
||||
using AppleHills.Core.Settings;
|
||||
using Core;
|
||||
using UnityEngine.Audio;
|
||||
|
||||
namespace Minigames.DivingForPictures
|
||||
{
|
||||
@@ -23,7 +22,6 @@ namespace Minigames.DivingForPictures
|
||||
private bool _isShowingDamageColor;
|
||||
private Coroutine _blinkCoroutine;
|
||||
private Color _originalColor;
|
||||
public AudioSource damagePlayer;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
@@ -97,7 +95,6 @@ namespace Minigames.DivingForPictures
|
||||
|
||||
// Start a new blink coroutine
|
||||
_blinkCoroutine = StartCoroutine(BlinkCoroutine());
|
||||
damagePlayer.Play();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
using UnityEngine;
|
||||
|
||||
public class BirdGameStats : MonoBehaviour
|
||||
{
|
||||
public int birdsFoundInLevel;
|
||||
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void BirdFound()
|
||||
{
|
||||
birdsFoundInLevel += 1;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 47259b63379fb1b40aa2650a13f01fd1
|
||||
@@ -1,16 +0,0 @@
|
||||
using UnityEngine;
|
||||
|
||||
public class AudioManager : MonoBehaviour
|
||||
{
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d8bd90cfc02c8274fac5ce090285ed6a
|
||||
@@ -1,55 +0,0 @@
|
||||
using AudioSourceEvents;
|
||||
using Input;
|
||||
using System;
|
||||
using System.Diagnostics.Tracing;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Audio;
|
||||
|
||||
public class BushAudioController : MonoBehaviour
|
||||
{
|
||||
private IAudioEventSource _eventSource;
|
||||
public AudioSource VOPlayer;
|
||||
public AudioSource SFXPlayer;
|
||||
public AudioResource reactionClipToPlay;
|
||||
public AudioResource flashSFXClipToPlay;
|
||||
|
||||
public BirdGameStats birdGameStats;
|
||||
public AudioResource[] birdCounterClip;
|
||||
private int _birdCounter;
|
||||
|
||||
|
||||
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void Start()
|
||||
{
|
||||
_eventSource = VOPlayer.RequestEventHandlers();
|
||||
_eventSource.AudioStopped += PlayBirdCounter;
|
||||
|
||||
}
|
||||
|
||||
public void PlayPhotoSoundBite()
|
||||
{
|
||||
VOPlayer.resource = reactionClipToPlay;
|
||||
VOPlayer.Play();
|
||||
}
|
||||
|
||||
public void PlayFlashSound()
|
||||
{
|
||||
SFXPlayer.resource = flashSFXClipToPlay;
|
||||
SFXPlayer.Play();
|
||||
}
|
||||
|
||||
private void PlayBirdCounter(object sender, EventArgs e)
|
||||
{
|
||||
VOPlayer.resource = birdCounterClip[birdGameStats.birdsFoundInLevel];
|
||||
VOPlayer.Play();
|
||||
birdGameStats.BirdFound();
|
||||
_eventSource.AudioStopped -= PlayBirdCounter;
|
||||
}
|
||||
|
||||
public void OnDisable()
|
||||
{
|
||||
// Unsubscribe from events when disabled
|
||||
_eventSource.AudioStopped -= PlayBirdCounter;
|
||||
}
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: edc43a9f07fedb44abb68b06c71d17ea
|
||||
@@ -1,62 +0,0 @@
|
||||
using AudioSourceEvents;
|
||||
using System;
|
||||
using System.Diagnostics.Tracing;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Audio;
|
||||
|
||||
public class GardenerAudioController : MonoBehaviour
|
||||
{
|
||||
|
||||
public AudioSource gardenerAudioPlayer;
|
||||
public AudioSource mowerAudioPlayer;
|
||||
public AudioResource mowerStartAudio;
|
||||
public AudioResource mowerLoopAudio;
|
||||
public AudioResource gardenerFleeAudioClip;
|
||||
public AudioResource gardenerChaseAudioClip;
|
||||
|
||||
public SpriteRenderer gardenerSprite;
|
||||
|
||||
private IAudioEventSource _eventSource;
|
||||
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void Start()
|
||||
{
|
||||
}
|
||||
|
||||
void GardenerIsOnScreen()
|
||||
{
|
||||
Debug.Log("Gardener spotted!");
|
||||
}
|
||||
|
||||
public void StartMowerSound()
|
||||
{
|
||||
mowerAudioPlayer.Play();
|
||||
_eventSource = mowerAudioPlayer.RequestEventHandlers();
|
||||
_eventSource.AudioStopped += PlayMowerLoop;
|
||||
|
||||
}
|
||||
|
||||
private void PlayMowerLoop(object sender, EventArgs e)
|
||||
{
|
||||
_eventSource.AudioStopped -= PlayMowerLoop;
|
||||
mowerAudioPlayer.resource = mowerLoopAudio;
|
||||
mowerAudioPlayer.loop = true;
|
||||
mowerAudioPlayer.Play();
|
||||
}
|
||||
|
||||
public void PlayGardenerVOClip(bool fleeing)
|
||||
{
|
||||
if (gardenerAudioPlayer.isPlaying) { return; }
|
||||
if (fleeing) {
|
||||
gardenerAudioPlayer.resource = gardenerFleeAudioClip;
|
||||
gardenerAudioPlayer.Play();
|
||||
}
|
||||
if (!fleeing)
|
||||
{
|
||||
gardenerAudioPlayer.resource = gardenerChaseAudioClip;
|
||||
gardenerAudioPlayer.Play();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f0f1834ce0c7b0b42b633a6d2bd67698
|
||||
@@ -1,21 +0,0 @@
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
|
||||
|
||||
public class GardenerVisibilityDetection : MonoBehaviour
|
||||
{
|
||||
public GardenerAudioController gardenerAudioController;
|
||||
private Animator _animator;
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void Start()
|
||||
{
|
||||
_animator = GetComponent<Animator>();
|
||||
}
|
||||
|
||||
private void OnBecameVisible()
|
||||
{
|
||||
gardenerAudioController.PlayGardenerVOClip(_animator.GetBool("IsScared?"));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 52a39ff5639315a499266196941d6894
|
||||
@@ -2,23 +2,17 @@ using Input;
|
||||
using Pixelplacement;
|
||||
using System.Collections;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Audio;
|
||||
using UnityEngine.Events;
|
||||
using static Input.PlayerTouchController;
|
||||
using System;
|
||||
|
||||
|
||||
public class TakePhotoState : State
|
||||
{
|
||||
|
||||
public Transform playerTargetObject;
|
||||
private GameObject playerCharacter;
|
||||
private PlayerTouchController playerTouchController;
|
||||
private Vector3 newPlayerPosition;
|
||||
|
||||
public UnityEvent animFlash;
|
||||
public UnityEvent animStart;
|
||||
|
||||
|
||||
void OnEnable()
|
||||
{
|
||||
playerCharacter = GameObject.FindWithTag("Player");
|
||||
@@ -29,7 +23,6 @@ public class TakePhotoState : State
|
||||
playerTouchController.InterruptMoveTo();
|
||||
playerTouchController.MoveToAndNotify(newPlayerPosition);
|
||||
InputManager.Instance.SetInputMode(InputMode.InputDisabled);
|
||||
|
||||
}
|
||||
|
||||
// When the player has arrived at the bush do Animator.SetTrigger(Takephoto) and whatevs
|
||||
@@ -45,22 +38,4 @@ public class TakePhotoState : State
|
||||
GetComponent<Animator>().SetTrigger("TakePhoto");
|
||||
playerTouchController.OnArrivedAtTarget -= PlayerHasArrived;
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
playerTouchController.OnArrivedAtTarget -= PlayerHasArrived;
|
||||
|
||||
}
|
||||
|
||||
public void AnimStarted()
|
||||
{
|
||||
animStart.Invoke();
|
||||
}
|
||||
|
||||
public void Flash()
|
||||
{
|
||||
animFlash.Invoke();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,134 +1,5 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1142003717250661430
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1817619063130555080}
|
||||
- component: {fileID: 2652043308892028149}
|
||||
m_Layer: 0
|
||||
m_Name: LakeAmbience
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1817619063130555080
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1142003717250661430}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 74.849236, y: 50.012436, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2873907538289469479}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!82 &2652043308892028149
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1142003717250661430}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: -1208528772216134639, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_Resource: {fileID: 8300000, guid: f932b21fb17be8143ae37a3fa9d80fef, type: 3}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 0.193
|
||||
m_Pitch: 1
|
||||
Loop: 1
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 15.012131
|
||||
MaxDistance: 15.012132
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &5928208945904495084
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -176,7 +47,7 @@ AudioSource:
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
@@ -291,7 +162,6 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 2279651898552875333}
|
||||
- {fileID: 4121215864022656322}
|
||||
- {fileID: 1817619063130555080}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &8545106365577783398
|
||||
@@ -308,6 +178,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: '::'
|
||||
narratorAudioSource: {fileID: 9091997474527205907}
|
||||
firstNarration: {fileID: 8300000, guid: d0a13dd948bacda48be267eec3e0b080, type: 3}
|
||||
anneLiseExposition: {fileID: 0}
|
||||
narrationFinished:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2a75c1b14d7422744b5db564d48f8651
|
||||
guid: 423ebef95a1a80540a39e097c4a2c206
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
Binary file not shown.
@@ -1,23 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9c89c1eb718dd4a4d8b9f14ff8f480ee
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 8
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,23 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2ac461fcc3f7a014ca716a4f231be004
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 8
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,23 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 517c366dd13248241a3002396084594d
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 8
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,23 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d28a7eebafdc6064ba95bde0f6056d56
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 8
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,23 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 082fcd5bdadf2884e9aefc6abf4a5cc5
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 8
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,23 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f932b21fb17be8143ae37a3fa9d80fef
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 8
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,71 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1233149941 &5888169292782101467
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: 1bird_{5888169292782101467}
|
||||
m_AudioClip: {fileID: 8300000, guid: 2446033223f0de14bab42a40b36a5e1a, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1307931743 &6418180475301049370
|
||||
AudioRandomContainer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: birdCounterAudio
|
||||
m_Volume: 0
|
||||
m_Pitch: 0
|
||||
m_AutomaticTriggerTime: 0
|
||||
m_LoopCount: 1
|
||||
m_VolumeRandomizationRange: {x: 0, y: 0}
|
||||
m_PitchRandomizationRange: {x: 0, y: 0}
|
||||
m_AutomaticTriggerTimeRandomizationRange: {x: 0, y: 0}
|
||||
m_LoopCountRandomizationRange: {x: 0, y: 0}
|
||||
m_Elements:
|
||||
- {fileID: 8031590168900661445}
|
||||
- {fileID: 7046197025720374664}
|
||||
- {fileID: 5888169292782101467}
|
||||
- {fileID: 6961595029314351120}
|
||||
m_AvoidRepeatingLast: 0
|
||||
m_PlaybackMode: 0
|
||||
m_TriggerMode: 0
|
||||
m_AutomaticTriggerMode: 1
|
||||
m_LoopMode: 2
|
||||
m_VolumeRandomizationEnabled: 0
|
||||
m_PitchRandomizationEnabled: 0
|
||||
m_AutomaticTriggerTimeRandomizationEnabled: 0
|
||||
m_LoopCountRandomizationEnabled: 0
|
||||
--- !u!1233149941 &6961595029314351120
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: 0bird_{6961595029314351120}
|
||||
m_AudioClip: {fileID: 8300000, guid: 1803dc83ad49a6543882628a46d5701a, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1233149941 &7046197025720374664
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: 2birds_{7046197025720374664}
|
||||
m_AudioClip: {fileID: 8300000, guid: 86dc2e8f9a1cf7440adccad824209334, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1233149941 &8031590168900661445
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: 3birds_{8031590168900661445}
|
||||
m_AudioClip: {fileID: 8300000, guid: 60d02b75b267d5949a36f04bb5dfe409, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 02ff958a82d9cc6478783a0e7cd3b2b1
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 6418180475301049370
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,82 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1233149941 &-5309023858716468127
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: traf_no1_{-5309023858716468127}
|
||||
m_AudioClip: {fileID: 8300000, guid: 7daf361da397d6d44b698ee4fe5b112f, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1233149941 &-5074051279880114189
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: traf_no2_{-5074051279880114189}
|
||||
m_AudioClip: {fileID: 8300000, guid: 6ea2c1d043d029241ba2bf976817eff8, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1233149941 &-4817933010465290265
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: negative1_{-4817933010465290265}
|
||||
m_AudioClip: {fileID: 8300000, guid: 9cd155aba23b8ca4394ea3ecec4a0792, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1233149941 &-569638598327121888
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: traf_no3_{-569638598327121888}
|
||||
m_AudioClip: {fileID: 8300000, guid: c93ed6144e2ade6478c61d76a6d0b195, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1307931743 &6418180475301049370
|
||||
AudioRandomContainer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: birdNo
|
||||
m_Volume: 0
|
||||
m_Pitch: 0
|
||||
m_AutomaticTriggerTime: 0
|
||||
m_LoopCount: 1
|
||||
m_VolumeRandomizationRange: {x: 0, y: 0}
|
||||
m_PitchRandomizationRange: {x: 0, y: 0}
|
||||
m_AutomaticTriggerTimeRandomizationRange: {x: 0, y: 0}
|
||||
m_LoopCountRandomizationRange: {x: 0, y: 0}
|
||||
m_Elements:
|
||||
- {fileID: -4817933010465290265}
|
||||
- {fileID: 9143116294945548828}
|
||||
- {fileID: -5309023858716468127}
|
||||
- {fileID: -5074051279880114189}
|
||||
- {fileID: -569638598327121888}
|
||||
m_AvoidRepeatingLast: 2
|
||||
m_PlaybackMode: 2
|
||||
m_TriggerMode: 0
|
||||
m_AutomaticTriggerMode: 1
|
||||
m_LoopMode: 2
|
||||
m_VolumeRandomizationEnabled: 0
|
||||
m_PitchRandomizationEnabled: 0
|
||||
m_AutomaticTriggerTimeRandomizationEnabled: 0
|
||||
m_LoopCountRandomizationEnabled: 0
|
||||
--- !u!1233149941 &9143116294945548828
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: negative2_{9143116294945548828}
|
||||
m_AudioClip: {fileID: 8300000, guid: 69b3ae7103725d843b45b91cd31c0a4a, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b9e6fbf22e15c7f49b1c2832d8d2745c
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 6418180475301049370
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,23 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e479d4c09170f7c4998db6919a1900ef
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 8
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,71 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1233149941 &-6300757241535428918
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Gotcha4_{-6300757241535428918}
|
||||
m_AudioClip: {fileID: 8300000, guid: 3eaabdc2b752b7749abe43bfeb9a76b2, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1233149941 &-6130579406768192317
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Gotcha3_{-6130579406768192317}
|
||||
m_AudioClip: {fileID: 8300000, guid: 2b0efcb56ff88244faf00f7af02d55fc, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1233149941 &-2401993488800243936
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Gotcha2_{-2401993488800243936}
|
||||
m_AudioClip: {fileID: 8300000, guid: 221a0aefd729ae94588acfb9b337e7cf, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1307931743 &6418180475301049370
|
||||
AudioRandomContainer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: gardener_chase
|
||||
m_Volume: 0
|
||||
m_Pitch: 0
|
||||
m_AutomaticTriggerTime: 4
|
||||
m_LoopCount: 1
|
||||
m_VolumeRandomizationRange: {x: 0, y: 0}
|
||||
m_PitchRandomizationRange: {x: 0, y: 0}
|
||||
m_AutomaticTriggerTimeRandomizationRange: {x: 0, y: 4}
|
||||
m_LoopCountRandomizationRange: {x: 0, y: 0}
|
||||
m_Elements:
|
||||
- {fileID: 7674516443378238336}
|
||||
- {fileID: -2401993488800243936}
|
||||
- {fileID: -6130579406768192317}
|
||||
- {fileID: -6300757241535428918}
|
||||
m_AvoidRepeatingLast: 2
|
||||
m_PlaybackMode: 2
|
||||
m_TriggerMode: 0
|
||||
m_AutomaticTriggerMode: 1
|
||||
m_LoopMode: 0
|
||||
m_VolumeRandomizationEnabled: 0
|
||||
m_PitchRandomizationEnabled: 0
|
||||
m_AutomaticTriggerTimeRandomizationEnabled: 0
|
||||
m_LoopCountRandomizationEnabled: 0
|
||||
--- !u!1233149941 &7674516443378238336
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Gotcha1_{7674516443378238336}
|
||||
m_AudioClip: {fileID: 8300000, guid: ceba6c129ddad3e42be967ca02d8a2bd, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 97ccaa2fcf396f446aa7fde8586d225a
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 6418180475301049370
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,82 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1233149941 &-9006445417435446222
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Ohno3_{-9006445417435446222}
|
||||
m_AudioClip: {fileID: 8300000, guid: e82ce780c4bb0f749974b62cb30c471b, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1233149941 &-3577357751735622808
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Ohno2_{-3577357751735622808}
|
||||
m_AudioClip: {fileID: 8300000, guid: 1f8c0cce139cfdf42adc6676ea43b66d, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1233149941 &-2397706616386917472
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Longscream_{-2397706616386917472}
|
||||
m_AudioClip: {fileID: 8300000, guid: af2f268ef07101049ad6268eb7c94b0d, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1233149941 &3731748606425802519
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Ohno1_{3731748606425802519}
|
||||
m_AudioClip: {fileID: 8300000, guid: aaa2a2b734528d24c9994f0e5273ad1a, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1233149941 &5536817073655588610
|
||||
AudioContainerElement:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Ohno4_{5536817073655588610}
|
||||
m_AudioClip: {fileID: 8300000, guid: b7e96231be2f34a4d8f41357550117a4, type: 3}
|
||||
m_Volume: 0
|
||||
m_Enabled: 1
|
||||
--- !u!1307931743 &6418180475301049370
|
||||
AudioRandomContainer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: gardener_flee
|
||||
m_Volume: 0
|
||||
m_Pitch: 0
|
||||
m_AutomaticTriggerTime: 4
|
||||
m_LoopCount: 1
|
||||
m_VolumeRandomizationRange: {x: 0, y: 0}
|
||||
m_PitchRandomizationRange: {x: 0, y: 0}
|
||||
m_AutomaticTriggerTimeRandomizationRange: {x: 0, y: 0}
|
||||
m_LoopCountRandomizationRange: {x: 0, y: 0}
|
||||
m_Elements:
|
||||
- {fileID: -2397706616386917472}
|
||||
- {fileID: 3731748606425802519}
|
||||
- {fileID: -3577357751735622808}
|
||||
- {fileID: -9006445417435446222}
|
||||
- {fileID: 5536817073655588610}
|
||||
m_AvoidRepeatingLast: 2
|
||||
m_PlaybackMode: 2
|
||||
m_TriggerMode: 0
|
||||
m_AutomaticTriggerMode: 1
|
||||
m_LoopMode: 2
|
||||
m_VolumeRandomizationEnabled: 0
|
||||
m_PitchRandomizationEnabled: 0
|
||||
m_AutomaticTriggerTimeRandomizationEnabled: 0
|
||||
m_LoopCountRandomizationEnabled: 0
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4949348ce86bb9e43a4251c06c1cb5d1
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 6418180475301049370
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user