diff --git a/Assets/Scripts/Assembly-CSharp/Properties.meta b/Assets/Editor.meta similarity index 57% rename from Assets/Scripts/Assembly-CSharp/Properties.meta rename to Assets/Editor.meta index 71d1da11..60eecd71 100644 --- a/Assets/Scripts/Assembly-CSharp/Properties.meta +++ b/Assets/Editor.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 0ab42e016d1c1ae48a0bc2938df987f4 +guid: 196a32b5a66d86f4994f5517006e9d0f folderAsset: yes -timeCreated: 1749670530 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Editor/FullInspector-Editor.dll b/Assets/Editor/FullInspector-Editor.dll new file mode 100644 index 00000000..d84964b5 Binary files /dev/null and b/Assets/Editor/FullInspector-Editor.dll differ diff --git a/Assets/Editor/FullInspector-Editor.dll.meta b/Assets/Editor/FullInspector-Editor.dll.meta new file mode 100644 index 00000000..29982feb --- /dev/null +++ b/Assets/Editor/FullInspector-Editor.dll.meta @@ -0,0 +1,30 @@ +fileFormatVersion: 2 +guid: 1005e38d5b37b114a83640a41095cce5 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/FullInspector-Editor.xml b/Assets/Editor/FullInspector-Editor.xml new file mode 100644 index 00000000..2d7ac40c --- /dev/null +++ b/Assets/Editor/FullInspector-Editor.xml @@ -0,0 +1,2555 @@ + + + + FullInspector-Editor + + + + + A list of all types that have a CustomBehaviorEditorAttribute attribute. + + + + + Cached property editors. + + + + + If there are multiple user-defined property editors that report that they can edit a + specific type, we sort the applicability of the property editor based on how close it's + reported edited type is to the actual property type. This allows for, say, the + IListPropertyEditor to override the ICollectionPropertyEditor. + + + + + Returns a set of property editors that can be used to edit the given property type. + + + + + Returns a behavior editor that can be used to edit the given behavior type. + + The type of behavior to edit. This should derive from + BaseBehavior. + + + + Returns true if the given dataType matches the given behaviorType. If the dataType is + generic and the behaviorType is a generic definition, then the behaviorType will be + instantiated with the same generic arguments as dataType. + + + + + Creates a new instance of the given editorType. It is assumed that editorType extends + IBehaviorEditor. + + + + + Attempt to create a new IBehaviorEditor instance. + + The data type that is used for comparison with the behavior + editor. + The actual data type that that usedEditedType was derived + from. + The type of editor we are trying to create. + + + + + Attempts to create a behavior editor for the given edited data type from the given + editor type. + + The type that is being edited. + The editor type. + A behavior editor that can edit the given edited type. + + + + Allows an IPropertyEditor to be used as an attribute property editor. + + + + + The attribute type that activates this property editor. + + + + + If true, then this attribute property editor will replace other property editors beneath + it. + + + + + Construct a new attribute instance. + + The attribute type that activates this property + editor. + + + + Construct a new attribute instance. + + The attribute type that activates this property + editor. + If true, then this attribute property editor will replace + other property editors beneath it. + + + + Mark a type as a custom behavior editor. That editor needs to derive from + BehaviorEditor{TBehavior} and will be used as the editor for that behavior type. + + + + + The behavior type to edit. + + + + + True if this should editor should apply to derived types. Defaults to true. + + + + + An annotation that signals that a class is a property editor for a given property type. + + + If the property editor is editing a generic type, then PropertyType should just be an open + generic type reflecting the edited type. For example, for a List property editor, + PropertyType should be typeof(List{}) (where {} are angle brackets). + + + + + The type of property that this class is a property editor for. This can be either a + non-generic type or an open generic type (List{} is an open generic type, but List[int] + is not). + + + + + Should this editor type be used for inherited PropertyTypes? If Inherit is true, then + the first generic parameter of your property editor type will be automatically populated + with the derived type that the property editor is being used to edit. + + + + + Internal bool to prevent a warning emission if this property editor targets UnityObject + types. + + + + + Mark this type as an IPropertyEditor. It will be instantiated automatically. + + The type of property that this PropertyEditor is + editing. + + + + Mark this type as an IPropertyEditor. It will be instantiated automatically. + + The type of property that this PropertyEditor is + editing. + If true, then this PropertyEditor will also be used for types that + derive from propertyType. If true, then this also has implications on the generic + parameter list. See the documentation on the member variable for more + information. + + + + The default behavior editor is used whenever there is not a user-defined one that should be + used instead. + + + + + If you wish to just extend the default behavior editor by adding a section before/after it, you + can just extend this class and override the appropriate methods. + + + + + An editor that provides a good inspector experience for types which derive from + ISerializedObject. + + + + + This is accessed by the BaseBehaviorEditor (using reflection) to determine if the editor + should show the value for _serializedState. + + + + + Draws an open script button for the given object. + + + + + An IAttributePropertyEditor is identical to an IPropertyEditor, except that it also + contains an Attribute parameter. + + + + + The attribute that was used to create this editor. + + + + + A property editor is the core editing abstraction used within FI. This allows for + overriding of the default inspector logic for elements of a custom type. PropertyEditors + are extremely similar to Unity's PropertyDrawers, except that they support generics and + are fully type-safe. The AttributePropertyEditor is identical to the PropertyEditor, except + that it is activated when a user adds an attribute to a type. + + + Recall that to get FI to actually use the property editor, you need to add the + [CustomAttributePropertyEditor] attribute to the type with appropriate parameters. + + The element type that the editor will edit + + + + Notification that the inspector/editor is now active. + + + + + Notification that the inspector/editor is no longer active. + + + + + This method makes it easy to use a typical behavior editor as a GUILayout style method, + where the rect is taken care of. + + The editor that is being used. + The element that is being edited. + + + + Marks an object as a property editor. + + + This interface is split up into two parts, the core one that user's typically access, + IPropertyEditor, and one that implements the actual editing API, IPropertyEditorEditAPI. +
+ You almost certainly want to extend PropertyEditor{T} instead of this + interface. It provides an automatic implementation for all methods and gives type-safety to + your editor. +
+
+ + + The editing chain that this editor is within. This can be used to fetch the next editor + to use and the like. + + + + + Can the editor edit the given type? + + + + + An optional annotation for a property editor to specify its default foldout state. + + + + + The default foldout state for the property editor. If set to false, then the editor + will be collapsed immediately. + + + + + A property editor is the core editing abstraction used within FI. This allows for overriding + of the default inspector logic for elements of a custom type. PropertyEditors are extremely + similar to Unity's PropertyDrawers, except that they support generics and are fully + type-safe. + + + Recall that to get FI to actually use the property editor, you need to add the + [CustomPropertyEditor] attribute to the type with appropriate parameters. + + The element type that the editor will edit + + + + This is the core editing API that property editors use. We split the editing API and the + IPropertyEditor interfaces into two as we define extension methods on IPropertyEditor that + allows FI to run arbitrary code before/after the actual edit method executes. + + + + + Display a Unity inspector GUI that provides an editing interface for the given object. + + The rect on the screen to draw the GUI controls. + The label to label the controls with. + The element itself to edit. This can be mutated directly. For + values which cannot be mutated, such as structs, the return value is used to update the + stored value. + An updated instance of the element. + + + + Returns the height of the region that needs editing. + + The label that will be used when editing. + The element that will be edited. + The height of the region that needs editing. + + + + Returns a header that should be used for the foldout. An item is displayed within a + foldout when this property editor reaches a certain height. + + The current foldout label. + The current object element. + An updated label. + + + + Draw an optional scene GUI. + + The object instance to edit using the scene GUI. + An updated object instance. + + + + Does this editor display a standard label that can instead be rendered with EditorGUI.Foldout? + + + + + The cached height metadata is used to optimize CPU/execution time for some memory so that + we don't have to recompute heights multiple times over. In essence, if we call + GetElementHeight from Edit, then GetElementHeight will short-circuit and just return a + cached height. + + + + + We store the current + + + + + The current method that we are invoking. + + + + + Helper method to fetch the editing API for an IPropertyEditor. + + + + + Display a Unity inspector GUI that provides an editing interface for the given object. + + The rect on the screen to draw the GUI controls. + The label to label the controls with. + The element itself to edit. This can be mutated directly. For + values which cannot be mutated, such as structs, the return value is used to update the + stored value. + An updated instance of the element. + + + + Fetches the dropdown metadata instance that should be used. This performs any necessary initialization. + + + + + Returns the height of the region that needs editing. + + The label that will be used when editing. + The element that will be edited. + The height of the region that needs editing. + + + + Returns a header that should be used for the foldout. An item is displayed within a + foldout when this property editor reaches a certain height. + + The current foldout label. + The current object element. + An updated label. + + + + Draw an optional scene GUI. + + The object instance to edit using the scene GUI. + An updated object instance. + + + + This method makes it easy to use a typical property editor as a GUILayout style method, + where the rect is taken care of. + + The editor that is being used. + The label to edit the region with. + The element that is being edited. + + + + Detects when Unity is recompiling code. Before a recompile happens, all state is saved and + after the recompilation is finished all state is restored. + + + + + True if we have detected a compile but have already saved. This is set to false by Unity + after a compilation has finished. + + + + + True if everything has been restored. This is set to false by Unity after a compilation + / reload has occurred. + + + + + Detects when the editor has entered or left play mode or has paused. + + + This class is currently disabled / not used, but it remains here because the code is tricky + to get right and may be useful in the future. + + + + + A transition that the editor can go through. + + + + + The editor is about to enter play mode but has yet to go through Unity + serialization. + + + + + The editor is about to enter play mode and has just gone through Unity + serialization. + + + + + The editor is leaving play mode and has just gone through Unity serialization. + + + + + The editor is about to enter pause mode + + + + + The editor is about to leave pause mode + + + + + The last playing state + + + + + The last paused state + + + + + This function is called when the editor is undergoing a play mode related transition. + + + + + This processor saves the state of any unsaved BaseBehavior instances when the scene has been + saved. This type isn't necessary as the BaseBehaviorEditor manages saving everything, but it + provides some extra data protection. + + + + + Manages the discovery of PropertyEditor class instances. + + + + + The type of the edited object. + + + + + The attributes associated with the edited type. + + + + + A list of all types that have a CustomPropertyEditorAttribute attribute. + + + + + Cached property editors. + + + + + If there are multiple user-defined property editors that report that they can edit a + specific type, we sort the applicability of the property editor based on how close it's + reported edited type is to the actual property type. This allows for, say, the + IListPropertyEditor to override the ICollectionPropertyEditor. + + + + + Returns a set of property editors that can be used to edit the given property type. + + + + + Returns a PropertyEditorChain that can edit the given type. The PropertyEditorChain will + contain all of the IPropertyEditor instances which reported that they could edit the + given type (with the associated set of attributes). To get an actual property editor, + use chain.FirstEditor or a similar method. + + The type of property/field that is being edited. + Provides attributes that may override the default + property editor. This parameter can safely be set to null. + A property editor chain composed of property editors which can edit the given + property type. + + + + In Full Inspector, there are typically a large number of property editors that can be used + for each type, for example, a user defined editor, then the abstract editor, then the + reflected editor. PropertyEditorChain encapsulates this idea and makes it easy to retrieve + the next editor that will be used. + + + + + The editing chain. The most applicable editor is at index 0 (followed by the next most + applicable at index 1, ...). + + + + + Adds an editor to the end of this chain. + + + + + Returns true if there is another editor after the given one. + + + + + Returns the next editor that will be used, or null if the given editor is either the + last one or was not found in the chain. + + The editor that is currently being used. + The next editor, or null if there is no next one. + + + + Returns the first property editor in this chain that is not an instance of any of the + given types. + + + + + Returns the first property editor in this chain. + + + + + Returns true if the given dataType matches the given propertyType. If the dataType is + generic and the propertyType is a generic definition, then the propertyType will be + instantiated with the same generic arguments as dataType. + + + + + Creates a new instance of the given editorType. It is assumed that editorType extends + IPropertyEditor. + + + + + Attempt to create a new IPropertyEditor instance. + + The data type that is used for comparison with the property + editor. + The actual data type that that usedEditedType was derived + from. + The type of editor we are trying to create. + + + + + Attempts to create a property editor for the given edited data type from the given + editor type. + + The type that is being edited. + The editor type. + The attributes that were specified for the type. + Should inheritance behavior be forced? The expected value is false. + A property editor that can edit the given edited type. + + + + We only animate the abstract type height when we have changed types ourselves. If we + always animate when a height change occurs and the inside is also animating, then we + will create an "animation lag" which looks awful. + + + + + Provides a property editor for types which cannot be instantiated directly and require the + user to select a specific instance to instantiate. + + + + + A map of attribute type to the IPropertyEditor type that is associated with that + attribute (via the CustomAttributePropertyEditorAttribute annotation). + + + + + A map of attribute type to if that property editor should replace all other editors + after it. + + + + + Provides a property editor for enums. + + + + + A property editor for nullable types. + + + + + The general property editor that takes over when there is no specific override. This uses + reflection to discover what values to edit. + + + + + The maximum depth that the reflected editor will go to for automatic object reference + instantiation. Beyond this depth, the user will have the manually instantiate + references. We have a depth limit so that we don't end up in an infinite object + construction cycle. + + + + + This returns true if automatic instantiation should be enabled. Automatic instantiation + gets disabled after the reflected editor has gone a x calls deep into itself in an + attempt to prevent infinite recursion. + + + + + How tall buttons should be. + + + + + How tall the label element should be. + + + + + How much space is between each element. + + + + + The height of the category toolbar. + + + + + Returns true if the given GUIContent element contains any content. + + + + + Draws a label at the given region. Returns an indented rectangle that can be used for + drawing properties directly under the label. + + + + + A helper method that draws the inspector for a field/property at the given location. + + + + + A helper method that draws a button at the given region. + + + + + Draws the actual property editors. + + + + + Manages the options that are displayed to the user in the instance selection drop-down. + + + + + Setup the instance option manager for the given type. + + + + + Returns an array of options that should be displayed. + + + + + Remove any options from the set of display options that are not permanently visible. + + + + + Returns the index of the option that should be displayed (from GetDisplayOptions()) + based on the current object instance. + + + + + Changes the instance of the given object, if necessary. + + + + + This class assists with cycle detection in an object graph. + + + + + Factory we use for allocation HashSets (to minimize GC pressure). + + + + + Cycle detectors that we are depending on / derived from. + + + + + The objects we have encountered so far. + + + + + The recursion depth level that we're at. + + + + + The current recursion / nesting depth. + + + + + Increase the recursion / nesting depth. + + + + + Decrease the recursion / nesting depth. + + + + + Tries to mark an object. Returns false if the object is already in the cycle detector, + ie, it has already been encountered (which implies that it's part of a cycle). + + + + + Returns true if the object is in the cycle detector, ie, the object is part of a cycle. + + + + + An editor that is displayed while we are generating the PropertyDrawer bindings. + + + + + The current version string. + + + + + Full Inspector will effectively force the user to do a clean import if any of the following types are found in + the assembly. + + + + + A wrapper around AnimFloat that makes it easier to use. + + + + + Update the height of the editor. + + The new height. + Should animation be allowed? Sometimes animation is not + desired if a sub-item is animation. If this item animations when a sub-item is + animating, then there will be visible UX jerk. + If true, then a transition is occurring and the animation is rendering. + + + + Returns true if animation is occurring. + + + + + The current height of the animation. + + + + + Draws a normal EditorGUI.ObjectField, except it includes the component type. + + + + + Draws a button with a label in front of the button. + + + + + Draws a button with a label in front of the button. + + + + + Draws an editor for the given control at the given rect. + + The rect to draw the editor within. + The label for the edited control. + The element to edit. + The metadata to use when editing. + The actual control that will be used for the editor. + The updated element instance. + + + + Draws an editor for the given control at the given rect. + + The element to edit. + The label for the edited control. + The metadata to use when editing. + The actual control that will be used for the editor. + The height that is needed to fully display this control. + + + + Draws a GUI for editing the given property and returns the updated value. This does + *not* write the updated value to a container. + + + + + Draws a GUI for editing the given property and returns the updated value. This does + *not* write the updated value to a container. + + An optional context that the property value came from. If this is not given, then a prefab context menu will not be displayable. + + + + This class is used to cache results for some expensive fiEditorUtility method calls. + + + + + Returns the paths of all .scene files in the Unity project. + + + + + Find all prefabs of a given type, regardless of location. + + The type of object to fetch + Please note that this method can return UnityObject instances that have been deleted. + + + + Find all assets of a given type, regardless of location. + + The (ScriptableObject derived) type of object to fetch + Please note that this method can return UnityObject instances that have been deleted. + + + + This will sent a repaint request to every active editor. + + + + + Add to this list if the editor should be repainted upon a general repaint request. + + + + + If enabled, then the inspector should be constantly redrawn. This is used to work around + some rendering issues within Unity. + + + + + Attempts to fetch a MonoScript that is associated with the given obj. + + The object to fetch the script for. + The script, if found. + True if there was a script, false otherwise. + + + + Returns true if the given obj has a MonoScript associated with it. + + + + + Returns an associated object for another object. + + + + + A mapping from the objects that contain metadata to their metadata. + + + + + Returns true if there is metadata for the given item. + + + + + Sets the metadata instance for the given item and type. + + + + + Fetch a metadata instance for the given item. + + + + + Utility functions for working with prefab overrides. + + + + + Returns true if the period separate property path contains the given property name. + + + + + Attempts to extract the name of serialized key for the given property modification. + + The object that that modification is applied to. + The modification. + An output parameter containing the name of the key that the + modification maps to. + True if the key was found, false otherwise. + + + + Reverts the given property on the instance to the prefab value. + + The prefab instance to revert the value on. + The property to revert. + + + + Returns true if the given property on the given object instance has a prefab override. + + The object instance. + The property to check. + True if the property is prefab override, false otherwise. + + Currently, this method only works for MonoBehavior targets. + + + + + A cache of all types that derive the key type in the AppDomain. The cache is + automatically destroyed upon assembly loads. + + + + + Returns all types that derive from the base type. This includes generic type + definitions, which when returned will have appropriate constructor values injected. + + The base parent type. + + + + A candidate type that can potentially be used as a generic parameter argument. + + + + + The actual type that will be the generic parameter. + + + + + The name of the generic parameter that this type came from. + + + + + Helper method to return the index of the Type in the array that has the given Name (or + - 1 if the item is not in the array). + + + + + Orders the given types parameter array so that the order most closely matches the given + genericArguments array + + The types that have been collected as potential candidates + for generic parameter arguments + The type that we are going to use the candidateTypes for + constructing a closed generic type on + An array of types that can (hopefully) be used to construct a closed generic + type from the given openGenericType. + + + + Attempts to create an instance of openGenericType such that it is can be assigned to + baseType. + + An open generic type that derives baseType + A generic type with fully populated type parameters. + Just baseType.GetGenericTypeDefinition() + Just baseType.GetGenericArguments() + If this function returns true, then this value is set to + the created type that is assignable to baseType and an instance of + openGenericType. + True if a type was constructed, false otherwise. + + + + Searches for a particular implementation of the given parent type inside of the type. + This is particularly useful if the interface type is an open type, ie, typeof(IFace{}), + because this method will then return IFace{} but with appropriate type parameters + inserted. + + The base type to search for interface + The parent type to search for. Can be an open generic + type. + The actual interface type that the type contains, or null if there is no + implementation of the given interfaceType on type. + + + + Tries to fetch the given CSharpName of the given object type, or null if the object is + null. + + + + + Returns the value of a boolean, field, or property. + + + + + A few APIs to forcibly call SaveState and RestoreState on every type + that implements ISerializedObject. + + + + + Forcibly save the state of all objects which derive from ISerializedObject. + ISerializedObject saving is managed automatically when you use the editor (and can be + customized in fiSettings). + + + + + Forcibly restore the state of all objects which derive from ISerializedObject. + + + + + This will clean all of the FI data from the scene. + + + + + Returns the object that this serialized property is currently storing. + + + + + This class contains methods that do not use public Unity API. These are subject to + break/change per update. + + + + + Attempts to enable/disable the bold font that is used by Unity when an object has a + value different from its prefab. + + True if the bold font is set, false if it is not. + + + + Helper to write the C# file containing the selected serializer information. + + + + + Contains editing logic common to the backup window and the inline backup viewer. + + + + + The backup editor window. + + + + + The central API that end-users might be interested in. Provides key functions such as + creating a new backup and restoring an old one. + + + + + Returns all backups for the given object. + + + + + Creates a new backup of the given component. Only guaranteed to work for types that + derive from CommonBaseBehavior, but there is a good chance it'll work for most/all + types derived from Component. + + + + + Helper function that just ignores a few FI internal types for serialization since the + backup solution serializes all inspected properties, not just those that are serialized + + + + + Restores a backup that was previously created. + + + + + Creates a serialized object from the given component. + + + + + Manages backups stored in prefab storage container. The prefab container stores backups + when Unity is in play-mode and when the backup target does not live in the scene (an + example would be a backup targeting another prefab). + + + + + Manages the backup storage that lives in the scene. + + + + + This class provides a unified API for accessing backups across scene and prefab storage. + + + + + Returns the storage component that is currently best suited for use. + + + + + Removes the given backup instance. + + + + + Removes backups that are no longer valid (their target got destroyed, etc). + + + + + Attempts to migrate prefab storage into scene storage. + + + + + Returns true if there is a backup for the given behavior. + + + + + Returns every serialized object. + + + + + Reorderable list adapter for arrays. + + + + + Reorderable list adapter for ICollection types + + + + + Returns the height of the given element. + + + + + Provides an editor for the given element. + + + + + Metadata we use for the callbacks. + + + + + Stores all of the elements + + + + + A cached version of the collection optimized for item lookup. + + + + + For performance reasons, the CollectionAdaptor stores an array version of the + collection. If the adapted collection has been structurally modified, for example, an + item has been added, then the local cache is invalid. Calling this method updates the + cache, which will restore proper adapter semantics. + + + + + Reorderable list adapter for generic list. + + + This adapter can be subclassed to add special logic to item height calculation. You + may want to implement a custom adapter class where specialized functionality is + needed. + + + + The list which can be reordered. + Callback to draw list item. + Height of list item in pixels. + + + + This is the base collection property editor with a set of extension points for the other + property editors. All Rotorz-style collection editors use this as the base editor. It + provides automatic support for paging. + + The actual type of the collection, ie, List{T}. This is used for instance creation. + The collection interface, ie, IList{T}, or List{T}. The property editor + selection logic will choose the most associated editor using this type. + The type of items stored inside of the collection, ie, {T} in List{T}. + The type of item that is added to a collection, ie, + TAddItem = {K} in TActual = Dictionary{K, V} where TItem = KeyValuePair{K, V} + + + + Fetch an adaptor for the collection. + + + + + Called after an edit cycle is done if the collection needs to be updated from the adaptor. + + + + + An item has been added to the collection. + + + + + Should the item added to the collection be customized *before* adding it? + + + + + Can we reorder elements inside of the collection? + + + + + Provides a relatively simple editor for IList{T} types that only views one element at a + time. This is useful if the list is massive, or perhaps to just reduce information overload + when editing. + + + + + Returns true if there is currently an item that is being edited. + + + + + Attempts to ensure that the current editing index is not out of range. However, if the + edited list is empty, then the index will always be out of range. + + + + + The metadata we store on each item that we edit so that we know what the active editing + item is. + + + + + Adaptor allowing reorderable list control to interface with list data. + + + + + Gets count of elements in list. + + + + + Determines whether an item can be reordered by dragging mouse. + + + This should be a light-weight method since it will be used to determine whether + grab handle should be included for each item in a reorderable list. Please + note that returning a value of false does not prevent movement on list item since + other draggable items can be moved around it. + + Zero-based index for list element. + A value of true if item can be dragged; otherwise /c>. + + + + Determines whether an item can be removed from list. + + + This should be a light-weight method since it will be used to determine whether + remove button should be included for each item in list. This is redundant + when is specified. + + Zero-based index for list element. + A value of true if item can be removed; otherwise /c>. + + + + Add new element at end of list. + + + + + Insert new element at specified index. + + Zero-based index for list element. + + + + Duplicate existing element. + + Zero-based index of list element. + + + + Remove element at specified index. + + Zero-based index of list element. + + + + Move element from source index to destination index. + + Zero-based index of source element. + Zero-based index of destination element. + + + + Clear all elements from list. + + + + + Draw interface for list element. + + Position in GUI. + Zero-based index of array element. + + + + Gets height of list item in pixels. + + Zero-based index of array element. + Measurement in pixels. + + + + Resources to assist with reorderable list control. + + + + + Resource assets for light skin. + + + Resource assets are PNG images which have been encoded using a base-64 string so + that actual asset files are not necessary. + + + + + Resource assets for dark skin. + + + Resource assets are PNG images which have been encoded using a base-64 string so + that actual asset files are not necessary. + + + + + Gets light or dark texture "add_button.png". + + + + + Gets light or dark texture "add_button_active.png". + + + + + Gets light or dark texture "container_background.png". + + + + + Gets light or dark texture "grab_handle.png". + + + + + Gets light or dark texture "remove_button.png". + + + + + Gets light or dark texture "remove_button_active.png". + + + + + Gets light or dark texture "title_background.png". + + + + + Generate special textures. + + + + + Create 1x1 pixel texture of specified color. + + Name for texture object. + Pixel color. + The new Texture2D instance. + + + + Read textures from base-64 encoded strings. Automatically selects assets based upon + whether the light or dark (pro) skin is active. + + + + + Read width and height if PNG file in pixels. + + PNG image data. + Width of image in pixels. + Height of image in pixels. + + + + Utility functions to assist with GUIs. + + + + + Gets visible rectangle within GUI. + + + VisibleRect = TopmostRect + scrollViewOffsets + + + + + Focus control and text editor where applicable. + + + + + Arguments which are passed to . + + + + + Gets adaptor to reorderable list container which contains element. + + + + + Gets zero-based index of item which was inserted. + + + + + Indicates if inserted item was duplicated from another item. + + + + + Initializes a new instance of . + + Reorderable list adaptor. + Zero-based index of item. + Indicates if inserted item was duplicated from another + item. + + + + An event handler which is invoked after new list item is inserted. + + Object which raised event. + Event arguments. + + + + Arguments which are passed to . + + + + + Gets adaptor to reorderable list container which contains element. + + + + + Gets zero-based index of item which was inserted. + + + + + Initializes a new instance of . + + Reorderable list adaptor. + Zero-based index of item. + + + + An event handler which is invoked before a list item is removed. + + + Item removal can be cancelled by setting to + true. + + Object which raised event. + Event arguments. + + + + Base class for custom reorderable list control. + + + + + Invoked to draw list item. + + + GUI controls must be positioned absolutely within the given rectangle since list + items must be sized consistently. + + + The following listing presents a text field for each list item: + wishlist = new + List(); + + private void OnGUI() { ReorderableListGUI.ListField(wishlist, DrawListItem); } + + private string DrawListItem(Rect position, string value) { // Text fields do not like + `null` values! if (value == null) value = ""; return EditorGUI.TextField(position, + value) ; } } ]]> ; + + function OnGUI() { ReorderableListGUI.ListField(wishlist, DrawListItem); } + + function DrawListItem(position:Rect, value:String):String { // Text fields do not like + `null` values! if (value == null) value = ''; return EditorGUI.TextField(position, + value) ; } } ]]> + + Type of item list. + Position of list item. + The list item. + The modified value. + + + + Invoked to draw content for empty list. + + + Callback should make use of GUILayout to present controls. + + + The following listing displays a label for empty list control: + _list; + + private void OnEnable() { _list = new List(); } private void OnGUI() { + ReorderableListGUI.ListField(_list, ReorderableListGUI.TextFieldItemDrawer, + DrawEmptyMessage) ; } + + private string DrawEmptyMessage() { GUILayout.Label("List is empty!", + EditorStyles.miniLabel); } } ]]> ; + + function OnEnable() { _list = new List.(); } function OnGUI() { + ReorderableListGUI.ListField(_list, ReorderableListGUI.TextFieldItemDrawer, + DrawEmptyMessage) ; } + + function DrawEmptyMessage() { GUILayout.Label('List is empty!', EditorStyles.miniLabel); + } } ]]> + + + + + Invoked to draw content for empty list with absolute positioning. + + Position of empty content. + + + + Background color of anchor list item. + + + + + Background color of target slot when dragging list item. + + + + + Style for right-aligned label for element number prefix. + + + + + Generate and draw control from state object. + + Reorderable list adaptor. + Delegate for drawing empty list. + Optional flags to pass into list field. + + + + Generate and draw control from state object. + + Position of control. + Reorderable list adaptor. + Delegate for drawing empty list. + Optional flags to pass into list field. + + + + Position of mouse upon anchoring item for drag. + + + + + Zero-based index of anchored list item. + + + + + Zero-based index of target list item for reordering. + + + + + Unique ID of list control which should be automatically focused. A value of zero + indicates that no control is to be focused. + + + + + Zero-based index of item which should be focused. + + + + + Zero-based index of list item which is currently being drawn. + + + + + Gets zero-based index of list item which is currently being drawn; or a value of -1 if + no item is currently being drawn. + + + Use instead. + + + + + Gets or sets flags which affect behavior of control. + + + + + Gets a value indicating whether add button is shown. + + + + + Gets a value indicating whether remove buttons are shown. + + + + + Occurs after list item is inserted or duplicated. + + + + + Raises event after list item is inserted or duplicated. + + Event arguments. + + + + Occurs before list item is removed and allows removal to be cancelled. + + + + + Raises event before list item is removed and provides oppertunity to cancel. + + Event arguments. + + + + Initializes a new instance of . + + + + + Initializes a new instance of . + + Optional flags which affect behavior of control. + + + + Unique Id of control. + + + + + Visible rectangle of control. + + + + + Width of index label in pixels (zero indicates no label). + + + + + Indicates whether item is currently being dragged within control. + + + + + Indicates if reordering is allowed. + + + + + Prepare initial state for list control. + + Unique ID of list control. + Reorderable list adaptor. + + + + Indicate that first control of list item should be automatically focused if possible. + + Unique ID of list control. + Zero-based index of list item. + + + + Draw add item button. + + Position of button. + Unique ID of list control. + Reorderable list adaptor. + + + + Draw remove button. + + Position of button. + Indicates if control is visible within GUI. + A value of true if clicked; otherwise /c>. + + + + Begin tracking drag and drop within list. + + Unique ID of list control. + Zero-based index of item which is going to be dragged. + + + + Stop tracking drag and drop. + + + + + Gets a value indicating whether item in current list is currently being tracked. + + Unique ID of list control. + A value of true if item is being tracked; otherwise /c>. + + + + Accept reordering. + + Reorderable list adaptor. + + + + Draw list container and items. + + Position of list control in GUI. + Unique ID of list control. + Reorderable list adaptor. + + + + Checks to see if list control needs to be automatically focused. + + Unique ID of list control. + + + + Draw additional controls below list control and highlight drop target. + + Position of list control in GUI. + Unique ID of list control. + Reorderable list adaptor. + + + + Cache of container heights mapped by control ID. + + + + + Do layout version of list field. + + Unique ID of list control. + Reorderable list adaptor. + Position of list container area in GUI (excludes footer area). + + + + Draw content for empty list (layout version). + + Callback to draw empty content. + Position of list container area in GUI (excludes footer area). + + + + Draw content for empty list (layout version). + + Position of list control in GUI. + Callback to draw empty content. + + + + Correct if for some reason one or more styles are missing! + + + + + Draw layout version of list control. + + Unique ID of list control. + Reorderable list adaptor. + Delegate for drawing empty list. + + + + + + + + + + Draw list control with absolute positioning. + + Position of list control in GUI. + Unique ID of list control. + Reorderable list adaptor. + Delegate for drawing empty list. + + + + Draw list control with absolute positioning. + + Position of list control in GUI. + Reorderable list adaptor. + Delegate for drawing empty list. + + + + + + + Content for "Move to Top" command. + + + + + Content for "Move to Bottom" command. + + + + + Content for "Insert Above" command. + + + + + Content for "Insert Below" command. + + + + + Content for "Duplicate" command. + + + + + Content for "Remove" command. + + + + + Content for "Clear All" command. + + + + + Default functionality to handle context command. + + + Can be used when adding custom items to the context menu: + + + + + + Invoked to generate context menu for list item. + + Menu which can be populated. + Zero-based index of item which was right-clicked. + Reorderable list adaptor. + + + + Invoked to handle context command. + + + It is important to set the value of GUI.changed to true if any + changes are made by command handler. Default command handling functionality + can be inherited: + + Name of command. This is the text shown in the context + menu. + Zero-based index of item which was right-clicked. + Reorderable list adaptor. + A value of true if command was known; otherwise /c>. + + + + Call to manually perform command. + + + Warning message is logged to console if attempted to execute unknown + command. + + Name of command. This is the text shown in the context + menu. + Zero-based index of item which was right-clicked. + Reorderable list adaptor. + A value of true if command was known; otherwise /c>. + + + + Call to manually perform command. + + + Warning message is logged to console if attempted to execute unknown + command. + + Content representing command. + Zero-based index of item which was right-clicked. + Reorderable list adaptor. + A value of true if command was known; otherwise /c>. + + + + Calculate height of list control in pixels. + + Reorderable list adaptor. + Required list height in pixels. + + + + Calculate height of list control in pixels. + + Count of items in list. + Fixed height of list item. + Required list height in pixels. + + + + Move item from source index to destination index. + + Reorderable list adaptor. + Zero-based index of source item. + Zero-based index of destination index. + + + + Add item at end of list and raises the event . + + Reorderable list adaptor. + + + + Insert item at specified index and raises the event . + + Reorderable list adaptor. + Zero-based index of item. + + + + Duplicate specified item and raises the event . + + Reorderable list adaptor. + Zero-based index of item. + + + + Remove specified item. + + + The event is raised prior to removing item and allows + removal to be cancelled. + + Reorderable list adaptor. + Zero-based index of item. + Returns a value of false if operation was cancelled. + + + + Remove all items from list. + + + The event is raised for each item prior to clearing + array and allows entire operation to be cancelled. + + Reorderable list adaptor. + Returns a value of false if operation was cancelled. + + + + Utility class for drawing reorderable lists. + + + + + Default list item height. + + + + + Gets or sets zero-based index of last item which was changed. A value of -1 indicates + that no item was changed by list. + + + This property should not be set when items are added or removed. + + + + + Gets zero-based index of list item which is currently being drawn; or a value of -1 if + no item is currently being drawn. + + + + + Gets the default list control implementation. + + + + + Gets default style for title header. + + + + + Gets default style for background of list control. + + + + + Gets default style for add item button. + + + + + Gets default style for remove item button. + + + + + Draw title control for list field. + + + When needed, should be shown immediately before list field. + + + + + Content for title control. + + + + Draw title control for list field. + + + When needed, should be shown immediately before list field. + + + + + Text for title control. + + + + Draw title control for list field with absolute positioning. + + Position of control. + Content for title control. + + + + Draw title control for list field with absolute positioning. + + Position of control. + Text for title control. + + + + Draw list field control for adapted collection. + + Reorderable list adaptor. + Callback to draw custom content for empty list + (optional). + Optional flags to pass into list field. + + + + Draw list field control for adapted collection. + + Position of control. + Reorderable list adaptor. + Callback to draw custom content for empty list + (optional). + Optional flags to pass into list field. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Calculate height of list field for adapted collection. + + Reorderable list adaptor. + Optional flags to pass into list field. + Required list height in pixels. + + + + + + + + + Provides an Edit field that uses a string so that types of varying bit width (greater than + 32 bits, which is what IntField/FloatField is limited to) can be represented properly in the + editor without losing data. + + + + + Edit the given type using a TextField. Convert.ChangeType will be used to convert the + given type T to and from a string. + + + + + Splits the given rect into two rects that are divided horizontally. + + The rect to split + The horizontal percentage that the rects are split at + How much space that should be between the two rects + The output left-hand side rect + The output right-hand side rect + + + + Is the foldout currently active, ie, is the rendered item being displayed or is the + short-form foldout being displayed? + + + + + What percentage are we at in the animation between active states? + + + + + Are we currently animating between different states? + + + + + Used to remove the generic arguments from ObjectPropertyEditor so that it can be used as a + "banned" argument for PropertyEditor.Get + + + + + Provides an ObjectField for every type which derives from Object. + + The actual type of the derived parameter + + + + Provides a route to read/write data inside of an object. That data can be + (recursively) stored within a field, property, or collection. + + + + + The data path stores the type of the object. + + + + + The data path accesses the given property. + + + + + The data path accesses an element inside of an IList instance + (including arrays). The list instance resides at |property|. + + + + + The data path accesses an element inside of an IDictionary instance. + The dictionary instance resides at |property|. + + + + + Special marker object used to notify Write to write the default/null value. + + + + + Returns true if the given object should be saved directly inside of + the state dictionary. + + + + + Read width and height of PNG file in pixels. + + + + + Manages the type selection drop-down for a facade. + + + + + Creates a new type manager. + + The base facade type. + + + + Finds the active display option index for the given type, or -1 if it isn't found. + + + + + The available types. This will always have at least one element. + + + + + A displayable variant of the type array. This will always have at least one element. + + + + + Returns the default value for the given type. Notably, this will return a zeroed out + value type if the type is a value type, not null. + + + + + Deserializes a property on the facade. + + + + + Serializes a property that will be stored on the facade. + + + + + Provides a nice interface for interacting with and managing scriptable object instances + + + + + The amount of space between the object selector and the method selection popup. + + + + + Amount of space after the method selection popup that will separate this element from + the next one. + + + + + Adaptor method to determine if the given method should be shown in the method dropdown. + + + + + Ensures that action is not null. + + + + + Splits the general region rect into the two object and popup rects. + + + + + Returns the methods that should be shown in the dropdown, and returns the active method + in that list. + + + + + Returns either the container type, or if the contaier is null, then typeof(UnityObject). + + + + + Changes the serialization data for the given GameObject. + + The UnityObject to migrate (either a ScriptableObject, GameObject, or Component). If it is a GameObject, then all child components will also be scanned. + The current serializer + The new serializer + + + + Returns all scene specific objects that use Full Inspector. + + + + + + Returns all persistent objects that use Full Inspector. + + + + + This is a utility class that wraps the UX that lets the user pick which UnityObjects they + want to process. + + + + + Generates derived types for SharedInstance{T}. + + + + The name of the file to emit. This should be the normalized class name. + The name of the class in the file, ie, class {className} {} + The value for the generic type, ie, class foo : parent{genericType} {} + The value for the serializer type, optional. It will also go in a generic type argument. + + + + Shows a new selection window for a SharedInstance type. + + The generic SharedInstance parameter; that actual instance type. + The generic SharedInstance type itself. + Method to invoke when a new SharedInstance has been selected. + + + + Returns a SharedInstance type that Unity can serialize for the given generic SharedInstance type. + This returns null if the type is not yet created. Create it with + SharedInstanceScriptGenerator.GenerateScript(instanceType); + + + + + The current scrolling position for the static inspector. + + + + + The type that we are currently viewing the statics for. Unfortunately, we have to store + this type as a string so that Unity can serialize it. It would be awesome to have FI + serialization on EditorWindows, but oh well :P. + + + + + This class enables a menu item that allows the developer to toggle between DLL or non-dll versions of Full Inspector. Toggling + is done by switching file extensions. + + + + + A standard tkControlPropertyEditor except with some more appropriate values popualted. + + + + + Derive from this class if you wish to write a custom property editor that is rendered + from a tkControl. + + You probably want to derive from tkControlPropertyEditor{TEdited} + + + + Helper class you can derive from to write a custom tk control for a behavior. This wraps + some of the boilerplate. + + +
+
diff --git a/Assets/Editor/FullInspector-Editor.xml.meta b/Assets/Editor/FullInspector-Editor.xml.meta new file mode 100644 index 00000000..ca1752ce --- /dev/null +++ b/Assets/Editor/FullInspector-Editor.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e0af0c076a7105542a32185a79178970 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FullInspector2.meta b/Assets/FullInspector2.meta new file mode 100644 index 00000000..b72d1bc3 --- /dev/null +++ b/Assets/FullInspector2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5c7472f8ca1e2a44b7c6d2df64b3a86 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FullInspector2_Generated.meta b/Assets/FullInspector2_Generated.meta new file mode 100644 index 00000000..9cf17d43 --- /dev/null +++ b/Assets/FullInspector2_Generated.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5259900d9f34a4c428eff55172b7d06a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FullInspector2_Generated/fiBackupStorage.prefab b/Assets/FullInspector2_Generated/fiBackupStorage.prefab new file mode 100644 index 00000000..db1203ad --- /dev/null +++ b/Assets/FullInspector2_Generated/fiBackupStorage.prefab @@ -0,0 +1,41 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1823553846448924} + m_IsPrefabParent: 1 +--- !u!1 &1823553846448924 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4817884475758202} + m_Layer: 0 + m_Name: fiBackupStorage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4817884475758202 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1823553846448924} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/FullInspector2_Generated/fiBackupStorage.prefab.meta b/Assets/FullInspector2_Generated/fiBackupStorage.prefab.meta new file mode 100644 index 00000000..17abb488 --- /dev/null +++ b/Assets/FullInspector2_Generated/fiBackupStorage.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 928203131fe337e4bb3a22637d41e514 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FullInspector2_Generated/fiPersistentEditorStorage.prefab b/Assets/FullInspector2_Generated/fiPersistentEditorStorage.prefab new file mode 100644 index 00000000..d7267c57 --- /dev/null +++ b/Assets/FullInspector2_Generated/fiPersistentEditorStorage.prefab @@ -0,0 +1,41 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1460865372375866} + m_IsPrefabParent: 1 +--- !u!1 &1460865372375866 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4583350002654790} + m_Layer: 0 + m_Name: fiPersistentEditorStorage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4583350002654790 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1460865372375866} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/FullInspector2_Generated/fiPersistentEditorStorage.prefab.meta b/Assets/FullInspector2_Generated/fiPersistentEditorStorage.prefab.meta new file mode 100644 index 00000000..eaae328c --- /dev/null +++ b/Assets/FullInspector2_Generated/fiPersistentEditorStorage.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b7a1efc000ff004f9450de38a0d28b6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Material/BG1.mat b/Assets/Material/BG1.mat index 4efb047b..97fa25e2 100644 --- a/Assets/Material/BG1.mat +++ b/Assets/Material/BG1.mat @@ -7,181 +7,74 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: BG1 - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 2000 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: c645ad565c4555e4cbb6564c3cc6d303, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 0.3 - - first: - name: _BrushScaleX - second: 1 - - first: - name: _BrushScaleY - second: 1 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionBloomFactor - second: 1 - - first: - name: _EmissionFactor - second: 0 - - first: - name: _EmissionFactorFromTexToggle - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _FadeDistance - second: 0.5 - - first: - name: _FadeOffset - second: 1 - - first: - name: _FogColorIntensity - second: 0.01 - - first: - name: _FogEffectLimit - second: 0.5 - - first: - name: _FogEffectStart - second: 0 - - first: - name: _FogIntensity - second: 0.01 - - first: - name: _FogStartDistance - second: 50 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _LightArea - second: 0.51 - - first: - name: _LightMapIntensity - second: 1 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Opaqueness - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _ReflectionEmissionAdjust - second: 1 - - first: - name: _SPIntensity - second: 0.5 - - first: - name: _SPNoiseScaler - second: 1 - - first: - name: _SPTransition - second: 0 - - first: - name: _SPTransitionBloomFactor - second: 1 - - first: - name: _SPTransitionEmissionScaler - second: 1 - - first: - name: _Scale - second: 0.01 - - first: - name: _Shininess - second: 10 - - first: - name: _SpecMulti - second: 0.1 - - first: - name: _SpecialState - second: 0 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _VertexAlphaFactor - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 0.3 + - _BrushScaleX: 1 + - _BrushScaleY: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionBloomFactor: 1 + - _EmissionFactor: 0 + - _EmissionFactorFromTexToggle: 0 + - _EmissionScaler: 1 + - _FadeDistance: 0.5 + - _FadeOffset: 1 + - _FogColorIntensity: 0.01 + - _FogEffectLimit: 0.5 + - _FogEffectStart: 0 + - _FogIntensity: 0.01 + - _FogStartDistance: 50 + - _Glossiness: 0.5 + - _LightArea: 0.51 + - _LightMapIntensity: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Opaqueness: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _ReflectionEmissionAdjust: 1 + - _SPIntensity: 0.5 + - _SPNoiseScaler: 1 + - _SPTransition: 0 + - _SPTransitionBloomFactor: 1 + - _SPTransitionEmissionScaler: 1 + - _Scale: 0.01 + - _Shininess: 10 + - _SpecMulti: 0.1 + - _SpecialState: 0 + - _SrcBlend: 1 + - _UVSec: 0 + - _VertexAlphaFactor: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _ClipPlane - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _Emission - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _FogColorFar - second: {r: 1, g: 0, b: 0, a: 1} - - first: - name: _FogColorNear - second: {r: 1, g: 0, b: 0, a: 1} - - first: - name: _FresnelParams - second: {r: 1, g: 1, b: 0, a: 0} - - first: - name: _LightSpecColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _MainColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _SPOutlineColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _SPTransitionColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _ShadowMultColor - second: {r: 0.9, g: 0.7, b: 0.75, a: 1} + - _ClipPlane: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Emission: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FogColorFar: {r: 1, g: 0, b: 0, a: 1} + - _FogColorNear: {r: 1, g: 0, b: 0, a: 1} + - _FresnelParams: {r: 1, g: 1, b: 0, a: 0} + - _LightSpecColor: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SPOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _SPTransitionColor: {r: 1, g: 1, b: 1, a: 1} + - _ShadowMultColor: {r: 0.9, g: 0.7, b: 0.75, a: 1} diff --git a/Assets/Material/BG2.mat b/Assets/Material/BG2.mat index be389ff6..f5455f34 100644 --- a/Assets/Material/BG2.mat +++ b/Assets/Material/BG2.mat @@ -7,76 +7,39 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: BG2 - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 2000 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: f2bcc14170e3b8f428cb5be951850b51, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 0.3 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _Scale - second: 0.01 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 0.3 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionScaler: 1 + - _Glossiness: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _Scale: 0.01 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Material/BG3.mat b/Assets/Material/BG3.mat index 298bb093..d3d8bdfb 100644 --- a/Assets/Material/BG3.mat +++ b/Assets/Material/BG3.mat @@ -7,100 +7,49 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: BG3 - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 2999 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _DistortionTex - second: + - _DistortionTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: f2bcc14170e3b8f428cb5be951850b51, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 1 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _Distortion - second: 0 - - first: - name: _DistortionIntensity - second: 5 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _Scale - second: 0.01 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _Distortion: 0 + - _DistortionIntensity: 5 + - _DstBlend: 0 + - _EmissionScaler: 1 + - _Glossiness: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _Scale: 0.01 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 0.60294116, g: 0.34580448, b: 0.34580448, a: 0.322} - - first: - name: _Emission - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _TintColor - second: {r: 0.3159035, g: 0.303338, b: 0.329, a: 0.241} + - _Color: {r: 0.60294116, g: 0.34580448, b: 0.34580448, a: 0.322} + - _Emission: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.3159035, g: 0.303338, b: 0.329, a: 0.241} diff --git a/Assets/Material/BG4.mat b/Assets/Material/BG4.mat index bb72413a..950d1b7f 100644 --- a/Assets/Material/BG4.mat +++ b/Assets/Material/BG4.mat @@ -7,115 +7,54 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: BG4 - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 3001 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _DistortionTex - second: + - _DistortionTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: f2bcc14170e3b8f428cb5be951850b51, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 0.3 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _Distortion - second: 0 - - first: - name: _DistortionIntensity - second: 5 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _Scale - second: 0.01 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _VFogIntensity - second: 1 - - first: - name: _VFogRange - second: 0 - - first: - name: _VFogStartPos - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 0.3 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _Distortion: 0 + - _DistortionIntensity: 5 + - _DstBlend: 0 + - _EmissionScaler: 1 + - _Glossiness: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _Scale: 0.01 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _VFogIntensity: 1 + - _VFogRange: 0 + - _VFogStartPos: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 0.322} - - first: - name: _Emission - second: {r: 0, g: 0.8235294, b: 0.653144, a: 0} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _MainColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _TintColor - second: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.503} - - first: - name: _VFogColor - second: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 0.322} + - _Emission: {r: 0, g: 0.8235294, b: 0.653144, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.503} + - _VFogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} diff --git a/Assets/Material/Background.mat b/Assets/Material/Background.mat index 5ce89edd..f8dba466 100644 --- a/Assets/Material/Background.mat +++ b/Assets/Material/Background.mat @@ -7,67 +7,38 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Background - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 1000 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 - m_TexEnvs: {} + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _InvFade - second: 1 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Glossiness: 0.5 + - _InvFade: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _PixelOffset - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _TexelOffset - second: {r: 0.0007401924, g: -0.0015432099, b: 0, a: 0} - - first: - name: _TintColor - second: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _PixelOffset: {r: 0, g: 0, b: 0, a: 0} + - _TexelOffset: {r: 0.0007401924, g: -0.0015432099, b: 0, a: 0} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/Assets/Material/Button.mat b/Assets/Material/Button.mat index d4a8a449..4866fbf8 100644 --- a/Assets/Material/Button.mat +++ b/Assets/Material/Button.mat @@ -7,85 +7,42 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Button - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 2000 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: 86da39a3e0281a54ba7829a7e512a2f9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 0.3 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _Scale - second: 0.01 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 0.3 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionScaler: 1 + - _Glossiness: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _Scale: 0.01 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _TintColor - second: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/Assets/Material/DescScreen.mat b/Assets/Material/DescScreen.mat index c1980c7c..8adad280 100644 --- a/Assets/Material/DescScreen.mat +++ b/Assets/Material/DescScreen.mat @@ -7,97 +7,48 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: DescScreen - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 3001 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _DistortionTex - second: + - _DistortionTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: 4dfe830b79948bb4b9af45e9751e55f1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 1 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _Distortion - second: 0 - - first: - name: _DistortionIntensity - second: 5 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _Scale - second: 0.01 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _Distortion: 0 + - _DistortionIntensity: 5 + - _DstBlend: 0 + - _EmissionScaler: 1 + - _Glossiness: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _Scale: 0.01 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _TintColor - second: {r: 0.791, g: 0.791, b: 0.791, a: 0.5} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.791, g: 0.791, b: 0.791, a: 0.5} diff --git a/Assets/Material/Elevator1.mat b/Assets/Material/Elevator1.mat index c69d9ba2..221f90b7 100644 --- a/Assets/Material/Elevator1.mat +++ b/Assets/Material/Elevator1.mat @@ -7,76 +7,39 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Elevator1 - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 2000 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: ff8c16d60e8a571459e12fbb8579bead, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 0.3 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _Scale - second: 0.01 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 0.3 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionScaler: 1 + - _Glossiness: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _Scale: 0.01 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Material/Floor.mat b/Assets/Material/Floor.mat index 66381239..c5cb2384 100644 --- a/Assets/Material/Floor.mat +++ b/Assets/Material/Floor.mat @@ -7,181 +7,74 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Floor - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 2000 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: b385515fb866cd8408b35f7a59b34f8e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 1 - - first: - name: _BrushScaleX - second: 1 - - first: - name: _BrushScaleY - second: 1 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionBloomFactor - second: 1 - - first: - name: _EmissionFactor - second: 0 - - first: - name: _EmissionFactorFromTexToggle - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _FadeDistance - second: 0.5 - - first: - name: _FadeOffset - second: 1 - - first: - name: _FogColorIntensity - second: 0.01 - - first: - name: _FogEffectLimit - second: 0.5 - - first: - name: _FogEffectStart - second: 0 - - first: - name: _FogIntensity - second: 0.01 - - first: - name: _FogStartDistance - second: 50 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _LightArea - second: 0.51 - - first: - name: _LightMapIntensity - second: 1 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Opaqueness - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _ReflectionEmissionAdjust - second: 1 - - first: - name: _SPIntensity - second: 0.5 - - first: - name: _SPNoiseScaler - second: 1 - - first: - name: _SPTransition - second: 0 - - first: - name: _SPTransitionBloomFactor - second: 1 - - first: - name: _SPTransitionEmissionScaler - second: 1 - - first: - name: _Scale - second: 0.01 - - first: - name: _Shininess - second: 10 - - first: - name: _SpecMulti - second: 0.1 - - first: - name: _SpecialState - second: 0 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _VertexAlphaFactor - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 1 + - _BrushScaleX: 1 + - _BrushScaleY: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionBloomFactor: 1 + - _EmissionFactor: 0 + - _EmissionFactorFromTexToggle: 0 + - _EmissionScaler: 1 + - _FadeDistance: 0.5 + - _FadeOffset: 1 + - _FogColorIntensity: 0.01 + - _FogEffectLimit: 0.5 + - _FogEffectStart: 0 + - _FogIntensity: 0.01 + - _FogStartDistance: 50 + - _Glossiness: 0.5 + - _LightArea: 0.51 + - _LightMapIntensity: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Opaqueness: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _ReflectionEmissionAdjust: 1 + - _SPIntensity: 0.5 + - _SPNoiseScaler: 1 + - _SPTransition: 0 + - _SPTransitionBloomFactor: 1 + - _SPTransitionEmissionScaler: 1 + - _Scale: 0.01 + - _Shininess: 10 + - _SpecMulti: 0.1 + - _SpecialState: 0 + - _SrcBlend: 1 + - _UVSec: 0 + - _VertexAlphaFactor: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _ClipPlane - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _Emission - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _FogColorFar - second: {r: 1, g: 0, b: 0, a: 1} - - first: - name: _FogColorNear - second: {r: 1, g: 0, b: 0, a: 1} - - first: - name: _FresnelParams - second: {r: 1, g: 1, b: 0, a: 0} - - first: - name: _LightSpecColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _MainColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _SPOutlineColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _SPTransitionColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _ShadowMultColor - second: {r: 0.9, g: 0.7, b: 0.75, a: 1} + - _ClipPlane: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Emission: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FogColorFar: {r: 1, g: 0, b: 0, a: 1} + - _FogColorNear: {r: 1, g: 0, b: 0, a: 1} + - _FresnelParams: {r: 1, g: 1, b: 0, a: 0} + - _LightSpecColor: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SPOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _SPTransitionColor: {r: 1, g: 1, b: 1, a: 1} + - _ShadowMultColor: {r: 0.9, g: 0.7, b: 0.75, a: 1} diff --git a/Assets/Material/FloorAlpha.mat b/Assets/Material/FloorAlpha.mat index 792927af..cad866ec 100644 --- a/Assets/Material/FloorAlpha.mat +++ b/Assets/Material/FloorAlpha.mat @@ -7,202 +7,84 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: FloorAlpha - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 3002 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _DistortionTex - second: + - _DistortionTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: 7179e4612d349784590a6eac9db6553d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 1 - - first: - name: _BrushScaleX - second: 1 - - first: - name: _BrushScaleY - second: 1 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _Distortion - second: 0 - - first: - name: _DistortionIntensity - second: 5 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionBloomFactor - second: 1 - - first: - name: _EmissionFactor - second: 0 - - first: - name: _EmissionFactorFromTexToggle - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _FadeDistance - second: 0.5 - - first: - name: _FadeOffset - second: 1 - - first: - name: _FogColorIntensity - second: 0.01 - - first: - name: _FogEffectLimit - second: 0.5 - - first: - name: _FogEffectStart - second: 0 - - first: - name: _FogIntensity - second: 0.01 - - first: - name: _FogStartDistance - second: 50 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _LightArea - second: 0.51 - - first: - name: _LightMapIntensity - second: 1 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Opaqueness - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _ReflectionEmissionAdjust - second: 1 - - first: - name: _SPIntensity - second: 0.5 - - first: - name: _SPNoiseScaler - second: 1 - - first: - name: _SPTransition - second: 0 - - first: - name: _SPTransitionBloomFactor - second: 1 - - first: - name: _SPTransitionEmissionScaler - second: 1 - - first: - name: _Scale - second: 0.01 - - first: - name: _Shininess - second: 10 - - first: - name: _SpecMulti - second: 0.1 - - first: - name: _SpecialState - second: 0 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _VertexAlphaFactor - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 1 + - _BrushScaleX: 1 + - _BrushScaleY: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _Distortion: 0 + - _DistortionIntensity: 5 + - _DstBlend: 0 + - _EmissionBloomFactor: 1 + - _EmissionFactor: 0 + - _EmissionFactorFromTexToggle: 0 + - _EmissionScaler: 1 + - _FadeDistance: 0.5 + - _FadeOffset: 1 + - _FogColorIntensity: 0.01 + - _FogEffectLimit: 0.5 + - _FogEffectStart: 0 + - _FogIntensity: 0.01 + - _FogStartDistance: 50 + - _Glossiness: 0.5 + - _InvFade: 1 + - _LightArea: 0.51 + - _LightMapIntensity: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Opaqueness: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _ReflectionEmissionAdjust: 1 + - _SPIntensity: 0.5 + - _SPNoiseScaler: 1 + - _SPTransition: 0 + - _SPTransitionBloomFactor: 1 + - _SPTransitionEmissionScaler: 1 + - _Scale: 0.01 + - _Shininess: 10 + - _SpecMulti: 0.1 + - _SpecialState: 0 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _VertexAlphaFactor: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _ClipPlane - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _Emission - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _FogColorFar - second: {r: 1, g: 0, b: 0, a: 1} - - first: - name: _FogColorNear - second: {r: 1, g: 0, b: 0, a: 1} - - first: - name: _FresnelParams - second: {r: 1, g: 1, b: 0, a: 0} - - first: - name: _LightSpecColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _MainColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _SPOutlineColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _SPTransitionColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _ShadowMultColor - second: {r: 0.9, g: 0.7, b: 0.75, a: 1} - - first: - name: _TintColor - second: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _ClipPlane: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Emission: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FogColorFar: {r: 1, g: 0, b: 0, a: 1} + - _FogColorNear: {r: 1, g: 0, b: 0, a: 1} + - _FresnelParams: {r: 1, g: 1, b: 0, a: 0} + - _LightSpecColor: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SPOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _SPTransitionColor: {r: 1, g: 1, b: 1, a: 1} + - _ShadowMultColor: {r: 0.9, g: 0.7, b: 0.75, a: 1} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/Assets/Material/InnerDoor.mat b/Assets/Material/InnerDoor.mat index c9b1a396..0bf38b56 100644 --- a/Assets/Material/InnerDoor.mat +++ b/Assets/Material/InnerDoor.mat @@ -7,151 +7,64 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: InnerDoor - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 2000 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: 86da39a3e0281a54ba7829a7e512a2f9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 0.3 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionBloomFactor - second: 1 - - first: - name: _EmissionFactor - second: 0 - - first: - name: _EmissionFactorFromTexToggle - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _FadeDistance - second: 0.5 - - first: - name: _FadeOffset - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _LightArea - second: 0.51 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Opaqueness - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _SPIntensity - second: 0.5 - - first: - name: _SPNoiseScaler - second: 1 - - first: - name: _SPTransition - second: 0 - - first: - name: _SPTransitionBloomFactor - second: 1 - - first: - name: _SPTransitionEmissionScaler - second: 1 - - first: - name: _Scale - second: 0.01 - - first: - name: _Shininess - second: 10 - - first: - name: _SpecMulti - second: 0.1 - - first: - name: _SpecialState - second: 0 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _VertexAlphaFactor - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 0.3 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionBloomFactor: 1 + - _EmissionFactor: 0 + - _EmissionFactorFromTexToggle: 0 + - _EmissionScaler: 1 + - _FadeDistance: 0.5 + - _FadeOffset: 1 + - _Glossiness: 0.5 + - _LightArea: 0.51 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Opaqueness: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _SPIntensity: 0.5 + - _SPNoiseScaler: 1 + - _SPTransition: 0 + - _SPTransitionBloomFactor: 1 + - _SPTransitionEmissionScaler: 1 + - _Scale: 0.01 + - _Shininess: 10 + - _SpecMulti: 0.1 + - _SpecialState: 0 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _VertexAlphaFactor: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _ClipPlane - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _LightSpecColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _MainColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _SPOutlineColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _SPTransitionColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _ShadowMultColor - second: {r: 0.9, g: 0.7, b: 0.75, a: 1} - - first: - name: _TintColor - second: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _ClipPlane: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _LightSpecColor: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SPOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _SPTransitionColor: {r: 1, g: 1, b: 1, a: 1} + - _ShadowMultColor: {r: 0.9, g: 0.7, b: 0.75, a: 1} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/Assets/Material/InnerDoorGlass.mat b/Assets/Material/InnerDoorGlass.mat index d9b8e446..77f03cf7 100644 --- a/Assets/Material/InnerDoorGlass.mat +++ b/Assets/Material/InnerDoorGlass.mat @@ -7,97 +7,48 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: InnerDoorGlass - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 3003 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _DistortionTex - second: + - _DistortionTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: 86da39a3e0281a54ba7829a7e512a2f9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 0.3 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _Distortion - second: 0 - - first: - name: _DistortionIntensity - second: 5 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _Scale - second: 0.01 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 0.3 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _Distortion: 0 + - _DistortionIntensity: 5 + - _DstBlend: 0 + - _EmissionScaler: 1 + - _Glossiness: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _Scale: 0.01 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _TintColor - second: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/Assets/Material/OutsideDoor.mat b/Assets/Material/OutsideDoor.mat index ad3a3983..80db64f7 100644 --- a/Assets/Material/OutsideDoor.mat +++ b/Assets/Material/OutsideDoor.mat @@ -7,85 +7,42 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: OutsideDoor - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 2000 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: d51f61cb981e8e641afe5e85f49cd1ae, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 0.3 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _Scale - second: 0.01 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 0.3 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionScaler: 1 + - _Glossiness: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _Scale: 0.01 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _TintColor - second: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/Assets/Material/OutsideDoorGlass.mat b/Assets/Material/OutsideDoorGlass.mat index dd51f852..cc7a340d 100644 --- a/Assets/Material/OutsideDoorGlass.mat +++ b/Assets/Material/OutsideDoorGlass.mat @@ -7,97 +7,48 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: OutsideDoorGlass - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 3002 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _DistortionTex - second: + - _DistortionTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: d51f61cb981e8e641afe5e85f49cd1ae, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 0.3 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _Distortion - second: 0 - - first: - name: _DistortionIntensity - second: 5 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _Scale - second: 0.01 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 0.3 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _Distortion: 0 + - _DistortionIntensity: 5 + - _DstBlend: 0 + - _EmissionScaler: 1 + - _Glossiness: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _Scale: 0.01 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _TintColor - second: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/Assets/Material/Pillar.mat b/Assets/Material/Pillar.mat index 7145413f..fbe85d0f 100644 --- a/Assets/Material/Pillar.mat +++ b/Assets/Material/Pillar.mat @@ -7,76 +7,39 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Pillar - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 2000 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: ff8c16d60e8a571459e12fbb8579bead, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 1 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _Scale - second: 0.01 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionScaler: 1 + - _Glossiness: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _Scale: 0.01 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Material/ProjectiveLight.mat b/Assets/Material/ProjectiveLight.mat index e8eb9e8e..b9320430 100644 --- a/Assets/Material/ProjectiveLight.mat +++ b/Assets/Material/ProjectiveLight.mat @@ -7,85 +7,45 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: ProjectiveLight - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 3000 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: dddf17da4b0ba674088edf17c95ed0ed, type: 3} m_Scale: {x: 1, y: 0.8} m_Offset: {x: 0, y: 0} - - first: - name: _SpecularTex - second: + - _SpecularTex: m_Texture: {fileID: 2800000, guid: 4a63eba8958a7bf4db34e834b4bafe71, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 0.5 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _LightStrength - second: 1.2 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 0.5 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionScaler: 1 + - _Glossiness: 0.5 + - _InvFade: 1 + - _LightStrength: 1.2 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _TintColor - second: {r: 0.36862746, g: 0.28235295, b: 0.41568628, a: 0.49803922} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.36862746, g: 0.28235295, b: 0.41568628, a: 0.49803922} diff --git a/Assets/Material/Screen_0.mat b/Assets/Material/Screen_0.mat index fb85668b..81a7b075 100644 --- a/Assets/Material/Screen_0.mat +++ b/Assets/Material/Screen_0.mat @@ -7,118 +7,53 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Screen_0 - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 3001 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: 2363e702631cf454b9eea604158c7bea, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 1 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _Emission - second: 1 - - first: - name: _EmissionFactor - second: 0 - - first: - name: _FadeDistance - second: 0.5 - - first: - name: _FadeOffset - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _InvFade - second: 1 - - first: - name: _LightArea - second: 0.51 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _OutlineWidth - second: 0.2 - - first: - name: _Parallax - second: 0.02 - - first: - name: _Scale - second: 0.01 - - first: - name: _Scaler - second: 1 - - first: - name: _Shininess - second: 10 - - first: - name: _SpecMulti - second: 0.1 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _VertexAlphaFactor - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Emission: 1 + - _EmissionFactor: 0 + - _FadeDistance: 0.5 + - _FadeOffset: 1 + - _Glossiness: 0.5 + - _InvFade: 1 + - _LightArea: 0.51 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.2 + - _Parallax: 0.02 + - _Scale: 0.01 + - _Scaler: 1 + - _Shininess: 10 + - _SpecMulti: 0.1 + - _SrcBlend: 1 + - _UVSec: 0 + - _VertexAlphaFactor: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _ClipPlane - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _LightSpecColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _MainColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _ShadowMultColor - second: {r: 0.9, g: 0.7, b: 0.75, a: 1} - - first: - name: _TintColor - second: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _ClipPlane: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _LightSpecColor: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ShadowMultColor: {r: 0.9, g: 0.7, b: 0.75, a: 1} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/Assets/Material/Screw.mat b/Assets/Material/Screw.mat index bbf9afce..518e849f 100644 --- a/Assets/Material/Screw.mat +++ b/Assets/Material/Screw.mat @@ -7,181 +7,74 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Screw - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 2000 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: d51f61cb981e8e641afe5e85f49cd1ae, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 0.3 - - first: - name: _BrushScaleX - second: 1 - - first: - name: _BrushScaleY - second: 1 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionBloomFactor - second: 1 - - first: - name: _EmissionFactor - second: 0 - - first: - name: _EmissionFactorFromTexToggle - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _FadeDistance - second: 0.5 - - first: - name: _FadeOffset - second: 1 - - first: - name: _FogColorIntensity - second: 0.01 - - first: - name: _FogEffectLimit - second: 0.5 - - first: - name: _FogEffectStart - second: 0 - - first: - name: _FogIntensity - second: 0.01 - - first: - name: _FogStartDistance - second: 50 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _LightArea - second: 0.51 - - first: - name: _LightMapIntensity - second: 1 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Opaqueness - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _ReflectionEmissionAdjust - second: 1 - - first: - name: _SPIntensity - second: 0.5 - - first: - name: _SPNoiseScaler - second: 1 - - first: - name: _SPTransition - second: 0 - - first: - name: _SPTransitionBloomFactor - second: 1 - - first: - name: _SPTransitionEmissionScaler - second: 1 - - first: - name: _Scale - second: 0.01 - - first: - name: _Shininess - second: 10 - - first: - name: _SpecMulti - second: 0.1 - - first: - name: _SpecialState - second: 0 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _VertexAlphaFactor - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 0.3 + - _BrushScaleX: 1 + - _BrushScaleY: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionBloomFactor: 1 + - _EmissionFactor: 0 + - _EmissionFactorFromTexToggle: 0 + - _EmissionScaler: 1 + - _FadeDistance: 0.5 + - _FadeOffset: 1 + - _FogColorIntensity: 0.01 + - _FogEffectLimit: 0.5 + - _FogEffectStart: 0 + - _FogIntensity: 0.01 + - _FogStartDistance: 50 + - _Glossiness: 0.5 + - _LightArea: 0.51 + - _LightMapIntensity: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Opaqueness: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _ReflectionEmissionAdjust: 1 + - _SPIntensity: 0.5 + - _SPNoiseScaler: 1 + - _SPTransition: 0 + - _SPTransitionBloomFactor: 1 + - _SPTransitionEmissionScaler: 1 + - _Scale: 0.01 + - _Shininess: 10 + - _SpecMulti: 0.1 + - _SpecialState: 0 + - _SrcBlend: 1 + - _UVSec: 0 + - _VertexAlphaFactor: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _ClipPlane - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _Emission - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _FogColorFar - second: {r: 1, g: 0, b: 0, a: 1} - - first: - name: _FogColorNear - second: {r: 1, g: 0, b: 0, a: 1} - - first: - name: _FresnelParams - second: {r: 1, g: 1, b: 0, a: 0} - - first: - name: _LightSpecColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _MainColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _SPOutlineColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _SPTransitionColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _ShadowMultColor - second: {r: 0.9, g: 0.7, b: 0.75, a: 1} + - _ClipPlane: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Emission: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FogColorFar: {r: 1, g: 0, b: 0, a: 1} + - _FogColorNear: {r: 1, g: 0, b: 0, a: 1} + - _FresnelParams: {r: 1, g: 1, b: 0, a: 0} + - _LightSpecColor: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SPOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _SPTransitionColor: {r: 1, g: 1, b: 1, a: 1} + - _ShadowMultColor: {r: 0.9, g: 0.7, b: 0.75, a: 1} diff --git a/Assets/Material/Shadow02.mat b/Assets/Material/Shadow02.mat index d2a8d1fb..e31a63a7 100644 --- a/Assets/Material/Shadow02.mat +++ b/Assets/Material/Shadow02.mat @@ -7,98 +7,49 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Shadow02 - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 3005 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: Distortion: None + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _DistortionTex - second: + - _DistortionTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: fc9ec89ab3bcee14ab27070e74099d35, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 1 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _Distortion - second: 0 - - first: - name: _DistortionIntensity - second: 5 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _Scale - second: 0.01 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _Distortion: 0 + - _DistortionIntensity: 5 + - _DstBlend: 0 + - _EmissionScaler: 1 + - _Glossiness: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _Scale: 0.01 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _TintColor - second: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/Assets/Material/Staff.mat b/Assets/Material/Staff.mat index fa4ed5d9..7cbed06e 100644 --- a/Assets/Material/Staff.mat +++ b/Assets/Material/Staff.mat @@ -7,169 +7,72 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Staff - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 2999 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _DistortionTex - second: + - _DistortionTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: d7e99776830b19e47b4364179f82c60f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 1 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _Distortion - second: 0 - - first: - name: _DistortionIntensity - second: 5 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionBloomFactor - second: 1 - - first: - name: _EmissionFactor - second: 0 - - first: - name: _EmissionFactorFromTexToggle - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _FadeDistance - second: 0.5 - - first: - name: _FadeOffset - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _LightArea - second: 0.51 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Opaqueness - second: 1 - - first: - name: _OpaquenessFromTexToggle - second: 0 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _SPIntensity - second: 0.5 - - first: - name: _SPNoiseScaler - second: 1 - - first: - name: _SPTransition - second: 0 - - first: - name: _SPTransitionBloomFactor - second: 1 - - first: - name: _SPTransitionEmissionScaler - second: 1 - - first: - name: _Scale - second: 0.01 - - first: - name: _Shininess - second: 10 - - first: - name: _SpecMulti - second: 0.1 - - first: - name: _SpecialState - second: 0 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _VertexAlphaFactor - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _Distortion: 0 + - _DistortionIntensity: 5 + - _DstBlend: 0 + - _EmissionBloomFactor: 1 + - _EmissionFactor: 0 + - _EmissionFactorFromTexToggle: 0 + - _EmissionScaler: 1 + - _FadeDistance: 0.5 + - _FadeOffset: 1 + - _Glossiness: 0.5 + - _LightArea: 0.51 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Opaqueness: 1 + - _OpaquenessFromTexToggle: 0 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _SPIntensity: 0.5 + - _SPNoiseScaler: 1 + - _SPTransition: 0 + - _SPTransitionBloomFactor: 1 + - _SPTransitionEmissionScaler: 1 + - _Scale: 0.01 + - _Shininess: 10 + - _SpecMulti: 0.1 + - _SpecialState: 0 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _VertexAlphaFactor: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _ClipPlane - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _Emission - second: {r: 0.33088237, g: 0.33088237, b: 0.33088237, a: 0} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _LightSpecColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _MainColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _SPOutlineColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _SPTransitionColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _ShadowMultColor - second: {r: 0.9, g: 0.7, b: 0.75, a: 1} - - first: - name: _TintColor - second: {r: 0.312, g: 0.312, b: 0.312, a: 0.5} + - _ClipPlane: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Emission: {r: 0.33088237, g: 0.33088237, b: 0.33088237, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _LightSpecColor: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SPOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _SPTransitionColor: {r: 1, g: 1, b: 1, a: 1} + - _ShadowMultColor: {r: 0.9, g: 0.7, b: 0.75, a: 1} + - _TintColor: {r: 0.312, g: 0.312, b: 0.312, a: 0.5} diff --git a/Assets/Material/StaffLight.mat b/Assets/Material/StaffLight.mat index 6cf21584..61fbcbcb 100644 --- a/Assets/Material/StaffLight.mat +++ b/Assets/Material/StaffLight.mat @@ -7,169 +7,72 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: StaffLight - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 - m_CustomRenderQueue: 2999 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _DistortionTex - second: + - _DistortionTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: d7e99776830b19e47b4364179f82c60f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 1 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _Distortion - second: 0 - - first: - name: _DistortionIntensity - second: 5 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionBloomFactor - second: 1 - - first: - name: _EmissionFactor - second: 0 - - first: - name: _EmissionFactorFromTexToggle - second: 0 - - first: - name: _EmissionScaler - second: 1 - - first: - name: _FadeDistance - second: 0.5 - - first: - name: _FadeOffset - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _LightArea - second: 0.51 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Opaqueness - second: 1 - - first: - name: _OpaquenessFromTexToggle - second: 0 - - first: - name: _OutlineWidth - second: 0.1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _SPIntensity - second: 0.5 - - first: - name: _SPNoiseScaler - second: 1 - - first: - name: _SPTransition - second: 0 - - first: - name: _SPTransitionBloomFactor - second: 1 - - first: - name: _SPTransitionEmissionScaler - second: 1 - - first: - name: _Scale - second: 0.01 - - first: - name: _Shininess - second: 10 - - first: - name: _SpecMulti - second: 0.1 - - first: - name: _SpecialState - second: 0 - - first: - name: _SrcBlend - second: 1 - - first: - name: _TSAspectRatio - second: 1 - - first: - name: _TextureScale - second: 0 - - first: - name: _UVSec - second: 0 - - first: - name: _VertexAlphaFactor - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _Distortion: 0 + - _DistortionIntensity: 5 + - _DstBlend: 0 + - _EmissionBloomFactor: 1 + - _EmissionFactor: 0 + - _EmissionFactorFromTexToggle: 0 + - _EmissionScaler: 1 + - _FadeDistance: 0.5 + - _FadeOffset: 1 + - _Glossiness: 0.5 + - _LightArea: 0.51 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Opaqueness: 1 + - _OpaquenessFromTexToggle: 0 + - _OutlineWidth: 0.1 + - _Parallax: 0.02 + - _SPIntensity: 0.5 + - _SPNoiseScaler: 1 + - _SPTransition: 0 + - _SPTransitionBloomFactor: 1 + - _SPTransitionEmissionScaler: 1 + - _Scale: 0.01 + - _Shininess: 10 + - _SpecMulti: 0.1 + - _SpecialState: 0 + - _SrcBlend: 1 + - _TSAspectRatio: 1 + - _TextureScale: 0 + - _UVSec: 0 + - _VertexAlphaFactor: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _ClipPlane - second: {r: 0, g: 0, b: 0, a: 0} - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _Emission - second: {r: 0.33088237, g: 0.33088237, b: 0.33088237, a: 0} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _LightSpecColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _MainColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _OutlineColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _SPOutlineColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _SPTransitionColor - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _ShadowMultColor - second: {r: 0.9, g: 0.7, b: 0.75, a: 1} - - first: - name: _TintColor - second: {r: 0.493, g: 0.493, b: 0.493, a: 0.5} + - _ClipPlane: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Emission: {r: 0.33088237, g: 0.33088237, b: 0.33088237, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _LightSpecColor: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SPOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _SPTransitionColor: {r: 1, g: 1, b: 1, a: 1} + - _ShadowMultColor: {r: 0.9, g: 0.7, b: 0.75, a: 1} + - _TintColor: {r: 0.493, g: 0.493, b: 0.493, a: 0.5} diff --git a/Assets/Material/StartLight 1.mat b/Assets/Material/StartLight 1.mat index b4ab83e4..61cc1467 100644 --- a/Assets/Material/StartLight 1.mat +++ b/Assets/Material/StartLight 1.mat @@ -7,70 +7,38 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: StartLight 1 - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: ff8c16d60e8a571459e12fbb8579bead, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 1.5 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 2 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 1.5 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionScaler: 2 + - _Glossiness: 0.5 + - _InvFade: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _TintColor - second: {r: 0.203, g: 0.203, b: 0.203, a: 0.5} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.203, g: 0.203, b: 0.203, a: 0.5} diff --git a/Assets/Material/StartLight.mat b/Assets/Material/StartLight.mat index b33b46f2..12114c20 100644 --- a/Assets/Material/StartLight.mat +++ b/Assets/Material/StartLight.mat @@ -7,70 +7,38 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: StartLight - m_Shader: {fileID: 4800000, guid: 0000000deadbeef15deadf00d0000000, type: 2} - m_ShaderKeywords: + m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: ff8c16d60e8a571459e12fbb8579bead, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BloomFactor - second: 0.2 - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionScaler - second: 0.8 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BloomFactor: 0.2 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionScaler: 0.8 + - _Glossiness: 0.5 + - _InvFade: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _TintColor - second: {r: 0.203, g: 0.203, b: 0.203, a: 0.5} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.203, g: 0.203, b: 0.203, a: 0.5} diff --git a/Assets/Plugins/Assembly-CSharp-firstpass/CinemaDirector/ScreenshotCapture.cs b/Assets/Plugins/Assembly-CSharp-firstpass/CinemaDirector/ScreenshotCapture.cs index 3b02ab5a..bbb77242 100644 --- a/Assets/Plugins/Assembly-CSharp-firstpass/CinemaDirector/ScreenshotCapture.cs +++ b/Assets/Plugins/Assembly-CSharp-firstpass/CinemaDirector/ScreenshotCapture.cs @@ -18,7 +18,7 @@ namespace CinemaDirector private void Update() { string filename = string.Format("{0}/shot {1:D04}.png", Folder, Time.frameCount); - Application.CaptureScreenshot(filename); + ScreenCapture.CaptureScreenshot(filename); } } } diff --git a/Assets/Plugins/Assembly-CSharp-firstpass/CinemaDirector/SetDestinationEvent.cs b/Assets/Plugins/Assembly-CSharp-firstpass/CinemaDirector/SetDestinationEvent.cs index a2a01962..bffed589 100644 --- a/Assets/Plugins/Assembly-CSharp-firstpass/CinemaDirector/SetDestinationEvent.cs +++ b/Assets/Plugins/Assembly-CSharp-firstpass/CinemaDirector/SetDestinationEvent.cs @@ -9,7 +9,7 @@ namespace CinemaDirector public override void Trigger(GameObject actor) { - NavMeshAgent component = actor.GetComponent(); + UnityEngine.AI.NavMeshAgent component = actor.GetComponent(); if (component != null) { component.SetDestination(target); diff --git a/Assets/Plugins/Assembly-CSharp-firstpass/CinemaDirector/StoryboardEvent.cs b/Assets/Plugins/Assembly-CSharp-firstpass/CinemaDirector/StoryboardEvent.cs index 085a726c..5fa5cb56 100644 --- a/Assets/Plugins/Assembly-CSharp-firstpass/CinemaDirector/StoryboardEvent.cs +++ b/Assets/Plugins/Assembly-CSharp-firstpass/CinemaDirector/StoryboardEvent.cs @@ -11,7 +11,7 @@ namespace CinemaDirector public override void Trigger() { - Application.CaptureScreenshot(string.Format("Assets\\{0}{1}.png", base.gameObject.name, Count++)); + ScreenCapture.CaptureScreenshot(string.Format("Assets\\{0}{1}.png", base.gameObject.name, Count++)); } } } diff --git a/Assets/Plugins/Assembly-CSharp-firstpass/UniWebViewMessage.cs b/Assets/Plugins/Assembly-CSharp-firstpass/UniWebViewMessage.cs index 797ebe9f..64c1ea2d 100644 --- a/Assets/Plugins/Assembly-CSharp-firstpass/UniWebViewMessage.cs +++ b/Assets/Plugins/Assembly-CSharp-firstpass/UniWebViewMessage.cs @@ -14,6 +14,9 @@ public struct UniWebViewMessage public UniWebViewMessage(string rawMessage) { + this.path = null; + this.scheme = null; + this.args = null; this.rawMessage = rawMessage; string[] array = rawMessage.Split(new string[1] { "://" }, StringSplitOptions.None); if (array.Length >= 2) diff --git a/Assets/Plugins/FullInspector-Core.dll b/Assets/Plugins/FullInspector-Core.dll index 85f1e446..1215f59a 100644 Binary files a/Assets/Plugins/FullInspector-Core.dll and b/Assets/Plugins/FullInspector-Core.dll differ diff --git a/Assets/Plugins/FullInspector-Core.dll.meta b/Assets/Plugins/FullInspector-Core.dll.meta index e90670a3..cd541c23 100644 --- a/Assets/Plugins/FullInspector-Core.dll.meta +++ b/Assets/Plugins/FullInspector-Core.dll.meta @@ -1,22 +1,30 @@ fileFormatVersion: 2 guid: 9c4a19ccd81ab3ecac0f508827304d31 -timeCreated: 1749699017 -licenseType: Free PluginImporter: - name: + externalObjects: {} + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 + isOverridable: 0 platformData: - Any: + - first: + Any: + second: enabled: 1 settings: {} - Editor: + - first: + Editor: Editor + second: enabled: 0 settings: DefaultValueInitialized: true - output: - pluginType: 0 - userData: - assetBundleName: - assetBundleVariant: + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameEntry.unity b/Assets/Scenes/GameEntry.unity index 3e03d594..f46b5487 100644 --- a/Assets/Scenes/GameEntry.unity +++ b/Assets/Scenes/GameEntry.unity @@ -1,73 +1,15 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!104 &267 -RenderSettings: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - m_AmbientEquatorColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} ---- !u!157 &274 -LightmapSettings: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_GIWorkflowMode: 1 - m_LightmapsMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 3 - m_Resolution: 2 - m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 - m_AOMaxDistance: 1 - m_Padding: 2 - m_CompAOExponent: 1 - m_LightmapParameters: {fileID: 0} - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_LightingDataAsset: {fileID: 112000000, guid: 757775c266798d84494d9818422dab6d, type: 2} - m_RuntimeCPUUsage: 25 --- !u!1 &1 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 106} - - 114: {fileID: 418} - - 114: {fileID: 417} + - component: {fileID: 106} + - component: {fileID: 418} + - component: {fileID: 417} m_Layer: 0 m_Name: AccountEventListener m_TagString: Untagged @@ -77,13 +19,13 @@ GameObject: m_IsActive: 1 --- !u!1 &2 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 107} - - 20: {fileID: 168} + - component: {fileID: 107} + - component: {fileID: 168} m_Layer: 0 m_Name: InnerCamera m_TagString: Untagged @@ -93,30 +35,30 @@ GameObject: m_IsActive: 1 --- !u!1 &3 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 108} - - 33: {fileID: 218} - - 23: {fileID: 172} + - component: {fileID: 108} + - component: {fileID: 218} + - component: {fileID: 172} m_Layer: 12 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &4 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 109} - - 20: {fileID: 167} + - component: {fileID: 109} + - component: {fileID: 167} m_Layer: 0 m_Name: DistortionCamera m_TagString: Untagged @@ -126,13 +68,13 @@ GameObject: m_IsActive: 1 --- !u!1 &5 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 110} - - 20: {fileID: 169} + - component: {fileID: 110} + - component: {fileID: 169} m_Layer: 0 m_Name: FarCamera m_TagString: Untagged @@ -142,20 +84,20 @@ GameObject: m_IsActive: 1 --- !u!1 &6 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 111} - - 20: {fileID: 170} - - 92: {fileID: 265} - - 124: {fileID: 272} - - 114: {fileID: 376} - - 114: {fileID: 375} - - 114: {fileID: 428} - - 114: {fileID: 357} - - 111: {fileID: 268} + - component: {fileID: 111} + - component: {fileID: 170} + - component: {fileID: 265} + - component: {fileID: 272} + - component: {fileID: 376} + - component: {fileID: 375} + - component: {fileID: 428} + - component: {fileID: 357} + - component: {fileID: 268} m_Layer: 0 m_Name: MainCamera m_TagString: MainCamera @@ -165,15 +107,15 @@ GameObject: m_IsActive: 1 --- !u!1 &7 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 112} - - 114: {fileID: 355} - - 114: {fileID: 414} - - 114: {fileID: 413} + - component: {fileID: 112} + - component: {fileID: 355} + - component: {fileID: 414} + - component: {fileID: 413} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -183,17 +125,17 @@ GameObject: m_IsActive: 1 --- !u!1 &8 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 113} - - 20: {fileID: 171} - - 124: {fileID: 273} - - 92: {fileID: 266} - - 81: {fileID: 264} - - 114: {fileID: 409} + - component: {fileID: 113} + - component: {fileID: 171} + - component: {fileID: 273} + - component: {fileID: 266} + - component: {fileID: 264} + - component: {fileID: 409} m_Layer: 0 m_Name: UICamera m_TagString: Untagged @@ -203,15 +145,15 @@ GameObject: m_IsActive: 1 --- !u!1 &9 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 307} - - 222: {fileID: 275} - - 114: {fileID: 364} - - 114: {fileID: 363} + - component: {fileID: 307} + - component: {fileID: 275} + - component: {fileID: 364} + - component: {fileID: 363} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -221,15 +163,15 @@ GameObject: m_IsActive: 1 --- !u!1 &10 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 309} - - 222: {fileID: 278} - - 114: {fileID: 366} - - 114: {fileID: 365} + - component: {fileID: 309} + - component: {fileID: 278} + - component: {fileID: 366} + - component: {fileID: 365} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -239,15 +181,15 @@ GameObject: m_IsActive: 1 --- !u!1 &11 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 306} - - 222: {fileID: 276} - - 114: {fileID: 411} - - 114: {fileID: 410} + - component: {fileID: 306} + - component: {fileID: 276} + - component: {fileID: 411} + - component: {fileID: 410} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -257,15 +199,15 @@ GameObject: m_IsActive: 1 --- !u!1 &12 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 308} - - 222: {fileID: 277} - - 114: {fileID: 397} - - 114: {fileID: 396} + - component: {fileID: 308} + - component: {fileID: 277} + - component: {fileID: 397} + - component: {fileID: 396} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -275,16 +217,16 @@ GameObject: m_IsActive: 1 --- !u!1 &13 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 313} - - 222: {fileID: 285} - - 114: {fileID: 391} - - 114: {fileID: 390} - - 114: {fileID: 389} + - component: {fileID: 313} + - component: {fileID: 285} + - component: {fileID: 391} + - component: {fileID: 390} + - component: {fileID: 389} m_Layer: 5 m_Name: TryUserBtn m_TagString: Untagged @@ -294,14 +236,14 @@ GameObject: m_IsActive: 1 --- !u!1 &14 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 312} - - 222: {fileID: 282} - - 114: {fileID: 377} + - component: {fileID: 312} + - component: {fileID: 282} + - component: {fileID: 377} m_Layer: 5 m_Name: Label m_TagString: Untagged @@ -311,14 +253,14 @@ GameObject: m_IsActive: 1 --- !u!1 &15 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 311} - - 222: {fileID: 281} - - 114: {fileID: 362} + - component: {fileID: 311} + - component: {fileID: 281} + - component: {fileID: 362} m_Layer: 5 m_Name: Name m_TagString: Untagged @@ -328,16 +270,16 @@ GameObject: m_IsActive: 1 --- !u!1 &16 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 317} - - 222: {fileID: 279} - - 114: {fileID: 424} - - 114: {fileID: 423} - - 114: {fileID: 422} + - component: {fileID: 317} + - component: {fileID: 279} + - component: {fileID: 424} + - component: {fileID: 423} + - component: {fileID: 422} m_Layer: 5 m_Name: LoginBtn m_TagString: Untagged @@ -347,14 +289,14 @@ GameObject: m_IsActive: 1 --- !u!1 &17 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 316} - - 222: {fileID: 283} - - 114: {fileID: 388} + - component: {fileID: 316} + - component: {fileID: 283} + - component: {fileID: 388} m_Layer: 5 m_Name: Fill m_TagString: Untagged @@ -364,16 +306,16 @@ GameObject: m_IsActive: 1 --- !u!1 &18 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 315} - - 222: {fileID: 284} - - 114: {fileID: 369} - - 114: {fileID: 368} - - 114: {fileID: 367} + - component: {fileID: 315} + - component: {fileID: 284} + - component: {fileID: 369} + - component: {fileID: 368} + - component: {fileID: 367} m_Layer: 5 m_Name: LoginBtn m_TagString: Untagged @@ -383,16 +325,16 @@ GameObject: m_IsActive: 1 --- !u!1 &19 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 314} - - 222: {fileID: 280} - - 114: {fileID: 360} - - 114: {fileID: 359} - - 114: {fileID: 358} + - component: {fileID: 314} + - component: {fileID: 280} + - component: {fileID: 360} + - component: {fileID: 359} + - component: {fileID: 358} m_Layer: 5 m_Name: RigsterBtn m_TagString: Untagged @@ -402,15 +344,15 @@ GameObject: m_IsActive: 1 --- !u!1 &20 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 310} - - 222: {fileID: 286} - - 114: {fileID: 407} - - 114: {fileID: 406} + - component: {fileID: 310} + - component: {fileID: 286} + - component: {fileID: 407} + - component: {fileID: 406} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -420,16 +362,16 @@ GameObject: m_IsActive: 1 --- !u!1 &21 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 321} - - 222: {fileID: 290} - - 114: {fileID: 427} - - 114: {fileID: 426} - - 114: {fileID: 425} + - component: {fileID: 321} + - component: {fileID: 290} + - component: {fileID: 427} + - component: {fileID: 426} + - component: {fileID: 425} m_Layer: 5 m_Name: LogoutBtn m_TagString: Untagged @@ -439,13 +381,13 @@ GameObject: m_IsActive: 1 --- !u!1 &22 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 322} - - 114: {fileID: 370} + - component: {fileID: 322} + - component: {fileID: 370} m_Layer: 5 m_Name: Info m_TagString: Untagged @@ -455,12 +397,12 @@ GameObject: m_IsActive: 1 --- !u!1 &23 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 319} + - component: {fileID: 319} m_Layer: 5 m_Name: Normal m_TagString: Untagged @@ -470,12 +412,12 @@ GameObject: m_IsActive: 0 --- !u!1 &24 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 324} + - component: {fileID: 324} m_Layer: 5 m_Name: Fill Area m_TagString: Untagged @@ -485,16 +427,16 @@ GameObject: m_IsActive: 1 --- !u!1 &25 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 320} - - 222: {fileID: 289} - - 114: {fileID: 408} - - 225: {fileID: 350} - - 111: {fileID: 269} + - component: {fileID: 320} + - component: {fileID: 289} + - component: {fileID: 408} + - component: {fileID: 350} + - component: {fileID: 269} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -504,12 +446,12 @@ GameObject: m_IsActive: 1 --- !u!1 &26 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 318} + - component: {fileID: 318} m_Layer: 5 m_Name: ForbidNewUser m_TagString: Untagged @@ -519,14 +461,14 @@ GameObject: m_IsActive: 1 --- !u!1 &27 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 325} - - 222: {fileID: 288} - - 114: {fileID: 416} + - component: {fileID: 325} + - component: {fileID: 288} + - component: {fileID: 416} m_Layer: 5 m_Name: Background m_TagString: Untagged @@ -536,14 +478,14 @@ GameObject: m_IsActive: 1 --- !u!1 &28 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 323} - - 222: {fileID: 287} - - 114: {fileID: 387} + - component: {fileID: 323} + - component: {fileID: 287} + - component: {fileID: 387} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -553,12 +495,12 @@ GameObject: m_IsActive: 1 --- !u!1 &29 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 327} + - component: {fileID: 327} m_Layer: 5 m_Name: EmptyUser m_TagString: Untagged @@ -568,13 +510,13 @@ GameObject: m_IsActive: 1 --- !u!1 &30 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 330} - - 225: {fileID: 352} + - component: {fileID: 330} + - component: {fileID: 352} m_Layer: 5 m_Name: Label m_TagString: Untagged @@ -584,12 +526,12 @@ GameObject: m_IsActive: 0 --- !u!1 &31 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 326} + - component: {fileID: 326} m_Layer: 5 m_Name: LastUser m_TagString: Untagged @@ -599,15 +541,15 @@ GameObject: m_IsActive: 0 --- !u!1 &32 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 331} - - 222: {fileID: 291} - - 114: {fileID: 374} - - 225: {fileID: 353} + - component: {fileID: 331} + - component: {fileID: 291} + - component: {fileID: 374} + - component: {fileID: 353} m_Layer: 5 m_Name: Desc m_TagString: Untagged @@ -617,14 +559,14 @@ GameObject: m_IsActive: 1 --- !u!1 &33 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 328} - - 222: {fileID: 292} - - 114: {fileID: 421} + - component: {fileID: 328} + - component: {fileID: 292} + - component: {fileID: 421} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -634,14 +576,14 @@ GameObject: m_IsActive: 1 --- !u!1 &34 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 332} - - 114: {fileID: 371} - - 225: {fileID: 351} + - component: {fileID: 332} + - component: {fileID: 371} + - component: {fileID: 351} m_Layer: 5 m_Name: Progress m_TagString: Untagged @@ -651,14 +593,14 @@ GameObject: m_IsActive: 1 --- !u!1 &35 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 329} - - 222: {fileID: 293} - - 114: {fileID: 415} + - component: {fileID: 329} + - component: {fileID: 293} + - component: {fileID: 415} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -668,12 +610,12 @@ GameObject: m_IsActive: 1 --- !u!1 &36 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 333} + - component: {fileID: 333} m_Layer: 5 m_Name: LoginPanel m_TagString: Untagged @@ -683,14 +625,14 @@ GameObject: m_IsActive: 0 --- !u!1 &37 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 335} - - 222: {fileID: 295} - - 114: {fileID: 403} + - component: {fileID: 335} + - component: {fileID: 295} + - component: {fileID: 403} m_Layer: 5 m_Name: Splash m_TagString: Untagged @@ -700,16 +642,16 @@ GameObject: m_IsActive: 1 --- !u!1 &38 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 340} - - 222: {fileID: 294} - - 114: {fileID: 400} - - 114: {fileID: 399} - - 114: {fileID: 398} + - component: {fileID: 340} + - component: {fileID: 294} + - component: {fileID: 400} + - component: {fileID: 399} + - component: {fileID: 398} m_Layer: 5 m_Name: DebugBtn m_TagString: Untagged @@ -719,13 +661,13 @@ GameObject: m_IsActive: 0 --- !u!1 &39 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 338} - - 222: {fileID: 297} + - component: {fileID: 338} + - component: {fileID: 297} m_Layer: 5 m_Name: LoadAssetPanel m_TagString: Untagged @@ -735,14 +677,14 @@ GameObject: m_IsActive: 0 --- !u!1 &40 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 337} - - 222: {fileID: 299} - - 111: {fileID: 270} + - component: {fileID: 337} + - component: {fileID: 299} + - component: {fileID: 270} m_Layer: 5 m_Name: LoadingPanel m_TagString: Untagged @@ -752,14 +694,14 @@ GameObject: m_IsActive: 0 --- !u!1 &41 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 336} - - 222: {fileID: 298} - - 114: {fileID: 404} + - component: {fileID: 336} + - component: {fileID: 298} + - component: {fileID: 404} m_Layer: 5 m_Name: TransitBlack m_TagString: Untagged @@ -769,14 +711,14 @@ GameObject: m_IsActive: 1 --- !u!1 &42 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 339} - - 222: {fileID: 300} - - 114: {fileID: 412} + - component: {fileID: 339} + - component: {fileID: 300} + - component: {fileID: 412} m_Layer: 5 m_Name: VersionText m_TagString: Untagged @@ -786,14 +728,14 @@ GameObject: m_IsActive: 0 --- !u!1 &43 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 334} - - 222: {fileID: 296} - - 114: {fileID: 401} + - component: {fileID: 334} + - component: {fileID: 296} + - component: {fileID: 401} m_Layer: 5 m_Name: FullScreenLogin m_TagString: Untagged @@ -803,14 +745,14 @@ GameObject: m_IsActive: 1 --- !u!1 &44 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 341} - - 222: {fileID: 301} - - 114: {fileID: 361} + - component: {fileID: 341} + - component: {fileID: 301} + - component: {fileID: 361} m_Layer: 5 m_Name: BlackPanel m_TagString: Untagged @@ -820,13 +762,13 @@ GameObject: m_IsActive: 0 --- !u!1 &45 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 115} - - 114: {fileID: 405} + - component: {fileID: 115} + - component: {fileID: 405} m_Layer: 0 m_Name: VideoDisplay m_TagString: Untagged @@ -836,13 +778,13 @@ GameObject: m_IsActive: 0 --- !u!1 &46 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 114} - - 114: {fileID: 378} + - component: {fileID: 114} + - component: {fileID: 378} m_Layer: 0 m_Name: VideoPlayer m_TagString: Untagged @@ -852,13 +794,13 @@ GameObject: m_IsActive: 0 --- !u!1 &47 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 342} - - 222: {fileID: 303} + - component: {fileID: 342} + - component: {fileID: 303} m_Layer: 5 m_Name: GameEntryPage m_TagString: Untagged @@ -868,12 +810,12 @@ GameObject: m_IsActive: 1 --- !u!1 &48 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 343} + - component: {fileID: 343} m_Layer: 5 m_Name: Video m_TagString: Untagged @@ -883,15 +825,15 @@ GameObject: m_IsActive: 0 --- !u!1 &49 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 344} - - 222: {fileID: 302} - - 114: {fileID: 373} - - 114: {fileID: 372} + - component: {fileID: 344} + - component: {fileID: 302} + - component: {fileID: 373} + - component: {fileID: 372} m_Layer: 5 m_Name: BlockPanel m_TagString: Untagged @@ -901,19 +843,19 @@ GameObject: m_IsActive: 0 --- !u!1 &50 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 345} - - 114: {fileID: 384} - - 114: {fileID: 383} - - 114: {fileID: 382} - - 114: {fileID: 381} - - 114: {fileID: 380} - - 223: {fileID: 304} - - 114: {fileID: 379} + - component: {fileID: 345} + - component: {fileID: 384} + - component: {fileID: 383} + - component: {fileID: 382} + - component: {fileID: 381} + - component: {fileID: 380} + - component: {fileID: 304} + - component: {fileID: 379} m_Layer: 5 m_Name: Dialogs m_TagString: Untagged @@ -923,12 +865,12 @@ GameObject: m_IsActive: 1 --- !u!1 &51 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 346} + - component: {fileID: 346} m_Layer: 5 m_Name: SuspendBar m_TagString: Untagged @@ -938,12 +880,12 @@ GameObject: m_IsActive: 1 --- !u!1 &52 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 347} + - component: {fileID: 347} m_Layer: 5 m_Name: SpecialDialogs m_TagString: Untagged @@ -953,12 +895,12 @@ GameObject: m_IsActive: 1 --- !u!1 &53 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 348} + - component: {fileID: 348} m_Layer: 5 m_Name: Pages m_TagString: Untagged @@ -968,16 +910,16 @@ GameObject: m_IsActive: 1 --- !u!1 &54 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 224: {fileID: 349} - - 223: {fileID: 305} - - 114: {fileID: 393} - - 114: {fileID: 392} - - 114: {fileID: 356} + - component: {fileID: 349} + - component: {fileID: 305} + - component: {fileID: 393} + - component: {fileID: 392} + - component: {fileID: 356} m_Layer: 5 m_Name: GameEntryCanvas m_TagString: Untagged @@ -987,14 +929,14 @@ GameObject: m_IsActive: 1 --- !u!1 &55 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 116} - - 33: {fileID: 220} - - 23: {fileID: 174} + - component: {fileID: 116} + - component: {fileID: 220} + - component: {fileID: 174} m_Layer: 12 m_Name: Screws02 m_TagString: Untagged @@ -1004,14 +946,14 @@ GameObject: m_IsActive: 1 --- !u!1 &56 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 118} - - 33: {fileID: 221} - - 23: {fileID: 175} + - component: {fileID: 118} + - component: {fileID: 221} + - component: {fileID: 175} m_Layer: 12 m_Name: Screws04 m_TagString: Untagged @@ -1021,14 +963,14 @@ GameObject: m_IsActive: 1 --- !u!1 &57 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 119} - - 33: {fileID: 222} - - 23: {fileID: 176} + - component: {fileID: 119} + - component: {fileID: 222} + - component: {fileID: 176} m_Layer: 12 m_Name: Screws03 m_TagString: Untagged @@ -1038,14 +980,14 @@ GameObject: m_IsActive: 1 --- !u!1 &58 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 117} - - 33: {fileID: 219} - - 23: {fileID: 173} + - component: {fileID: 117} + - component: {fileID: 219} + - component: {fileID: 173} m_Layer: 12 m_Name: Screws01 m_TagString: Untagged @@ -1055,15 +997,15 @@ GameObject: m_IsActive: 1 --- !u!1 &59 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 124} - - 33: {fileID: 229} - - 23: {fileID: 183} - - 114: {fileID: 402} + - component: {fileID: 124} + - component: {fileID: 229} + - component: {fileID: 183} + - component: {fileID: 402} m_Layer: 12 m_Name: Shadow02 m_TagString: Untagged @@ -1073,14 +1015,14 @@ GameObject: m_IsActive: 1 --- !u!1 &60 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 120} - - 33: {fileID: 224} - - 23: {fileID: 178} + - component: {fileID: 120} + - component: {fileID: 224} + - component: {fileID: 178} m_Layer: 12 m_Name: OutsideDoor_Up m_TagString: Untagged @@ -1090,14 +1032,14 @@ GameObject: m_IsActive: 1 --- !u!1 &61 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 121} - - 33: {fileID: 226} - - 23: {fileID: 180} + - component: {fileID: 121} + - component: {fileID: 226} + - component: {fileID: 180} m_Layer: 12 m_Name: OutsideDoor_Down m_TagString: Untagged @@ -1107,14 +1049,14 @@ GameObject: m_IsActive: 1 --- !u!1 &62 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 127} - - 33: {fileID: 230} - - 23: {fileID: 184} + - component: {fileID: 127} + - component: {fileID: 230} + - component: {fileID: 184} m_Layer: 12 m_Name: Button02 m_TagString: Untagged @@ -1124,14 +1066,14 @@ GameObject: m_IsActive: 1 --- !u!1 &63 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 125} - - 33: {fileID: 228} - - 23: {fileID: 182} + - component: {fileID: 125} + - component: {fileID: 228} + - component: {fileID: 182} m_Layer: 12 m_Name: Door m_TagString: Untagged @@ -1141,14 +1083,14 @@ GameObject: m_IsActive: 1 --- !u!1 &64 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 128} - - 33: {fileID: 225} - - 23: {fileID: 179} + - component: {fileID: 128} + - component: {fileID: 225} + - component: {fileID: 179} m_Layer: 12 m_Name: Button01 m_TagString: Untagged @@ -1158,14 +1100,14 @@ GameObject: m_IsActive: 1 --- !u!1 &65 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 122} - - 33: {fileID: 223} - - 23: {fileID: 177} + - component: {fileID: 122} + - component: {fileID: 223} + - component: {fileID: 177} m_Layer: 12 m_Name: StartLoading_Screen02 m_TagString: Untagged @@ -1175,14 +1117,14 @@ GameObject: m_IsActive: 1 --- !u!1 &66 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 126} - - 33: {fileID: 231} - - 23: {fileID: 185} + - component: {fileID: 126} + - component: {fileID: 231} + - component: {fileID: 185} m_Layer: 12 m_Name: Button03 m_TagString: Untagged @@ -1192,15 +1134,15 @@ GameObject: m_IsActive: 1 --- !u!1 &67 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 123} - - 33: {fileID: 227} - - 23: {fileID: 181} - - 114: {fileID: 420} + - component: {fileID: 123} + - component: {fileID: 227} + - component: {fileID: 181} + - component: {fileID: 420} m_Layer: 12 m_Name: StartLoading_Screen01 m_TagString: Untagged @@ -1210,14 +1152,14 @@ GameObject: m_IsActive: 1 --- !u!1 &68 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 136} - - 33: {fileID: 237} - - 23: {fileID: 191} + - component: {fileID: 136} + - component: {fileID: 237} + - component: {fileID: 191} m_Layer: 12 m_Name: Pillar m_TagString: Untagged @@ -1227,16 +1169,16 @@ GameObject: m_IsActive: 1 --- !u!1 &69 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 135} - - 33: {fileID: 246} - - 23: {fileID: 200} - - 114: {fileID: 386} - - 114: {fileID: 385} + - component: {fileID: 135} + - component: {fileID: 246} + - component: {fileID: 200} + - component: {fileID: 386} + - component: {fileID: 385} m_Layer: 12 m_Name: Shadow_Left m_TagString: Untagged @@ -1246,14 +1188,14 @@ GameObject: m_IsActive: 1 --- !u!1 &70 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 152} - - 33: {fileID: 253} - - 23: {fileID: 207} + - component: {fileID: 152} + - component: {fileID: 253} + - component: {fileID: 207} m_Layer: 12 m_Name: StartLoading_BG01_Light_A_05 m_TagString: Untagged @@ -1263,14 +1205,14 @@ GameObject: m_IsActive: 1 --- !u!1 &71 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 129} - - 33: {fileID: 257} - - 23: {fileID: 211} + - component: {fileID: 129} + - component: {fileID: 257} + - component: {fileID: 211} m_Layer: 12 m_Name: StartLoading_BG02_Light_B_02 m_TagString: Untagged @@ -1280,14 +1222,14 @@ GameObject: m_IsActive: 1 --- !u!1 &72 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 130} - - 33: {fileID: 234} - - 23: {fileID: 188} + - component: {fileID: 130} + - component: {fileID: 234} + - component: {fileID: 188} m_Layer: 12 m_Name: StartLoading_BG02_Light_B_01 m_TagString: Untagged @@ -1297,14 +1239,14 @@ GameObject: m_IsActive: 1 --- !u!1 &73 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 131} - - 33: {fileID: 235} - - 23: {fileID: 189} + - component: {fileID: 131} + - component: {fileID: 235} + - component: {fileID: 189} m_Layer: 12 m_Name: StartLoading_BG02_Light_A_02 m_TagString: Untagged @@ -1314,14 +1256,14 @@ GameObject: m_IsActive: 1 --- !u!1 &74 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 155} - - 33: {fileID: 252} - - 23: {fileID: 206} + - component: {fileID: 155} + - component: {fileID: 252} + - component: {fileID: 206} m_Layer: 12 m_Name: StartLoading_BG01_Light_A_02 m_TagString: Untagged @@ -1331,16 +1273,16 @@ GameObject: m_IsActive: 1 --- !u!1 &75 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 134} - - 33: {fileID: 254} - - 23: {fileID: 208} - - 114: {fileID: 395} - - 114: {fileID: 394} + - component: {fileID: 134} + - component: {fileID: 254} + - component: {fileID: 208} + - component: {fileID: 395} + - component: {fileID: 394} m_Layer: 12 m_Name: Shadow_Right m_TagString: Untagged @@ -1350,14 +1292,14 @@ GameObject: m_IsActive: 1 --- !u!1 &76 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 149} - - 33: {fileID: 256} - - 23: {fileID: 210} + - component: {fileID: 149} + - component: {fileID: 256} + - component: {fileID: 210} m_Layer: 12 m_Name: StartLoading_BG01_Light_A_08 m_TagString: Untagged @@ -1367,14 +1309,14 @@ GameObject: m_IsActive: 1 --- !u!1 &77 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 144} - - 33: {fileID: 233} - - 23: {fileID: 187} + - component: {fileID: 144} + - component: {fileID: 233} + - component: {fileID: 187} m_Layer: 12 m_Name: StartLoading_BG01_Light_B_05 m_TagString: Untagged @@ -1384,14 +1326,14 @@ GameObject: m_IsActive: 1 --- !u!1 &78 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 143} - - 33: {fileID: 236} - - 23: {fileID: 190} + - component: {fileID: 143} + - component: {fileID: 236} + - component: {fileID: 190} m_Layer: 12 m_Name: StartLoading_BG01_Light_B_06 m_TagString: Untagged @@ -1401,14 +1343,14 @@ GameObject: m_IsActive: 1 --- !u!1 &79 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 132} - - 33: {fileID: 250} - - 23: {fileID: 204} + - component: {fileID: 132} + - component: {fileID: 250} + - component: {fileID: 204} m_Layer: 12 m_Name: StartLoading_BG02_Light_A_01 m_TagString: Untagged @@ -1418,12 +1360,12 @@ GameObject: m_IsActive: 1 --- !u!1 &80 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 137} + - component: {fileID: 137} m_Layer: 12 m_Name: OutsideDoor m_TagString: Untagged @@ -1433,14 +1375,14 @@ GameObject: m_IsActive: 1 --- !u!1 &81 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 147} - - 33: {fileID: 260} - - 23: {fileID: 214} + - component: {fileID: 147} + - component: {fileID: 260} + - component: {fileID: 214} m_Layer: 12 m_Name: StartLoading_BG01_Light_B_02 m_TagString: Untagged @@ -1450,14 +1392,14 @@ GameObject: m_IsActive: 1 --- !u!1 &82 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 140} - - 33: {fileID: 241} - - 23: {fileID: 195} + - component: {fileID: 140} + - component: {fileID: 241} + - component: {fileID: 195} m_Layer: 12 m_Name: Elevator 1 m_TagString: Untagged @@ -1467,14 +1409,14 @@ GameObject: m_IsActive: 1 --- !u!1 &83 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 154} - - 33: {fileID: 255} - - 23: {fileID: 209} + - component: {fileID: 154} + - component: {fileID: 255} + - component: {fileID: 209} m_Layer: 12 m_Name: StartLoading_BG01_Light_A_03 m_TagString: Untagged @@ -1484,14 +1426,14 @@ GameObject: m_IsActive: 1 --- !u!1 &84 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 145} - - 33: {fileID: 238} - - 23: {fileID: 192} + - component: {fileID: 145} + - component: {fileID: 238} + - component: {fileID: 192} m_Layer: 12 m_Name: StartLoading_BG01_Light_B_04 m_TagString: Untagged @@ -1501,14 +1443,14 @@ GameObject: m_IsActive: 1 --- !u!1 &85 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 148} - - 33: {fileID: 248} - - 23: {fileID: 202} + - component: {fileID: 148} + - component: {fileID: 248} + - component: {fileID: 202} m_Layer: 12 m_Name: StartLoading_BG01_Light_B_01 m_TagString: Untagged @@ -1518,14 +1460,14 @@ GameObject: m_IsActive: 1 --- !u!1 &86 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 153} - - 33: {fileID: 247} - - 23: {fileID: 201} + - component: {fileID: 153} + - component: {fileID: 247} + - component: {fileID: 201} m_Layer: 12 m_Name: StartLoading_BG01_Light_A_04 m_TagString: Untagged @@ -1535,14 +1477,14 @@ GameObject: m_IsActive: 1 --- !u!1 &87 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 150} - - 33: {fileID: 243} - - 23: {fileID: 197} + - component: {fileID: 150} + - component: {fileID: 243} + - component: {fileID: 197} m_Layer: 12 m_Name: StartLoading_BG01_Light_A_07 m_TagString: Untagged @@ -1552,14 +1494,14 @@ GameObject: m_IsActive: 1 --- !u!1 &88 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 133} - - 33: {fileID: 251} - - 23: {fileID: 205} + - component: {fileID: 133} + - component: {fileID: 251} + - component: {fileID: 205} m_Layer: 12 m_Name: StartLoading_BG02_Shadow m_TagString: Untagged @@ -1569,14 +1511,14 @@ GameObject: m_IsActive: 1 --- !u!1 &89 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 151} - - 33: {fileID: 258} - - 23: {fileID: 212} + - component: {fileID: 151} + - component: {fileID: 258} + - component: {fileID: 212} m_Layer: 12 m_Name: StartLoading_BG01_Light_A_06 m_TagString: Untagged @@ -1586,14 +1528,14 @@ GameObject: m_IsActive: 1 --- !u!1 &90 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 158} - - 33: {fileID: 239} - - 23: {fileID: 193} + - component: {fileID: 158} + - component: {fileID: 239} + - component: {fileID: 193} m_Layer: 12 m_Name: BG:StartLoading_BG01_Light02 m_TagString: Untagged @@ -1603,12 +1545,12 @@ GameObject: m_IsActive: 1 --- !u!1 &91 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 138} + - component: {fileID: 138} m_Layer: 12 m_Name: InnerDoor m_TagString: Untagged @@ -1618,14 +1560,14 @@ GameObject: m_IsActive: 1 --- !u!1 &92 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 139} - - 33: {fileID: 259} - - 23: {fileID: 213} + - component: {fileID: 139} + - component: {fileID: 259} + - component: {fileID: 213} m_Layer: 12 m_Name: Floor m_TagString: Untagged @@ -1635,14 +1577,14 @@ GameObject: m_IsActive: 1 --- !u!1 &93 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 142} - - 33: {fileID: 232} - - 23: {fileID: 186} + - component: {fileID: 142} + - component: {fileID: 232} + - component: {fileID: 186} m_Layer: 12 m_Name: StartLoading_BG01_Light_B_07 m_TagString: Untagged @@ -1652,14 +1594,14 @@ GameObject: m_IsActive: 1 --- !u!1 &94 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 157} - - 33: {fileID: 249} - - 23: {fileID: 203} + - component: {fileID: 157} + - component: {fileID: 249} + - component: {fileID: 203} m_Layer: 12 m_Name: BG:StartLoading_Staff m_TagString: Untagged @@ -1669,14 +1611,14 @@ GameObject: m_IsActive: 1 --- !u!1 &95 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 141} - - 33: {fileID: 245} - - 23: {fileID: 199} + - component: {fileID: 141} + - component: {fileID: 245} + - component: {fileID: 199} m_Layer: 12 m_Name: StartLoading_BG01_Light_B_08 m_TagString: Untagged @@ -1686,14 +1628,14 @@ GameObject: m_IsActive: 1 --- !u!1 &96 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 159} - - 33: {fileID: 242} - - 23: {fileID: 196} + - component: {fileID: 159} + - component: {fileID: 242} + - component: {fileID: 196} m_Layer: 12 m_Name: BG:StartLoading_BG01_Light m_TagString: Untagged @@ -1703,14 +1645,14 @@ GameObject: m_IsActive: 1 --- !u!1 &97 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 156} - - 33: {fileID: 244} - - 23: {fileID: 198} + - component: {fileID: 156} + - component: {fileID: 244} + - component: {fileID: 198} m_Layer: 12 m_Name: StartLoading_BG01_Light_A_01 m_TagString: Untagged @@ -1720,14 +1662,14 @@ GameObject: m_IsActive: 1 --- !u!1 &98 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 146} - - 33: {fileID: 240} - - 23: {fileID: 194} + - component: {fileID: 146} + - component: {fileID: 240} + - component: {fileID: 194} m_Layer: 12 m_Name: StartLoading_BG01_Light_B_03 m_TagString: Untagged @@ -1737,14 +1679,14 @@ GameObject: m_IsActive: 1 --- !u!1 &99 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 160} - - 33: {fileID: 263} - - 23: {fileID: 217} + - component: {fileID: 160} + - component: {fileID: 263} + - component: {fileID: 217} m_Layer: 12 m_Name: StartLoading_BG02_F m_TagString: Untagged @@ -1754,14 +1696,14 @@ GameObject: m_IsActive: 1 --- !u!1 &100 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 161} - - 33: {fileID: 262} - - 23: {fileID: 216} + - component: {fileID: 161} + - component: {fileID: 262} + - component: {fileID: 216} m_Layer: 12 m_Name: StartLoading_BG02_B m_TagString: Untagged @@ -1771,14 +1713,14 @@ GameObject: m_IsActive: 1 --- !u!1 &101 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 162} - - 33: {fileID: 261} - - 23: {fileID: 215} + - component: {fileID: 162} + - component: {fileID: 261} + - component: {fileID: 215} m_Layer: 12 m_Name: StartLoading_BG01 m_TagString: Untagged @@ -1788,12 +1730,12 @@ GameObject: m_IsActive: 1 --- !u!1 &102 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 163} + - component: {fileID: 163} m_Layer: 12 m_Name: Elevator m_TagString: Untagged @@ -1803,14 +1745,14 @@ GameObject: m_IsActive: 1 --- !u!1 &103 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 164} - - 111: {fileID: 271} - - 114: {fileID: 419} + - component: {fileID: 164} + - component: {fileID: 271} + - component: {fileID: 419} m_Layer: 12 m_Name: StartLoading_Model m_TagString: Untagged @@ -1820,14 +1762,14 @@ GameObject: m_IsActive: 1 --- !u!1 &104 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 165} - - 114: {fileID: 429} - - 114: {fileID: 354} + - component: {fileID: 165} + - component: {fileID: 429} + - component: {fileID: 354} m_Layer: 0 m_Name: __WwiseGlobal m_TagString: Untagged @@ -1837,12 +1779,12 @@ GameObject: m_IsActive: 1 --- !u!1 &105 GameObject: - serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - 4: {fileID: 166} + - component: {fileID: 166} m_Layer: 0 m_Name: fiBackupSceneStorage m_TagString: Untagged @@ -1862,42 +1804,46 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &107 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 111} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &108 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 3} - m_LocalRotation: {x: 1.4217333E-09, y: -0.9999619, z: 0.008726536, w: -1.6291447E-07} + m_LocalRotation: {x: 0.0000000014217333, y: -0.9999619, z: 0.008726536, w: -0.00000016291447} m_LocalPosition: {x: -0, y: -1.208868, z: 7.524243} m_LocalScale: {x: 100, y: 100, z: 100.000015} m_Children: [] m_Father: {fileID: 111} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &109 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 4} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 111} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &110 Transform: m_ObjectHideFlags: 0 @@ -1910,13 +1856,14 @@ Transform: m_Children: [] m_Father: {fileID: 111} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &111 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 6} - m_LocalRotation: {x: 0, y: 1, z: 0, w: -1.6292068E-07} + m_LocalRotation: {x: 0, y: 1, z: 0, w: -0.00000016292068} m_LocalPosition: {x: 0, y: 1.595405, z: 14.10238} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -1925,7 +1872,8 @@ Transform: - {fileID: 108} - {fileID: 107} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &112 Transform: m_ObjectHideFlags: 0 @@ -1937,7 +1885,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &113 Transform: m_ObjectHideFlags: 0 @@ -1949,7 +1898,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &114 Transform: m_ObjectHideFlags: 0 @@ -1962,6 +1912,7 @@ Transform: m_Children: [] m_Father: {fileID: 343} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &115 Transform: m_ObjectHideFlags: 0 @@ -1974,6 +1925,7 @@ Transform: m_Children: [] m_Father: {fileID: 343} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &116 Transform: m_ObjectHideFlags: 0 @@ -1986,6 +1938,7 @@ Transform: m_Children: [] m_Father: {fileID: 120} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &117 Transform: m_ObjectHideFlags: 0 @@ -1998,6 +1951,7 @@ Transform: m_Children: [] m_Father: {fileID: 120} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &118 Transform: m_ObjectHideFlags: 0 @@ -2010,6 +1964,7 @@ Transform: m_Children: [] m_Father: {fileID: 121} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &119 Transform: m_ObjectHideFlags: 0 @@ -2022,6 +1977,7 @@ Transform: m_Children: [] m_Father: {fileID: 121} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &120 Transform: m_ObjectHideFlags: 0 @@ -2036,6 +1992,7 @@ Transform: - {fileID: 116} m_Father: {fileID: 137} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &121 Transform: m_ObjectHideFlags: 0 @@ -2050,6 +2007,7 @@ Transform: - {fileID: 118} m_Father: {fileID: 137} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &122 Transform: m_ObjectHideFlags: 0 @@ -2062,18 +2020,20 @@ Transform: m_Children: [] m_Father: {fileID: 140} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &123 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 67} - m_LocalRotation: {x: 2.1855694E-08, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0.000000021855694, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 140} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &124 Transform: m_ObjectHideFlags: 0 @@ -2086,6 +2046,7 @@ Transform: m_Children: [] m_Father: {fileID: 138} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &125 Transform: m_ObjectHideFlags: 0 @@ -2098,6 +2059,7 @@ Transform: m_Children: [] m_Father: {fileID: 138} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &126 Transform: m_ObjectHideFlags: 0 @@ -2110,6 +2072,7 @@ Transform: m_Children: [] m_Father: {fileID: 138} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &127 Transform: m_ObjectHideFlags: 0 @@ -2122,6 +2085,7 @@ Transform: m_Children: [] m_Father: {fileID: 138} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &128 Transform: m_ObjectHideFlags: 0 @@ -2134,6 +2098,7 @@ Transform: m_Children: [] m_Father: {fileID: 138} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &129 Transform: m_ObjectHideFlags: 0 @@ -2146,6 +2111,7 @@ Transform: m_Children: [] m_Father: {fileID: 160} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &130 Transform: m_ObjectHideFlags: 0 @@ -2158,6 +2124,7 @@ Transform: m_Children: [] m_Father: {fileID: 160} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &131 Transform: m_ObjectHideFlags: 0 @@ -2170,6 +2137,7 @@ Transform: m_Children: [] m_Father: {fileID: 160} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &132 Transform: m_ObjectHideFlags: 0 @@ -2182,6 +2150,7 @@ Transform: m_Children: [] m_Father: {fileID: 160} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &133 Transform: m_ObjectHideFlags: 0 @@ -2194,6 +2163,7 @@ Transform: m_Children: [] m_Father: {fileID: 160} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &134 Transform: m_ObjectHideFlags: 0 @@ -2206,6 +2176,7 @@ Transform: m_Children: [] m_Father: {fileID: 163} m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &135 Transform: m_ObjectHideFlags: 0 @@ -2218,6 +2189,7 @@ Transform: m_Children: [] m_Father: {fileID: 163} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &136 Transform: m_ObjectHideFlags: 0 @@ -2230,6 +2202,7 @@ Transform: m_Children: [] m_Father: {fileID: 163} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &137 Transform: m_ObjectHideFlags: 0 @@ -2244,6 +2217,7 @@ Transform: - {fileID: 120} m_Father: {fileID: 163} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &138 Transform: m_ObjectHideFlags: 0 @@ -2261,6 +2235,7 @@ Transform: - {fileID: 124} m_Father: {fileID: 163} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &139 Transform: m_ObjectHideFlags: 0 @@ -2273,6 +2248,7 @@ Transform: m_Children: [] m_Father: {fileID: 163} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &140 Transform: m_ObjectHideFlags: 0 @@ -2287,6 +2263,7 @@ Transform: - {fileID: 122} m_Father: {fileID: 163} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &141 Transform: m_ObjectHideFlags: 0 @@ -2299,6 +2276,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &142 Transform: m_ObjectHideFlags: 0 @@ -2311,6 +2289,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &143 Transform: m_ObjectHideFlags: 0 @@ -2323,6 +2302,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &144 Transform: m_ObjectHideFlags: 0 @@ -2335,6 +2315,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &145 Transform: m_ObjectHideFlags: 0 @@ -2347,6 +2328,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &146 Transform: m_ObjectHideFlags: 0 @@ -2359,6 +2341,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &147 Transform: m_ObjectHideFlags: 0 @@ -2371,6 +2354,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &148 Transform: m_ObjectHideFlags: 0 @@ -2383,6 +2367,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &149 Transform: m_ObjectHideFlags: 0 @@ -2395,6 +2380,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &150 Transform: m_ObjectHideFlags: 0 @@ -2407,6 +2393,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &151 Transform: m_ObjectHideFlags: 0 @@ -2419,6 +2406,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &152 Transform: m_ObjectHideFlags: 0 @@ -2431,6 +2419,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &153 Transform: m_ObjectHideFlags: 0 @@ -2443,6 +2432,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &154 Transform: m_ObjectHideFlags: 0 @@ -2455,6 +2445,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &155 Transform: m_ObjectHideFlags: 0 @@ -2467,6 +2458,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &156 Transform: m_ObjectHideFlags: 0 @@ -2479,6 +2471,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &157 Transform: m_ObjectHideFlags: 0 @@ -2491,6 +2484,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &158 Transform: m_ObjectHideFlags: 0 @@ -2503,6 +2497,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &159 Transform: m_ObjectHideFlags: 0 @@ -2515,6 +2510,7 @@ Transform: m_Children: [] m_Father: {fileID: 162} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &160 Transform: m_ObjectHideFlags: 0 @@ -2532,6 +2528,7 @@ Transform: - {fileID: 129} m_Father: {fileID: 164} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &161 Transform: m_ObjectHideFlags: 0 @@ -2544,6 +2541,7 @@ Transform: m_Children: [] m_Father: {fileID: 164} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &162 Transform: m_ObjectHideFlags: 0 @@ -2575,6 +2573,7 @@ Transform: - {fileID: 141} m_Father: {fileID: 164} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &163 Transform: m_ObjectHideFlags: 0 @@ -2594,6 +2593,7 @@ Transform: - {fileID: 134} m_Father: {fileID: 164} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &164 Transform: m_ObjectHideFlags: 0 @@ -2609,7 +2609,8 @@ Transform: - {fileID: 161} - {fileID: 160} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &165 Transform: m_ObjectHideFlags: 0 @@ -2621,7 +2622,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &166 Transform: m_ObjectHideFlags: 0 @@ -2633,15 +2635,16 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &167 Camera: - serializedVersion: 2 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 4} m_Enabled: 0 + serializedVersion: 2 m_ClearFlags: 4 m_BackGroundColor: {r: 0.498, g: 0.498, b: 0, a: 0} m_NormalizedViewPortRect: @@ -2663,19 +2666,21 @@ Camera: m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 m_TargetEye: 3 - m_HDR: 0 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!20 &168 Camera: - serializedVersion: 2 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2} m_Enabled: 0 + serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} m_NormalizedViewPortRect: @@ -2697,19 +2702,21 @@ Camera: m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 m_TargetEye: 3 - m_HDR: 0 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!20 &169 Camera: - serializedVersion: 2 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 5} m_Enabled: 1 + serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} m_NormalizedViewPortRect: @@ -2732,18 +2739,20 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!20 &170 Camera: - serializedVersion: 2 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 6} m_Enabled: 1 + serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} m_NormalizedViewPortRect: @@ -2766,18 +2775,20 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!20 &171 Camera: - serializedVersion: 2 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 8} m_Enabled: 1 + serializedVersion: 2 m_ClearFlags: 3 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} m_NormalizedViewPortRect: @@ -2800,10 +2811,12 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!23 &172 MeshRenderer: m_ObjectHideFlags: 0 @@ -2813,22 +2826,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 116b891cec9a8f943b547fffa8a6d09f, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &173 MeshRenderer: @@ -2839,22 +2860,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 4b0829e6e4413fc44976e7b59cfeba69, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &174 MeshRenderer: @@ -2865,22 +2894,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 4b0829e6e4413fc44976e7b59cfeba69, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &175 MeshRenderer: @@ -2891,22 +2928,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 4b0829e6e4413fc44976e7b59cfeba69, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &176 MeshRenderer: @@ -2917,22 +2962,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 4b0829e6e4413fc44976e7b59cfeba69, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &177 MeshRenderer: @@ -2943,22 +2996,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 3d761a72e7bd7814d86f7b31cd153ec9, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &178 MeshRenderer: @@ -2969,23 +3030,31 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: d25bbe15455fd0f418e7f25940c1f59b, type: 2} - {fileID: 2100000, guid: 07517bcd626ff8d4db0cbf79508ef54b, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &179 MeshRenderer: @@ -2996,22 +3065,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 224de8cb3c1c46d4d85ec6a89b53c6f2, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &180 MeshRenderer: @@ -3022,23 +3099,31 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: d25bbe15455fd0f418e7f25940c1f59b, type: 2} - {fileID: 2100000, guid: 07517bcd626ff8d4db0cbf79508ef54b, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &181 MeshRenderer: @@ -3049,22 +3134,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 49f8f36484bf9604a9d84f0d954033bf, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &182 MeshRenderer: @@ -3075,23 +3168,31 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 2dc99769cc0a06442a9d641b8d41653f, type: 2} - {fileID: 2100000, guid: 8ab1f0cc9770373418f976d40c16d7da, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &183 MeshRenderer: @@ -3102,22 +3203,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 04c1cdd9f4869614f83326e2d420a7cd, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &184 MeshRenderer: @@ -3128,22 +3237,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 224de8cb3c1c46d4d85ec6a89b53c6f2, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &185 MeshRenderer: @@ -3154,22 +3271,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 224de8cb3c1c46d4d85ec6a89b53c6f2, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &186 MeshRenderer: @@ -3180,22 +3305,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &187 MeshRenderer: @@ -3206,22 +3339,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &188 MeshRenderer: @@ -3232,22 +3373,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 88ef1700795671c45beb4295aef4e4a6, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &189 MeshRenderer: @@ -3258,22 +3407,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 88ef1700795671c45beb4295aef4e4a6, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &190 MeshRenderer: @@ -3284,22 +3441,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &191 MeshRenderer: @@ -3310,22 +3475,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 15496f88329b1b1498ba3f272fa6c75c, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &192 MeshRenderer: @@ -3336,22 +3509,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &193 MeshRenderer: @@ -3362,22 +3543,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &194 MeshRenderer: @@ -3388,22 +3577,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &195 MeshRenderer: @@ -3414,22 +3611,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 06a6784e1e6262c448ed6a5f8858b84a, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &196 MeshRenderer: @@ -3440,22 +3645,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: fe8757b638a937c4da0c20729d100d67, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &197 MeshRenderer: @@ -3466,22 +3679,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &198 MeshRenderer: @@ -3492,22 +3713,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &199 MeshRenderer: @@ -3518,22 +3747,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &200 MeshRenderer: @@ -3544,22 +3781,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 949d1de2a9523894c926f69bfa5eee7d, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &201 MeshRenderer: @@ -3570,22 +3815,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &202 MeshRenderer: @@ -3596,22 +3849,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &203 MeshRenderer: @@ -3622,23 +3883,31 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 00eb22c7b22d0e643adf7e83240e3da9, type: 2} - {fileID: 2100000, guid: b39e92af7726afa4c953bf9a8346d52f, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &204 MeshRenderer: @@ -3649,22 +3918,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 88ef1700795671c45beb4295aef4e4a6, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &205 MeshRenderer: @@ -3675,22 +3952,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 5e7164eaba73a4740ae4159653f4756e, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &206 MeshRenderer: @@ -3701,22 +3986,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &207 MeshRenderer: @@ -3727,22 +4020,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &208 MeshRenderer: @@ -3753,22 +4054,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 949d1de2a9523894c926f69bfa5eee7d, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &209 MeshRenderer: @@ -3779,22 +4088,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &210 MeshRenderer: @@ -3805,22 +4122,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &211 MeshRenderer: @@ -3831,22 +4156,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 88ef1700795671c45beb4295aef4e4a6, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &212 MeshRenderer: @@ -3857,22 +4190,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &213 MeshRenderer: @@ -3883,23 +4224,31 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: caded1e4b061c12459cd367fc923d31c, type: 2} - {fileID: 2100000, guid: c00606f3f87f54d4aa629c46850603ea, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &214 MeshRenderer: @@ -3910,22 +4259,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 0b69e06fdd234934a871c13403cd91ff, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &215 MeshRenderer: @@ -3936,22 +4293,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: fe8757b638a937c4da0c20729d100d67, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &216 MeshRenderer: @@ -3962,22 +4327,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 8a69acbdc160d5d4c9f4e5ac85d6b34c, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!23 &217 MeshRenderer: @@ -3988,22 +4361,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 5809f74f88ff4c748bc39e28e00cd1e4, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &218 MeshFilter: @@ -4335,27 +4716,56 @@ AudioListener: m_GameObject: {fileID: 8} m_Enabled: 1 --- !u!92 &265 -GUILayer: +Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 6} m_Enabled: 1 --- !u!92 &266 -GUILayer: +Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 8} m_Enabled: 1 +--- !u!104 &267 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 8 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_AmbientEquatorColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} --- !u!111 &268 Animation: - serializedVersion: 3 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 6} m_Enabled: 1 + serializedVersion: 3 m_Animation: {fileID: 7400000, guid: 4c8022f37b795dc4cb1ce32a280856a8, type: 2} m_Animations: - {fileID: 7400000, guid: 4c8022f37b795dc4cb1ce32a280856a8, type: 2} @@ -4366,12 +4776,12 @@ Animation: m_CullingType: 0 --- !u!111 &269 Animation: - serializedVersion: 3 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 25} m_Enabled: 1 + serializedVersion: 3 m_Animation: {fileID: 7400000, guid: c698cb6e0bfa6534f9649cde354c1a4e, type: 2} m_Animations: - {fileID: 7400000, guid: c698cb6e0bfa6534f9649cde354c1a4e, type: 2} @@ -4381,12 +4791,12 @@ Animation: m_CullingType: 0 --- !u!111 &270 Animation: - serializedVersion: 3 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 40} m_Enabled: 1 + serializedVersion: 3 m_Animation: {fileID: 7400000, guid: 5e73f64102ead56429d148b134873b57, type: 2} m_Animations: - {fileID: 7400000, guid: 5e73f64102ead56429d148b134873b57, type: 2} @@ -4396,12 +4806,12 @@ Animation: m_CullingType: 0 --- !u!111 &271 Animation: - serializedVersion: 3 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 103} m_Enabled: 1 + serializedVersion: 3 m_Animation: {fileID: 7400000, guid: 3dfc7fcdeaca7c64b90668c8a0b19b7a, type: 2} m_Animations: - {fileID: 7400000, guid: ccda68bea86f1be4cb23146238fc8661, type: 2} @@ -4416,19 +4826,72 @@ Animation: m_AnimatePhysics: 0 m_CullingType: 0 --- !u!124 &272 -FlareLayer: +Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 6} m_Enabled: 1 --- !u!124 &273 -FlareLayer: +Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 8} m_Enabled: 1 +--- !u!157 &274 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 9 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AO: 1 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 1 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 112000000, guid: 757775c266798d84494d9818422dab6d, + type: 2} + m_UseShadowmask: 0 --- !u!222 &275 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4605,12 +5068,12 @@ CanvasRenderer: m_GameObject: {fileID: 47} --- !u!223 &304 Canvas: - serializedVersion: 2 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 50} m_Enabled: 1 + serializedVersion: 3 m_RenderMode: 2 m_Camera: {fileID: 0} m_PlaneDistance: 100 @@ -4619,17 +5082,18 @@ Canvas: m_OverrideSorting: 1 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 --- !u!223 &305 Canvas: - serializedVersion: 2 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 54} m_Enabled: 1 + serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 171} m_PlaneDistance: 4 @@ -4638,6 +5102,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -4648,11 +5113,12 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 11} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 313} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 1} @@ -4665,11 +5131,12 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 9} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 317} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 1} @@ -4682,11 +5149,12 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 12} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 315} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 1} @@ -4699,11 +5167,12 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 10} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 314} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 1} @@ -4716,11 +5185,12 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 20} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -100, y: 1, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 321} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 1} @@ -4733,11 +5203,12 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 15} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 64.973755, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 322} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 310.47375, y: -24.5} @@ -4750,11 +5221,12 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 14} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -35.22406, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 322} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 210.27594, y: -24.5} @@ -4767,12 +5239,13 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 13} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 280, y: 10, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 306} m_Father: {fileID: 319} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 280, y: 60} @@ -4785,12 +5258,13 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 19} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 10, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 309} m_Father: {fileID: 319} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 60} @@ -4803,12 +5277,13 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 18} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -280, y: 10, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 308} m_Father: {fileID: 319} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -280, y: 60} @@ -4821,11 +5296,12 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 17} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1, y: -0.5, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 324} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -1, y: -0.5} @@ -4838,12 +5314,13 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 16} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 10, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 307} m_Father: {fileID: 318} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 60} @@ -4862,6 +5339,7 @@ RectTransform: - {fileID: 317} m_Father: {fileID: 327} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -4882,6 +5360,7 @@ RectTransform: - {fileID: 313} m_Father: {fileID: 327} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -4899,6 +5378,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 330} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -4911,12 +5391,13 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 21} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 610, y: 10, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 310} m_Father: {fileID: 326} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -30, y: 10} @@ -4929,13 +5410,14 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 22} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 10, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 312} - {fileID: 311} m_Father: {fileID: 326} m_RootOrder: 1 + 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: 0, y: 10} @@ -4948,11 +5430,12 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 28} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 10, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 326} m_RootOrder: 0 + 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: 0, y: 10} @@ -4971,6 +5454,7 @@ RectTransform: - {fileID: 316} m_Father: {fileID: 332} m_RootOrder: 1 + 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: 0, y: 0} @@ -4988,6 +5472,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 332} m_RootOrder: 0 + 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: 0, y: 0} @@ -5000,7 +5485,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 31} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 50, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 323} @@ -5008,6 +5493,7 @@ RectTransform: - {fileID: 321} m_Father: {fileID: 333} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5020,13 +5506,14 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 29} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 50, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 319} - {fileID: 318} m_Father: {fileID: 333} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5039,11 +5526,12 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 33} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -110, y: 1, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 340} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 1} @@ -5056,14 +5544,15 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 35} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -300.00003, y: 25.999985, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 338} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 340, y: -1.5258789E-05} + m_AnchoredPosition: {x: 340, y: -0.000015258789} m_SizeDelta: {x: 600, y: 32} m_Pivot: {x: 0.5220847, y: 0.5} --- !u!224 &330 @@ -5073,12 +5562,13 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 30} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -11, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 320} m_Father: {fileID: 337} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -11} @@ -5091,11 +5581,12 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 32} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -67.01959, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 337} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: -0.4} m_AnchorMax: {x: 1, y: 0.4} m_AnchoredPosition: {x: 0, y: -4.296875} @@ -5115,6 +5606,7 @@ RectTransform: - {fileID: 324} m_Father: {fileID: 337} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -5127,13 +5619,14 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 36} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -803.9298, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 327} - {fileID: 326} m_Father: {fileID: 342} m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -5151,6 +5644,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 342} m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5168,6 +5662,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 342} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -5185,6 +5680,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 342} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5197,7 +5693,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 40} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -19.5, y: -349.4469, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 332} @@ -5205,6 +5701,7 @@ RectTransform: - {fileID: 330} m_Father: {fileID: 342} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.24365322} m_AnchorMax: {x: 1, y: 0.32167336} m_AnchoredPosition: {x: -19.5, y: 0} @@ -5217,12 +5714,13 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 39} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -783.9298, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 329} m_Father: {fileID: 342} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 20.000004} @@ -5235,11 +5733,12 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 42} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 630, y: -801.9298, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 342} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -10, y: 2} @@ -5252,12 +5751,13 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 38} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 620, y: 753.9298, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 328} m_Father: {fileID: 342} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -20, y: -50} @@ -5275,6 +5775,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 343} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5300,6 +5801,7 @@ RectTransform: - {fileID: 333} m_Father: {fileID: 348} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5320,6 +5822,7 @@ RectTransform: - {fileID: 114} m_Father: {fileID: 349} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5337,6 +5840,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 349} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5354,6 +5858,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 349} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5371,6 +5876,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 349} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5388,6 +5894,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 349} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5406,6 +5913,7 @@ RectTransform: - {fileID: 342} m_Father: {fileID: 349} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5418,8 +5926,8 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 54} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 2} - m_LocalScale: {x: 0.006219448, y: 0.006219448, z: 0.006219448} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 348} - {fileID: 347} @@ -5428,12 +5936,13 @@ RectTransform: - {fileID: 344} - {fileID: 343} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 1607.8596} - m_Pivot: {x: 0.5, y: 0.5} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!225 &350 CanvasGroup: m_ObjectHideFlags: 0 @@ -5487,8 +5996,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2bbe4bd7fe4bf8bc0dccce4101c3adb2, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: basePath: Audio\GeneratedSoundBanks language: Chinese(PRC) defaultPoolSize: 8192 @@ -5505,8 +6014,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 5 @@ -5519,8 +6028,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f6d5a50b0fd255c22a8fd44dc5bde2f3, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: GameEntryPage: {fileID: 47} assetbundleRetryTimes: 0 --- !u!114 &357 @@ -5532,8 +6041,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d5d4fbbc00313beb4b10f5ac21efcb42, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: listenerId: 0 --- !u!114 &358 MonoBehaviour: @@ -5544,8 +6053,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6b75de72a10b55e3bea343118ef542fa, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: eventName: UI_Select_GameEntry --- !u!114 &359 MonoBehaviour: @@ -5556,8 +6065,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_SelectOnUp: {fileID: 0} @@ -5586,7 +6095,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &360 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5596,15 +6106,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 11cabeb4ae4ee8c489d1266f63014ce9, type: 2} m_Type: 1 m_PreserveAspect: 0 @@ -5622,15 +6133,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -5648,15 +6160,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.7058824, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 66955514758d3734eb47e2a999406165, type: 3} m_FontSize: 30 @@ -5680,10 +6193,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c98ea2533c3b7e766f7e46473e8dfe0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _textID: Menu_MihoyoAccountLogin_2 - _textPattern: + _textPattern: --- !u!114 &364 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5693,15 +6206,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 32e255f207eb65549b7d6d1d76d33445, type: 3} m_FontSize: 28 @@ -5715,7 +6229,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 米哈游账号登录 + m_Text: "\u7C73\u54C8\u6E38\u8D26\u53F7\u767B\u5F55" --- !u!114 &365 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5725,10 +6239,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c98ea2533c3b7e766f7e46473e8dfe0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _textID: Menu_MihoyoAccountRegister - _textPattern: + _textPattern: --- !u!114 &366 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5738,15 +6252,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 32e255f207eb65549b7d6d1d76d33445, type: 3} m_FontSize: 28 @@ -5760,7 +6275,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 注册崩坏账号 + m_Text: "\u6CE8\u518C\u5D29\u574F\u8D26\u53F7" --- !u!114 &367 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5770,8 +6285,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6b75de72a10b55e3bea343118ef542fa, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: eventName: UI_Select_GameEntry --- !u!114 &368 MonoBehaviour: @@ -5782,8 +6297,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_SelectOnUp: {fileID: 0} @@ -5812,7 +6327,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &369 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5822,15 +6338,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 11cabeb4ae4ee8c489d1266f63014ce9, type: 2} m_Type: 1 m_PreserveAspect: 0 @@ -5848,8 +6365,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Padding: m_Left: 0 m_Right: 0 @@ -5859,6 +6376,8 @@ MonoBehaviour: m_Spacing: 14 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 --- !u!114 &371 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5868,8 +6387,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_SelectOnUp: {fileID: 0} @@ -5905,7 +6424,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &372 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5915,8 +6435,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: eee0f39be23ca30fde7f135ff8cd1df6, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!114 &373 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5926,15 +6446,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -5952,15 +6473,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19215688, g: 1, b: 0.5137255, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 32e255f207eb65549b7d6d1d76d33445, type: 3} m_FontSize: 18 @@ -5974,7 +6496,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 更在更新数据包... + m_Text: "\u66F4\u5728\u66F4\u65B0\u6570\u636E\u5305..." --- !u!114 &375 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5984,15 +6506,15 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6e9d3e9d9cdfee9e1d803373b62fc17, type: 3} - m_Name: - m_EditorClassIdentifier: - CompositionShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - GaussShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - DownSampleShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - DownSample4xShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - DownSampleCompShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} + m_Name: + m_EditorClassIdentifier: + CompositionShader: {fileID: 0} + GaussShader: {fileID: 0} + DownSampleShader: {fileID: 0} + DownSample4xShader: {fileID: 0} + DownSampleCompShader: {fileID: 0} ReflectedShader: {fileID: 0} - HexBlurShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} + HexBlurShader: {fileID: 0} FarCamera: {fileID: 169} NearFarSeparateDistance: 8.9 BackgroundQuad: {fileID: 3} @@ -6000,17 +6522,20 @@ MonoBehaviour: BackgrondBlurCurve: serializedVersion: 2 m_Curve: - - time: 8.902067 + - serializedVersion: 2 + time: 8.902067 value: 3.5950923 inSlope: -2.4300814 outSlope: -2.4300814 tangentMode: 0 - - time: 9.468142 + - serializedVersion: 2 + time: 9.468142 value: 2.0526876 inSlope: -2.8255987 outSlope: -2.8255987 tangentMode: 0 - - time: 10.3 + - serializedVersion: 2 + time: 10.3 value: 0 inSlope: 0.11634245 outSlope: 0.11634245 @@ -6030,8 +6555,8 @@ MonoBehaviour: m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c61cb9a2d16c82e5cded3544ec92fe2d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: target: {fileID: 0} Distance: 4 headSpeed: 250 @@ -6054,27 +6579,32 @@ MonoBehaviour: PilotShakeX: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 1 tangentMode: 0 - - time: 0.20447998 + - serializedVersion: 2 + time: 0.20447998 value: 0.13776892 inSlope: -0.1842156 outSlope: -0.1842156 tangentMode: 0 - - time: 0.5012176 + - serializedVersion: 2 + time: 0.5012176 value: -0.07802135 inSlope: -0.85899013 outSlope: -0.85899013 tangentMode: 0 - - time: 0.7857378 + - serializedVersion: 2 + time: 0.7857378 value: 0.040461447 inSlope: 0.18902123 outSlope: 0.18902123 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 1 outSlope: 0 @@ -6085,42 +6615,50 @@ MonoBehaviour: PilotShakeY: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0.09043635 outSlope: 0.09043635 tangentMode: 0 - - time: 0.3565489 + - serializedVersion: 2 + time: 0.3565489 value: -0.0022879015 inSlope: -0.025182962 outSlope: -0.025182962 tangentMode: 0 - - time: 0.5083719 + - serializedVersion: 2 + time: 0.5083719 value: -0.008003237 inSlope: 0.008159926 outSlope: 0.008159926 tangentMode: 0 - - time: 0.8864803 + - serializedVersion: 2 + time: 0.8864803 value: 0.004025384 inSlope: -0.02622784 outSlope: -0.02622784 tangentMode: 0 - - time: 1.0872278 + - serializedVersion: 2 + time: 1.0872278 value: 0.006457602 inSlope: 0.017010607 outSlope: 0.017010607 tangentMode: 0 - - time: 1.3496084 + - serializedVersion: 2 + time: 1.3496084 value: -0.008057073 inSlope: -0.02488494 outSlope: -0.02488494 tangentMode: 0 - - time: 1.7303476 + - serializedVersion: 2 + time: 1.7303476 value: -0.00489475 inSlope: 0.0014763356 outSlope: 0.0014763356 tangentMode: 0 - - time: 2 + - serializedVersion: 2 + time: 2 value: 0 inSlope: 0.114648305 outSlope: 0.114648305 @@ -6131,17 +6669,20 @@ MonoBehaviour: GyroSensitivityCurve: serializedVersion: 2 m_Curve: - - time: 3.22 + - serializedVersion: 2 + time: 3.22 value: 0.01 inSlope: 0.01666667 outSlope: 0.01666667 tangentMode: 0 - - time: 3.82 + - serializedVersion: 2 + time: 3.82 value: 0.02 inSlope: 0.0129204905 outSlope: 0.0129204905 tangentMode: 0 - - time: 6 + - serializedVersion: 2 + time: 6 value: 0.04 inSlope: 0.0091743115 outSlope: 0.0091743115 @@ -6162,15 +6703,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0.7647059, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 32e255f207eb65549b7d6d1d76d33445, type: 3} m_FontSize: 26 @@ -6184,7 +6726,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 用户/游客 + m_Text: "\u7528\u6237/\u6E38\u5BA2" --- !u!114 &378 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6194,10 +6736,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 43244178e09b96266a7199a107e2a8e2, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_VideoLocation: 2 - m_VideoPath: + m_VideoPath: m_AutoOpen: 0 m_AutoStart: 0 m_Loop: 0 @@ -6215,41 +6757,42 @@ MonoBehaviour: m_events: m_PersistentCalls: m_Calls: [] - m_TypeName: RenderHeads.Media.AVProVideo.MediaPlayerEvent, Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: RenderHeads.Media.AVProVideo.MediaPlayerEvent, Assembly-CSharp-firstpass, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null _optionsWindows: overridePath: 0 pathLocation: 2 - path: + path: forceDirectShowApi: 0 - forceAudioOutputDeviceName: + forceAudioOutputDeviceName: _optionsMacOSX: overridePath: 0 pathLocation: 2 - path: + path: _optionsIOS: overridePath: 0 pathLocation: 2 - path: + path: _optionsTVOS: overridePath: 0 pathLocation: 2 - path: + path: _optionsAndroid: overridePath: 0 pathLocation: 2 - path: + path: _optionsWindowsPhone: overridePath: 0 pathLocation: 2 - path: + path: _optionsWindowsUWP: overridePath: 0 pathLocation: 2 - path: + path: _optionsWebGL: overridePath: 0 pathLocation: 2 - path: + path: --- !u!114 &379 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6259,8 +6802,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 m_BlockingObjects: 0 m_BlockingMask: @@ -6275,8 +6818,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 m_BlockingObjects: 0 m_BlockingMask: @@ -6291,8 +6834,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 m_BlockingObjects: 0 m_BlockingMask: @@ -6307,8 +6850,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 m_BlockingObjects: 0 m_BlockingMask: @@ -6323,8 +6866,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 m_BlockingObjects: 0 m_BlockingMask: @@ -6339,8 +6882,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 m_BlockingObjects: 0 m_BlockingMask: @@ -6355,8 +6898,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 18ce8e22bfb359c92cb09af77417d1d3, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: scrollX: 0 scrollY: -1 speed2Ratio: 1 @@ -6366,16 +6909,18 @@ MonoBehaviour: referenceStartPhaseY: 0.79 materialId: 0 materialId2: -1 - TexName: + TexName: frameOverTime: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 0 @@ -6395,8 +6940,8 @@ MonoBehaviour: m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8db9b6b6028fe0678839bc82c1e1ef5d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: projObjDist: 1.9 projObjTopY: 2.8 projObjBottomY: -0.61 @@ -6407,12 +6952,14 @@ MonoBehaviour: lightSourceMovementCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0.6349387 tangentMode: 0 - - time: 0.9999902 + - serializedVersion: 2 + time: 0.9999902 value: 0.6349325 inSlope: 0.6349387 outSlope: 0.63493854 @@ -6424,32 +6971,38 @@ MonoBehaviour: lightStrenthCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0.14604595 outSlope: 0.14604595 tangentMode: 0 - - time: 0.3894303 + - serializedVersion: 2 + time: 0.3894303 value: 0.46739218 inSlope: 2.5240593 outSlope: 2.5240593 tangentMode: 0 - - time: 0.49131316 + - serializedVersion: 2 + time: 0.49131316 value: 0.97446007 inSlope: 0.046080306 outSlope: 0.046080306 tangentMode: 0 - - time: 0.62832445 + - serializedVersion: 2 + time: 0.62832445 value: 0.4624632 inSlope: -1.5418203 outSlope: -1.5418203 tangentMode: 0 - - time: 0.84613 + - serializedVersion: 2 + time: 0.84613 value: 0.12173612 inSlope: -0.9807508 outSlope: -0.9807508 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: -0.17670518 outSlope: -0.17670518 @@ -6469,15 +7022,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.09019608, g: 0.09019608, b: 0.09019608, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 2ef43ca00ce7c0e438645493bdb3dd2c, type: 2} m_Type: 1 m_PreserveAspect: 0 @@ -6495,15 +7049,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: d2fcc06c35183e04ba6a7df096263dfe, type: 2} m_Type: 2 m_PreserveAspect: 0 @@ -6521,8 +7076,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6b75de72a10b55e3bea343118ef542fa, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: eventName: UI_Select_GameEntry --- !u!114 &390 MonoBehaviour: @@ -6533,8 +7088,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_SelectOnUp: {fileID: 0} @@ -6563,7 +7118,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &391 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6573,15 +7129,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 11cabeb4ae4ee8c489d1266f63014ce9, type: 2} m_Type: 1 m_PreserveAspect: 0 @@ -6599,8 +7156,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 m_BlockingObjects: 0 m_BlockingMask: @@ -6615,8 +7172,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 1 m_ScaleFactor: 1 @@ -6636,8 +7193,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 18ce8e22bfb359c92cb09af77417d1d3, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: scrollX: 0 scrollY: -1 speed2Ratio: 1 @@ -6647,16 +7204,18 @@ MonoBehaviour: referenceStartPhaseY: 0.29 materialId: 0 materialId2: -1 - TexName: + TexName: frameOverTime: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 0 @@ -6676,8 +7235,8 @@ MonoBehaviour: m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8db9b6b6028fe0678839bc82c1e1ef5d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: projObjDist: 1.9 projObjTopY: 2.8 projObjBottomY: -0.61 @@ -6688,12 +7247,14 @@ MonoBehaviour: lightSourceMovementCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0.6349387 tangentMode: 0 - - time: 0.9999902 + - serializedVersion: 2 + time: 0.9999902 value: 0.6349325 inSlope: 0.6349387 outSlope: 0.63493854 @@ -6705,32 +7266,38 @@ MonoBehaviour: lightStrenthCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0.14604595 outSlope: 0.14604595 tangentMode: 0 - - time: 0.3894303 + - serializedVersion: 2 + time: 0.3894303 value: 0.46739218 inSlope: 2.5240593 outSlope: 2.5240593 tangentMode: 0 - - time: 0.49131316 + - serializedVersion: 2 + time: 0.49131316 value: 0.97446007 inSlope: 0.046080306 outSlope: 0.046080306 tangentMode: 0 - - time: 0.62832445 + - serializedVersion: 2 + time: 0.62832445 value: 0.4624632 inSlope: -1.5418203 outSlope: -1.5418203 tangentMode: 0 - - time: 0.84613 + - serializedVersion: 2 + time: 0.84613 value: 0.12173612 inSlope: -0.9807508 outSlope: -0.9807508 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: -0.17670518 outSlope: -0.17670518 @@ -6750,10 +7317,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c98ea2533c3b7e766f7e46473e8dfe0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _textID: Menu_MihoyoAccountLogin - _textPattern: + _textPattern: --- !u!114 &397 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6763,15 +7330,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 32e255f207eb65549b7d6d1d76d33445, type: 3} m_FontSize: 28 @@ -6785,7 +7353,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 已有账号登录 + m_Text: "\u5DF2\u6709\u8D26\u53F7\u767B\u5F55" --- !u!114 &398 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6795,8 +7363,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6b75de72a10b55e3bea343118ef542fa, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: eventName: UI_Select_GameEntry --- !u!114 &399 MonoBehaviour: @@ -6807,8 +7375,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_SelectOnUp: {fileID: 0} @@ -6837,7 +7405,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &400 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6847,15 +7416,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 032d2ea21c501804aa56b44c2e933f6e, type: 2} m_Type: 1 m_PreserveAspect: 0 @@ -6873,8 +7443,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9f59a3a1075b1ccd1eb1aa54a1a33bee, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -6887,8 +7457,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 18ce8e22bfb359c92cb09af77417d1d3, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: scrollX: 0 scrollY: 1 speed2Ratio: 1 @@ -6898,31 +7468,36 @@ MonoBehaviour: referenceStartPhaseY: 0.813 materialId: 0 materialId2: -1 - TexName: + TexName: frameOverTime: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: -0.1 inSlope: 0 outSlope: 1.097135 tangentMode: 0 - - time: 0.43750316 + - serializedVersion: 2 + time: 0.43750316 value: 0.38 inSlope: 1.097135 outSlope: -0 tangentMode: 0 - - time: 0.66714334 + - serializedVersion: 2 + time: 0.66714334 value: 0.38 inSlope: 0 outSlope: -1.1171613 tangentMode: 0 - - time: 1.0968038 + - serializedVersion: 2 + time: 1.0968038 value: -0.1 inSlope: -1.1171613 outSlope: -0 tangentMode: 0 - - time: 1.3331103 + - serializedVersion: 2 + time: 1.3331103 value: -0.1 inSlope: 0 outSlope: 0 @@ -6942,15 +7517,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 6b5f9fc8670751147aacf8b4d691eb34, type: 2} m_Type: 0 m_PreserveAspect: 0 @@ -6968,15 +7544,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -6994,8 +7571,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f83f866c5c7a67386b409f428d9d98c0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _mediaPlayer: {fileID: 378} _displayInEditor: 1 _scaleMode: 2 @@ -7016,10 +7593,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c98ea2533c3b7e766f7e46473e8dfe0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _textID: Menu_MihoyoChangeUser - _textPattern: + _textPattern: --- !u!114 &407 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7029,15 +7606,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19215687, g: 0.19215687, b: 0.19215687, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 32e255f207eb65549b7d6d1d76d33445, type: 3} m_FontSize: 28 @@ -7051,7 +7629,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 更换账号 + m_Text: "\u66F4\u6362\u8D26\u53F7" --- !u!114 &408 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7061,15 +7639,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19215688, g: 1, b: 0.5137255, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 32e255f207eb65549b7d6d1d76d33445, type: 3} m_FontSize: 24 @@ -7083,7 +7662,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 更在更新数据包... + m_Text: "\u66F4\u5728\u66F4\u65B0\u6570\u636E\u5305..." --- !u!114 &409 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7093,8 +7672,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1e448103d6ff06862a5911f7b64eecc0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!114 &410 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7104,10 +7683,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c98ea2533c3b7e766f7e46473e8dfe0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _textID: Menu_MihoyoTryUser - _textPattern: + _textPattern: --- !u!114 &411 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7117,15 +7696,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 32e255f207eb65549b7d6d1d76d33445, type: 3} m_FontSize: 28 @@ -7139,7 +7719,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 游客入口 + m_Text: "\u6E38\u5BA2\u5165\u53E3" --- !u!114 &412 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7149,15 +7729,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.84313726, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 32e255f207eb65549b7d6d1d76d33445, type: 3} m_FontSize: 18 @@ -7181,8 +7762,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_ForceModuleActive: 0 --- !u!114 &414 MonoBehaviour: @@ -7193,8 +7774,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -7211,15 +7792,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.84313726, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 32e255f207eb65549b7d6d1d76d33445, type: 3} m_FontSize: 26 @@ -7233,7 +7815,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1.21 - m_Text: 检查配置更新 + m_Text: "\u68C0\u67E5\u914D\u7F6E\u66F4\u65B0" --- !u!114 &416 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7243,15 +7825,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 0.991, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: a7288a68dee4a9846a233fb7554aef1c, type: 2} m_Type: 1 m_PreserveAspect: 0 @@ -7269,8 +7852,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b93328bd60cb9001789d0248f187c5a2, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!114 &418 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7280,8 +7863,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 031c69f4da047f4ed93b862ea1800bf4, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!114 &419 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7291,8 +7874,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1663fa48e11e6b5545a85b3fcf3d56d8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!114 &420 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7302,8 +7885,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: df07a2e9cc8c01971b5d6580761159e6, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: offsetMode: 0 materialId: 0 playbackSpeed: 1 @@ -7312,12 +7895,14 @@ MonoBehaviour: frameOverTime: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 1 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 1 @@ -7327,7 +7912,7 @@ MonoBehaviour: m_RotationOrder: 4 tiles_X: 2 tiles_Y: 2 - tileFilterList: + tileFilterList: needScale: 0 offsetList: [] --- !u!114 &421 @@ -7339,15 +7924,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 32e255f207eb65549b7d6d1d76d33445, type: 3} m_FontSize: 28 @@ -7361,7 +7947,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 离线测试版 + m_Text: "\u79BB\u7EBF\u6D4B\u8BD5\u7248" --- !u!114 &422 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7371,8 +7957,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6b75de72a10b55e3bea343118ef542fa, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: eventName: UI_Select_GameEntry --- !u!114 &423 MonoBehaviour: @@ -7383,8 +7969,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_SelectOnUp: {fileID: 0} @@ -7413,7 +7999,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &424 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7423,15 +8010,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 11cabeb4ae4ee8c489d1266f63014ce9, type: 2} m_Type: 1 m_PreserveAspect: 0 @@ -7449,8 +8037,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6b75de72a10b55e3bea343118ef542fa, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: eventName: UI_Select_GameEntry --- !u!114 &426 MonoBehaviour: @@ -7461,8 +8049,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_SelectOnUp: {fileID: 0} @@ -7491,7 +8079,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &427 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7501,15 +8090,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 11cabeb4ae4ee8c489d1266f63014ce9, type: 2} m_Type: 1 m_PreserveAspect: 0 @@ -7524,16 +8114,16 @@ MonoBehaviour: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 6} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 26a7d41aba418956b21a4a441be69a00, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: originalEnabled: 0 - DistortionApplyShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - DistortionMapNormShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - DrawDepthShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - DrawAlphaShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} + DistortionApplyShader: {fileID: 0} + DistortionMapNormShader: {fileID: 0} + DrawDepthShader: {fileID: 0} + DrawAlphaShader: {fileID: 0} glareThreshold: 0.65 glareScaler: 1.06 glareIntensity: 0.75 @@ -7563,19 +8153,19 @@ MonoBehaviour: RadialBlurScatterScale: 1 RadialBlurStrenth: 0 RadialBlurDownScale: 4 - RadialBlurShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} + RadialBlurShader: {fileID: 0} WriteDepthTexture: 0 UseColorGrading: 0 sourceLut3D: {fileID: 2800000, guid: 8a057bb10b5926746a8c2bb42fd7bb23, type: 3} avatarShadowAdjust: 0.3 - DownSample4XShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - DownSampleShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - BrightPassExShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - GaussCompositionExShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - GlareCompositionExShader: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - MultipleGaussPassFilterShader_128: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - MultipleGaussPassFilterShader_256: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} - MultipleGaussPassFilterShader_512: {fileID: 0, guid: 0000000deadbeef15deadf00d0000000, type: 2} + DownSample4XShader: {fileID: 0} + DownSampleShader: {fileID: 0} + BrightPassExShader: {fileID: 0} + GaussCompositionExShader: {fileID: 0} + GlareCompositionExShader: {fileID: 0} + MultipleGaussPassFilterShader_128: {fileID: 0} + MultipleGaussPassFilterShader_256: {fileID: 0} + MultipleGaussPassFilterShader_512: {fileID: 0} internalBufferSize: 128 OnlyResScale: 0 CameraResScale: 100 @@ -7593,5 +8183,37 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1cf931701347abbd7a7bfdc044a350d4, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: +--- !u!29 &430 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!196 &431 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/AccountManager.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/AccountManager.cs index 5ac608bd..c56de994 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/AccountManager.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/AccountManager.cs @@ -74,8 +74,8 @@ namespace MoleMole public void SetupApkCommentInfo() { - apkCommentInfo = null; - apkCommentInfo = OpeUtil.GetApkComment(); + //apkCommentInfo = null; + //apkCommentInfo = OpeUtil.GetApkComment(); } } } diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/AltFISettigs.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/AltFISettigs.cs index 93a24971..e6354b86 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/AltFISettigs.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/AltFISettigs.cs @@ -6,7 +6,7 @@ namespace MoleMole { public void Process() { - fiSettings.GetTypeNameSpaceFormat = "MoleMole.Config.{0},Assembly-CSharp"; + //fiSettings.GetTypeNameSpaceFormat = "MoleMole.Config.{0},Assembly-CSharp"; fiSettings.EmitWarnings = true; fiSettings.EnableAnimation = false; fiSettings.AutomaticReferenceInstantation = false; diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/ApplicationManager.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/ApplicationManager.cs index 6efe163d..30064590 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/ApplicationManager.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/ApplicationManager.cs @@ -38,7 +38,7 @@ namespace MoleMole _applicationBehaviour.Init(this); _go.AddComponent(); _go.AddComponent(); - _go.AddComponent(); + //_go.AddComponent(); _coroutines = new List(); _manualCoroutines = new List>(); } @@ -225,7 +225,7 @@ namespace MoleMole public void DetectCheat() { - if (AntiCheatPlugin.Detect()) + /*if (AntiCheatPlugin.Detect()) { try { @@ -237,19 +237,19 @@ namespace MoleMole SuperDebug.VeryImportantError("Exception: " + ex.ToString()); AntiCheatQuit("Menu_Title_AntiCheatQuit", "Menu_Desc_AntiCheatQuit"); } - } + }*/ } public void ReportProcList() { - byte[] buf = AntiCheatPlugin.ReadProcList(); + /*byte[] buf = AntiCheatPlugin.ReadProcList(); Singleton.Instance.SendFileToServer(MiscData.Config.DumpFileUploadUrl, "anti-cheat", buf, delegate { AntiCheatQuit("Menu_Title_AntiCheatQuit", "Menu_Desc_AntiCheatQuit"); }, delegate { AntiCheatQuit("Menu_Title_AntiCheatQuit", "Menu_Desc_AntiCheatQuit"); - }, 10f); + }, 10f);*/ } public void AntiCheatQuit(string title, string text) diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/DetourManager.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/DetourManager.cs index 7955f103..104da5cf 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/DetourManager.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/DetourManager.cs @@ -28,7 +28,7 @@ namespace MoleMole private DetourManager() { _detours = new Dictionary(); - _stageAreaWalkMask = 1 << NavMesh.GetAreaFromName("Walkable"); + _stageAreaWalkMask = 1 << UnityEngine.AI.NavMesh.GetAreaFromName("Walkable"); } public void RemoveDetourElement(uint id) @@ -95,12 +95,12 @@ namespace MoleMole { flag = uint.TryParse(locatorName.Substring(locatorName.Length - 1), out result); } - int areaFromName = NavMesh.GetAreaFromName("Walkable"); + int areaFromName = UnityEngine.AI.NavMesh.GetAreaFromName("Walkable"); if (flag) { - areaFromName = NavMesh.GetAreaFromName("StageMask" + result); + areaFromName = UnityEngine.AI.NavMesh.GetAreaFromName("StageMask" + result); } - _stageAreaWalkMask = (1 << areaFromName) | (1 << NavMesh.GetAreaFromName("Walkable")); + _stageAreaWalkMask = (1 << areaFromName) | (1 << UnityEngine.AI.NavMesh.GetAreaFromName("Walkable")); } public bool GetTargetPosition(BaseMonoEntity entity, Vector3 sourcePosition, Vector3 targetPosition, ref Vector3 targetCorner) @@ -119,8 +119,8 @@ namespace MoleMole for (int i = 0; i < num; i++) { Vector3 sourcePosition2 = sourcePosition + Random.insideUnitSphere * maxDistance; - NavMeshHit hit; - if (NavMesh.SamplePosition(sourcePosition2, out hit, 1f, _stageAreaWalkMask)) + UnityEngine.AI.NavMeshHit hit; + if (UnityEngine.AI.NavMesh.SamplePosition(sourcePosition2, out hit, 1f, _stageAreaWalkMask)) { targetPosition = hit.position; return true; @@ -132,8 +132,8 @@ namespace MoleMole private bool Raycast(uint id, Vector3 sourcePosition, Vector3 targetPosition) { - NavMeshHit hit; - bool flag = NavMesh.Raycast(sourcePosition, targetPosition, out hit, _stageAreaWalkMask); + UnityEngine.AI.NavMeshHit hit; + bool flag = UnityEngine.AI.NavMesh.Raycast(sourcePosition, targetPosition, out hit, _stageAreaWalkMask); if (!flag) { Debug.DrawLine(sourcePosition, targetPosition, Color.red, 0.1f); @@ -163,8 +163,8 @@ namespace MoleMole private DetourElement GetNewDetourElement(BaseMonoEntity entity, Vector3 sourcePosition, Vector3 targetPosition) { - NavMeshPath navMeshPath = new NavMeshPath(); - bool isCompletePath = NavMesh.CalculatePath(sourcePosition, targetPosition, _stageAreaWalkMask, navMeshPath); + UnityEngine.AI.NavMeshPath navMeshPath = new UnityEngine.AI.NavMeshPath(); + bool isCompletePath = UnityEngine.AI.NavMesh.CalculatePath(sourcePosition, targetPosition, _stageAreaWalkMask, navMeshPath); for (int i = 0; i < navMeshPath.corners.Length - 1; i++) { Debug.DrawLine(navMeshPath.corners[i], navMeshPath.corners[i + 1], Color.green, 0.1f); @@ -194,7 +194,7 @@ namespace MoleMole return detourElement; } - private Vector3[] SimplifyPath(Vector3 sourcePosition, NavMeshPath path) + private Vector3[] SimplifyPath(Vector3 sourcePosition, UnityEngine.AI.NavMeshPath path) { List list = new List(); Vector3[] corners = path.corners; diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/InLevelMainPageContext.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/InLevelMainPageContext.cs index 2134e6c8..3e024daa 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/InLevelMainPageContext.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/InLevelMainPageContext.cs @@ -1065,7 +1065,7 @@ namespace MoleMole } else if (tutorial.step == 1) { - Transform highlightTrans = transform.FindChild("HPBar"); + Transform highlightTrans = transform.Find("HPBar"); Singleton.Instance.ShowDialog(new NewbieDialogContext { disableHighlightEffect = true, @@ -1084,7 +1084,7 @@ namespace MoleMole } else if (tutorial.step == 2) { - Transform highlightTrans2 = transform.FindChild("SPBar"); + Transform highlightTrans2 = transform.Find("SPBar"); Singleton.Instance.ShowDialog(new NewbieDialogContext { disableHighlightEffect = true, @@ -1281,7 +1281,7 @@ namespace MoleMole } else if (tutorial.step == 7) { - Transform highlightTrans4 = transform.FindChild("HPBar"); + Transform highlightTrans4 = transform.Find("HPBar"); Singleton.Instance.ShowDialog(new NewbieDialogContext { disableHighlightEffect = true, @@ -1300,7 +1300,7 @@ namespace MoleMole } else if (tutorial.step == 8) { - Transform highlightTrans5 = transform.FindChild("SPBar"); + Transform highlightTrans5 = transform.Find("SPBar"); Singleton.Instance.ShowDialog(new NewbieDialogContext { disableHighlightEffect = true, diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/LevelDesignManager.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/LevelDesignManager.cs index 6f48eda0..dcd0b0b6 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/LevelDesignManager.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/LevelDesignManager.cs @@ -1107,9 +1107,9 @@ namespace MoleMole public void SetEnvCollisionActive(bool isActive) { - if (Singleton.Instance.GetStageEnv().transform.FindChild("Collision") != null) + if (Singleton.Instance.GetStageEnv().transform.Find("Collision") != null) { - Singleton.Instance.GetStageEnv().transform.FindChild("Collision").gameObject.SetActive(isActive); + Singleton.Instance.GetStageEnv().transform.Find("Collision").gameObject.SetActive(isActive); } } @@ -2168,7 +2168,7 @@ namespace MoleMole if (targetUIPath != string.Empty) { BaseMonoCanvas sceneCanvas = Singleton.Instance.SceneCanvas; - highlightTrans = sceneCanvas.transform.FindChild(targetUIPath); + highlightTrans = sceneCanvas.transform.Find(targetUIPath); } NewbieDialogContext newbieDialogContext = new NewbieDialogContext(); newbieDialogContext.destroyByOthers = true; diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/LevelEndPageContext.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/LevelEndPageContext.cs index 8ac1391a..3b600caa 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/LevelEndPageContext.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/LevelEndPageContext.cs @@ -335,7 +335,7 @@ namespace MoleMole Transform transform = base.view.transform.Find("LosePanel/HintListPanel"); for (int i = 0; i < list.Count; i++) { - Transform transform2 = transform.FindChild(i + "/Content"); + Transform transform2 = transform.Find(i + "/Content"); transform2.GetComponent().text = LocalizationGeneralLogic.GetText(list[i]); } } diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/MainMenu/CloudEmitter.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/MainMenu/CloudEmitter.cs index 3ed5fcd9..a8f1229d 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/MainMenu/CloudEmitter.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/MainMenu/CloudEmitter.cs @@ -648,7 +648,7 @@ namespace MoleMole.MainMenu collidedParticle.RealVelocity = _particles[i].velocity; _collidedParticleMap.Add((int)_particles[i].startSize, collidedParticle); _particles[i].velocity = Vector3.zero; - _particles[i].lifetime = 1f; + _particles[i].remainingLifetime = 1f; } } if (collidedParticle != null) @@ -657,7 +657,7 @@ namespace MoleMole.MainMenu Vector3 point = LocalToCamera(collidedParticle.RealPosition); if (point.z > -0.1f) { - _particles[i].lifetime = 0f; + _particles[i].remainingLifetime = 0f; _collidedParticleMap.Remove((int)_particles[i].startSize); continue; } @@ -671,7 +671,7 @@ namespace MoleMole.MainMenu color.b = Mathf.Max(1f / num2, 0.003921569f); color.a = 1f / num2; _particles[i].startColor = color; - _particles[i].lifetime = 1f; + _particles[i].remainingLifetime = 1f; } } } @@ -691,7 +691,7 @@ namespace MoleMole.MainMenu shipColliderRect.size *= _particles[i].position.z / _shipColliderZ; if (_shipColliderRect.Overlaps(other)) { - _particles[i].lifetime = 0f; + _particles[i].remainingLifetime = 0f; } } } diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/MainPageContext.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/MainPageContext.cs index e91fb09a..a36a7f9b 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/MainPageContext.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/MainPageContext.cs @@ -626,7 +626,7 @@ namespace MoleMole Singleton.GetInstance().RequestGetSignInRewardStatus(); Singleton.GetInstance().playerData.uiTempSaveData.hasShowedStartUpDialogs = true; } - AntiCheatPlugin.Init(MiscData.Config.AntiCheat.Enable, MiscData.Config.AntiCheat.LibList, MiscData.Config.AntiCheat.ProcList); + //AntiCheatPlugin.Init(MiscData.Config.AntiCheat.Enable, MiscData.Config.AntiCheat.LibList, MiscData.Config.AntiCheat.ProcList); Singleton.Instance.DetectCheat(); AntiEmulatorPlugin.Init(MiscData.Config.AntiEmulator.Enable, MiscData.Config.AntiEmulator.DeviceModelList); Singleton.Instance.DetectEmulator(); diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/MonoEffectPluginSpeedSensitive.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/MonoEffectPluginSpeedSensitive.cs index 542d8879..00bb16b3 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/MonoEffectPluginSpeedSensitive.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/MonoEffectPluginSpeedSensitive.cs @@ -25,7 +25,7 @@ namespace MoleMole ParticleSystem.EmissionModule emission = targetParticleSystems[i].emission; ParticleSystem.MinMaxCurve rate = emission.rate; _origRateMaxes[i] = rate.constantMax; - rate.curveScalar = 0f; + rate.curveMultiplier = 0f; emission.rate = rate; } } diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/MonoEffectPluginUI.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/MonoEffectPluginUI.cs index bf3a1060..ea831400 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/MonoEffectPluginUI.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/MonoEffectPluginUI.cs @@ -38,7 +38,7 @@ namespace MoleMole { return; } - Transform transform = sceneCanvas.transform.FindChild(FollowTargetUIPath); + Transform transform = sceneCanvas.transform.Find(FollowTargetUIPath); position = transform.position; } else if (UseParentUIPos) diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/MonoMemoryProfiler.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/MonoMemoryProfiler.cs index 346e4232..fcb70487 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/MonoMemoryProfiler.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/MonoMemoryProfiler.cs @@ -159,7 +159,7 @@ namespace MoleMole for (int i = 0; i < array2.Length; i++) { Texture texture = (Texture)array2[i]; - uint runtimeMemorySize = (uint)Profiler.GetRuntimeMemorySize(texture); + uint runtimeMemorySize = (uint)UnityEngine.Profiling.Profiler.GetRuntimeMemorySize(texture); if (texture is RenderTexture) { _memory_renderTexture += runtimeMemorySize; @@ -182,7 +182,7 @@ namespace MoleMole for (int j = 0; j < array4.Length; j++) { Mesh mesh = (Mesh)array4[j]; - uint runtimeMemorySize2 = (uint)Profiler.GetRuntimeMemorySize(mesh); + uint runtimeMemorySize2 = (uint)UnityEngine.Profiling.Profiler.GetRuntimeMemorySize(mesh); _memory_mesh += runtimeMemorySize2; if (_assetDetail == E_AssetDetail.Meshes) { @@ -194,7 +194,7 @@ namespace MoleMole for (int k = 0; k < array6.Length; k++) { AnimationClip animationClip = (AnimationClip)array6[k]; - uint runtimeMemorySize3 = (uint)Profiler.GetRuntimeMemorySize(animationClip); + uint runtimeMemorySize3 = (uint)UnityEngine.Profiling.Profiler.GetRuntimeMemorySize(animationClip); _memory_animationClip += runtimeMemorySize3; if (_assetDetail == E_AssetDetail.AnimationClips) { @@ -206,7 +206,7 @@ namespace MoleMole for (int l = 0; l < array8.Length; l++) { Material material = (Material)array8[l]; - uint runtimeMemorySize4 = (uint)Profiler.GetRuntimeMemorySize(material); + uint runtimeMemorySize4 = (uint)UnityEngine.Profiling.Profiler.GetRuntimeMemorySize(material); _memory_material += runtimeMemorySize4; if (_assetDetail == E_AssetDetail.Meterials) { @@ -221,7 +221,7 @@ namespace MoleMole { GameObject o = (GameObject)array10[m]; _num_gameobject++; - uint runtimeMemorySize5 = (uint)Profiler.GetRuntimeMemorySize(o); + uint runtimeMemorySize5 = (uint)UnityEngine.Profiling.Profiler.GetRuntimeMemorySize(o); _memory_gameobject += runtimeMemorySize5; } _memory_texture = ToMegaBytes(_memory_texture); @@ -229,8 +229,8 @@ namespace MoleMole _memory_mesh = ToMegaBytes(_memory_mesh); _memory_animationClip = ToMegaBytes(_memory_animationClip); _memory_material = ToMegaBytes(_memory_material); - _memory_monoHeap = ToMegaBytes(Profiler.GetMonoHeapSize()); - _memory_monoUsed = ToMegaBytes(Profiler.GetMonoUsedSize()); + _memory_monoHeap = ToMegaBytes(UnityEngine.Profiling.Profiler.GetMonoHeapSize()); + _memory_monoUsed = ToMegaBytes(UnityEngine.Profiling.Profiler.GetMonoUsedSize()); _memory_gameobject = ToMegaBytes(_memory_gameobject); } diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/MonoNotificationServices.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/MonoNotificationServices.cs index 0fba063f..c794cdb6 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/MonoNotificationServices.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/MonoNotificationServices.cs @@ -12,25 +12,25 @@ namespace MoleMole private void Awake() { - CleanNotification(); + // CleanNotification(); } private void OnApplicationPause(bool paused) { if (paused) { - AddGameLocalNotifications(); + //AddGameLocalNotifications(); } else { - CleanNotification(); + //CleanNotification(); } } public void OnApplicationQuit() { - CleanNotification(); - AddGameLocalNotifications(); + //CleanNotification(); + //AddGameLocalNotifications(); } private void AddGameLocalNotifications() @@ -115,16 +115,16 @@ namespace MoleMole { int num = ++_notificationId; _notificationIdList.Add(num); - LocalNotificationPlugin.SendNotification(num, time - DateTime.Now, title, text); + //LocalNotificationPlugin.SendNotification(num, time - DateTime.Now, title, text); } } private void CleanNotification() { - LocalNotificationPlugin.ClearNotifications(); + //LocalNotificationPlugin.ClearNotifications(); foreach (int notificationId in _notificationIdList) { - LocalNotificationPlugin.CancelNotification(notificationId); + //LocalNotificationPlugin.CancelNotification(notificationId); } _notificationIdList.Clear(); } diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/MonoSettingAudioTab.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/MonoSettingAudioTab.cs index 0d9b2b87..2721e96b 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/MonoSettingAudioTab.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/MonoSettingAudioTab.cs @@ -99,18 +99,18 @@ namespace MoleMole { Transform transform = volumeBtns[i]; transform.GetComponent().color = MiscData.GetColor("Blue"); - transform.FindChild("Check").gameObject.SetActive(false); - transform.FindChild("Text").gameObject.SetActive(true); + transform.Find("Check").gameObject.SetActive(false); + transform.Find("Text").gameObject.SetActive(true); } volumeBtns[volume].GetComponent().color = MiscData.GetColor("Blue"); - volumeBtns[volume].FindChild("Check").gameObject.SetActive(true); - volumeBtns[volume].FindChild("Text").gameObject.SetActive(false); + volumeBtns[volume].Find("Check").gameObject.SetActive(true); + volumeBtns[volume].Find("Text").gameObject.SetActive(false); for (int j = volume + 1; j < volumeBtns.Length; j++) { Transform transform2 = volumeBtns[j]; transform2.GetComponent().color = MiscData.GetColor("TextGrey"); - transform2.FindChild("Check").gameObject.SetActive(false); - transform2.FindChild("Text").gameObject.SetActive(true); + transform2.Find("Check").gameObject.SetActive(false); + transform2.Find("Text").gameObject.SetActive(true); } } @@ -145,9 +145,9 @@ namespace MoleMole int i = 0; for (int num = cvLanguageGroups.Length; i < num && i < cvLanguageNames.Length; i++) { - Transform transform = cvLanguageGroups[i].FindChild("Check"); - Transform transform2 = cvLanguageGroups[i].FindChild("Blue"); - Transform transform3 = cvLanguageGroups[i].FindChild("Grey"); + Transform transform = cvLanguageGroups[i].Find("Check"); + Transform transform2 = cvLanguageGroups[i].Find("Blue"); + Transform transform3 = cvLanguageGroups[i].Find("Grey"); if (!(transform == null)) { bool flag = cvLanguageNames[i] == _modifiedSettingConfig.CVLanguage; diff --git a/Assets/Scripts/Assembly-CSharp/MoleMole/MonoSettingGraphicsTab.cs b/Assets/Scripts/Assembly-CSharp/MoleMole/MonoSettingGraphicsTab.cs index a818a7ff..4e3c8656 100644 --- a/Assets/Scripts/Assembly-CSharp/MoleMole/MonoSettingGraphicsTab.cs +++ b/Assets/Scripts/Assembly-CSharp/MoleMole/MonoSettingGraphicsTab.cs @@ -249,99 +249,99 @@ namespace MoleMole { Transform transform = base.transform.Find("Content/DetailSetting/FirstLine/Resolution"); Transform transform2 = transform.Find("Mark"); - transform2.FindChild("Enable").gameObject.SetActive(!isRecommend); - transform2.FindChild("Disable").gameObject.SetActive(isRecommend); - Transform transform3 = transform.FindChild("Choice/Low"); - Transform transform4 = transform.FindChild("Choice/Middle"); - Transform transform5 = transform.FindChild("Choice/High"); - Transform transform6 = transform.FindChild("Label"); - Transform transform7 = transform3.FindChild("Text"); - Transform transform8 = transform4.FindChild("Text"); - Transform transform9 = transform5.FindChild("Text"); + transform2.Find("Enable").gameObject.SetActive(!isRecommend); + transform2.Find("Disable").gameObject.SetActive(isRecommend); + Transform transform3 = transform.Find("Choice/Low"); + Transform transform4 = transform.Find("Choice/Middle"); + Transform transform5 = transform.Find("Choice/High"); + Transform transform6 = transform.Find("Label"); + Transform transform7 = transform3.Find("Text"); + Transform transform8 = transform4.Find("Text"); + Transform transform9 = transform5.Find("Text"); if (isRecommend) { - transform3.FindChild("Blue").gameObject.SetActive(false); - transform3.FindChild("Grey").gameObject.SetActive(false); - transform3.FindChild("Disable").gameObject.SetActive(true); - transform4.FindChild("Blue").gameObject.SetActive(false); - transform4.FindChild("Grey").gameObject.SetActive(false); - transform4.FindChild("Disable").gameObject.SetActive(true); - transform5.FindChild("Blue").gameObject.SetActive(false); - transform5.FindChild("Grey").gameObject.SetActive(false); - transform5.FindChild("Disable").gameObject.SetActive(true); + transform3.Find("Blue").gameObject.SetActive(false); + transform3.Find("Grey").gameObject.SetActive(false); + transform3.Find("Disable").gameObject.SetActive(true); + transform4.Find("Blue").gameObject.SetActive(false); + transform4.Find("Grey").gameObject.SetActive(false); + transform4.Find("Disable").gameObject.SetActive(true); + transform5.Find("Blue").gameObject.SetActive(false); + transform5.Find("Grey").gameObject.SetActive(false); + transform5.Find("Disable").gameObject.SetActive(true); transform6.GetComponent().color = MiscData.GetColor("GraphicsSettingDisableText"); transform7.GetComponent().color = MiscData.GetColor("GraphicsSettingDisableText"); transform8.GetComponent().color = MiscData.GetColor("GraphicsSettingDisableText"); transform9.GetComponent().color = MiscData.GetColor("GraphicsSettingDisableText"); - transform3.FindChild("Check").GetComponent().color = MiscData.GetColor("GraphicsSettingDisableRadioboxCheck"); - transform4.FindChild("Check").GetComponent().color = MiscData.GetColor("GraphicsSettingDisableRadioboxCheck"); - transform5.FindChild("Check").GetComponent().color = MiscData.GetColor("GraphicsSettingDisableRadioboxCheck"); + transform3.Find("Check").GetComponent().color = MiscData.GetColor("GraphicsSettingDisableRadioboxCheck"); + transform4.Find("Check").GetComponent().color = MiscData.GetColor("GraphicsSettingDisableRadioboxCheck"); + transform5.Find("Check").GetComponent().color = MiscData.GetColor("GraphicsSettingDisableRadioboxCheck"); } else { - transform3.FindChild("Disable").gameObject.SetActive(false); - transform4.FindChild("Disable").gameObject.SetActive(false); - transform5.FindChild("Disable").gameObject.SetActive(false); + transform3.Find("Disable").gameObject.SetActive(false); + transform4.Find("Disable").gameObject.SetActive(false); + transform5.Find("Disable").gameObject.SetActive(false); transform6.GetComponent().color = Color.white; transform7.GetComponent().color = Color.white; transform8.GetComponent().color = Color.white; transform9.GetComponent().color = Color.white; - transform3.FindChild("Check").GetComponent().color = Color.white; - transform4.FindChild("Check").GetComponent().color = Color.white; - transform5.FindChild("Check").GetComponent().color = Color.white; + transform3.Find("Check").GetComponent().color = Color.white; + transform4.Find("Check").GetComponent().color = Color.white; + transform5.Find("Check").GetComponent().color = Color.white; } switch (resolutionGrade) { case ResolutionQualityGrade.High: - transform3.FindChild("Button").GetComponent