diff --git a/Assets/Framework/Tool/UITool/UIManager.cs b/Assets/Framework/Tool/UITool/UIManager.cs index 7a5d354d7..1919b1b40 100644 --- a/Assets/Framework/Tool/UITool/UIManager.cs +++ b/Assets/Framework/Tool/UITool/UIManager.cs @@ -233,7 +233,8 @@ public class UIManager : MonoSingleton /// /// 提示内容 /// 点击确认按钮时的回调(可选),关闭按钮不触发 - public void ShowTiShi(string text, Action onConfirmAction = null) + /// 是否显示关闭按钮(默认 true,部分提示只能点确认) + public void ShowTiShi(string text, Action onConfirmAction = null, bool showClose = true) { if (TiShiParefab == null) { @@ -244,7 +245,7 @@ public class UIManager : MonoSingleton obj.transform.SetAsLastSibling(); var tishi = obj.GetComponent(); if (tishi != null) - tishi.Init(text, onConfirmAction); + tishi.Init(text, onConfirmAction, showClose); } IEnumerator IEShowHuoDe(List backPackPropItemDatas, Action onCloseAction) { diff --git a/Assets/MyGame/Scripts/Net/WebSocketReponseList.cs b/Assets/MyGame/Scripts/Net/WebSocketReponseList.cs index 1fecbf31c..2ecf1b9f9 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketReponseList.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketReponseList.cs @@ -694,17 +694,13 @@ namespace Assets.MyGame.Scripts.Net { GameManager.Instance.Logout(); return; - }); + }, showClose: false); } } catch (Exception e) { Debug.LogWarning("[AccountKicked] 解析失败: " + e.Message); } - - // 提示并登出(Logout 已封装:CloseAll WebSocket + 清空用户 + 关闭所有 UI + 回登录界面) - UIManager.Instance.ShowBoardError("账号已在其他地方登录"); - //GameManager.Instance.Logout(); } /// @@ -783,7 +779,7 @@ namespace Assets.MyGame.Scripts.Net UIManager.Instance.ShowTiShi("连接已失效,请重新登录", () => { GameManager.Instance.Logout(); - }); + }, showClose: false); } /// diff --git a/Assets/MyGame/aa/UI/DefaultPanel/TiShi/TiShi.cs b/Assets/MyGame/aa/UI/DefaultPanel/TiShi/TiShi.cs index 5e0aed783..5eb086569 100644 --- a/Assets/MyGame/aa/UI/DefaultPanel/TiShi/TiShi.cs +++ b/Assets/MyGame/aa/UI/DefaultPanel/TiShi/TiShi.cs @@ -29,11 +29,14 @@ public class TiShi : MonoBehaviour /// /// 提示内容 /// 点击确认按钮时的回调(可选) - public void Init(string text, Action onConfirmAction = null) + /// 是否显示关闭按钮(默认 true) + public void Init(string text, Action onConfirmAction = null, bool showClose = true) { action = onConfirmAction; if (tmpText_TiShiLabel != null) tmpText_TiShiLabel.text = text; + if (btn_Close != null) + btn_Close.gameObject.SetActive(showClose); PlayAppear(); } diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab index 4a355c0bd..2cae4bca1 100644 --- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab +++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab @@ -365,7 +365,7 @@ GameObject: - component: {fileID: 3465149773433126722} - component: {fileID: 1382990633037409518} m_Layer: 0 - m_Name: game177_main3 + m_Name: "\u95EE\u597D" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1027,7 +1027,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5506378243937910797} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: SitPosData, Assembly-CSharp m_MethodName: ChangeTurret m_Mode: 3 @@ -1064,7 +1064,7 @@ GameObject: - component: {fileID: 1238828475662721287} - component: {fileID: 5811737153799833063} m_Layer: 5 - m_Name: Button + m_Name: "\u81EA\u52A8" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1441,6 +1441,132 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1106093949077880716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3201961212906715741} + - component: {fileID: 7344633381134725259} + - component: {fileID: 6451985906412611393} + - component: {fileID: 7018376083791635923} + m_Layer: 5 + m_Name: "\u72C2\u66B4" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3201961212906715741 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1106093949077880716} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 3188221807973527422} + - {fileID: 1638531232660352717} + m_Father: {fileID: 38992651813133378} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 381.37997, y: -60} + m_SizeDelta: {x: 68, y: 62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7344633381134725259 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1106093949077880716} + m_CullTransparentMesh: 1 +--- !u!114 &6451985906412611393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1106093949077880716} + 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: cec5cc0957ffb6a47900c184c7c41842, 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 &7018376083791635923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1106093949077880716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 6451985906412611393} + toggleTransition: 1 + graphic: {fileID: 704441504674685449} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 0 --- !u!1 &1134746370264218979 GameObject: m_ObjectHideFlags: 0 @@ -1845,7 +1971,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5506378243937910797} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: SitPosData, Assembly-CSharp m_MethodName: ChangeTurret m_Mode: 3 @@ -2066,6 +2192,132 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1999094402957473956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6986787484707396980} + - component: {fileID: 5285850206574561302} + - component: {fileID: 727967865281127520} + - component: {fileID: 3519450453960747646} + m_Layer: 5 + m_Name: "\u51B0\u51BB" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6986787484707396980 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1999094402957473956} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 3209030827122254461} + - {fileID: 3973494645399519050} + m_Father: {fileID: 38992651813133378} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 479.83997, y: -60} + m_SizeDelta: {x: 68, y: 62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5285850206574561302 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1999094402957473956} + m_CullTransparentMesh: 1 +--- !u!114 &727967865281127520 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1999094402957473956} + 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: cec5cc0957ffb6a47900c184c7c41842, 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 &3519450453960747646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1999094402957473956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 727967865281127520} + toggleTransition: 1 + graphic: {fileID: 7981991708595902724} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 0 --- !u!1 &2040923248137106588 GameObject: m_ObjectHideFlags: 0 @@ -2500,7 +2752,7 @@ GameObject: - component: {fileID: 8888854577048345338} - component: {fileID: 6737352122242343368} m_Layer: 0 - m_Name: game177_main2 + m_Name: "\u8BBE\u7F6E" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2825,6 +3077,8 @@ RectTransform: - {fileID: 8926196532408561376} - {fileID: 3466874122975853776} - {fileID: 1949727621758752760} + - {fileID: 3201961212906715741} + - {fileID: 6986787484707396980} - {fileID: 3940164364754224964} m_Father: {fileID: 245637205031072731} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3146,7 +3400,7 @@ GameObject: - component: {fileID: 6788830007509759241} - component: {fileID: 7746348157954613038} m_Layer: 5 - m_Name: Button (3) + m_Name: "\u53CC\u53D1" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3291,7 +3545,7 @@ GameObject: - component: {fileID: 7134620613915432364} - component: {fileID: 6626655253070962948} m_Layer: 0 - m_Name: game177_main3 (2) + m_Name: "\u5BA2\u670D" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3518,7 +3772,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5506378243937910797} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: SitPosData, Assembly-CSharp m_MethodName: ChangeTurret m_Mode: 3 @@ -3741,9 +3995,11 @@ RectTransform: - {fileID: 4415992113508979064} - {fileID: 6172531420321643531} - {fileID: 38992651813133378} + - {fileID: 2421507470733538738} - {fileID: 6665898966579201677} - {fileID: 755472782897628008} - {fileID: 4841427236217427560} + - {fileID: 54841084467576406} - {fileID: 1078076760308578925} - {fileID: 6681409744861298073} - {fileID: 6572098329424512867} @@ -3776,56 +4032,45 @@ MonoBehaviour: btn_QuXiao: {fileID: 4624491302151963912} sceneName: XJMH gameType: 4 - btn_SettingList: {fileID: 0} - SittingListParent: {fileID: 0} - btn_TuJian: {fileID: 0} - btn_ChangeTurret: {fileID: 0} - btn_TuiChu: {fileID: 0} - btn_Setting: {fileID: 0} + btn_SettingList: {fileID: 7409283134322969632} + SittingListParent: {fileID: 838072981635609327} + btn_TuJian: {fileID: 8779502177911634185} + btn_ChangeTurret: {fileID: 1167035719947141973} + btn_TuiChu: {fileID: 2288511243238812163} + btn_Setting: {fileID: 6737352122242343368} mySitAnim: {fileID: 448370382151683116} toggle_SkillAuto: {fileID: 5811737153799833063} toggle_Lock: {fileID: 1095565694137767186} toggle_Three: {fileID: 557993769889242771} toggle_Shuang: {fileID: 6788830007509759241} - toggle_BaoZou: {fileID: 0} - tmp_BaoZouCount: {fileID: 0} - img_BaoZou: {fileID: 0} + toggle_BaoZou: {fileID: 7018376083791635923} + tmp_BaoZouCount: {fileID: 7639431059393200537} + img_BaoZou: {fileID: 704441504674685449} currFrenzyTime: 0 - toggle_BingFeng: {fileID: 0} - tmp_BingFengCount: {fileID: 0} - img_BingFeng: {fileID: 0} - bingFengEffect: {fileID: 0} + toggle_BingFeng: {fileID: 3519450453960747646} + tmp_BingFengCount: {fileID: 7507250607910367431} + img_BingFeng: {fileID: 7981991708595902724} + bingFengEffect: {fileID: 1709254077376921, guid: a2a34db230a06c64c8d7cfad89a22d10, + type: 3} currBingFengTime: 0 - btn_GuaGuaKa: {fileID: 0} - tmp_GGKCount: {fileID: 0} + btn_GuaGuaKa: {fileID: 7407451208587999888} + tmp_GGKCount: {fileID: 8501205109268426696} list_Sits: - - {fileID: 5506378243937910797} + - {fileID: 0} - {fileID: 3631726351435843207} currSitData: {fileID: 0} attackTime: 0.2 - botRotateSpeed: 40 + botRotateSpeed: 80 bullet_Test: {fileID: 1166920474713197, guid: 279ce3d544e4bc34097fc18fccb2ceac, type: 3} bulletParent: {fileID: 5156217227802463099} boardCast_Boss: {fileID: 2654078965480511721, guid: 55e47b0ac9a12a547924880716dd3535, type: 3} - createVideoPlayer: {fileID: 0} + createVideoPlayer: {fileID: 3457788250773442335} paoBeiList: JinDuTiao: {fileID: 4665099600232146800} isFrenzy: 0 sitBulletMaxCount: 100 - tra_SettingListPos: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - tra_SettingListComponent: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} --- !u!1 &2865408747225355556 GameObject: m_ObjectHideFlags: 0 @@ -4381,7 +4626,7 @@ GameObject: - component: {fileID: 1145243125486608944} - component: {fileID: 8779502177911634185} m_Layer: 0 - m_Name: game177_main1 + m_Name: "\u56FE\u9274" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4888,7 +5133,7 @@ GameObject: - component: {fileID: 2148733653509180618} - component: {fileID: 557993769889242771} m_Layer: 5 - m_Name: Button (2) + m_Name: "\u6563\u5C04" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5433,7 +5678,7 @@ GameObject: - component: {fileID: 3813411747448435202} - component: {fileID: 2288511243238812163} m_Layer: 0 - m_Name: game177_main3 (1) + m_Name: "\u9000\u51FA" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5865,7 +6110,7 @@ GameObject: - component: {fileID: 372679129609879166} - component: {fileID: 1167035719947141973} m_Layer: 0 - m_Name: game177_main4 + m_Name: "\u6362\u70AE" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5972,6 +6217,143 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &4466015437471433552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6757216390465404371} + - component: {fileID: 7997378976357438594} + - component: {fileID: 8501205109268426696} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6757216390465404371 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4466015437471433552} + 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: 4468445275571865688} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7997378976357438594 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4466015437471433552} + m_CullTransparentMesh: 1 +--- !u!114 &8501205109268426696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4466015437471433552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: '100 + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281532197 + m_fontColor: {r: 0.1462264, g: 1, b: 0.19559065, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4500371578976225249 GameObject: m_ObjectHideFlags: 0 @@ -7057,7 +7439,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5506378243937910797} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: SitPosData, Assembly-CSharp m_MethodName: ChangeTurret m_Mode: 3 @@ -7500,7 +7882,7 @@ GameObject: - component: {fileID: 4668591805457072630} - component: {fileID: 1095565694137767186} m_Layer: 5 - m_Name: Button (1) + m_Name: "\u9501\u5B9A" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7810,6 +8192,157 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5800886820745291238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 54841084467576406} + - component: {fileID: 2954568169788987211} + - component: {fileID: 2777343608754665989} + - component: {fileID: 4560286055716598828} + - component: {fileID: 7460368085994800665} + - component: {fileID: 3457788250773442335} + m_Layer: 5 + m_Name: player (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &54841084467576406 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5800886820745291238} + 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: 245637205031072731} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &2954568169788987211 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5800886820745291238} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 9 + m_TargetDisplay: 0 +--- !u!114 &2777343608754665989 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5800886820745291238} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!222 &4560286055716598828 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5800886820745291238} + m_CullTransparentMesh: 1 +--- !u!114 &7460368085994800665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5800886820745291238} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 8400000, guid: 864e5c75f220d7f4f839e2ea88e6f736, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!328 &3457788250773442335 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5800886820745291238} + m_Enabled: 1 + m_VideoClip: {fileID: 0} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: 864e5c75f220d7f4f839e2ea88e6f736, type: 2} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: + m_RenderMode: 2 + m_AspectRatio: 2 + m_DataSource: 0 + m_TimeUpdateMode: 2 + m_PlaybackSpeed: 1 + m_AudioOutputMode: 2 + m_TargetAudioSources: + - {fileID: 0} + m_DirectAudioVolumes: + - 1 + m_Url: + m_EnabledAudioTracks: 01 + m_DirectAudioMutes: 00 + m_ControlledAudioTrackCount: 1 + m_PlayOnAwake: 1 + m_SkipOnDrop: 1 + m_Looping: 0 + m_WaitForFirstFrame: 1 + m_FrameReadyEventEnabled: 0 + m_VideoShaders: [] --- !u!1 &5829955823270693100 GameObject: m_ObjectHideFlags: 0 @@ -7940,7 +8473,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8019622945320605939} - - component: {fileID: 5506378243937910797} + - component: {fileID: 5812222518583518} m_Layer: 5 m_Name: Turret_Left m_TagString: Untagged @@ -7975,7 +8508,7 @@ RectTransform: m_AnchoredPosition: {x: -405.93396, y: -281.78986} m_SizeDelta: {x: -811.868, y: -563.5797} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &5506378243937910797 +--- !u!114 &5812222518583518 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7992,9 +8525,9 @@ MonoBehaviour: isBot: 0 goldNum: 0 consumeGoldNum: 0 - tMP_GoldNum: {fileID: 415724694880221988} + tMP_GoldNum: {fileID: 0} tMP_DiamondNum: {fileID: 0} - tMP_TurretConsumeNum: {fileID: 9184328036284424899} + tMP_TurretConsumeNum: {fileID: 0} wingParent: {fileID: 0} turretParent: {fileID: 0} turretAnchoredPos: {x: 0, y: 0} @@ -8005,7 +8538,7 @@ MonoBehaviour: monCotl_Lock: {fileID: 0} monCotl_Lock_Position: {fileID: 0} isLock: 0 - lockFX: {fileID: 7965752655696510792} + lockFX: {fileID: 0} lockFX_Triple: [] tripleLockTargets: [] tripleLockPositions: [] @@ -9325,6 +9858,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6395082452458472136 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3209030827122254461} + - component: {fileID: 6652612316007465895} + - component: {fileID: 7981991708595902724} + m_Layer: 5 + m_Name: Button (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3209030827122254461 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6395082452458472136} + 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: 1 + m_Children: [] + m_Father: {fileID: 6986787484707396980} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6652612316007465895 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6395082452458472136} + m_CullTransparentMesh: 1 +--- !u!114 &7981991708595902724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6395082452458472136} + 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.6603774, g: 0.6603774, b: 0.6603774, 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: cec5cc0957ffb6a47900c184c7c41842, 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 &6542138374165343523 GameObject: m_ObjectHideFlags: 0 @@ -9476,6 +10084,140 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6612592307452099521 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1638531232660352717} + - component: {fileID: 8218342646207029547} + - component: {fileID: 7639431059393200537} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1638531232660352717 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6612592307452099521} + 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: 3201961212906715741} + 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: -14.5141} + m_SizeDelta: {x: 0, y: -38.7043} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8218342646207029547 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6612592307452099521} + m_CullTransparentMesh: 1 +--- !u!114 &7639431059393200537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6612592307452099521} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u6563\u5C04" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4b1b429c45677a84c9609930fc8fd523, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6334ebf7b319f4c409ba639bf403628c, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6850309986158387218 GameObject: m_ObjectHideFlags: 0 @@ -11399,6 +12141,203 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7817678959230537988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3973494645399519050} + - component: {fileID: 6108734194771008911} + - component: {fileID: 7507250607910367431} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3973494645399519050 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7817678959230537988} + 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: 6986787484707396980} + 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: -14.5141} + m_SizeDelta: {x: 0, y: -38.7043} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6108734194771008911 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7817678959230537988} + m_CullTransparentMesh: 1 +--- !u!114 &7507250607910367431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7817678959230537988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u6563\u5C04" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4b1b429c45677a84c9609930fc8fd523, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6334ebf7b319f4c409ba639bf403628c, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7959684888067798354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2421507470733538738} + - component: {fileID: 6626195735275892259} + m_Layer: 5 + m_Name: left (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2421507470733538738 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7959684888067798354} + 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: 1 + m_Children: + - {fileID: 4468445275571865688} + m_Father: {fileID: 245637205031072731} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &6626195735275892259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7959684888067798354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 50 + m_Right: 0 + m_Top: 0 + m_Bottom: 150 + m_ChildAlignment: 6 + m_Spacing: 12 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &7965752655696510792 GameObject: m_ObjectHideFlags: 0 @@ -11863,6 +12802,127 @@ MonoBehaviour: calculateTangents: 0 addNormals: 0 immutableTriangles: 0 +--- !u!1 &8313154438718329174 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4468445275571865688} + - component: {fileID: 2732449347211094014} + - component: {fileID: 7330810881833416783} + - component: {fileID: 7407451208587999888} + m_Layer: 5 + m_Name: GGK + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4468445275571865688 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8313154438718329174} + 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: 6757216390465404371} + m_Father: {fileID: 2421507470733538738} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 90, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2732449347211094014 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8313154438718329174} + m_CullTransparentMesh: 1 +--- !u!114 &7330810881833416783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8313154438718329174} + 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: da36edb433208164b98afded3cd212d6, 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 &7407451208587999888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8313154438718329174} + 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: 7330810881833416783} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &8493339622112871966 GameObject: m_ObjectHideFlags: 0 @@ -12075,6 +13135,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8614103051566134858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3188221807973527422} + - component: {fileID: 415915146755719435} + - component: {fileID: 704441504674685449} + m_Layer: 5 + m_Name: Button (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3188221807973527422 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8614103051566134858} + 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: 1 + m_Children: [] + m_Father: {fileID: 3201961212906715741} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &415915146755719435 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8614103051566134858} + m_CullTransparentMesh: 1 +--- !u!114 &704441504674685449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8614103051566134858} + 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.6603774, g: 0.6603774, b: 0.6603774, 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: cec5cc0957ffb6a47900c184c7c41842, 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 &8828026033782523779 GameObject: m_ObjectHideFlags: 0 @@ -12975,6 +14110,66 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 245637205031072731} m_Modifications: + - target: {fileID: 138056469388480093, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 650006122218526034, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 650376084763086858, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 650698932204956519, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1505387611358535781, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1506102413720542800, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1506426086099002685, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1547406922231960939, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2020716219115436906, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2131531925377577041, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2131784131585182524, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2131978175086825060, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2317508501387410268, guid: b7049b34ef7178248b09689838182b4d, type: 3} propertyPath: m_AnchorMax.y @@ -12995,6 +14190,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -45.5 objectReference: {fileID: 0} + - target: {fileID: 2620665667519991552, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3066473336798849514, guid: b7049b34ef7178248b09689838182b4d, type: 3} propertyPath: m_AnchorMax.y @@ -13015,11 +14215,41 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -45.5 objectReference: {fileID: 0} + - target: {fileID: 3220435702070449167, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220805668574957911, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3221128241431603770, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3463654937139411066, guid: b7049b34ef7178248b09689838182b4d, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 5535968146897247970, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5536256501517457354, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5536750975091894157, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5860049383923451584, guid: b7049b34ef7178248b09689838182b4d, type: 3} propertyPath: m_Name @@ -13030,6 +14260,41 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6526280350797584445, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6527230807686153922, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566408954352965217, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566783039562079061, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6569950082936143053, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6570250123548623397, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6570710159567373862, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7069774063767299635, guid: b7049b34ef7178248b09689838182b4d, type: 3} propertyPath: m_AnchorMax.y @@ -13050,6 +14315,21 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -45.5 objectReference: {fileID: 0} + - target: {fileID: 7593275534527305367, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7593769943752599248, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7595238962784837567, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, type: 3} propertyPath: m_Pivot.x @@ -13170,6 +14450,21 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -45.5 objectReference: {fileID: 0} + - target: {fileID: 8395207575708935072, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8395556976092763111, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8396621245979404936, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8441262843426643071, guid: b7049b34ef7178248b09689838182b4d, type: 3} propertyPath: m_AnchorMax.y @@ -13190,6 +14485,21 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -555 objectReference: {fileID: 0} + - target: {fileID: 9075169151524077030, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9075804499161877921, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9076075263619138697, guid: b7049b34ef7178248b09689838182b4d, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs index 83301bd8e..14d359a2c 100644 --- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs +++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs @@ -13,8 +13,7 @@ using UnityEngine.UI; public class GameMainPanel_XJMH : GameMainPanel_FishBase { - public Transform[] tra_SettingListPos; - public Transform[] tra_SettingListComponent; + //public GameObject turretParent_Left; @@ -30,70 +29,70 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase { base.Start(); - foreach (var item in tra_SettingListComponent) - { - if (item.name == "Setting") - { - item.GetComponent