Merge branch 'develop' into feature/czq_0610

This commit is contained in:
Ovid
2025-06-12 18:32:14 +08:00
8 changed files with 280 additions and 1297 deletions
@@ -67,6 +67,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ca909870d485bde44b1e652490df203f
m_Address: "BubbleSprite/\u5927\u5BF9\u8BDD\u6846"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
@@ -46,7 +46,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 0}
m_Motion: {fileID: 7400000, guid: f468217ea82a20c428e4018154d7858b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -89,13 +89,13 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -6541299090111933027}
m_Position: {x: 260, y: 80, z: 0}
m_Position: {x: 340, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: -1971952016047913077}
m_Position: {x: 340, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: -5708449068058360597}
m_Position: {x: 370, y: 260, z: 0}
m_Position: {x: 340, y: 260, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -26,7 +26,7 @@ Transform:
m_GameObject: {fileID: 281336877678007029}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.3, y: -1.41, z: 0}
m_LocalPosition: {x: -4.3, y: -1.57, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -296,11 +296,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
config:
key: "\u4F69\u4F69\u6700\u65B0"
layerId: 941243827
key: "\u77F3\u5934"
layerId: 1134468525
maxLayer: 200
minLayer: 100
spriteGroup: {fileID: 484818901331367303, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3}
spriteGroup: {fileID: 3259275819111110517, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3}
data:
configKey:
curState:
@@ -376,8 +376,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 16
m_Sprite: {fileID: -1612899159409639466, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -483,8 +483,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 50
m_Sprite: {fileID: -8709910151141876178, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -545,7 +545,7 @@ Transform:
m_GameObject: {fileID: 2615926060114227568}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.3, y: -4.56, z: 0}
m_LocalPosition: {x: -4.3, y: -4.76, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -688,8 +688,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 200
m_Sprite: {fileID: -7694110997164362583, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -747,7 +747,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
slotName: "\u7A97\u5916"
sortingLayer: 941243827
sortingLayer: 1134468525
sortingOrder: 40
hasDefaultActor: 0
defaultActorType: 0
@@ -966,8 +966,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 13
m_Sprite: {fileID: -1988038007918108968, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1002,6 +1002,88 @@ MonoBehaviour:
- time: 2
weather: 0
sprite: {fileID: -8619082023303832335, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
--- !u!1 &4533473656043687394
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3736846127602575434}
- component: {fileID: 5736563398886913608}
m_Layer: 0
m_Name: Light 2D
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3736846127602575434
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4533473656043687394}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7333995943917754426}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5736563398886913608
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4533473656043687394}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ComponentVersion: 1
m_LightType: 1
m_BlendStyleIndex: 0
m_FalloffIntensity: 0.5
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_LightVolumeIntensity: 1
m_LightVolumeIntensityEnabled: 0
m_ApplyToSortingLayers: f3a9fe5c00000000bbbb5032670b9971b7e66ab5d3878c191da0cc5f7740d514351d35393d533d9a7dc3a93dad9d9e43a55d9d3c8db9e11bb33d1a38cd4376e253b7f3d03394c91221d98fe1c7af7730011a6676
m_LightCookieSprite: {fileID: 0}
m_DeprecatedPointLightCookieSprite: {fileID: 0}
m_LightOrder: 0
m_AlphaBlendOnOverlap: 0
m_OverlapOperation: 0
m_NormalMapDistance: 3
m_NormalMapQuality: 2
m_UseNormalMap: 0
m_ShadowIntensityEnabled: 0
m_ShadowIntensity: 0.75
m_ShadowVolumeIntensityEnabled: 0
m_ShadowVolumeIntensity: 0.75
m_LocalBounds:
m_Center: {x: 0.029300213, y: -0.06520009, z: 0}
m_Extent: {x: 14.105, y: 5.5692997, z: 0}
m_PointLightInnerAngle: 360
m_PointLightOuterAngle: 360
m_PointLightInnerRadius: 0
m_PointLightOuterRadius: 1
m_ShapeLightParametricSides: 5
m_ShapeLightParametricAngleOffset: 0
m_ShapeLightParametricRadius: 1
m_ShapeLightFalloffSize: 0.5
m_ShapeLightFalloffOffset: {x: 0, y: 0}
m_ShapePath:
- {x: -13.581709, y: -5.1318007, z: 0}
- {x: 13.6442995, y: -5.006618, z: 0}
- {x: 13.581708, y: 5.0066175, z: 0}
- {x: -13.550413, y: 4.8814335, z: 0}
--- !u!1 &5321307203511402235
GameObject:
m_ObjectHideFlags: 0
@@ -1073,7 +1155,7 @@ Transform:
- {fileID: 8348444316318293934}
- {fileID: 9073824794961298310}
- {fileID: 7584334070843953053}
- {fileID: 1811240740758700661}
- {fileID: 3736846127602575434}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &882042772592041067
@@ -1161,8 +1243,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 15
m_Sprite: {fileID: 2666721193800013233, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1286,7 +1368,7 @@ GameObject:
- component: {fileID: 8372944285270283523}
- component: {fileID: 2775464944167648828}
m_Layer: 0
m_Name: "\u7A97\u5916\u5217\u8F66 (1)"
m_Name: "\u7A97\u5916\u5217\u8F66"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1327,7 +1409,7 @@ MonoBehaviour:
assetAddressArray:
- "Clinic/\u4E3B\u573A\u666F[\u767D\u5929\u7A97\u5916\u5217\u8F66]"
offset: {x: 0, y: 0}
sortingLayerId: 941243827
sortingLayerId: 1134468525
sortingOrder: 14
isDistanceMode: 0
existTime: 0
@@ -1494,88 +1576,6 @@ MonoBehaviour:
initOnAwake: 1
defaultTime: 0
defaultWeather: 0
--- !u!1 &7198432246657461535
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1811240740758700661}
- component: {fileID: 4014124416602017759}
m_Layer: 0
m_Name: Light 2D
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1811240740758700661
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7198432246657461535}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7333995943917754426}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4014124416602017759
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7198432246657461535}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ComponentVersion: 1
m_LightType: 1
m_BlendStyleIndex: 0
m_FalloffIntensity: 0.5
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_LightVolumeIntensity: 1
m_LightVolumeIntensityEnabled: 0
m_ApplyToSortingLayers: f3a9fe5c00000000bbbb5032670b9971b7e66ab5d3878c191da0cc5f7740d514351d35393d533d9a7dc3a93dad9d9e43a55d9d3c8db9e11bb33d1a38cd4376e253b7f3d03394c91221d98fe1c7af7730011a6676
m_LightCookieSprite: {fileID: 0}
m_DeprecatedPointLightCookieSprite: {fileID: 0}
m_LightOrder: 0
m_AlphaBlendOnOverlap: 0
m_OverlapOperation: 0
m_NormalMapDistance: 3
m_NormalMapQuality: 2
m_UseNormalMap: 0
m_ShadowIntensityEnabled: 0
m_ShadowIntensity: 0.75
m_ShadowVolumeIntensityEnabled: 0
m_ShadowVolumeIntensity: 0.75
m_LocalBounds:
m_Center: {x: 0.029900074, y: -0.06675005, z: 0}
m_Extent: {x: 14.1052, y: 5.56905, z: 0}
m_PointLightInnerAngle: 360
m_PointLightOuterAngle: 360
m_PointLightInnerRadius: 0
m_PointLightOuterRadius: 1
m_ShapeLightParametricSides: 5
m_ShapeLightParametricAngleOffset: 0
m_ShapeLightParametricRadius: 1
m_ShapeLightFalloffSize: 0.5
m_ShapeLightFalloffOffset: {x: 0, y: 0}
m_ShapePath:
- {x: -13.581709, y: -5.1318007, z: 0}
- {x: 13.6442995, y: -5.006618, z: 0}
- {x: 13.581708, y: 5.0066175, z: 0}
- {x: -13.550413, y: 4.8814335, z: 0}
--- !u!1 &7640562354936030701
GameObject:
m_ObjectHideFlags: 0
@@ -1742,8 +1742,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 51
m_Sprite: {fileID: 21300000, guid: c921bfdd369821a4f8314aa72431515b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1860,8 +1860,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 52
m_Sprite: {fileID: -7887151042877035774, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1919,7 +1919,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
slotName: clinic
sortingLayer: 941243827
sortingLayer: 1134468525
sortingOrder: 120
hasDefaultActor: 0
defaultActorType: 0
@@ -0,0 +1,84 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1929229985024213391
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7539617763774564167}
- component: {fileID: 8281347500780604551}
m_Layer: 0
m_Name: Light 2D
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7539617763774564167
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1929229985024213391}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8281347500780604551
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1929229985024213391}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ComponentVersion: 1
m_LightType: 1
m_BlendStyleIndex: 0
m_FalloffIntensity: 0.5
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_LightVolumeIntensity: 1
m_LightVolumeIntensityEnabled: 0
m_ApplyToSortingLayers: f3a9fe5c00000000bbbb5032670b9971b7e66ab5d3878c191da0cc5f7740d514351d35393d533d9a7dc3a93dad9d9e43a55d9d3c8db9e11bb33d1a38cd4376e253b7f3d03394c91221d98fe1c7af7730011a6676
m_LightCookieSprite: {fileID: 0}
m_DeprecatedPointLightCookieSprite: {fileID: 0}
m_LightOrder: 0
m_AlphaBlendOnOverlap: 0
m_OverlapOperation: 0
m_NormalMapDistance: 3
m_NormalMapQuality: 2
m_UseNormalMap: 0
m_ShadowIntensityEnabled: 0
m_ShadowIntensity: 0.75
m_ShadowVolumeIntensityEnabled: 0
m_ShadowVolumeIntensity: 0.75
m_LocalBounds:
m_Center: {x: 0.033599854, y: -0.06134987, z: 0}
m_Extent: {x: 14.1118, y: 5.57755, z: 0}
m_PointLightInnerAngle: 360
m_PointLightOuterAngle: 360
m_PointLightInnerRadius: 0
m_PointLightOuterRadius: 1
m_ShapeLightParametricSides: 5
m_ShapeLightParametricAngleOffset: 0
m_ShapeLightParametricRadius: 1
m_ShapeLightFalloffSize: 0.5
m_ShapeLightFalloffOffset: {x: 0, y: 0}
m_ShapePath:
- {x: -13.581709, y: -5.1318007, z: 0}
- {x: 13.6442995, y: -5.006618, z: 0}
- {x: 13.581708, y: 5.0066175, z: 0}
- {x: -13.550413, y: 4.8814335, z: 0}
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 245f2f6112657044aa4431eef024e2da
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -70,8 +70,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 118
m_Sprite: {fileID: 6323271751243769601, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -187,8 +187,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 120
m_Sprite: {fileID: 4137787962559099257, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -303,8 +303,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 107
m_Sprite: {fileID: 2478775731549634716, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -387,8 +387,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 122
m_Sprite: {fileID: -8788223535012521681, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -471,8 +471,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 104
m_Sprite: {fileID: 4776206269529371476, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -555,8 +555,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 116
m_Sprite: {fileID: 8962918017820446866, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.7058824}
@@ -639,8 +639,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 106
m_Sprite: {fileID: 8334890132620819893, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -723,8 +723,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 112
m_Sprite: {fileID: -425839213017922319, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -848,8 +848,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 105
m_Sprite: {fileID: -7419982826322881100, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -932,8 +932,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 101
m_Sprite: {fileID: 459543891564587335, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1016,8 +1016,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 121
m_Sprite: {fileID: 1334166003218808176, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1100,8 +1100,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 102
m_Sprite: {fileID: 3581718187618583822, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1184,8 +1184,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 110
m_Sprite: {fileID: -7547062833339466231, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1313,8 +1313,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 123
m_Sprite: {fileID: 1510002135873676259, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1430,8 +1430,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 109
m_Sprite: {fileID: -5542022998808174665, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1514,8 +1514,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 126
m_Sprite: {fileID: -23736826301380022, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1598,8 +1598,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 111
m_Sprite: {fileID: 6569224906845880241, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1682,8 +1682,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 124
m_Sprite: {fileID: 3474121723572056905, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1766,8 +1766,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 100
m_Sprite: {fileID: -4536251038558256942, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1850,8 +1850,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 114
m_Sprite: {fileID: 7360568446174839270, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1934,8 +1934,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 128
m_Sprite: {fileID: -3590090846338729505, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -2018,8 +2018,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 125
m_Sprite: {fileID: -7231693895997857733, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -2102,8 +2102,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 127
m_Sprite: {fileID: 3468312634236209334, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -2222,8 +2222,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 108
m_Sprite: {fileID: 8695994089708513954, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -2306,8 +2306,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 103
m_Sprite: {fileID: -3316971073709076221, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -2390,8 +2390,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 113
m_Sprite: {fileID: -9147217012527053800, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -2474,8 +2474,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 119
m_Sprite: {fileID: -2452535401947224898, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -2558,8 +2558,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 115
m_Sprite: {fileID: 6056875787964206845, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -2642,8 +2642,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 117
m_Sprite: {fileID: -793228827355489120, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
+16 -16
View File
@@ -70,8 +70,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 105
m_Sprite: {fileID: 4703645615906209115, guid: 2d3d7f9199e56554098528708d850bd7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -154,8 +154,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 106
m_Sprite: {fileID: -6205028777198704418, guid: 2d3d7f9199e56554098528708d850bd7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -238,8 +238,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 107
m_Sprite: {fileID: 2440255744171708036, guid: 2d3d7f9199e56554098528708d850bd7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -322,8 +322,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 104
m_Sprite: {fileID: 2139415004306018790, guid: 2d3d7f9199e56554098528708d850bd7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -445,8 +445,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 103
m_Sprite: {fileID: -2951390548796001332, guid: 2d3d7f9199e56554098528708d850bd7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -529,8 +529,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 101
m_Sprite: {fileID: -7704096600580687689, guid: 2d3d7f9199e56554098528708d850bd7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -613,8 +613,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 100
m_Sprite: {fileID: -1774445849321152450, guid: 2d3d7f9199e56554098528708d850bd7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -697,8 +697,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 102
m_Sprite: {fileID: -9121129633636255685, guid: 2d3d7f9199e56554098528708d850bd7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
File diff suppressed because one or more lines are too long