Merge branch 'RomanVersion' of https://e.coding.net/gensokyogroup/RedGame/Warcorrespondents into RomanVersion
# Conflicts: # UserSettings/EditorUserSettings.asset
This commit is contained in:
Roman
commit
b45611b41d
@ -123,6 +123,7 @@ NavMeshSettings:
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
--- !u!1001 &5949026
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -189,6 +190,8 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1777921847428221709, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3}
|
||||
m_PrefabInstance: {fileID: 5949026}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
=======
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
--- !u!1 &45693862
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -349,11 +352,19 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 56435766}
|
||||
<<<<<<< HEAD
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -1.4000001, y: 0.49338245, z: -9.900214}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1049093360}
|
||||
=======
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.045726582, y: 0.09207827, z: -10}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &56435770
|
||||
@ -487,6 +498,7 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 188312669}
|
||||
<<<<<<< HEAD
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -2.0254455, y: 3.462307, z: 0.5263625}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
@ -495,6 +507,16 @@ Transform:
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &363919958
|
||||
=======
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.07, y: 2.02, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &282277969
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -502,20 +524,383 @@ GameObject:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
<<<<<<< HEAD
|
||||
- component: {fileID: 363919959}
|
||||
m_Layer: 0
|
||||
m_Name: "\u4E91"
|
||||
m_TagString: Untagged
|
||||
=======
|
||||
- component: {fileID: 282277976}
|
||||
- component: {fileID: 282277975}
|
||||
- component: {fileID: 282277974}
|
||||
- component: {fileID: 282277973}
|
||||
- component: {fileID: 282277972}
|
||||
- component: {fileID: 282277971}
|
||||
- component: {fileID: 282277970}
|
||||
m_Layer: 0
|
||||
m_Name: "\u5C0F\u5B69"
|
||||
m_TagString: Player
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
<<<<<<< HEAD
|
||||
--- !u!4 &363919959
|
||||
=======
|
||||
--- !u!120 &282277970
|
||||
LineRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 282277969}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 0
|
||||
m_LightProbeUsage: 0
|
||||
m_ReflectionProbeUsage: 0
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10301, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 2
|
||||
m_Positions:
|
||||
- {x: 0, y: 0, z: 0}
|
||||
- {x: 0, y: 0, z: 1}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
widthCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0.2857151
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
colorGradient:
|
||||
serializedVersion: 2
|
||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
||||
key1: {r: 1, g: 1, b: 1, a: 1}
|
||||
key2: {r: 0, g: 0, b: 0, a: 0}
|
||||
key3: {r: 0, g: 0, b: 0, a: 0}
|
||||
key4: {r: 0, g: 0, b: 0, a: 0}
|
||||
key5: {r: 0, g: 0, b: 0, a: 0}
|
||||
key6: {r: 0, g: 0, b: 0, a: 0}
|
||||
key7: {r: 0, g: 0, b: 0, a: 0}
|
||||
ctime0: 0
|
||||
ctime1: 65535
|
||||
ctime2: 0
|
||||
ctime3: 0
|
||||
ctime4: 0
|
||||
ctime5: 0
|
||||
ctime6: 0
|
||||
ctime7: 0
|
||||
atime0: 0
|
||||
atime1: 65535
|
||||
atime2: 0
|
||||
atime3: 0
|
||||
atime4: 0
|
||||
atime5: 0
|
||||
atime6: 0
|
||||
atime7: 0
|
||||
m_Mode: 0
|
||||
m_NumColorKeys: 2
|
||||
m_NumAlphaKeys: 2
|
||||
numCornerVertices: 0
|
||||
numCapVertices: 0
|
||||
alignment: 0
|
||||
textureMode: 0
|
||||
shadowBias: 0.5
|
||||
generateLightingData: 0
|
||||
m_UseWorldSpace: 1
|
||||
m_Loop: 0
|
||||
--- !u!114 &282277971
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 282277969}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e2c1a0de69ef6d468a14db32ebf68fe, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
catched: {fileID: 0}
|
||||
missile: {fileID: 4018427281142380165, guid: 628f0c1ef857ddd4687c94b8ba9b1aa6, type: 3}
|
||||
throwOffset: {fileID: 1161914447}
|
||||
--- !u!50 &282277972
|
||||
Rigidbody2D:
|
||||
serializedVersion: 4
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 282277969}
|
||||
m_BodyType: 0
|
||||
m_Simulated: 1
|
||||
m_UseFullKinematicContacts: 0
|
||||
m_UseAutoMass: 0
|
||||
m_Mass: 1
|
||||
m_LinearDrag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_GravityScale: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_Interpolate: 0
|
||||
m_SleepingMode: 1
|
||||
m_CollisionDetection: 0
|
||||
m_Constraints: 0
|
||||
--- !u!61 &282277973
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 282277969}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 2.52, y: 3.7866666}
|
||||
newSize: {x: 1, y: 1}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1.67, y: 2.69}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!114 &282277974
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 282277969}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Actions: {fileID: -944628639613478452, guid: 6c1186e0febe48c4e866173c0f39422d, type: 3}
|
||||
m_NotificationBehavior: 2
|
||||
m_UIInputModule: {fileID: 0}
|
||||
m_DeviceLostEvent:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_DeviceRegainedEvent:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_ControlsChangedEvent:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_ActionEvents:
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 282277971}
|
||||
m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
|
||||
m_MethodName: OnMoveHorizons
|
||||
m_Mode: 0
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: 5a93f020-27b4-4cb6-975f-af9ed1ef4ec3
|
||||
m_ActionName: PlayerNormal/MoveHorizons[/Keyboard/a,/Keyboard/d,/XInputControllerWindows/leftStick/left,/XInputControllerWindows/leftStick/right]
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 282277971}
|
||||
m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
|
||||
m_MethodName: OnRun
|
||||
m_Mode: 0
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: 5c554403-34b9-4a85-a8f5-ac58363cad75
|
||||
m_ActionName: PlayerNormal/Run[/XInputControllerWindows/rightShoulder,/Keyboard/shift]
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 282277971}
|
||||
m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
|
||||
m_MethodName: OnInteraction
|
||||
m_Mode: 0
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: a3099043-3ac2-4656-8595-f0c577842621
|
||||
m_ActionName: PlayerNormal/Interaction[/XInputControllerWindows/buttonWest,/Keyboard/f]
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 282277971}
|
||||
m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
|
||||
m_MethodName: OnCoding
|
||||
m_Mode: 0
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: f7af9390-5dad-4c80-a4a7-83d8314f8e88
|
||||
m_ActionName: PlayerNormal/Codeing[/XInputControllerWindows/rightTrigger,/Keyboard/space]
|
||||
- m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_ActionId: beabb251-6f14-495d-9364-88119e0f9bf0
|
||||
m_ActionName: NullMap/New action
|
||||
- m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_ActionId: 078b3370-2cb6-4574-9156-0146ae814573
|
||||
m_ActionName: PlayerInThrowing/Quit[/Keyboard/k]
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 282277971}
|
||||
m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
|
||||
m_MethodName: OnThrow
|
||||
m_Mode: 0
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: 6bab4454-55d6-409c-9736-d1640a407628
|
||||
m_ActionName: PlayerInThrowing/Throw[/Keyboard/shift]
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 282277971}
|
||||
m_TargetAssemblyTypeName: M_Player, Assembly-CSharp
|
||||
m_MethodName: OnAdjustTheAngle
|
||||
m_Mode: 0
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: fddd4068-5ae8-4c1a-8498-4c8c30327f57
|
||||
m_ActionName: PlayerInThrowing/AdjustTheAngle[/Keyboard/s,/Keyboard/w]
|
||||
m_NeverAutoSwitchControlSchemes: 0
|
||||
m_DefaultControlScheme: Player
|
||||
m_DefaultActionMap: PlayerNormal
|
||||
m_SplitScreenIndex: -1
|
||||
m_Camera: {fileID: 0}
|
||||
--- !u!212 &282277975
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 282277969}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: -1830823525
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 2
|
||||
m_Sprite: {fileID: 21300000, guid: 29e56f162a0374b44a23437dd6e68ca6, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!4 &282277976
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
m_GameObject: {fileID: 363919958}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -2.2228749, y: 10.902307, z: -7.0532846}
|
||||
@ -528,6 +913,18 @@ Transform:
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &493331769
|
||||
=======
|
||||
m_GameObject: {fileID: 282277969}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -0.049999997, y: -0.92, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1161914447}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &363919958
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -535,20 +932,31 @@ GameObject:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
<<<<<<< HEAD
|
||||
- component: {fileID: 493331770}
|
||||
m_Layer: 0
|
||||
m_Name: "\u5149\u6E90"
|
||||
=======
|
||||
- component: {fileID: 363919959}
|
||||
m_Layer: 0
|
||||
m_Name: "\u4E91"
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
<<<<<<< HEAD
|
||||
--- !u!4 &493331770
|
||||
=======
|
||||
--- !u!4 &363919959
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
m_GameObject: {fileID: 493331769}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
@ -557,6 +965,18 @@ Transform:
|
||||
- {fileID: 188312671}
|
||||
m_Father: {fileID: 1803085805}
|
||||
m_RootOrder: 2
|
||||
=======
|
||||
m_GameObject: {fileID: 363919958}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.2674294, y: 9.46, z: -7.579647}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1073926322}
|
||||
- {fileID: 562648601}
|
||||
- {fileID: 45693863}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 6
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &496175134
|
||||
GameObject:
|
||||
@ -571,7 +991,11 @@ GameObject:
|
||||
- component: {fileID: 496175137}
|
||||
- component: {fileID: 496175138}
|
||||
m_Layer: 0
|
||||
<<<<<<< HEAD
|
||||
m_Name: "\u4E2D\u5C42\u5730\u9762"
|
||||
=======
|
||||
m_Name: "\u5E8F\u7AE0\u573A\u666F\u7B2C\u4E09\u5C42"
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -636,10 +1060,18 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 496175134}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
<<<<<<< HEAD
|
||||
m_LocalPosition: {x: -2.2254455, y: -0.86769307, z: 0.5263625}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1803085805}
|
||||
=======
|
||||
m_LocalPosition: {x: -0.27, y: -2.31, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1171269131}
|
||||
m_Father: {fileID: 0}
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!61 &496175137
|
||||
@ -815,7 +1247,11 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<<<<<<< HEAD
|
||||
m_TrackedObjectOffset: {x: 3, y: 0.53, z: 0}
|
||||
=======
|
||||
m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_LookaheadTime: 0
|
||||
m_LookaheadSmoothing: 0
|
||||
m_LookaheadIgnoreY: 0
|
||||
@ -858,6 +1294,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<<<<<<< HEAD
|
||||
--- !u!1 &1049093359
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -891,6 +1328,8 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
=======
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
--- !u!1 &1073926321
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -973,6 +1412,39 @@ SpriteRenderer:
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
--- !u!1 &1161914446
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1161914447}
|
||||
m_Layer: 0
|
||||
m_Name: "\u6295\u63B7\u70B9"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 7174288486110832750, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1161914447
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1161914446}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 1.75, y: 0.44, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 282277976}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
--- !u!1 &1171269130
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -984,7 +1456,11 @@ GameObject:
|
||||
- component: {fileID: 1171269131}
|
||||
- component: {fileID: 1171269132}
|
||||
m_Layer: 0
|
||||
<<<<<<< HEAD
|
||||
m_Name: "\u7535\u62A5\u7EBF"
|
||||
=======
|
||||
m_Name: "\u5E8F\u7AE0\u573A\u666F\u7B2C\u4E8C\u5C42\uFF08\u7535\u62A5\u7EBF\uFF09"
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -998,11 +1474,19 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1171269130}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
<<<<<<< HEAD
|
||||
m_LocalPosition: {x: -2.2954454, y: -0.49769306, z: 0.5263625}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1803085805}
|
||||
m_RootOrder: 1
|
||||
=======
|
||||
m_LocalPosition: {x: -0.07, y: 0.37, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 496175136}
|
||||
m_RootOrder: 0
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &1171269132
|
||||
SpriteRenderer:
|
||||
@ -1055,6 +1539,7 @@ SpriteRenderer:
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
<<<<<<< HEAD
|
||||
--- !u!1 &1258254498
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1113,6 +1598,8 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
=======
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
--- !u!1 &1373134508
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1167,7 +1654,11 @@ MonoBehaviour:
|
||||
m_Priority: 10
|
||||
m_StandbyUpdate: 2
|
||||
m_LookAt: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
m_Follow: {fileID: 5949027}
|
||||
=======
|
||||
m_Follow: {fileID: 282277976}
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_Lens:
|
||||
FieldOfView: 60
|
||||
OrthographicSize: 5
|
||||
@ -1190,6 +1681,7 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1373134508}
|
||||
<<<<<<< HEAD
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -1.4000001, y: 0.49338245, z: -9.900214}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
@ -1197,6 +1689,15 @@ Transform:
|
||||
- {fileID: 963972581}
|
||||
m_Father: {fileID: 1049093360}
|
||||
m_RootOrder: 1
|
||||
=======
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.049999997, y: -0.92, z: -10}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 963972581}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 9
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1402141436
|
||||
GameObject:
|
||||
@ -1209,7 +1710,11 @@ GameObject:
|
||||
- component: {fileID: 1402141438}
|
||||
- component: {fileID: 1402141437}
|
||||
m_Layer: 0
|
||||
<<<<<<< HEAD
|
||||
m_Name: "\u5929\u7A7A"
|
||||
=======
|
||||
m_Name: "\u5E8F\u7AE0\u573A\u666F\u5929\u7A7A\u80CC\u666F"
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -1273,11 +1778,19 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1402141436}
|
||||
<<<<<<< HEAD
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -1.9554454, y: 2.5923069, z: 0.5263625}
|
||||
m_LocalScale: {x: 1.2581, y: 1.2581, z: 1.2581}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1803085805}
|
||||
=======
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 1.15, z: 0}
|
||||
m_LocalScale: {x: 1.2581, y: 1.2581, z: 1.2581}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1537313301
|
||||
@ -1292,7 +1805,11 @@ GameObject:
|
||||
- component: {fileID: 1537313303}
|
||||
- component: {fileID: 1537313302}
|
||||
m_Layer: 0
|
||||
<<<<<<< HEAD
|
||||
m_Name: "\u70DF\u96FE\u7C92\u5B50\u7CFB\u7EDF"
|
||||
=======
|
||||
m_Name: fog
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -6077,6 +6594,7 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1537313301}
|
||||
<<<<<<< HEAD
|
||||
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
|
||||
m_LocalPosition: {x: -5.7454453, y: -0.42769313, z: -7.6436377}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
@ -6115,6 +6633,15 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
=======
|
||||
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: -3.79, y: -1.87, z: -8.17}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
--- !u!1 &1677427149
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -6126,7 +6653,11 @@ GameObject:
|
||||
- component: {fileID: 1677427151}
|
||||
- component: {fileID: 1677427150}
|
||||
m_Layer: 0
|
||||
<<<<<<< HEAD
|
||||
m_Name: "\u8FDC\u5904"
|
||||
=======
|
||||
m_Name: "\u5E8F\u7AE0\u573A\u666F\u7B2C\u56DB\u5C42"
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -6190,11 +6721,19 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1677427149}
|
||||
<<<<<<< HEAD
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -1.9554454, y: 1.342307, z: 0.5263625}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1803085805}
|
||||
=======
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -0.099999905, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1686602594
|
||||
@ -6209,7 +6748,11 @@ GameObject:
|
||||
- component: {fileID: 1686602595}
|
||||
- component: {fileID: 1686602597}
|
||||
m_Layer: 0
|
||||
<<<<<<< HEAD
|
||||
m_Name: "\u9760\u8FD1\u6444\u50CF\u673A\u7684\u5730\u9762"
|
||||
=======
|
||||
m_Name: "\u5E8F\u7AE0\u573A\u666F\u7B2C\u4E00\u5C42"
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -6273,12 +6816,21 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1686602594}
|
||||
<<<<<<< HEAD
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -1.9554454, y: -1.5076929, z: 0.5263625}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1803085805}
|
||||
m_RootOrder: 0
|
||||
=======
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -2.9499998, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1686602597
|
||||
MonoBehaviour:
|
||||
@ -6292,6 +6844,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 69c08ecd162c9144b9de9ce144669c83, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<<<<<<< HEAD
|
||||
Cam: {fileID: 56435769}
|
||||
moveRate: 0
|
||||
--- !u!1 &1803085804
|
||||
@ -6332,6 +6885,10 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
=======
|
||||
Cam: {fileID: 0}
|
||||
moveRate: 0
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
--- !u!1 &2087774247
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -6359,7 +6916,11 @@ PolygonCollider2D:
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
m_IsTrigger: 1
|
||||
=======
|
||||
m_IsTrigger: 0
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
@ -6385,10 +6946,19 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2087774247}
|
||||
<<<<<<< HEAD
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 8.212225, y: -0.8222625, z: -1.3445091}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1049093360}
|
||||
m_RootOrder: 2
|
||||
=======
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 8.212225, y: -0.8222625, z: -1.3445091}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 10
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
||||
@ -6,14 +6,31 @@ EditorUserSettings:
|
||||
serializedVersion: 4
|
||||
m_ConfigSettings:
|
||||
RecentlyUsedScenePath-0:
|
||||
<<<<<<< HEAD
|
||||
value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb73663ffabe163e78fce9332b25
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
value: 22424703114646680e0b0227036c721f04041d09232c2304283a097df7ee3d2cfb
|
||||
=======
|
||||
value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
>>>>>>> 5d812753da2f9af3c5b8640dd11b561df5989be2
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-1:
|
||||
value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
|
||||
flags: 0
|
||||
<<<<<<< HEAD
|
||||
RecentlyUsedScenePath-2:
|
||||
value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
|
||||
flags: 0
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
RecentlyUsedScenePath-4:
|
||||
value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
|
||||
flags: 0
|
||||
=======
|
||||
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
|
||||
>>>>>>> 5d812753da2f9af3c5b8640dd11b561df5989be2
|
||||
vcSharedLogLevel:
|
||||
value: 0d5e400f0650
|
||||
flags: 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user