|
@@ -142,8 +142,8 @@ RectTransform:
|
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
|
m_AnchorMin: {x: 0, y: 0}
|
|
|
m_AnchorMax: {x: 1, y: 1}
|
|
|
- m_AnchoredPosition: {x: -0.8045044, y: 226.50027}
|
|
|
- m_SizeDelta: {x: -62.0529, y: -613.3034}
|
|
|
+ m_AnchoredPosition: {x: -0.56381226, y: 266.55963}
|
|
|
+ m_SizeDelta: {x: -30.7806, y: -710.0225}
|
|
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
|
--- !u!222 &5167498229776329142
|
|
|
CanvasRenderer:
|
|
@@ -166,7 +166,7 @@ MonoBehaviour:
|
|
|
m_Name:
|
|
|
m_EditorClassIdentifier:
|
|
|
m_Material: {fileID: 0}
|
|
|
- m_Color: {r: 0.81568635, g: 0.7372549, b: 0.5529412, a: 1}
|
|
|
+ m_Color: {r: 0.8470589, g: 0.8235295, b: 0.7607844, a: 1}
|
|
|
m_RaycastTarget: 1
|
|
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
|
m_Maskable: 1
|
|
@@ -183,7 +183,7 @@ MonoBehaviour:
|
|
|
m_FillOrigin: 0
|
|
|
m_UseSpriteMesh: 0
|
|
|
m_PixelsPerUnitMultiplier: 1
|
|
|
- _icon_name: dec_juxing_fang_hujiao
|
|
|
+ _icon_name: dec_juxing_fang
|
|
|
isNotLoadDeftIcon: 0
|
|
|
CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
|
|
|
packInfo:
|
|
@@ -228,8 +228,8 @@ RectTransform:
|
|
|
m_ConstrainProportionsScale: 0
|
|
|
m_Children:
|
|
|
- {fileID: 8842124393281780795}
|
|
|
+ - {fileID: 3914291755169970593}
|
|
|
- {fileID: 7663317156490623705}
|
|
|
- - {fileID: 2708046515207152597}
|
|
|
- {fileID: 6275148584250070916}
|
|
|
- {fileID: 3375913756600433316}
|
|
|
- {fileID: 5866622043385976589}
|
|
@@ -237,8 +237,8 @@ RectTransform:
|
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
|
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
|
|
- m_AnchoredPosition: {x: 0, y: 0}
|
|
|
- m_SizeDelta: {x: 619.7278, y: 657.4299}
|
|
|
+ m_AnchoredPosition: {x: -0.8211, y: 72.68799}
|
|
|
+ m_SizeDelta: {x: 664.8527, y: 760.2731}
|
|
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
|
--- !u!222 &507674846458028489
|
|
|
CanvasRenderer:
|
|
@@ -326,8 +326,8 @@ RectTransform:
|
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
|
m_AnchorMin: {x: 0, y: 0.5}
|
|
|
m_AnchorMax: {x: 0, y: 0.5}
|
|
|
- m_AnchoredPosition: {x: 12.5, y: 0}
|
|
|
- m_SizeDelta: {x: 32.8863, y: 32.5289}
|
|
|
+ m_AnchoredPosition: {x: 251.1, y: 0.000024319}
|
|
|
+ m_SizeDelta: {x: 38.951, y: 38.5277}
|
|
|
m_Pivot: {x: 0, y: 0.5}
|
|
|
--- !u!222 &3956759277254579743
|
|
|
CanvasRenderer:
|
|
@@ -415,8 +415,8 @@ RectTransform:
|
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
|
m_AnchorMin: {x: 0, y: 0}
|
|
|
m_AnchorMax: {x: 1, y: 1}
|
|
|
- m_AnchoredPosition: {x: 1.178009, y: 0.8644104}
|
|
|
- m_SizeDelta: {x: -17.304077, y: -17.237}
|
|
|
+ m_AnchoredPosition: {x: 0, y: 0}
|
|
|
+ m_SizeDelta: {x: -15.246704, y: -19.058594}
|
|
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
|
--- !u!222 &5143802336595678939
|
|
|
CanvasRenderer:
|
|
@@ -501,11 +501,11 @@ RectTransform:
|
|
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
|
m_ConstrainProportionsScale: 0
|
|
|
m_Children: []
|
|
|
- m_Father: {fileID: 5852862441037819201}
|
|
|
+ m_Father: {fileID: 3914291755169970593}
|
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
|
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
|
|
- m_AnchoredPosition: {x: 0, y: 295.75}
|
|
|
+ m_AnchoredPosition: {x: -0.0000059604645, y: 0}
|
|
|
m_SizeDelta: {x: 535.2303, y: 50.431}
|
|
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
|
--- !u!222 &1851182301441702079
|
|
@@ -529,7 +529,7 @@ MonoBehaviour:
|
|
|
m_Name:
|
|
|
m_EditorClassIdentifier:
|
|
|
m_Material: {fileID: 0}
|
|
|
- m_Color: {r: 0.5137255, g: 0.48235297, b: 0.3529412, a: 1}
|
|
|
+ m_Color: {r: 0.9058824, g: 0.882353, b: 0.82745105, a: 1}
|
|
|
m_RaycastTarget: 1
|
|
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
|
m_Maskable: 1
|
|
@@ -538,11 +538,11 @@ MonoBehaviour:
|
|
|
m_Calls: []
|
|
|
m_FontData:
|
|
|
m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
|
|
|
- m_FontSize: 38
|
|
|
+ m_FontSize: 40
|
|
|
m_FontStyle: 1
|
|
|
m_BestFit: 0
|
|
|
m_MinSize: 2
|
|
|
- m_MaxSize: 40
|
|
|
+ m_MaxSize: 42
|
|
|
m_Alignment: 4
|
|
|
m_AlignByGeometry: 0
|
|
|
m_RichText: 1
|
|
@@ -598,7 +598,7 @@ RectTransform:
|
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
|
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
|
|
- m_AnchoredPosition: {x: 15.075, y: -284.6}
|
|
|
+ m_AnchoredPosition: {x: 15.075, y: -294.8}
|
|
|
m_SizeDelta: {x: 525.9169, y: 47.657}
|
|
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
|
--- !u!222 &2600124819267049154
|
|
@@ -622,7 +622,7 @@ MonoBehaviour:
|
|
|
m_Name:
|
|
|
m_EditorClassIdentifier:
|
|
|
m_Material: {fileID: 0}
|
|
|
- m_Color: {r: 0, g: 0, b: 0, a: 1}
|
|
|
+ m_Color: {r: 0.14901961, g: 0.13725491, b: 0.11764706, a: 1}
|
|
|
m_RaycastTarget: 1
|
|
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
|
m_Maskable: 1
|
|
@@ -631,7 +631,7 @@ MonoBehaviour:
|
|
|
m_Calls: []
|
|
|
m_FontData:
|
|
|
m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
|
|
|
- m_FontSize: 20
|
|
|
+ m_FontSize: 25
|
|
|
m_FontStyle: 1
|
|
|
m_BestFit: 0
|
|
|
m_MinSize: 2
|
|
@@ -680,8 +680,8 @@ RectTransform:
|
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
|
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
|
|
- m_AnchoredPosition: {x: -2.0751, y: -21.54712}
|
|
|
- m_SizeDelta: {x: 555.1339, y: 377.0047}
|
|
|
+ m_AnchoredPosition: {x: -0.56382, y: 29.1074}
|
|
|
+ m_SizeDelta: {x: 634.07, y: 380.9899}
|
|
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
|
--- !u!222 &3793524203819905834
|
|
|
CanvasRenderer:
|
|
@@ -734,7 +734,7 @@ MonoBehaviour:
|
|
|
m_Name:
|
|
|
m_EditorClassIdentifier:
|
|
|
m_Material: {fileID: 0}
|
|
|
- m_Color: {r: 0.8588236, g: 0.83921576, b: 0.78823537, a: 1}
|
|
|
+ m_Color: {r: 0.8470589, g: 0.8235295, b: 0.7607844, a: 1}
|
|
|
m_RaycastTarget: 1
|
|
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
|
m_Maskable: 1
|
|
@@ -751,7 +751,7 @@ MonoBehaviour:
|
|
|
m_FillOrigin: 0
|
|
|
m_UseSpriteMesh: 0
|
|
|
m_PixelsPerUnitMultiplier: 1
|
|
|
- _icon_name: dec_juxing_fang_hujiao
|
|
|
+ _icon_name: dec_juxing_fang
|
|
|
isNotLoadDeftIcon: 0
|
|
|
CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
|
|
|
packInfo:
|
|
@@ -935,6 +935,96 @@ MonoBehaviour:
|
|
|
m_Name:
|
|
|
m_EditorClassIdentifier:
|
|
|
m_ShowMaskGraphic: 0
|
|
|
+--- !u!1 &6573144540420729276
|
|
|
+GameObject:
|
|
|
+ m_ObjectHideFlags: 0
|
|
|
+ m_CorrespondingSourceObject: {fileID: 0}
|
|
|
+ m_PrefabInstance: {fileID: 0}
|
|
|
+ m_PrefabAsset: {fileID: 0}
|
|
|
+ serializedVersion: 7
|
|
|
+ m_Component:
|
|
|
+ - component: {fileID: 3914291755169970593}
|
|
|
+ - component: {fileID: 5837731469000901826}
|
|
|
+ - component: {fileID: 4846221850105916576}
|
|
|
+ m_Layer: 0
|
|
|
+ m_HasEditorInfo: 1
|
|
|
+ m_Name: myImage (3)
|
|
|
+ m_TagString: Untagged
|
|
|
+ m_Icon: {fileID: 0}
|
|
|
+ m_NavMeshLayer: 0
|
|
|
+ m_StaticEditorFlags: 0
|
|
|
+ m_IsActive: 1
|
|
|
+--- !u!224 &3914291755169970593
|
|
|
+RectTransform:
|
|
|
+ m_ObjectHideFlags: 0
|
|
|
+ m_CorrespondingSourceObject: {fileID: 0}
|
|
|
+ m_PrefabInstance: {fileID: 0}
|
|
|
+ m_PrefabAsset: {fileID: 0}
|
|
|
+ m_GameObject: {fileID: 6573144540420729276}
|
|
|
+ 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:
|
|
|
+ - {fileID: 2708046515207152597}
|
|
|
+ m_Father: {fileID: 5852862441037819201}
|
|
|
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
|
+ m_AnchorMin: {x: 0, y: 0}
|
|
|
+ m_AnchorMax: {x: 1, y: 1}
|
|
|
+ m_AnchoredPosition: {x: -0.56427, y: 334.48773}
|
|
|
+ m_SizeDelta: {x: -30.781, y: -701.9854}
|
|
|
+ m_Pivot: {x: 0.5, y: 0.5}
|
|
|
+--- !u!222 &5837731469000901826
|
|
|
+CanvasRenderer:
|
|
|
+ m_ObjectHideFlags: 0
|
|
|
+ m_CorrespondingSourceObject: {fileID: 0}
|
|
|
+ m_PrefabInstance: {fileID: 0}
|
|
|
+ m_PrefabAsset: {fileID: 0}
|
|
|
+ m_GameObject: {fileID: 6573144540420729276}
|
|
|
+ m_CullTransparentMesh: 1
|
|
|
+--- !u!114 &4846221850105916576
|
|
|
+MonoBehaviour:
|
|
|
+ m_ObjectHideFlags: 0
|
|
|
+ m_CorrespondingSourceObject: {fileID: 0}
|
|
|
+ m_PrefabInstance: {fileID: 0}
|
|
|
+ m_PrefabAsset: {fileID: 0}
|
|
|
+ m_GameObject: {fileID: 6573144540420729276}
|
|
|
+ m_Enabled: 1
|
|
|
+ m_EditorHideFlags: 0
|
|
|
+ m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
|
|
|
+ m_Name:
|
|
|
+ m_EditorClassIdentifier:
|
|
|
+ m_Material: {fileID: 0}
|
|
|
+ m_Color: {r: 0.4156863, g: 0.5058824, b: 0.46274513, a: 1}
|
|
|
+ m_RaycastTarget: 1
|
|
|
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
|
+ m_Maskable: 1
|
|
|
+ m_OnCullStateChanged:
|
|
|
+ m_PersistentCalls:
|
|
|
+ m_Calls: []
|
|
|
+ m_Sprite: {fileID: 0}
|
|
|
+ m_Type: 1
|
|
|
+ m_PreserveAspect: 0
|
|
|
+ m_FillCenter: 1
|
|
|
+ m_FillMethod: 4
|
|
|
+ m_FillAmount: 1
|
|
|
+ m_FillClockwise: 1
|
|
|
+ m_FillOrigin: 0
|
|
|
+ m_UseSpriteMesh: 0
|
|
|
+ m_PixelsPerUnitMultiplier: 1
|
|
|
+ _icon_name: dec_juxing_135
|
|
|
+ isNotLoadDeftIcon: 0
|
|
|
+ CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
|
|
|
+ packInfo:
|
|
|
+ packName: tongyong
|
|
|
+ packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
|
|
|
+ packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
|
|
|
+ lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
|
|
|
+ imageH: 777.9515
|
|
|
+ useGradient: 0
|
|
|
+ topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
|
|
|
+ bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
|
|
|
+ direction: 0
|
|
|
--- !u!1 &6864546897549033815
|
|
|
GameObject:
|
|
|
m_ObjectHideFlags: 0
|
|
@@ -1092,7 +1182,7 @@ RectTransform:
|
|
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
|
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
|
|
m_AnchoredPosition: {x: 0, y: 0}
|
|
|
- m_SizeDelta: {x: 753, y: 1623}
|
|
|
+ m_SizeDelta: {x: 750, y: 1624}
|
|
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
|
--- !u!222 &2050812396940640416
|
|
|
CanvasRenderer:
|
|
@@ -1122,7 +1212,7 @@ MonoBehaviour:
|
|
|
m_OnCullStateChanged:
|
|
|
m_PersistentCalls:
|
|
|
m_Calls: []
|
|
|
- m_Sprite: {fileID: 21300000, guid: 9c262a0a7985107478ae165836f1936a, type: 3}
|
|
|
+ m_Sprite: {fileID: 21300000, guid: b4bb8185f4bbfad4d95fb27ae0cb488c, type: 3}
|
|
|
m_Type: 0
|
|
|
m_PreserveAspect: 0
|
|
|
m_FillCenter: 1
|
|
@@ -1211,12 +1301,12 @@ MonoBehaviour:
|
|
|
m_Name:
|
|
|
m_EditorClassIdentifier:
|
|
|
m_Padding:
|
|
|
- m_Left: 5
|
|
|
+ m_Left: 23
|
|
|
m_Right: 0
|
|
|
m_Top: 16
|
|
|
m_Bottom: 0
|
|
|
m_ChildAlignment: 0
|
|
|
- m_Spacing: 10.9
|
|
|
+ m_Spacing: 37.72
|
|
|
m_ChildForceExpandWidth: 1
|
|
|
m_ChildForceExpandHeight: 1
|
|
|
m_ChildControlWidth: 0
|
|
@@ -1259,7 +1349,7 @@ RectTransform:
|
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
|
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
|
|
- m_AnchoredPosition: {x: 15.075, y: -241.9}
|
|
|
+ m_AnchoredPosition: {x: 0, y: -235.1}
|
|
|
m_SizeDelta: {x: 525.9169, y: 47.657}
|
|
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
|
--- !u!222 &1376453331867545162
|
|
@@ -1283,7 +1373,7 @@ MonoBehaviour:
|
|
|
m_Name:
|
|
|
m_EditorClassIdentifier:
|
|
|
m_Material: {fileID: 0}
|
|
|
- m_Color: {r: 0, g: 0, b: 0, a: 1}
|
|
|
+ m_Color: {r: 0.14901961, g: 0.13725491, b: 0.11764707, a: 1}
|
|
|
m_RaycastTarget: 1
|
|
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
|
m_Maskable: 1
|
|
@@ -1292,7 +1382,7 @@ MonoBehaviour:
|
|
|
m_Calls: []
|
|
|
m_FontData:
|
|
|
m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
|
|
|
- m_FontSize: 20
|
|
|
+ m_FontSize: 28
|
|
|
m_FontStyle: 1
|
|
|
m_BestFit: 0
|
|
|
m_MinSize: 2
|
|
@@ -1339,8 +1429,8 @@ RectTransform:
|
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
|
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
|
|
- m_AnchoredPosition: {x: 38.82071, y: 1.7654}
|
|
|
- m_SizeDelta: {x: 525.9169, y: 47.657}
|
|
|
+ m_AnchoredPosition: {x: 19.9724, y: 0.23427}
|
|
|
+ m_SizeDelta: {x: 488.2202, y: 50.719}
|
|
|
m_Pivot: {x: 0.5, y: 0.5}
|
|
|
--- !u!222 &4294669017348956789
|
|
|
CanvasRenderer:
|
|
@@ -1377,7 +1467,7 @@ MonoBehaviour:
|
|
|
m_BestFit: 0
|
|
|
m_MinSize: 2
|
|
|
m_MaxSize: 40
|
|
|
- m_Alignment: 3
|
|
|
+ m_Alignment: 4
|
|
|
m_AlignByGeometry: 0
|
|
|
m_RichText: 1
|
|
|
m_HorizontalOverflow: 0
|
|
@@ -1490,7 +1580,7 @@ PrefabInstance:
|
|
|
objectReference: {fileID: 0}
|
|
|
- target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
|
|
|
propertyPath: m_AnchoredPosition.x
|
|
|
- value: 92.36135
|
|
|
+ value: 110.36135
|
|
|
objectReference: {fileID: 0}
|
|
|
- target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
|
|
|
propertyPath: m_AnchoredPosition.y
|