diff --git a/Assets/EditorButton.meta b/Assets/EditorButton.meta new file mode 100644 index 00000000..ec0957cb --- /dev/null +++ b/Assets/EditorButton.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8bccf19e3ef05194ebd4f2c476a7b91b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/EditorButton/Editor.meta b/Assets/EditorButton/Editor.meta new file mode 100644 index 00000000..af5af509 --- /dev/null +++ b/Assets/EditorButton/Editor.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d25b603a1256942b39924da19a0db113 +folderAsset: yes +timeCreated: 1475533023 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/EditorButton/Editor/EditorButton.cs b/Assets/EditorButton/Editor/EditorButton.cs new file mode 100644 index 00000000..88020dbc --- /dev/null +++ b/Assets/EditorButton/Editor/EditorButton.cs @@ -0,0 +1,250 @@ +using System; +using System.Linq; +using UnityEngine; +using System.Text; +using System.Collections.Generic; +using System.Collections; + + +#if UNITY_EDITOR +using UnityEditor; +#endif +using System.Reflection; + +#if UNITY_EDITOR +[CustomEditor(typeof (MonoBehaviour), true)] +[CanEditMultipleObjects] +public class EditorButton : Editor +{ + class EditorButtonState { + public bool opened; + public System.Object[] parameters; + public EditorButtonState(int numberOfParameters) { + parameters = new System.Object[numberOfParameters]; + } + } + + EditorButtonState[] editorButtonStates; + + delegate object ParameterDrawer(ParameterInfo parameter, object val); + + Dictionary typeDrawer = new Dictionary { + + {typeof(float),DrawFloatParameter}, + {typeof(int),DrawIntParameter}, + {typeof(string),DrawStringParameter}, + {typeof(bool),DrawBoolParameter}, + {typeof(Color),DrawColorParameter}, + {typeof(Vector3),DrawVector3Parameter}, + {typeof(Vector2),DrawVector2Parameter}, + {typeof(Quaternion),DrawQuaternionParameter} + }; + + Dictionary typeDisplayName = new Dictionary { + + {typeof(float),"float"}, + {typeof(int),"int"}, + {typeof(string),"string"}, + {typeof(bool),"bool"}, + {typeof(Color),"Color"}, + {typeof(Vector3),"Vector3"}, + {typeof(Vector2),"Vector2"}, + {typeof(Quaternion),"Quaternion"} + }; + + public override void OnInspectorGUI() + { + base.OnInspectorGUI(); + + var mono = target as MonoBehaviour; + + var methods = mono.GetType() + .GetMembers(BindingFlags.Instance | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | + BindingFlags.NonPublic) + .Where(o => Attribute.IsDefined(o, typeof (EditorButtonAttribute))); + + int methodIndex = 0; + + if (editorButtonStates == null) { + CreateEditorButtonStates (methods.Select(member => (MethodInfo)member).ToArray()); + } + + foreach (var memberInfo in methods) + { + var method = memberInfo as MethodInfo; + DrawButtonforMethod (targets,method,GetEditorButtonState(method,methodIndex)); + methodIndex++; + } + } + + void CreateEditorButtonStates(MethodInfo[] methods) { + editorButtonStates = new EditorButtonState[methods.Length]; + int methodIndex = 0; + foreach (var methodInfo in methods) { + editorButtonStates [methodIndex] = new EditorButtonState (methodInfo.GetParameters ().Length); + methodIndex++; + } + } + + EditorButtonState GetEditorButtonState(MethodInfo method,int methodIndex) { + return editorButtonStates [methodIndex]; + } + + void DrawButtonforMethod(object[] invokationTargets, MethodInfo methodInfo, EditorButtonState state) { + EditorGUILayout.BeginHorizontal (); + var foldoutRect = EditorGUILayout.GetControlRect (GUILayout.Width (10.0f)); + state.opened = EditorGUI.Foldout (foldoutRect, state.opened, ""); + bool clicked = GUILayout.Button (MethodDisplayName(methodInfo),GUILayout.ExpandWidth(true)); + EditorGUILayout.EndHorizontal (); + + if (state.opened) { + EditorGUI.indentLevel++; + int paramIndex = 0; + foreach (ParameterInfo parameterInfo in methodInfo.GetParameters()) { + object currentVal = state.parameters [paramIndex]; + state.parameters[paramIndex] = DrawParameterInfo (parameterInfo,currentVal); + paramIndex++; + } + EditorGUI.indentLevel--; + } + + if (clicked) { + + foreach (var invokationTarget in invokationTargets) + { + var monoTarget = invokationTarget as MonoBehaviour; + object returnVal = methodInfo.Invoke (monoTarget,state.parameters); + + if (returnVal is IEnumerator) { + monoTarget.StartCoroutine ((IEnumerator)returnVal); + } else if(returnVal != null){ + Debug.Log ("Method call result -> "+returnVal); + } + } + } + } + + object GetDefaultValue(ParameterInfo parameter) + { + bool hasDefaultValue = !DBNull.Value.Equals (parameter.DefaultValue); + + if (hasDefaultValue) + return parameter.DefaultValue; + + Type parameterType = parameter.ParameterType; + if (parameterType.IsValueType) + return Activator.CreateInstance(parameterType); + + return null; + } + + object DrawParameterInfo(ParameterInfo parameterInfo, object currentValue) { + + object paramValue = null; + + EditorGUILayout.BeginHorizontal (); + EditorGUILayout.LabelField (parameterInfo.Name); + + ParameterDrawer drawer = GetParameterDrawer (parameterInfo); + if (currentValue == null) + currentValue = GetDefaultValue (parameterInfo); + paramValue = drawer.Invoke (parameterInfo, currentValue); + + EditorGUILayout.EndHorizontal (); + + return paramValue; + } + + ParameterDrawer GetParameterDrawer(ParameterInfo parameter) { + Type parameterType = parameter.ParameterType; + + if (typeof(UnityEngine.Object).IsAssignableFrom(parameterType)) + return DrawUnityEngineObjectParameter; + + ParameterDrawer drawer; + if (typeDrawer.TryGetValue (parameterType, out drawer)) { + return drawer; + } + + return null; + } + + static object DrawFloatParameter(ParameterInfo parameterInfo,object val) { + //Since it is legal to define a float param with an integer default value (e.g void method(float p = 5);) + //we must use Convert.ToSingle to prevent forbidden casts + //because you can't cast an "int" object to float + //See for http://stackoverflow.com/questions/17516882/double-casting-required-to-convert-from-int-as-object-to-float more info + + return EditorGUILayout.FloatField (Convert.ToSingle(val)); + } + + static object DrawIntParameter(ParameterInfo parameterInfo,object val) { + return EditorGUILayout.IntField ((int)val); + } + + static object DrawBoolParameter(ParameterInfo parameterInfo,object val) { + return EditorGUILayout.Toggle ((bool)val); + } + + static object DrawStringParameter(ParameterInfo parameterInfo,object val) { + return EditorGUILayout.TextField ((string)val); + } + + static object DrawColorParameter(ParameterInfo parameterInfo,object val) { + return EditorGUILayout.ColorField ((Color)val); + } + + static object DrawUnityEngineObjectParameter(ParameterInfo parameterInfo,object val) { + return EditorGUILayout.ObjectField ((UnityEngine.Object)val, parameterInfo.ParameterType, true); + } + + static object DrawVector2Parameter(ParameterInfo parameterInfo,object val) { + return EditorGUILayout.Vector2Field ("", (Vector2)val); + } + + static object DrawVector3Parameter(ParameterInfo parameterInfo,object val) { + return EditorGUILayout.Vector3Field ("", (Vector3)val); + } + + static object DrawQuaternionParameter(ParameterInfo parameterInfo,object val) { + return Quaternion.Euler(EditorGUILayout.Vector3Field ("", ((Quaternion)val).eulerAngles)); + } + + string MethodDisplayName(MethodInfo method) { + StringBuilder sb = new StringBuilder (); + sb.Append (method.Name +"("); + var methodParams = method.GetParameters (); + foreach (ParameterInfo parameter in methodParams) { + sb.Append (MethodParameterDisplayName (parameter)); + sb.Append (","); + } + + if(methodParams.Length > 0) + sb.Remove (sb.Length - 1, 1); + + sb.Append (")"); + return sb.ToString (); + } + + string MethodParameterDisplayName(ParameterInfo parameterInfo) { + string parameterTypeDisplayName; + if (!typeDisplayName.TryGetValue (parameterInfo.ParameterType,out parameterTypeDisplayName)) { + parameterTypeDisplayName = parameterInfo.ParameterType.ToString (); + } + + return parameterTypeDisplayName + " " + parameterInfo.Name; + } + + string MethodUID(MethodInfo method) { + StringBuilder sb = new StringBuilder (); + sb.Append (method.Name +"_"); + foreach (ParameterInfo parameter in method.GetParameters()) { + sb.Append (parameter.ParameterType.ToString ()); + sb.Append ("_"); + sb.Append (parameter.Name); + } + sb.Append (")"); + return sb.ToString (); + } +} +#endif \ No newline at end of file diff --git a/Assets/EditorButton/Editor/EditorButton.cs.meta b/Assets/EditorButton/Editor/EditorButton.cs.meta new file mode 100644 index 00000000..3ee0131f --- /dev/null +++ b/Assets/EditorButton/Editor/EditorButton.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 876be2ee57f9143b3a9424a6b2c479aa +timeCreated: 1470903683 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/EditorButton/EditorButtonAttribute.cs b/Assets/EditorButton/EditorButtonAttribute.cs new file mode 100644 index 00000000..5af10876 --- /dev/null +++ b/Assets/EditorButton/EditorButtonAttribute.cs @@ -0,0 +1,6 @@ +using UnityEngine; + +[System.AttributeUsage(System.AttributeTargets.Method)] +public class EditorButtonAttribute : PropertyAttribute +{ +} \ No newline at end of file diff --git a/Assets/EditorButton/EditorButtonAttribute.cs.meta b/Assets/EditorButton/EditorButtonAttribute.cs.meta new file mode 100644 index 00000000..49abb698 --- /dev/null +++ b/Assets/EditorButton/EditorButtonAttribute.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 0b4170225687844e5b8609a82902c5c3 +timeCreated: 1475533023 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/1/Animation/Character/Super_Attack.anim b/Assets/Resources/1/Animation/Character/Super_Attack.anim index 24d37038..6b108d19 100644 --- a/Assets/Resources/1/Animation/Character/Super_Attack.anim +++ b/Assets/Resources/1/Animation/Character/Super_Attack.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9a547e8a3df9a3bf32dd0baede1ba4884e2a6ffea5a57ba1860eda8ec4fb78f -size 2190819 +oid sha256:f41e6134daef2d77e52bf440ee35e2a71d3808b404fdc8a1ac578efd65565fcf +size 7307994 diff --git a/Assets/Resources/1/Animation/Character/TestController.controller b/Assets/Resources/1/Animation/Character/TestController.controller index 4a6be3f4..a7a2207c 100644 --- a/Assets/Resources/1/Animation/Character/TestController.controller +++ b/Assets/Resources/1/Animation/Character/TestController.controller @@ -429,55 +429,55 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: BackToIdle m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Build m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: TreeAttack m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Move m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: SuperJump m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Frozen m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: isMoving m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Death m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -763,7 +763,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 097363ae0f4e1f447b1b623e24b9cd2e, type: 2} + m_Motion: {fileID: 7400000, guid: 46c2b6df43404d447aace3726bf397e3, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/1/VFX/_Game/Protectior/Bomb.prefab b/Assets/Resources/1/VFX/_Game/Protectior/Bomb.prefab index 69c86de6..7a4494b9 100644 --- a/Assets/Resources/1/VFX/_Game/Protectior/Bomb.prefab +++ b/Assets/Resources/1/VFX/_Game/Protectior/Bomb.prefab @@ -4738,6 +4738,7 @@ GameObject: - component: {fileID: 6736513976124970964} - component: {fileID: 6736513976126722542} - component: {fileID: 6736513976104981120} + - component: {fileID: 254311947008733808} m_Layer: 0 m_Name: Bomb m_TagString: Untagged @@ -9562,6 +9563,21 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 +--- !u!114 &254311947008733808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6736513976106828952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfb2f14a56c34dcb80031c2336b24f1b, type: 3} + m_Name: + m_EditorClassIdentifier: + damage: 100 + hit: {fileID: 2307028534112872116, guid: 79d768bf87aadec478a5722da8c6d516, type: 3} + timeHit: 1.8 --- !u!1 &6736513976106878902 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/1/Warrior/Tracking_Bomb/FBX/Bomb.controller b/Assets/Resources/1/Warrior/Tracking_Bomb/FBX/Bomb.controller index 316846cd..3017a1a8 100644 --- a/Assets/Resources/1/Warrior/Tracking_Bomb/FBX/Bomb.controller +++ b/Assets/Resources/1/Warrior/Tracking_Bomb/FBX/Bomb.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-546070858855015587 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Explode + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102293829521826198} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -8,7 +33,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Bomb serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Explode + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -24,7 +55,7 @@ AnimatorController: m_Controller: {fileID: 9100000} --- !u!1101 &1101016393745526072 AnimatorStateTransition: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -376,7 +407,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1101 &1101570748783259436 AnimatorStateTransition: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -442,7 +473,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1101 &1101628936160979654 AnimatorStateTransition: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -640,7 +671,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1101 &1101999127345121280 AnimatorStateTransition: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -662,7 +693,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1102 &1102017953835933110 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -689,8 +720,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102026339988270548 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -716,8 +747,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102119963568475716 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -743,7 +774,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102290600603978840 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -770,7 +801,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102293829521826198 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -797,8 +828,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102300038324231582 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -824,8 +855,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102342943334615508 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -851,7 +882,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102349128289543252 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -878,7 +909,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102468043089081518 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -905,7 +936,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102469734140886672 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -932,8 +963,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102478560215277762 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -959,8 +990,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102500793846982196 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -986,7 +1017,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102509494326483986 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -996,6 +1027,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 1101652252861656132} + - {fileID: -546070858855015587} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -1013,7 +1045,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102560292473526350 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1040,8 +1072,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102573938536894438 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1067,8 +1099,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102643678307240484 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1094,8 +1126,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102655925780863650 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1121,8 +1153,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102678162120579112 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1148,8 +1180,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102707637426974368 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1175,8 +1207,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102827492225288746 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1202,7 +1234,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102855442037948304 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1229,7 +1261,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102867912869228568 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1256,8 +1288,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102878787506406972 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1283,7 +1315,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102884043357014408 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1310,7 +1342,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102892898970591168 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1336,7 +1368,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102903792119357532 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1363,7 +1395,7 @@ AnimatorState: m_TimeParameter: --- !u!1107 &1107240124866355324 AnimatorStateMachine: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1378,7 +1410,7 @@ AnimatorStateMachine: m_Position: {x: 156, y: -108, z: 0} - serializedVersion: 1 m_State: {fileID: 1102855442037948304} - m_Position: {x: 444, y: -108, z: 0} + m_Position: {x: 440, y: -110, z: 0} - serializedVersion: 1 m_State: {fileID: 1102878787506406972} m_Position: {x: 444, y: -204, z: 0} @@ -1420,7 +1452,7 @@ AnimatorStateMachine: m_Position: {x: 768, y: 348, z: 0} - serializedVersion: 1 m_State: {fileID: 1102293829521826198} - m_Position: {x: 768, y: 240, z: 0} + m_Position: {x: 770, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: 1102469734140886672} m_Position: {x: 768, y: 432, z: 0} diff --git a/Assets/Resources/1/Warrior/Tracking_Bomb/Prefabs/Bomb.prefab b/Assets/Resources/1/Warrior/Tracking_Bomb/Prefabs/Bomb.prefab index a7c712a3..5b7c1061 100644 --- a/Assets/Resources/1/Warrior/Tracking_Bomb/Prefabs/Bomb.prefab +++ b/Assets/Resources/1/Warrior/Tracking_Bomb/Prefabs/Bomb.prefab @@ -552,73 +552,59 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1175122412763087250} m_Modifications: - - target: {fileID: 2591572350827275293, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572350827275293, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalPosition.x value: -0.083 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalPosition.y value: 0.023 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalRotation.w value: -0.26092538 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalRotation.x value: -0.32429546 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalRotation.y value: 0.029789386 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalRotation.z value: 0.9087701 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154498, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154498, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154621, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154621, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_Name value: FX Spark objectReference: {fileID: 0} @@ -626,8 +612,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} --- !u!4 &3727224336371197390 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + m_CorrespondingSourceObject: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} m_PrefabInstance: {fileID: 1175122413194565070} m_PrefabAsset: {fileID: 0} --- !u!1001 &8207300010845384218 @@ -637,138 +622,111 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1175122412763087232} m_Modifications: - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.rateOverTime.scalar value: 5 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: InitialModule.startSize.minMaxState value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: InitialModule.startSizeY.minMaxState value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: InitialModule.startSizeZ.minMaxState value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.maxCurve.m_Curve.Array.data[0].inWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.maxCurve.m_Curve.Array.data[1].inWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.minCurve.m_Curve.Array.data[0].inWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.minCurve.m_Curve.Array.data[1].inWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.maxCurve.m_Curve.Array.data[0].outWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.maxCurve.m_Curve.Array.data[1].outWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.minCurve.m_Curve.Array.data[0].outWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.minCurve.m_Curve.Array.data[1].outWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_RootOrder value: 9 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalScale.x value: 0.37205154 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalScale.y value: 0.37205148 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalScale.z value: 0.37205154 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalPosition.y value: 0.01 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalRotation.w value: -0.006930769 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalRotation.y value: 0.999976 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107340321050, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107340321050, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_Name value: MonsterAura objectReference: {fileID: 0} @@ -776,7 +734,6 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} --- !u!4 &8780129905727237510 stripped Transform: - m_CorrespondingSourceObject: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + m_CorrespondingSourceObject: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} m_PrefabInstance: {fileID: 8207300010845384218} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Data/ItemData.asset b/Assets/Resources/Data/ItemData.asset index 67664e21..4a6c9806 100644 --- a/Assets/Resources/Data/ItemData.asset +++ b/Assets/Resources/Data/ItemData.asset @@ -14,12 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: items: - item: {fileID: 11400000, guid: e7adbedb55c5db341a823370b696f709, type: 2} - _spawnChance: 0.486 + _spawnChance: 0.48 - item: {fileID: 11400000, guid: 62849ddbcd32e834887aac5eb3d98db0, type: 2} - _spawnChance: 0.766 + _spawnChance: 0.846 - item: {fileID: 11400000, guid: ef628c3158b0ea34bb919ca105507009, type: 2} - _spawnChance: 0.918 - - item: {fileID: 11400000, guid: ef628c3158b0ea34bb919ca105507009, type: 2} - _spawnChance: 0.918 + _spawnChance: 0.721 + - item: {fileID: 11400000, guid: f824f23273de8df429d37f10b51f9a6f, type: 2} + _spawnChance: 0.83 + - item: {fileID: 11400000, guid: 133e523fdd159754e8bf8927faec5b0f, type: 2} + _spawnChance: 0.75 + - item: {fileID: 11400000, guid: 133e523fdd159754e8bf8927faec5b0f, type: 2} + _spawnChance: 0.756 fromTimeSpawn: 2.93 toTimeSpawn: 10 diff --git a/Assets/Resources/Data/Items/Bomb.asset b/Assets/Resources/Data/Items/Bomb.asset new file mode 100644 index 00000000..df43cf40 --- /dev/null +++ b/Assets/Resources/Data/Items/Bomb.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f23a091c5733400f8f0092a4c0f33c6e, type: 3} + m_Name: Bomb + m_EditorClassIdentifier: + iconPrefab: {fileID: 8639522512577941448, guid: 7b6a7f64e52da514d88aa97ad8f863df, type: 3} + icon: {fileID: 21300000, guid: 5a80ac41b33ef3f43945efa70e6dfdb0, type: 3} + buildingPrefab: {fileID: 6736513976106828952, guid: 18fb35664a7886842aa1702160b555a8, type: 3} diff --git a/Assets/Resources/Data/Items/Bomb.asset.meta b/Assets/Resources/Data/Items/Bomb.asset.meta new file mode 100644 index 00000000..3d5dd0f0 --- /dev/null +++ b/Assets/Resources/Data/Items/Bomb.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f824f23273de8df429d37f10b51f9a6f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Data/Items/CaptureTAbility.asset b/Assets/Resources/Data/Items/CaptureTAbility.asset index 56478b43..6d644bf9 100644 --- a/Assets/Resources/Data/Items/CaptureTAbility.asset +++ b/Assets/Resources/Data/Items/CaptureTAbility.asset @@ -12,6 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 461496314fe84e509ae72dd06538b62c, type: 3} m_Name: CaptureTAbility m_EditorClassIdentifier: - iconPrefab: {fileID: 0} - icon: {fileID: 0} - AimCanvas: {fileID: 0} + iconPrefab: {fileID: 3197816592181874056, guid: 2704c4f795b0d7748a3e3fa53be4d893, type: 3} + icon: {fileID: 21300000, guid: 543c4732bd2d47a41bdbbf2156eb358c, type: 3} + aimCanvas: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e, type: 3} + itterationMove: 000000000000000000000000040000000500000001000000 + animName: SuperJump diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 48860413..fde5c90d 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -97,10 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: 3f2e6469b8a81d142af4882a1267f9e7, - type: 2} - m_LightingSettings: {fileID: 4890085278179872738, guid: 82adcc5c04b15af44afe569caa21fa7e, - type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: 3f2e6469b8a81d142af4882a1267f9e7, type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: 82adcc5c04b15af44afe569caa21fa7e, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -373,8 +371,7 @@ MonoBehaviour: m_text: Opti m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5836,8 +5833,7 @@ MonoBehaviour: m_text: 120 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5971,8 +5967,7 @@ MonoBehaviour: m_text: HEALTH m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6203,113 +6198,91 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2028591410} m_Modifications: - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Name value: CardSlot (6) objectReference: {fileID: 0} @@ -6450,8 +6423,7 @@ MonoBehaviour: m_text: Vibration m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6585,8 +6557,7 @@ MonoBehaviour: m_text: 4,000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6720,8 +6691,7 @@ MonoBehaviour: m_text: Sound Fx m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6930,8 +6900,7 @@ MonoBehaviour: m_text: Add m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 5c5ee151f9307453bad78be36b51a077, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 5c5ee151f9307453bad78be36b51a077, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 5c5ee151f9307453bad78be36b51a077, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -7065,8 +7034,7 @@ MonoBehaviour: m_text: +8 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -7200,8 +7168,7 @@ MonoBehaviour: m_text: DEFENSE m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -7667,8 +7634,7 @@ MonoBehaviour: m_text: US $49.99 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -13346,8 +13312,7 @@ MonoBehaviour: m_text: 120 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -13784,8 +13749,7 @@ MonoBehaviour: m_text: GEMS m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ad5569965d2734880a004e3e3d7d1358, type: 2} - m_sharedMaterial: {fileID: 3074828514974314926, guid: ad5569965d2734880a004e3e3d7d1358, - type: 2} + m_sharedMaterial: {fileID: 3074828514974314926, guid: ad5569965d2734880a004e3e3d7d1358, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -13919,8 +13883,7 @@ MonoBehaviour: m_text: ATTACK m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -14054,8 +14017,7 @@ MonoBehaviour: m_text: +68 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -19604,8 +19566,7 @@ MonoBehaviour: m_ConstraintCount: 4 --- !u!224 &211421228 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} m_PrefabInstance: {fileID: 41827654} m_PrefabAsset: {fileID: 0} --- !u!1 &211677293 @@ -19895,8 +19856,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 7768238868673603305, guid: ef8db7fc680be184faf94530ac8125d6, - type: 3} + m_Sprite: {fileID: 7768238868673603305, guid: ef8db7fc680be184faf94530ac8125d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -20375,8 +20335,7 @@ MonoBehaviour: m_text: 1,500 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -21018,113 +20977,91 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2028591410} m_Modifications: - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_RootOrder value: 7 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Name value: CardSlot (7) objectReference: {fileID: 0} @@ -21190,8 +21127,7 @@ MonoBehaviour: m_text: US $11.99 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -21570,8 +21506,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1877753079322562185, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -1877753079322562185, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -21983,8 +21918,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 4007780875627063171, guid: e816ecf82b202d0449267fe992da842e, - type: 3} + m_Sprite: {fileID: 4007780875627063171, guid: e816ecf82b202d0449267fe992da842e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -27669,8 +27603,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1421353750256404717, guid: ef8db7fc680be184faf94530ac8125d6, - type: 3} + m_Sprite: {fileID: -1421353750256404717, guid: ef8db7fc680be184faf94530ac8125d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -27820,8 +27753,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -8755562226793376538, guid: ef8db7fc680be184faf94530ac8125d6, - type: 3} + m_Sprite: {fileID: -8755562226793376538, guid: ef8db7fc680be184faf94530ac8125d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -27976,8 +27908,7 @@ MonoBehaviour: SUBSCRIPTION' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -28609,8 +28540,7 @@ MonoBehaviour: m_text: 220 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -28744,8 +28674,7 @@ MonoBehaviour: m_text: 120 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -29083,8 +29012,7 @@ MonoBehaviour: m_text: 8 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -29218,8 +29146,7 @@ MonoBehaviour: m_text: 120 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -34731,8 +34658,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -6628639966651196924, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -6628639966651196924, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -34807,8 +34733,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 4649977899124048877, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: 4649977899124048877, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -34886,8 +34811,7 @@ MonoBehaviour: m_text: +123 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -35141,8 +35065,7 @@ MonoBehaviour: m_text: English m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c2f49fe8c22d94f9a9e6cd06ad490155, type: 2} - m_sharedMaterial: {fileID: 3074828514974314926, guid: c2f49fe8c22d94f9a9e6cd06ad490155, - type: 2} + m_sharedMaterial: {fileID: 3074828514974314926, guid: c2f49fe8c22d94f9a9e6cd06ad490155, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -35273,8 +35196,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -8755562226793376538, guid: ef8db7fc680be184faf94530ac8125d6, - type: 3} + m_Sprite: {fileID: -8755562226793376538, guid: ef8db7fc680be184faf94530ac8125d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -46456,8 +46378,7 @@ CanvasRenderer: m_CullTransparentMesh: 0 --- !u!224 &602553062 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} m_PrefabInstance: {fileID: 1226124161} m_PrefabAsset: {fileID: 0} --- !u!1 &605038537 @@ -46718,8 +46639,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1808039550651168064, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -1808039550651168064, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -46797,8 +46717,7 @@ MonoBehaviour: m_text: US $24.99 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -46974,8 +46893,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 9008153383594388043, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: 9008153383594388043, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -47095,8 +47013,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1909417148957516660, guid: ef8db7fc680be184faf94530ac8125d6, - type: 3} + m_Sprite: {fileID: -1909417148957516660, guid: ef8db7fc680be184faf94530ac8125d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -57620,8 +57537,7 @@ MonoBehaviour: m_text: 120 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -57697,8 +57613,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!224 &648090618 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} m_PrefabInstance: {fileID: 1870763315} m_PrefabAsset: {fileID: 0} --- !u!1 &654770306 @@ -57761,8 +57676,7 @@ MonoBehaviour: m_text: US $32.99 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -58036,8 +57950,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -4506707602248226088, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -4506707602248226088, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -58187,8 +58100,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1808039550651168064, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -1808039550651168064, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -58310,8 +58222,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1352394335780442164, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -1352394335780442164, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -63776,8 +63687,7 @@ MonoBehaviour: m_text: ENERGY VOLUME m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -63928,8 +63838,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!224 &701408440 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} m_PrefabInstance: {fileID: 1368609144} m_PrefabAsset: {fileID: 0} --- !u!1 &706553663 @@ -69309,8 +69218,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!224 &719662769 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} m_PrefabInstance: {fileID: 1441717190} m_PrefabAsset: {fileID: 0} --- !u!1 &721862536 @@ -74351,8 +74259,7 @@ MonoBehaviour: m_text: 120 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -74559,8 +74466,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 2211714010249429090, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: 2211714010249429090, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -74680,8 +74586,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 6209518796117832746, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: 6209518796117832746, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -74759,8 +74664,7 @@ MonoBehaviour: m_text: 4,000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -74892,8 +74796,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 2211714010249429090, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: 2211714010249429090, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -75171,8 +75074,7 @@ MonoBehaviour: m_text: 48 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -75314,8 +75216,7 @@ MonoBehaviour: m_ReverseArrangement: 0 --- !u!224 &785817672 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + m_CorrespondingSourceObject: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} m_PrefabInstance: {fileID: 1972383870} m_PrefabAsset: {fileID: 0} --- !u!1 &798211899 @@ -80607,8 +80508,7 @@ MonoBehaviour: m_text: +26 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -80684,8 +80584,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!224 &823471834 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} m_PrefabInstance: {fileID: 1962560845} m_PrefabAsset: {fileID: 0} --- !u!1 &829497757 @@ -80861,8 +80760,7 @@ MonoBehaviour: m_text: COINS m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ad5569965d2734880a004e3e3d7d1358, type: 2} - m_sharedMaterial: {fileID: 3074828514974314926, guid: ad5569965d2734880a004e3e3d7d1358, - type: 2} + m_sharedMaterial: {fileID: 3074828514974314926, guid: ad5569965d2734880a004e3e3d7d1358, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -81139,8 +81037,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -4506707602248226088, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -4506707602248226088, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -81215,8 +81112,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1808039550651168064, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -1808039550651168064, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -81839,8 +81735,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: data: {fileID: 11400000, guid: 933ff56c36f8e2048ac179b755c821f7, type: 2} - weaponIcon: {fileID: 7654707962074538017, guid: 05b7fd78d6e223444b3b41449c0dd92c, - type: 3} + weaponIcon: {fileID: 7654707962074538017, guid: 05b7fd78d6e223444b3b41449c0dd92c, type: 3} grid: {fileID: 1361972682} dataFilePath: ChosenWeapon.json chosenWeapon: {fileID: 1547182938} @@ -82216,8 +82111,7 @@ MonoBehaviour: m_text: 12,000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -82576,8 +82470,7 @@ MonoBehaviour: m_text: 120 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -87830,8 +87723,7 @@ MonoBehaviour: m_text: 480 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -87988,113 +87880,91 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2028591410} m_Modifications: - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Name value: CardSlot (3) objectReference: {fileID: 0} @@ -88705,10 +88575,8 @@ MonoBehaviour: musicOnSprite: {fileID: 21300000, guid: eb165af05aa2e4ab2bcad217611774b8, type: 3} musicOffSprite: {fileID: 21300000, guid: b1f42bbbfffc44202b66381ab8b622ee, type: 3} sfxImage: {fileID: 1844205148} - sfxOnSprite: {fileID: -9015007665768789201, guid: 4121167a6423ec74381c7b130b40092b, - type: 3} - sfxOffSprite: {fileID: -8419751542767139993, guid: 4121167a6423ec74381c7b130b40092b, - type: 3} + sfxOnSprite: {fileID: 21300000, guid: 901d64fc6ad9d44799c2ad0fd4f182d2, type: 3} + sfxOffSprite: {fileID: 21300000, guid: 78757b0623f3b4309b7cc69c4769ae37, type: 3} --- !u!1 &1014179672 GameObject: m_ObjectHideFlags: 0 @@ -88844,8 +88712,7 @@ MonoBehaviour: m_text: CAPTURE SPEED m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -88979,8 +88846,7 @@ MonoBehaviour: m_text: 1,200 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -89114,8 +88980,7 @@ MonoBehaviour: m_text: 120 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -89555,8 +89420,7 @@ MonoBehaviour: m_text: +13 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -89766,113 +89630,91 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2028591410} m_Modifications: - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Name value: CardSlot (10) objectReference: {fileID: 0} @@ -89880,8 +89722,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 15034609a8378124283961a4f6ac36c5, type: 3} --- !u!224 &1068114159 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} m_PrefabInstance: {fileID: 2723081675932122623} m_PrefabAsset: {fileID: 0} --- !u!1 &1079682518 @@ -90094,8 +89935,7 @@ MonoBehaviour: m_text: ATTACK RECOVERY m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -90226,8 +90066,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -8755562226793376538, guid: ef8db7fc680be184faf94530ac8125d6, - type: 3} + m_Sprite: {fileID: -8755562226793376538, guid: ef8db7fc680be184faf94530ac8125d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -90437,8 +90276,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 8957504569780140257, guid: ef8db7fc680be184faf94530ac8125d6, - type: 3} + m_Sprite: {fileID: 8957504569780140257, guid: ef8db7fc680be184faf94530ac8125d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -90463,113 +90301,91 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2028591410} m_Modifications: - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_RootOrder value: 11 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Name value: CardSlot (11) objectReference: {fileID: 0} @@ -90785,8 +90601,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 8350362020719645861, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: 8350362020719645861, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -90806,8 +90621,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!224 &1132893575 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} m_PrefabInstance: {fileID: 1124432363} m_PrefabAsset: {fileID: 0} --- !u!1 &1133509700 @@ -101290,8 +101104,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -845212314329855085, guid: ef8db7fc680be184faf94530ac8125d6, - type: 3} + m_Sprite: {fileID: -845212314329855085, guid: ef8db7fc680be184faf94530ac8125d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -101594,8 +101407,7 @@ MonoBehaviour: m_text: 12,000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -106711,8 +106523,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1421353750256404717, guid: ef8db7fc680be184faf94530ac8125d6, - type: 3} + m_Sprite: {fileID: -1421353750256404717, guid: ef8db7fc680be184faf94530ac8125d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -107072,8 +106883,7 @@ MonoBehaviour: m_text: Push Alarm m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -107304,113 +107114,91 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2028591410} m_Modifications: - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Name value: CardSlot (1) objectReference: {fileID: 0} @@ -107934,8 +107722,7 @@ MonoBehaviour: m_text: Opti m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -108069,8 +107856,7 @@ MonoBehaviour: m_text: 40 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -108835,8 +108621,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!224 &1324577825 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} m_PrefabInstance: {fileID: 1876371612} m_PrefabAsset: {fileID: 0} --- !u!1 &1327577965 @@ -109405,113 +109190,91 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2028591410} m_Modifications: - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_RootOrder value: 9 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Name value: CardSlot (9) objectReference: {fileID: 0} @@ -109952,8 +109715,7 @@ MonoBehaviour: m_text: Settings m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 605433b68313d491a8ab88bc03a41651, type: 2} - m_sharedMaterial: {fileID: 2830636965969884548, guid: 605433b68313d491a8ab88bc03a41651, - type: 2} + m_sharedMaterial: {fileID: 2830636965969884548, guid: 605433b68313d491a8ab88bc03a41651, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -110161,8 +109923,7 @@ MonoBehaviour: m_text: 480 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -110296,8 +110057,7 @@ MonoBehaviour: m_text: 8 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -111043,113 +110803,91 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2028591410} m_Modifications: - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Name value: CardSlot (5) objectReference: {fileID: 0} @@ -111421,8 +111159,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1808039550651168064, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -1808039550651168064, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -111500,8 +111237,7 @@ MonoBehaviour: m_text: 3 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -117039,8 +116775,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -4506707602248226088, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -4506707602248226088, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -117118,8 +116853,7 @@ MonoBehaviour: m_text: DAILY m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ad5569965d2734880a004e3e3d7d1358, type: 2} - m_sharedMaterial: {fileID: 3074828514974314926, guid: ad5569965d2734880a004e3e3d7d1358, - type: 2} + m_sharedMaterial: {fileID: 3074828514974314926, guid: ad5569965d2734880a004e3e3d7d1358, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -117384,8 +117118,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1808039550651168064, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -1808039550651168064, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -133569,8 +133302,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!224 &1560858037 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} m_PrefabInstance: {fileID: 1053987832} m_PrefabAsset: {fileID: 0} --- !u!1 &1561585180 @@ -133825,8 +133557,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 8117856743858075646, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: 8117856743858075646, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -134573,8 +134304,7 @@ MonoBehaviour: m_text: Get 30 daily gems for 15 days! m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -134750,8 +134480,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 3228208054905281657, guid: ef8db7fc680be184faf94530ac8125d6, - type: 3} + m_Sprite: {fileID: 3228208054905281657, guid: ef8db7fc680be184faf94530ac8125d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -135213,8 +134942,7 @@ MonoBehaviour: m_text: Music m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -135348,8 +135076,7 @@ MonoBehaviour: m_text: US $ 4.99 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -135425,8 +135152,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!224 &1653296686 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} m_PrefabInstance: {fileID: 998546773} m_PrefabAsset: {fileID: 0} --- !u!1 &1654157097 @@ -135489,8 +135215,7 @@ MonoBehaviour: m_text: 4,000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -135774,8 +135499,7 @@ MonoBehaviour: m_text: 48 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -136860,8 +136584,7 @@ MonoBehaviour: m_text: US $4.99 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -137310,8 +137033,7 @@ MonoBehaviour: m_text: 60000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -137923,8 +137645,7 @@ MonoBehaviour: m_text: US $38.99 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -138403,8 +138124,7 @@ MonoBehaviour: m_text: 1,500 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -138975,8 +138695,7 @@ MonoBehaviour: m_text: 12,000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -139168,113 +138887,91 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2028591410} m_Modifications: - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_RootOrder value: 8 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Name value: CardSlot (8) objectReference: {fileID: 0} @@ -139362,113 +139059,91 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2028591410} m_Modifications: - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Name value: CardSlot (4) objectReference: {fileID: 0} @@ -139531,8 +139206,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1421353750256404717, guid: ef8db7fc680be184faf94530ac8125d6, - type: 3} + m_Sprite: {fileID: -1421353750256404717, guid: ef8db7fc680be184faf94530ac8125d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -139835,8 +139509,7 @@ MonoBehaviour: m_text: 2100 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -140194,8 +139867,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1149673380122903276, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -1149673380122903276, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -140416,8 +140088,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -4506707602248226088, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -4506707602248226088, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -140746,113 +140417,91 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2028591410} m_Modifications: - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Name value: CardSlot (2) objectReference: {fileID: 0} @@ -141016,68 +140665,55 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1564547232} m_Modifications: - - target: {fileID: 7945853709318545960, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853709318545960, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_LocalScale.x value: 37.63456 objectReference: {fileID: 0} - - target: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_LocalScale.y value: 37.63456 objectReference: {fileID: 0} - - target: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_LocalScale.z value: 37.63456 objectReference: {fileID: 0} - - target: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_AnchoredPosition.x value: -13.021606 objectReference: {fileID: 0} - - target: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853709318545965, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_AnchoredPosition.y value: -21.584229 objectReference: {fileID: 0} - - target: {fileID: 7945853709500351809, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853709500351809, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 7945853709787684116, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853709787684116, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 7945853710185188220, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853710185188220, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 7945853710961685150, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853710961685150, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 7945853710984940608, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853710984940608, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 7945853711086925320, guid: 0f33c06c02f7f4a8093562cd8366fc9f, - type: 3} + - target: {fileID: 7945853711086925320, guid: 0f33c06c02f7f4a8093562cd8366fc9f, type: 3} propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} @@ -141253,8 +140889,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -5288760498867674710, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -5288760498867674710, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -141440,8 +141075,7 @@ MonoBehaviour: _ease: 5 --- !u!224 &2002846600 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + m_CorrespondingSourceObject: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} m_PrefabInstance: {fileID: 272354014} m_PrefabAsset: {fileID: 0} --- !u!1 &2006480384 @@ -141716,8 +141350,7 @@ MonoBehaviour: m_text: +26 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} - m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, - type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -142001,8 +141634,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -2684102947291226346, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -2684102947291226346, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -142392,8 +142024,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -4506707602248226088, guid: 385812793066f854f91c9ddd93653747, - type: 3} + m_Sprite: {fileID: -4506707602248226088, guid: 385812793066f854f91c9ddd93653747, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -142802,8 +142433,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -7642091020210582781, guid: ef8db7fc680be184faf94530ac8125d6, - type: 3} + m_Sprite: {fileID: -7642091020210582781, guid: ef8db7fc680be184faf94530ac8125d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -142883,8 +142513,7 @@ MonoBehaviour: 480' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -143368,8 +142997,7 @@ MonoBehaviour: m_text: US $1.99 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} - m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, - type: 2} + m_sharedMaterial: {fileID: 2517202264660172603, guid: 4995422ffdb954b70a642f73eb1442ea, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -143450,113 +143078,91 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2028591410} m_Modifications: - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820560, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, - type: 3} + - target: {fileID: 2723081676327820561, guid: 15034609a8378124283961a4f6ac36c5, type: 3} propertyPath: m_Name value: CardSlot objectReference: {fileID: 0} diff --git a/Assets/Scripts/Controller/GameController.cs b/Assets/Scripts/Controller/GameController.cs index 5c79cdf9..c00fe0f4 100644 --- a/Assets/Scripts/Controller/GameController.cs +++ b/Assets/Scripts/Controller/GameController.cs @@ -1,6 +1,4 @@ -using System; -using Runtime.Controller; -using UnityEngine; +using UnityEngine; namespace Controller { @@ -14,6 +12,7 @@ namespace Controller _controllers = new Controllers(); new GameInit(_controllers, data); _controllers.Awake(); + } private void Start() diff --git a/Assets/Scripts/Controller/GameInit.cs b/Assets/Scripts/Controller/GameInit.cs index ac2d5c1a..3b792791 100644 --- a/Assets/Scripts/Controller/GameInit.cs +++ b/Assets/Scripts/Controller/GameInit.cs @@ -68,7 +68,7 @@ namespace Controller controllers.Add(enemyController); units.Add(enemy); AIAgent agent = new AIAgent(unit, enemy); - controllers.Add(agent); + enemy.onPlayerSpawned += x => controllers.Add(agent); enemy.OnDeath += x => { controllers.Remove(agent); }; enemy.OnDeath += paintedController.PaintOnDeath; } diff --git a/Assets/Scripts/GameUI/PlayerInventoryView.cs b/Assets/Scripts/GameUI/PlayerInventoryView.cs index 19f6d048..3c618a23 100644 --- a/Assets/Scripts/GameUI/PlayerInventoryView.cs +++ b/Assets/Scripts/GameUI/PlayerInventoryView.cs @@ -11,7 +11,8 @@ namespace GameUI [SerializeField] private GameObject item; [SerializeField] private GameObject grid; - public Action OnBuildingInvoked; + public Action OnBuildingInvoked; + private List