From 8bb4be49dde1cfdf256da96ba008c24095dfa9a7 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 八月 2025 17:27:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
UI/SmallTipWin.prefab | 329 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 245 insertions(+), 84 deletions(-)
diff --git a/UI/SmallTipWin.prefab b/UI/SmallTipWin.prefab
index 7d7a43b..5946e71 100644
--- a/UI/SmallTipWin.prefab
+++ b/UI/SmallTipWin.prefab
@@ -13,6 +13,7 @@
- component: {fileID: 2031843680812767358}
- component: {fileID: 631711795948061990}
- component: {fileID: 6224850690561940336}
+ - component: {fileID: 5070512511429657881}
m_Layer: 5
m_Name: SmallTipWin
m_TagString: Untagged
@@ -32,6 +33,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 4390216443211883629}
- {fileID: 9076360790198305369}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -106,6 +108,39 @@
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
+--- !u!114 &5070512511429657881
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1725729790095644}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1b032869b3ea6c248a6e7c7cbb6c66c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ uiLayer: 3
+ uiName:
+ isMainUI: 0
+ supportParentChildRelation: 1
+ isPersistent: 0
+ maxIdleRounds: 20
+ openAnimationType: 1
+ closeAnimationType: 0
+ animeDuration: 0.2
+ scaleOverInOutCurve: {fileID: 0}
+ animationEase: 6
+ lastUsedRound: 0
+ parentUI: {fileID: 0}
+ childrenUI: []
+ _rectTransform: {fileID: 9076360790198305369}
+ openMask: 0
+ clickEmptySpaceClose: 1
+ screenMask: {fileID: 2818027921568371876}
+ rectTransform: {fileID: 6651114341082681162}
+ arrowImage: {fileID: 8298666161576546364}
+ descText: {fileID: 8235354753534358009}
--- !u!1 &484267082473912033
GameObject:
m_ObjectHideFlags: 0
@@ -139,9 +174,9 @@
m_Children: []
m_Father: {fileID: 6651114341082681162}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: -126.01, y: 6.5}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 16.71, y: 6.5}
m_SizeDelta: {x: 17, y: 13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1953637652972496932
@@ -240,6 +275,126 @@
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &2818027921568371876
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4390216443211883629}
+ - component: {fileID: 4247748877895706839}
+ - component: {fileID: 524060089948443433}
+ - component: {fileID: 3192885266446492277}
+ m_Layer: 5
+ m_Name: ScreenMask(Clone)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4390216443211883629
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2818027921568371876}
+ 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: 224477134459167860}
+ 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: 2000, y: 4000}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4247748877895706839
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2818027921568371876}
+ m_CullTransparentMesh: 1
+--- !u!114 &524060089948443433
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2818027921568371876}
+ 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: 0, g: 0, b: 0, a: 0}
+ 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: 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 &3192885266446492277
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2818027921568371876}
+ 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: 524060089948443433}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &3562787259126706700
GameObject:
m_ObjectHideFlags: 0
@@ -250,8 +405,9 @@
m_Component:
- component: {fileID: 8579104449448787534}
- component: {fileID: 5553871721581433819}
- - component: {fileID: 2449246907291869868}
- - component: {fileID: 2902159747957736974}
+ - component: {fileID: 8235354753534358009}
+ - component: {fileID: 7194144780622952916}
+ - component: {fileID: 2864782165521372389}
m_Layer: 5
m_Name: text
m_TagString: Untagged
@@ -270,14 +426,15 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children: []
+ m_Children:
+ - {fileID: 5606610203369548991}
m_Father: {fileID: 2601642826101635211}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 163, y: -9.999995}
- m_SizeDelta: {x: 313, y: 0}
- m_Pivot: {x: 0.5, y: 1.0000002}
+ m_AnchoredPosition: {x: 10, y: -21}
+ m_SizeDelta: {x: 288, y: 0}
+ m_Pivot: {x: 0, y: 0.5}
--- !u!222 &5553871721581433819
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -286,7 +443,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3562787259126706700}
m_CullTransparentMesh: 1
---- !u!114 &2449246907291869868
+--- !u!114 &8235354753534358009
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -295,12 +452,12 @@
m_GameObject: {fileID: 3562787259126706700}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8c90b724ae1ce3c4495afe6ba6005ae0, type: 3}
+ m_Script: {fileID: 11500000, guid: 7427db982a328e741b80b62f4181a37c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8039216, g: 0.74509805, b: 0.5803922, a: 1}
- m_RaycastTarget: 0
+ m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -318,13 +475,24 @@
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
- m_LineSpacing: 1.5
- m_Text: "\u6B66\u5C06\u7EE7\u627F\u4E3A\u6B66\u5C06"
- m_IsKey: 0
- m_KeyName:
+ m_LineSpacing: 1
+ m_Text: "\u6B66\u5C06\u7EE7\u627F\u6B66\u5C06\u7EE7\u627F\u6B66\u5C06\u7EE7\u627F\u6B66\u5C06\u7EE7\u627F"
+ m_ImgDeltay: 0
+ m_unlineDeltay: 0
+ m_unlineHeight: 1
+ m_faceSize: 32
+ m_unline: 1
+ m_HrefClick: 1
+ m_EnableDisplay:
+ m_Language: 0
+ m_AutoNewLine: 0
+ m_LockImgSize: 0
+ m_ModifyImgSize: 0
+ m_ModifyImgWidth: 0
+ m_ModifyImgHeight: 0
m_ColorType: 0
- m_BGColorType: 0
---- !u!114 &2902159747957736974
+ unline: {fileID: 546831650821235172}
+--- !u!114 &7194144780622952916
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -336,8 +504,35 @@
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_HorizontalFit: 0
+ m_HorizontalFit: 2
m_VerticalFit: 2
+--- !u!114 &2864782165521372389
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3562787259126706700}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2d8fad63d37034e4aad43225bd89f61c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreLayout: 0
+ m_MinWidth: -1
+ m_MinHeight: -1
+ m_PreferredWidth: 288
+ m_PreferredHeight: 22
+ m_FlexibleWidth: -1
+ m_FlexibleHeight: -1
+ m_LayoutPriority: 1
+ m_ClampEnable: 1
+ m_Clamp:
+ minX: 200
+ maxX: 600
+ minY: 22
+ maxY: 400
+ m_Target: {fileID: 8579104449448787534}
--- !u!1 &4260168790415388487
GameObject:
m_ObjectHideFlags: 0
@@ -368,15 +563,14 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 7599509299402652620}
- {fileID: 8298666161576546364}
- {fileID: 2601642826101635211}
m_Father: {fileID: 9076360790198305369}
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: 326, y: 0}
+ m_AnchoredPosition: {x: -155.90005, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8657497968088855872
MonoBehaviour:
@@ -397,8 +591,8 @@
m_Bottom: 9
m_ChildAlignment: 0
m_Spacing: 0
- m_ChildForceExpandWidth: 1
- m_ChildForceExpandHeight: 1
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
@@ -416,7 +610,7 @@
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_HorizontalFit: 0
+ m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &5631670571804469272
GameObject:
@@ -455,8 +649,8 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 163, y: -29}
- m_SizeDelta: {x: 326, y: 0}
+ m_AnchoredPosition: {x: 154, y: -30}
+ m_SizeDelta: {x: 308, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3556548026934470221
CanvasRenderer:
@@ -510,7 +704,7 @@
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_HorizontalFit: 0
+ m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!114 &1272052180035292305
MonoBehaviour:
@@ -525,20 +719,20 @@
m_Name:
m_EditorClassIdentifier:
m_Padding:
- m_Left: 0
- m_Right: 0
+ m_Left: 10
+ m_Right: 10
m_Top: 10
m_Bottom: 10
m_ChildAlignment: 4
m_Spacing: 0
- m_ChildForceExpandWidth: 1
- m_ChildForceExpandHeight: 1
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
---- !u!1 &7176568351047277801
+--- !u!1 &7248854087497147962
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -546,54 +740,53 @@
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 7599509299402652620}
- - component: {fileID: 234901896390148626}
- - component: {fileID: 7124819825576966918}
- - component: {fileID: 2762814705287392489}
+ - component: {fileID: 5606610203369548991}
+ - component: {fileID: 8145436582075341127}
+ - component: {fileID: 546831650821235172}
m_Layer: 5
- m_Name: uparrow
+ m_Name: TextUnline(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &7599509299402652620
+--- !u!224 &5606610203369548991
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7176568351047277801}
+ m_GameObject: {fileID: 7248854087497147962}
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: 6651114341082681162}
+ m_Father: {fileID: 8579104449448787534}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 1}
- m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: -132.5, y: -6.5}
- m_SizeDelta: {x: 17, y: 13}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &234901896390148626
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -144, y: 0}
+ m_SizeDelta: {x: 288, y: 22}
+ m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8145436582075341127
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7176568351047277801}
- m_CullTransparentMesh: 1
---- !u!114 &7124819825576966918
+ m_GameObject: {fileID: 7248854087497147962}
+ m_CullTransparentMesh: 0
+--- !u!114 &546831650821235172
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7176568351047277801}
+ m_GameObject: {fileID: 7248854087497147962}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5eec31867c0c74f4aa2eeade969eec0e, type: 3}
+ m_Script: {fileID: 11500000, guid: 9756d505db1073f488e3f36d498e74c2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -604,35 +797,3 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: a0e275957c8174d49ad87abf67f35839, 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
- m_Gray: 0
- m_IconKey:
---- !u!114 &2762814705287392489
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7176568351047277801}
- 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
--
Gitblit v1.8.0