Merge remote-tracking branch 'origin/feature/NewWork1' into feature/NewWork1
This commit is contained in:
@@ -95,7 +95,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8073739421243990378
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -113,8 +113,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 17.200012, y: 0}
|
||||
m_SizeDelta: {x: 10, y: 0.000030518}
|
||||
m_AnchoredPosition: {x: 26.6, y: 0}
|
||||
m_SizeDelta: {x: 6.225, y: 0}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &1593703873945028185
|
||||
CanvasRenderer:
|
||||
@@ -420,7 +420,7 @@ RectTransform:
|
||||
m_Father: {fileID: 7153619786216737190}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
@@ -1767,7 +1767,7 @@ MonoBehaviour:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5165765297585570479}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
@@ -1814,7 +1814,7 @@ MonoBehaviour:
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 3792682753661158045}
|
||||
m_HorizontalScrollbarVisibility: 2
|
||||
m_VerticalScrollbarVisibility: 2
|
||||
m_VerticalScrollbarVisibility: 0
|
||||
m_HorizontalScrollbarSpacing: -3
|
||||
m_VerticalScrollbarSpacing: -3
|
||||
m_OnValueChanged:
|
||||
@@ -2352,7 +2352,7 @@ RectTransform:
|
||||
m_Father: {fileID: 8619689084036403273}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
||||
@@ -2431,8 +2431,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: 9.75, y: 276.5}
|
||||
m_SizeDelta: {x: 1401.5, y: 99}
|
||||
m_AnchoredPosition: {x: 1.9461, y: 276.5}
|
||||
m_SizeDelta: {x: 1385.8921, y: 99}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4466119373126890971
|
||||
CanvasRenderer:
|
||||
|
||||
@@ -113,7 +113,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7719030958223073663
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1032,7 +1032,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 123456
|
||||
m_text:
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
|
||||
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
|
||||
@@ -3076,7 +3076,7 @@ MonoBehaviour:
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_IsOn: 0
|
||||
m_IsOn: 1
|
||||
--- !u!1 &4158852736360741398
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3990,8 +3990,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, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 4.3553}
|
||||
m_SizeDelta: {x: 0, y: 8.7107}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &196561740278415349
|
||||
CanvasRenderer:
|
||||
@@ -4604,7 +4604,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &199172646652219513
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5077,7 +5077,7 @@ MonoBehaviour:
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_IsOn: 1
|
||||
m_IsOn: 0
|
||||
--- !u!1 &6588279259123829032
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -7030,7 +7030,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 123456
|
||||
m_text:
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
|
||||
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
|
||||
|
||||
@@ -107,6 +107,81 @@ MonoBehaviour:
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &325664300666746120
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8484437644051729171}
|
||||
- component: {fileID: 1688826970388639998}
|
||||
- component: {fileID: 727551961560081828}
|
||||
m_Layer: 0
|
||||
m_Name: Image (4)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8484437644051729171
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 325664300666746120}
|
||||
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: 8325910059825996973}
|
||||
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: -411.5806, y: 43}
|
||||
m_SizeDelta: {x: 405.83, y: 4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1688826970388639998
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 325664300666746120}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &727551961560081828
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 325664300666746120}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, 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: 21300000, guid: 38734d2eae79ce54cba2510a5519682a, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &396947031929450505
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -366,7 +441,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 162.5, y: -286.4}
|
||||
m_AnchoredPosition: {x: 162.5, y: -245.3}
|
||||
m_SizeDelta: {x: 257, y: 35}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1954322384254806430
|
||||
@@ -830,7 +905,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: -0.5000305, y: 211.49997}
|
||||
m_AnchoredPosition: {x: -0.5000305, y: 217}
|
||||
m_SizeDelta: {x: 606, y: 203}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &456672506534852481
|
||||
@@ -1870,6 +1945,7 @@ RectTransform:
|
||||
- {fileID: 4562988945872288029}
|
||||
- {fileID: 7970148758949420148}
|
||||
- {fileID: 1170554213763529172}
|
||||
- {fileID: 2174549030305921267}
|
||||
- {fileID: 7758868008232987415}
|
||||
m_Father: {fileID: 40985208430184282}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -1950,7 +2026,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 194.5, y: -131.8}
|
||||
m_AnchoredPosition: {x: 194.5, y: -118.1}
|
||||
m_SizeDelta: {x: 321, y: 35}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2388141963297830527
|
||||
@@ -2026,7 +2102,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: -80.67108, y: 11.858124}
|
||||
m_AnchoredPosition: {x: -80.67108, y: 27}
|
||||
m_SizeDelta: {x: 125, y: 31}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2006258961026261860
|
||||
@@ -2421,6 +2497,81 @@ MonoBehaviour:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_IsOn: 0
|
||||
--- !u!1 &3141374194220829417
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 247509303588924757}
|
||||
- component: {fileID: 2291238769153185623}
|
||||
- component: {fileID: 2003876480500255267}
|
||||
m_Layer: 0
|
||||
m_Name: Image (2)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &247509303588924757
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3141374194220829417}
|
||||
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: 1258704311739026429}
|
||||
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: -202.91, y: 46.93976}
|
||||
m_SizeDelta: {x: 405.83, y: 4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2291238769153185623
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3141374194220829417}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2003876480500255267
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3141374194220829417}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, 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: 21300000, guid: 38734d2eae79ce54cba2510a5519682a, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &3271416902384711834
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2590,11 +2741,13 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 890822975017118850}
|
||||
- {fileID: 247509303588924757}
|
||||
- {fileID: 7702855637165600334}
|
||||
m_Father: {fileID: 1170554213763529172}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 164.5, y: -53}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -81}
|
||||
m_SizeDelta: {x: 261, y: 32}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5529782631447490888
|
||||
@@ -2736,6 +2889,7 @@ MonoBehaviour:
|
||||
toggle_Fps60: {fileID: 2695896144210334820}
|
||||
toggle_FpsUnlimited: {fileID: 6215252191328535144}
|
||||
group_Fps: {fileID: 2721460615196769330}
|
||||
btn_ChangeUser: {fileID: 4110841028567726580}
|
||||
--- !u!1 &3446973110227008176
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3031,7 +3185,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 258.5, y: -209.1}
|
||||
m_AnchoredPosition: {x: 258.5, y: -181.7}
|
||||
m_SizeDelta: {x: 449, y: 35}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3506799571004998656
|
||||
@@ -3720,7 +3874,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: 209.12897, y: 11.858124}
|
||||
m_AnchoredPosition: {x: 209.12897, y: 27}
|
||||
m_SizeDelta: {x: 125, y: 31}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3568319737403538812
|
||||
@@ -3899,6 +4053,81 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_IsOn: 1
|
||||
--- !u!1 &4514093005708410624
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7702855637165600334}
|
||||
- component: {fileID: 7877445486568331131}
|
||||
- component: {fileID: 2740281524563073431}
|
||||
m_Layer: 0
|
||||
m_Name: Image (3)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7702855637165600334
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4514093005708410624}
|
||||
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: 1258704311739026429}
|
||||
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: 211.59, y: 46.93976}
|
||||
m_SizeDelta: {x: 423.17, y: 4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7877445486568331131
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4514093005708410624}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2740281524563073431
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4514093005708410624}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, 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: 21300000, guid: 1c863bee27022514d809d1c3ba5e16a5, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &4727032793159494139
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4369,7 +4598,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: -374.17105, y: 11.858124}
|
||||
m_AnchoredPosition: {x: -374.17105, y: 27}
|
||||
m_SizeDelta: {x: 125, y: 31}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8364231806989980938
|
||||
@@ -4496,6 +4725,7 @@ GameObject:
|
||||
- component: {fileID: 233794616398860532}
|
||||
- component: {fileID: 477481326833908375}
|
||||
- component: {fileID: 6903987822693466789}
|
||||
- component: {fileID: 5320082417155625949}
|
||||
m_Layer: 0
|
||||
m_Name: "\u591A\u4E50\u6E38\u620F\u9690\u79C1\u653F\u7B56\u6458\u8981"
|
||||
m_TagString: Untagged
|
||||
@@ -4515,11 +4745,11 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7970148758949420148}
|
||||
m_Father: {fileID: 8325910059825996973}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 194.5, y: -440.99997}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -440, y: 0}
|
||||
m_SizeDelta: {x: 321, y: 35}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &477481326833908375
|
||||
@@ -4560,6 +4790,26 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &5320082417155625949
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5560250235195862992}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 1
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: -1
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &5585028379956857402
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4848,6 +5098,127 @@ MonoBehaviour:
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &5712206907147702136
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2174549030305921267}
|
||||
- component: {fileID: 254061804389236058}
|
||||
- component: {fileID: 262374978213875264}
|
||||
- component: {fileID: 4110841028567726580}
|
||||
m_Layer: 0
|
||||
m_Name: Button
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2174549030305921267
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5712206907147702136}
|
||||
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: 407330543974352925}
|
||||
m_Father: {fileID: 3845284550578936258}
|
||||
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: 81.671, y: -238}
|
||||
m_SizeDelta: {x: 232, y: 67}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &254061804389236058
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5712206907147702136}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &262374978213875264
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5712206907147702136}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, 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: 21300000, guid: 884427a03d5125f4ea6033ca161d98df, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &4110841028567726580
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5712206907147702136}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 262374978213875264}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &6336116694431866096
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5379,6 +5750,81 @@ MonoBehaviour:
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &6767563721504049188
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 407330543974352925}
|
||||
- component: {fileID: 4582326597192130301}
|
||||
- component: {fileID: 3632820688139791259}
|
||||
m_Layer: 0
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &407330543974352925
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6767563721504049188}
|
||||
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: 2174549030305921267}
|
||||
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: 122, y: 32}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4582326597192130301
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6767563721504049188}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &3632820688139791259
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6767563721504049188}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, 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: 21300000, guid: cb92612423531444f81db07f374b993f, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &6882443761465081021
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -6001,6 +6447,81 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &7508582620822347556
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4924725133655092736}
|
||||
- component: {fileID: 6446604736216065135}
|
||||
- component: {fileID: 1748619066176825824}
|
||||
m_Layer: 0
|
||||
m_Name: Image (5)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4924725133655092736
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7508582620822347556}
|
||||
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: 8325910059825996973}
|
||||
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.919342, y: 43}
|
||||
m_SizeDelta: {x: 423.17, y: 4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6446604736216065135
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7508582620822347556}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1748619066176825824
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7508582620822347556}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, 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: 21300000, guid: 1c863bee27022514d809d1c3ba5e16a5, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &7550079192321920409
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -6313,7 +6834,6 @@ GameObject:
|
||||
- component: {fileID: 1170554213763529172}
|
||||
- component: {fileID: 689451425703919984}
|
||||
- component: {fileID: 5982296567783725093}
|
||||
- component: {fileID: 7293951796567616725}
|
||||
m_Layer: 0
|
||||
m_Name: GYYX
|
||||
m_TagString: Untagged
|
||||
@@ -6379,32 +6899,6 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &7293951796567616725
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7970323470066299523}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 34
|
||||
m_Right: 0
|
||||
m_Top: 37
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 42.3
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &7983894030135256307
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -6961,6 +7455,7 @@ GameObject:
|
||||
- component: {fileID: 8325910059825996973}
|
||||
- component: {fileID: 1085906422898711294}
|
||||
- component: {fileID: 5408091209747480909}
|
||||
- component: {fileID: 7179345081442397303}
|
||||
m_Layer: 0
|
||||
m_Name: "\u7B2C\u4E09\u65B9\u4FE1\u606F\u5171\u4EAB\u6E05\u5355"
|
||||
m_TagString: Untagged
|
||||
@@ -6979,12 +7474,15 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 233794616398860532}
|
||||
- {fileID: 8484437644051729171}
|
||||
- {fileID: 4924725133655092736}
|
||||
m_Father: {fileID: 7970148758949420148}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 178.5, y: -363.69998}
|
||||
m_AnchoredPosition: {x: 635, y: -366}
|
||||
m_SizeDelta: {x: 289, y: 35}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1085906422898711294
|
||||
@@ -7025,6 +7523,26 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &7179345081442397303
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8572675959656665797}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 1
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: -1
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &8929531551233605689
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -7481,7 +7999,6 @@ RectTransform:
|
||||
- {fileID: 2138306749047540328}
|
||||
- {fileID: 8051133225794478825}
|
||||
- {fileID: 8325910059825996973}
|
||||
- {fileID: 233794616398860532}
|
||||
m_Father: {fileID: 3845284550578936258}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
@@ -7545,7 +8062,7 @@ MonoBehaviour:
|
||||
m_Top: 37
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 42.3
|
||||
m_Spacing: 28.6
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
|
||||
@@ -79,12 +79,18 @@ public class UIHome_BY_ServicePanel : SubUIBase
|
||||
});
|
||||
btn_SendText.onClick.AddListener(() =>
|
||||
{
|
||||
if (tMPInput_Text.text.Trim() == "")
|
||||
{
|
||||
UIManager.Instance.ShowBoardError("不能发送空白");
|
||||
return;
|
||||
}
|
||||
var var = Instantiate(dialogGreenPrefab, dialogPrefabParent).GetComponent<DialogItem>();
|
||||
var.SetMessage(tMPInput_Text.text);
|
||||
ScrollToBottom();
|
||||
string guid = Guid.NewGuid().ToString();
|
||||
WebSocketSendList.Customer_SendMessage(conversationId, 1, GameManager.Instance.user.id, GameManager.Instance.user.BaseInfo.userName, null, 1, tMPInput_Text.text, guid);
|
||||
dic_dialogItems.Add(guid, var);
|
||||
tMPInput_Text.text = "";
|
||||
});
|
||||
}
|
||||
Dictionary<string, DialogItem> dic_dialogItems = new Dictionary<string, DialogItem>();
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
using DG.Tweening.Core.Easing;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Audio;
|
||||
using UnityEngine.UI;
|
||||
using static UnityEngine.Rendering.DebugUI;
|
||||
|
||||
public class UIHome_BY_SettingPanel : SubUIBase
|
||||
{
|
||||
@@ -25,11 +25,14 @@ public class UIHome_BY_SettingPanel : SubUIBase
|
||||
|
||||
private Dictionary<Toggle, Color> labelOriginalColors = new Dictionary<Toggle, Color>();
|
||||
private static readonly Color SELECTED_COLOR = Color.white;
|
||||
|
||||
public Button btn_ChangeUser;
|
||||
public override void Awake()
|
||||
{
|
||||
base.Awake();
|
||||
|
||||
btn_ChangeUser.onClick.AddListener(() =>
|
||||
{
|
||||
GameManager.Instance.Logout();
|
||||
});
|
||||
slider_AudioMusic.value = PlayerPrefs.GetFloat("slider_AudioBG", 1f);
|
||||
slider_AudioEffect.value = PlayerPrefs.GetFloat("slider_FX", 1f);
|
||||
slider_AudioMusic.onValueChanged.AddListener((a) =>
|
||||
|
||||
@@ -100,102 +100,70 @@ public class UserInfoPanel : SubUIBase
|
||||
|
||||
// ==================== 头像列表 ====================
|
||||
|
||||
/// <summary>当前装备的头像名（从服务器数据读取）</summary>
|
||||
private string _equippedAvatarName;
|
||||
|
||||
private void BuildAvatarList()
|
||||
{
|
||||
if (prefab_AvatarItem == null || parent_AvatarList == null) return;
|
||||
|
||||
// 清空旧列表
|
||||
for (int i = parent_AvatarList.childCount - 1; i >= 0; i--)
|
||||
Destroy(parent_AvatarList.GetChild(i).gameObject);
|
||||
_avatarToggles.Clear();
|
||||
|
||||
// 获取所有头像
|
||||
gameManager.InitAvatarCache();
|
||||
var allSprites = Resources.LoadAll<Sprite>("Avatar");
|
||||
string currentAvatar = gameManager.user.BaseInfo.avatarUrl;
|
||||
_equippedAvatarName = gameManager.user.BaseInfo.avatarUrl;
|
||||
_pendingAvatarName = _equippedAvatarName;
|
||||
|
||||
foreach (var sprite in allSprites)
|
||||
{
|
||||
var obj = Instantiate(prefab_AvatarItem, parent_AvatarList);
|
||||
string avatarName = sprite.name;
|
||||
|
||||
// 1. 设置列表项的小头像 (child0 = Image)
|
||||
// child(0) = 头像图片
|
||||
if (obj.transform.childCount > 0)
|
||||
{
|
||||
var img = obj.transform.GetChild(0).GetComponent<Image>();
|
||||
if (img != null) img.sprite = sprite;
|
||||
}
|
||||
|
||||
// 2. 获取对号图标 (child2)
|
||||
Transform checkMark = null;
|
||||
if (obj.transform.childCount > 2)
|
||||
{
|
||||
checkMark = obj.transform.GetChild(2);
|
||||
// 初始隐藏
|
||||
checkMark.gameObject.SetActive(false);
|
||||
}
|
||||
// child(2) = 装备中对号（只在已装备的头像上显示，不跟随选中状态）
|
||||
Transform checkMark = obj.transform.childCount > 2 ? obj.transform.GetChild(2) : null;
|
||||
if (checkMark != null)
|
||||
checkMark.gameObject.SetActive(avatarName == _equippedAvatarName);
|
||||
|
||||
var toggle = obj.GetComponent<Toggle>();
|
||||
if (toggle != null)
|
||||
if (toggle == null) continue;
|
||||
|
||||
// 禁用 Toggle 自带的过渡效果（面板上已设置好选中高亮）
|
||||
toggle.transition = Selectable.Transition.None;
|
||||
// 初始选中已装备的头像
|
||||
toggle.isOn = (avatarName == _equippedAvatarName);
|
||||
|
||||
_avatarToggles.Add(toggle);
|
||||
|
||||
toggle.onValueChanged.AddListener(isOn =>
|
||||
{
|
||||
// 关键：禁用 Toggle 自动过渡，防止自动显示 Graphic
|
||||
toggle.transition = Selectable.Transition.None;
|
||||
if (!isOn) return;
|
||||
|
||||
_avatarToggles.Add(toggle);
|
||||
string avatarName = sprite.name;
|
||||
_pendingAvatarName = avatarName;
|
||||
|
||||
// 判断是否是当前已装备的头像
|
||||
bool isCurrent = (avatarName == currentAvatar);
|
||||
// 预览头像实时更新
|
||||
if (img_ShowAvatar != null)
|
||||
img_ShowAvatar.sprite = sprite;
|
||||
|
||||
// 设置选中状态
|
||||
toggle.isOn = isCurrent;
|
||||
|
||||
// 【修改点】只要 isOn 为 true，就显示对号
|
||||
// 这里的逻辑是：如果是当前用户装备的头像，打开面板时默认是选中的，且有对号
|
||||
if (isCurrent)
|
||||
// 单选：关闭其他 toggle（对号不动，只到点"使用"才切换）
|
||||
foreach (var t in _avatarToggles)
|
||||
{
|
||||
if (checkMark != null) checkMark.gameObject.SetActive(true);
|
||||
_pendingAvatarName = avatarName;
|
||||
if (t == toggle) continue;
|
||||
t.SetIsOnWithoutNotify(false);
|
||||
}
|
||||
|
||||
// 监听点击事件
|
||||
toggle.onValueChanged.AddListener(isOn =>
|
||||
{
|
||||
// 【修改点】对号显示完全跟随 isOn 状态
|
||||
// 当点击这个 Toggle 变成 true 时，显示对号；变成 false 时，隐藏对号
|
||||
if (checkMark != null)
|
||||
{
|
||||
checkMark.gameObject.SetActive(isOn);
|
||||
}
|
||||
|
||||
if (isOn)
|
||||
{
|
||||
_pendingAvatarName = avatarName;
|
||||
|
||||
// 实时更新预览大图
|
||||
if (img_ShowAvatar != null)
|
||||
{
|
||||
img_ShowAvatar.sprite = sprite;
|
||||
}
|
||||
|
||||
// 手动单选逻辑：关闭其他 Toggle
|
||||
foreach (var t in _avatarToggles)
|
||||
{
|
||||
if (t == toggle) continue;
|
||||
t.SetIsOnWithoutNotify(false);
|
||||
|
||||
// 【修改点】强制隐藏其他 Toggle 的对号
|
||||
// 虽然上面 SetIsOnWithoutNotify(false) 会触发各自的 onValueChanged=false，
|
||||
// 但为了保险起见，或者防止逻辑冲突，这里显式隐藏一次。
|
||||
var otherMark = t.transform.childCount > 2 ? t.transform.GetChild(2) : null;
|
||||
if (otherMark != null) otherMark.gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>点击“使用”按钮 → 确认数据，更新主头像</summary>
|
||||
/// <summary>点击"使用"按钮 → 确认切换装备头像</summary>
|
||||
private void OnClickUseAvatar()
|
||||
{
|
||||
if (string.IsNullOrEmpty(_pendingAvatarName))
|
||||
@@ -203,25 +171,37 @@ public class UserInfoPanel : SubUIBase
|
||||
Debug.Log("[UserInfoPanel] 未选中头像");
|
||||
return;
|
||||
}
|
||||
if (_pendingAvatarName == _equippedAvatarName)
|
||||
{
|
||||
Debug.Log("[UserInfoPanel] 未改变头像");
|
||||
return;
|
||||
}
|
||||
|
||||
// 1. 更新正式用户数据头像
|
||||
// 更新正式头像显示
|
||||
LoadAvatarImage(sprite_Avatar, _pendingAvatarName);
|
||||
|
||||
// 2. 上传到服务器/更新本地缓存
|
||||
// 上传到服务器（成功后 OnAvatarChanged 会切换对号）
|
||||
gameManager.ApplyAvatar(_pendingAvatarName);
|
||||
|
||||
// 注意：这里不再需要遍历去更新对号了，因为对号在点击 Toggle 时已经跟着动了
|
||||
// 点“使用”只是把当前的预览状态保存下来。
|
||||
}
|
||||
|
||||
/// <summary>头像变更回调（网络返回后）</summary>
|
||||
/// <summary>头像变更回调（服务器返回后），把对号从旧装备头像切到新的</summary>
|
||||
private void OnAvatarChanged(Sprite sprite)
|
||||
{
|
||||
if (sprite_Avatar != null && sprite != null)
|
||||
sprite_Avatar.sprite = sprite;
|
||||
|
||||
if (img_ShowAvatar != null && sprite != null)
|
||||
img_ShowAvatar.sprite = sprite;
|
||||
|
||||
// 更新装备中的头像名
|
||||
_equippedAvatarName = _pendingAvatarName;
|
||||
|
||||
// 切换对号：隐藏旧的、显示新的
|
||||
foreach (var t in _avatarToggles)
|
||||
{
|
||||
if (t == null || t.transform.childCount <= 2) continue;
|
||||
var img = t.transform.GetChild(0).GetComponent<Image>();
|
||||
bool isEquipped = img != null && img.sprite != null && img.sprite.name == _equippedAvatarName;
|
||||
t.transform.GetChild(2).gameObject.SetActive(isEquipped);
|
||||
}
|
||||
}
|
||||
|
||||
// ==================== 工具 ====================
|
||||
|
||||
Reference in New Issue
Block a user