diff --git a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs index 61eb218d4..71aa4acea 100644 --- a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs +++ b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs @@ -2074,6 +2074,11 @@ public class CreateFishManager : MonoSingleton // ⭐ 统一标记死亡:死亡后子弹不再命中、不再被锁定(含不调 base.DieFish 的 Boss 子类) monster.isDead = true; + // ⭐ 实时刷新击杀者座位的等级/经验：RoomKillNotice 每次击杀都下发 exp/level/expMax（绝对值）， + // 直接覆盖刷新座位 UI（独立于金币加分动画，鱼一死立即生效） + if (sitData != null) + sitData.SetUserExp(killFish.level, killFish.exp, killFish.expMax); + // ⭐ 击杀广播：任何鱼被击杀（XJMH 免费模式等"按鱼配置"的特性用它，监听方自行过滤鱼号） OnFishKilled?.Invoke(monster, sitData); diff --git a/Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs b/Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs index dd40ed85e..4833c89cc 100644 --- a/Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs +++ b/Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs @@ -54,6 +54,26 @@ namespace Assets.MyGame.Scripts.Net.WebResponses /// public RoomKillNoticeDrop drop; + /// + /// 本次击杀获得的经验 + /// + public long gainExp; + + /// + /// 击杀后当前经验 + /// + public long exp; + + /// + /// 击杀后当前等级 + /// + public int level; + + /// + /// 当前等级升级所需最大经验 + /// + public long expMax; + } /// diff --git a/Assets/MyGame/Scripts/Turret/SitPosData.cs b/Assets/MyGame/Scripts/Turret/SitPosData.cs index 475ac1e1c..2eafced93 100644 --- a/Assets/MyGame/Scripts/Turret/SitPosData.cs +++ b/Assets/MyGame/Scripts/Turret/SitPosData.cs @@ -1348,6 +1348,23 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler } } + /// + /// 实时刷新座位玩家的等级/经验（杀鱼 RoomKillNotice 每击杀一条鱼下发一次）。 + /// 数据为服务端权威绝对值（非累加），重复调用安全： + /// level → tmp_UserLevel（"LV:xx"），exp/expMax → slider_UserLevelEXP 进度。 + /// + /// 击杀后当前等级 + /// 击杀后当前经验（原始值） + /// 当前等级升级所需最大经验（经验条满值，0 时进度归零） + public void SetUserExp(int level, long exp, long maxExp) + { + if (tmp_UserLevel != null && level > 0) + tmp_UserLevel.text = "LV:" + level; + + if (slider_UserLevelEXP != null) + slider_UserLevelEXP.value = maxExp > 0 ? Mathf.Clamp01((float)exp / maxExp) : 0f; + } + /// /// 非本人昵称打码：保留前 2 位和后 2 位，中间用 *** 代替。 /// 例：123456789 → 12***89；12345 → 12***45。不足 5 位原样显示。 diff --git a/Assets/MyGame/aa/UI/EfScripts.meta b/Assets/MyGame/aa/UI/EfScripts.meta new file mode 100644 index 000000000..14226a69b --- /dev/null +++ b/Assets/MyGame/aa/UI/EfScripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c7695f283538ef94d9bf83d5f02e0e0c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/EfScripts/Text.meta b/Assets/MyGame/aa/UI/EfScripts/Text.meta new file mode 100644 index 000000000..80bed4b16 --- /dev/null +++ b/Assets/MyGame/aa/UI/EfScripts/Text.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66a522cc17f463849b6e3e3408b023de +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/EfScripts/Text/TextNumRander.cs b/Assets/MyGame/aa/UI/EfScripts/Text/TextNumRander.cs new file mode 100644 index 000000000..8468ee9ec --- /dev/null +++ b/Assets/MyGame/aa/UI/EfScripts/Text/TextNumRander.cs @@ -0,0 +1,163 @@ +using System.Collections; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +/// +/// 数字持续递增滚动组件（计数器效果，无最终值，一直递增） +/// 挂在 Text / TextMeshProUGUI 所在物体上： +/// - 面板上可设置显示位数（digitCount） +/// - 基础值随机：第一位 2~9，其余位全部随机 +/// - 每次增加 2000 的倍数：随机倍数 1~500 倍，倍数越大随机到的概率越小 +/// - 满位后重新随机一个基础值继续递增 +/// 同时支持 UnityEngine.UI.Text 和 TextMeshProUGUI，二选一，留空自动从自身/子物体查找。 +/// +public class TextNumRander : MonoBehaviour +{ + [Header("目标文本（二选一，留空自动从自身/子物体查找）")] + [SerializeField] private Text text; + [SerializeField] private TextMeshProUGUI tmpText; + + [Header("配置")] + [Tooltip("显示位数（面板上设置几位数）")] + [SerializeField] private int digitCount = 6; + [Tooltip("递增跳变间隔（秒），越小递增越快")] + [SerializeField] private float jumpInterval = 0.05f; + [Tooltip("启用时自动开始递增")] + [SerializeField] private bool autoStart = true; + + [Header("递增规则")] + [Tooltip("每次增加的基础量（按 2000 的倍数）")] + [SerializeField] private long baseStep = 2000; + [Tooltip("随机倍数的上限（1 ~ maxMultiplier，越大概率越小）")] + [SerializeField] private int maxMultiplier = 500; + + // ---- 运行时 ---- + private Coroutine rollCoroutine; + private bool isRolling; + private long currentValue; + + /// 当前数值 + public long CurrentValue => currentValue; + + private void Awake() + { + // 自动查找文本组件：自身优先，其次子物体 + if (text == null) text = GetComponent(); + if (text == null) text = GetComponentInChildren(); + if (tmpText == null) tmpText = GetComponent(); + if (tmpText == null) tmpText = GetComponentInChildren(); + } + + private void OnEnable() + { + if (autoStart && !isRolling) + StartRolling(); + } + + private void OnDisable() + { + Stop(); + } + + /// 设置显示位数（运行时调用会立即生效） + public void SetDigitCount(int count) + { + digitCount = Mathf.Max(1, count); + if (isRolling) + RefreshText(); + } + + /// 开始（或继续）递增滚动：先随机一个基础值（第一位 2~9，其余位随机） + public void StartRolling() + { + if (isRolling) return; + // 基础值随机：第一位 2~9，其余位全部随机 + currentValue = RandomBaseValue(); + RefreshText(); + isRolling = true; + rollCoroutine = StartCoroutine(RollLoop()); + } + + /// 停止递增滚动（保留当前显示值） + public void Stop() + { + if (rollCoroutine != null) + { + StopCoroutine(rollCoroutine); + rollCoroutine = null; + } + isRolling = false; + } + + /// 设置起始数值（立即显示，不影响递增状态；末三位强制归 000） + public void SetStartValue(long value) + { + // 与递增规则保持一致：末三位固定为 000 + currentValue = Wrap(System.Math.Max(0L, value) / 1000L * 1000L); + RefreshText(); + } + + private IEnumerator RollLoop() + { + while (isRolling) + { + // 每次增加 2000 的倍数：随机倍数 1~500 倍 + currentValue += baseStep * RandomMultiplier(); + if (currentValue > MaxValue()) + currentValue = RandomBaseValue(); // 满位回绕：重新随机一个基础值 + RefreshText(); + yield return new WaitForSeconds(jumpInterval); + } + } + + /// + /// 基础值随机：第一位 2~9，中间位随机，最后三位固定 000 + /// （递增量为 2000 的倍数，基础值末三位为 000 时，后续所有值末三位始终保持 000） + /// + private long RandomBaseValue() + { + // 位数不足 4 位时，最后三位全是 0 意味着整个数就是 0 + if (digitCount <= 3) + return 0; + + long val = Random.Range(2, 10); // 第一位 2~9 + for (int i = 1; i < digitCount - 3; i++) + val = val * 10 + Random.Range(0, 10); // 中间位随机 0~9 + return val * 1000; // 最后三位固定 000 + } + + /// + /// 随机倍数 1 ~ maxMultiplier，倍数越大随机到的概率越小。 + /// 用 500^u（u∈[0,1)）采样：概率密度 ∝ 1/倍数，小倍数高频、大倍数低频。 + /// + private long RandomMultiplier() + { + int m = Mathf.Clamp((int)Mathf.Pow(maxMultiplier, Random.value), 1, maxMultiplier); + return m; + } + + /// 当前位数能表示的最大值（10^digitCount - 1） + private long MaxValue() + { + long max = 1; + for (int i = 0; i < digitCount; i++) + max *= 10; + return max - 1; + } + + /// 数值限制在位数范围内 + private long Wrap(long value) + { + if (value < 0) value = 0; + return value % (MaxValue() + 1); + } + + private void RefreshText() + { + if (text == null && tmpText == null) return; + string s = currentValue.ToString().PadLeft(digitCount, '0'); + if (text != null) text.text = s; + if (tmpText != null) tmpText.text = s; + } +} diff --git a/Assets/MyGame/aa/UI/EfScripts/Text/TextNumRander.cs.meta b/Assets/MyGame/aa/UI/EfScripts/Text/TextNumRander.cs.meta new file mode 100644 index 000000000..aa1c16cbb --- /dev/null +++ b/Assets/MyGame/aa/UI/EfScripts/Text/TextNumRander.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dcb01f4d98cf9a34c9d3053cd67e9d59 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/Home/MainPanel.prefab b/Assets/MyGame/aa/UI/Home/MainPanel.prefab index 8ab4d3096..f36fb2a49 100644 --- a/Assets/MyGame/aa/UI/Home/MainPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/MainPanel.prefab @@ -106,7 +106,7 @@ RectTransform: - {fileID: 4313738529649717178} - {fileID: 6621572938974973778} - {fileID: 2569752025301705985} - m_Father: {fileID: 8977123748561868288} + m_Father: {fileID: 7095845487138386970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4082,6 +4082,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 3975517934417440323} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 6475897499525910216} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &785037975968402982 GameObject: m_ObjectHideFlags: 0 @@ -4717,6 +4719,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 5434436072167880956} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 5537812312063270792} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &855173995560254473 GameObject: m_ObjectHideFlags: 0 @@ -5116,12 +5120,14 @@ RectTransform: - {fileID: 7878969533608560483} - {fileID: 5864306273920659334} - {fileID: 6424416562348975512} + - {fileID: 116709192338210670} + - {fileID: 3140084480024508924} m_Father: {fileID: 1168244435367184264} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0.5, y: 62.152435} - m_SizeDelta: {x: -443, y: 124.3049} + m_AnchoredPosition: {x: 0, y: 62.152435} + m_SizeDelta: {x: 0, y: 124.3049} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2542023152924674091 CanvasRenderer: @@ -5144,11 +5150,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 28 m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 4 + m_ChildAlignment: 6 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -8350,6 +8356,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 1745281830603616034} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 2881057251063522783} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &1386349590797224218 GameObject: m_ObjectHideFlags: 0 @@ -10670,6 +10678,148 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &1822208394393803965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3140084480024508924} + - component: {fileID: 5425188625056034735} + - component: {fileID: 3946067662275898524} + - component: {fileID: 1273856550663831997} + - component: {fileID: 3176078953913445776} + m_Layer: 0 + m_Name: "Kuaisu\u5F00\u59CB" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3140084480024508924 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1822208394393803965} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.50504, y: 0.50504, z: 0.50504} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3285917535890361243} + m_Father: {fileID: 7095845487138386970} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -178, y: 49.6951} + m_SizeDelta: {x: 630, y: 217} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5425188625056034735 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1822208394393803965} + m_CullTransparentMesh: 1 +--- !u!114 &3946067662275898524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1822208394393803965} + 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: dd8acf4dc39b2a74b9dfd01b04b71efd, type: 2} + 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 &1273856550663831997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1822208394393803965} + 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!114 &3176078953913445776 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1822208394393803965} + 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: 3946067662275898524} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1831775646499524891 GameObject: m_ObjectHideFlags: 0 @@ -11964,6 +12114,7 @@ MonoBehaviour: HHWKButton1: {fileID: 8021205540622229734} HHWKButton2: {fileID: 7541712128247741062} HHWKButton3: {fileID: 3814183931473294660} + btn_KuaiSuKaiShi: {fileID: 3176078953913445776} ZGXQBtn: {fileID: 5964348902235362447} currLeave: 1 btn_VIP: {fileID: 8541196967996867916} @@ -13791,6 +13942,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 5914698413365628917} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 7555215805083839186} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &2274094363890084947 GameObject: m_ObjectHideFlags: 0 @@ -15578,6 +15731,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 7191304739449542881} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 7240690521709707157} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &2537221743328594667 GameObject: m_ObjectHideFlags: 0 @@ -16283,6 +16438,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 4343736992942183964} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 8433472271326875411} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &2640778193490996275 GameObject: m_ObjectHideFlags: 0 @@ -16687,6 +16844,81 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &2807873447358390634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8398196828527550264} + - component: {fileID: 310635512935722888} + - component: {fileID: 8980310847954297361} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8398196828527550264 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2807873447358390634} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.053, y: 1.053, z: 1.053} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4074354309035459113} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + 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: 47, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &310635512935722888 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2807873447358390634} + m_CullTransparentMesh: 1 +--- !u!114 &8980310847954297361 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2807873447358390634} + 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: 48259b1f9d63ffb489c701aa581a6409, type: 2} + 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 &2821600690195291576 GameObject: m_ObjectHideFlags: 0 @@ -19425,6 +19657,81 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &3201337636433648071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 97984018541380415} + - component: {fileID: 6702920180939853154} + - component: {fileID: 8598928382184241379} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &97984018541380415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3201337636433648071} + m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.053, y: 1.053, z: 1.053} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 239990740951415894} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} + 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: 47, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6702920180939853154 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3201337636433648071} + m_CullTransparentMesh: 1 +--- !u!114 &8598928382184241379 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3201337636433648071} + 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: 48259b1f9d63ffb489c701aa581a6409, type: 2} + 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 &3207065891839524533 GameObject: m_ObjectHideFlags: 0 @@ -21675,6 +21982,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 385465457336022300} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 6458219176170330820} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &3566636061565805910 GameObject: m_ObjectHideFlags: 0 @@ -22464,6 +22773,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 3330204166061710934} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 8701377720407768290} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &3691494330222732181 GameObject: m_ObjectHideFlags: 0 @@ -22566,7 +22877,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3941596332947205371} - - {fileID: 116709192338210670} - {fileID: 6274682360574130250} - {fileID: 5548704721294189509} - {fileID: 754207876655879297} @@ -22596,7 +22906,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 25 + m_Top: 5 m_Bottom: 0 m_ChildAlignment: 1 m_Spacing: -6.92 @@ -23949,6 +24259,140 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3917314797965050250 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3285917535890361243} + - component: {fileID: 122498894630485877} + - component: {fileID: 1822921855744468324} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3285917535890361243 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3917314797965050250} + 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: 3140084480024508924} + 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 &122498894630485877 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3917314797965050250} + m_CullTransparentMesh: 1 +--- !u!114 &1822921855744468324 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3917314797965050250} + 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: "\u5FEB\u901F\u5F00\u59CB" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 890e445e2e441fe419f4853436a28b56, 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: 71.68 + m_fontSizeBase: 71.68 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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 &3930551901122506566 GameObject: m_ObjectHideFlags: 0 @@ -26465,6 +26909,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 4406823871582780034} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 7789369957934753010} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &4256306906228117492 GameObject: m_ObjectHideFlags: 0 @@ -26530,6 +26976,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 6743861061137171171} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 8756371898384325089} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &4259658072568281850 GameObject: m_ObjectHideFlags: 0 @@ -28345,6 +28793,7 @@ GameObject: - component: {fileID: 4074354309035459113} - component: {fileID: 1406132421987965883} - component: {fileID: 4554922255860907309} + - component: {fileID: 5603886499205325975} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -28361,15 +28810,17 @@ RectTransform: m_GameObject: {fileID: 4526763220791337908} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.6972, y: 2.6972, z: 2.6972} + m_LocalScale: {x: 0.7187769, y: 0.7187769, z: 0.7187769} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 8398196828527550264} + - {fileID: 239990740951415894} m_Father: {fileID: 8074052773578245572} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 50, y: 214} - m_SizeDelta: {x: 21, y: 12} + m_SizeDelta: {x: 115, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1406132421987965883 CanvasRenderer: @@ -28399,7 +28850,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1e69d3e8d17b0944082bce60bf28d6e8, type: 2} + m_Sprite: {fileID: 21300000, guid: 0f90225000a4277469ad2a3da8b0a9f2, type: 2} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -28409,6 +28860,78 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5603886499205325975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4526763220791337908} + 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: 4554922255860907309} + toggleTransition: 1 + graphic: {fileID: 0} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7398833570398122999} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 6577732665522779995} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 1 --- !u!1 &4545339154622937623 GameObject: m_ObjectHideFlags: 0 @@ -29236,6 +29759,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 595701201377536391} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 8265562025064854870} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &4699931742248088885 GameObject: m_ObjectHideFlags: 0 @@ -31530,6 +32055,7 @@ GameObject: - component: {fileID: 93426220904165441} - component: {fileID: 2829115381299070104} - component: {fileID: 7794621205501254220} + - component: {fileID: 8207720363973758346} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -31594,6 +32120,29 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!223 &8207720363973758346 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5064464129794896752} + 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: 6 + m_TargetDisplay: 0 --- !u!1 &5077164181693049298 GameObject: m_ObjectHideFlags: 0 @@ -36049,6 +36598,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 1134480121181226772} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 580620811636678752} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &5731084488003992303 GameObject: m_ObjectHideFlags: 0 @@ -36677,6 +37228,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 1267448880742384528} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 1596066674626241764} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &5867137248991596954 GameObject: m_ObjectHideFlags: 0 @@ -38296,6 +38849,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 1374880856086107260} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 1487369848576881416} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &6035762362497549507 GameObject: m_ObjectHideFlags: 0 @@ -38546,7 +39101,7 @@ MonoBehaviour: freeze: 0 updateWhenInvisible: 3 unscaledTime: 0 - allowMultipleCanvasRenderers: 1 + allowMultipleCanvasRenderers: 0 canvasRenderers: - {fileID: 4361623388149170209} - {fileID: 1412347307022634470} @@ -41906,7 +42461,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2463621101953851616 RectTransform: m_ObjectHideFlags: 0 @@ -42665,6 +43220,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 6306782703300789250} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 2357400316180094342} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &6686626663589250669 GameObject: m_ObjectHideFlags: 0 @@ -43019,6 +43576,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 7829258414361100697} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 2003590129915689065} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &6763198562017412366 GameObject: m_ObjectHideFlags: 0 @@ -46767,6 +47326,82 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &7398833570398122999 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 239990740951415894} + - component: {fileID: 2779254090824197360} + - component: {fileID: 9196903854308052218} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &239990740951415894 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7398833570398122999} + 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: 97984018541380415} + m_Father: {fileID: 4074354309035459113} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 57.499973, y: 0.000015258789} + m_SizeDelta: {x: 115, y: 115} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2779254090824197360 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7398833570398122999} + m_CullTransparentMesh: 1 +--- !u!114 &9196903854308052218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7398833570398122999} + 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: 0f90225000a4277469ad2a3da8b0a9f2, type: 2} + 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 &7414856455114161810 GameObject: m_ObjectHideFlags: 0 @@ -51314,6 +51949,161 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &8139240770917612567 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6616200632571278177} + - component: {fileID: 46518010549656805} + - component: {fileID: 450944279417426940} + - component: {fileID: 1724912581539519089} + 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 &6616200632571278177 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8139240770917612567} + 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: 2700593517713940608} + 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 &46518010549656805 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8139240770917612567} + m_CullTransparentMesh: 1 +--- !u!114 &450944279417426940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8139240770917612567} + 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: 12345678912345 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fdd40eef2e75f6d46b51c289c46fe60b, type: 2} + m_sharedMaterial: {fileID: 581533097809427942, guid: fdd40eef2e75f6d46b51c289c46fe60b, + 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: 11400000, guid: b5a3b539bfcb41e46ad594b9b14d7732, type: 2} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 42.4 + m_fontSizeBase: 42.4 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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: -23.439957, z: -20.510162, w: -5.8599777} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &1724912581539519089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8139240770917612567} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcb01f4d98cf9a34c9d3053cd67e9d59, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 0} + tmpText: {fileID: 450944279417426940} + digitCount: 14 + jumpInterval: 0.05 + autoStart: 1 + baseStep: 2000 + maxMultiplier: 500 --- !u!1 &8143673015806223875 GameObject: m_ObjectHideFlags: 0 @@ -52686,7 +53476,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 192 + m_Left: 100 m_Right: 100 m_Top: 0 m_Bottom: 0 @@ -53251,6 +54041,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 3871849935224665368} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 3606027762967319148} + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &8478180721132397256 GameObject: m_ObjectHideFlags: 0 @@ -57804,6 +58596,11 @@ PrefabInstance: propertyPath: m_Name value: SelectRoomLV2_FXZY_1 objectReference: {fileID: 0} + - target: {fileID: 3447567965674678763, guid: 4df885aec65db17408fe5f416586659b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -22.099976 + objectReference: {fileID: 0} - target: {fileID: 4440020033962320383, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_LocalScale.x @@ -58015,6 +58812,11 @@ PrefabInstance: propertyPath: m_Name value: SelectRoomLV2_XJMH_4 objectReference: {fileID: 0} + - target: {fileID: 3447567965674678763, guid: 4df885aec65db17408fe5f416586659b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -22.099976 + objectReference: {fileID: 0} - target: {fileID: 4440020033962320383, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_LocalScale.x @@ -58044,7 +58846,7 @@ PrefabInstance: type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 5a7f28851212cf94599fa70af53365d7, + objectReference: {fileID: 11400000, guid: 3e1e01a2a4528ff468a75f62bb076f56, type: 2} - target: {fileID: 5060419867541585992, guid: 4df885aec65db17408fe5f416586659b, type: 3} @@ -58195,27 +58997,27 @@ PrefabInstance: - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_LocalScale.x - value: 0.6132421 + value: 0.23374155 objectReference: {fileID: 0} - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_LocalScale.y - value: 0.6132421 + value: 0.23374155 objectReference: {fileID: 0} - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_LocalScale.z - value: 0.55749285 + value: 0.21249233 objectReference: {fileID: 0} - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_AnchoredPosition.x - value: -30 + value: 34 objectReference: {fileID: 0} - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_AnchoredPosition.y - value: -28 + value: -145 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -58253,6 +59055,11 @@ PrefabInstance: propertyPath: m_Name value: SelectRoomLV2_HHWK_5 objectReference: {fileID: 0} + - target: {fileID: 3447567965674678763, guid: 4df885aec65db17408fe5f416586659b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -22.099976 + objectReference: {fileID: 0} - target: {fileID: 4440020033962320383, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_LocalScale.x @@ -58282,7 +59089,7 @@ PrefabInstance: type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: acabc6212aab0f644aba470017d46475, + objectReference: {fileID: 11400000, guid: 785d5de6ff10071429e202e9ee19d700, type: 2} - target: {fileID: 5060419867541585992, guid: 4df885aec65db17408fe5f416586659b, type: 3} @@ -58430,6 +59237,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, + type: 3} + propertyPath: m_LocalScale.x + value: 0.099304706 + objectReference: {fileID: 0} + - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, + type: 3} + propertyPath: m_LocalScale.y + value: 0.099304706 + objectReference: {fileID: 0} + - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, + type: 3} + propertyPath: m_LocalScale.z + value: 0.090277016 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -59563,12 +60385,12 @@ PrefabInstance: type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 9a3dd1e48620b5e418b97115b2c375c2, + objectReference: {fileID: 11400000, guid: 5a7f28851212cf94599fa70af53365d7, type: 2} - target: {fileID: 5060419867541585992, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: startingAnimation - value: stand + value: animation objectReference: {fileID: 0} - target: {fileID: 7699534015519354462, guid: 4df885aec65db17408fe5f416586659b, type: 3} @@ -59709,27 +60531,27 @@ PrefabInstance: - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_LocalScale.x - value: 0.8878628 + value: 0.58855176 objectReference: {fileID: 0} - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_LocalScale.y - value: 0.8878628 + value: 0.58855176 objectReference: {fileID: 0} - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_LocalScale.z - value: 0.80714804 + value: 0.53504705 objectReference: {fileID: 0} - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_AnchoredPosition.x - value: -40 + value: -7 objectReference: {fileID: 0} - target: {fileID: 8976565230966903283, guid: 4df885aec65db17408fe5f416586659b, type: 3} propertyPath: m_AnchoredPosition.y - value: -58 + value: -25 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -60115,6 +60937,16 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3491300132482268834, guid: f62f20488cebebc428af1bebd40494e5, + type: 3} + propertyPath: m_Particles.Array.size + value: 29 + objectReference: {fileID: 0} + - target: {fileID: 3491300132482268834, guid: f62f20488cebebc428af1bebd40494e5, + type: 3} + propertyPath: m_Particles.Array.data[29] + value: + objectReference: {fileID: 2251667513129494709} - target: {fileID: 3600118702666593769, guid: f62f20488cebebc428af1bebd40494e5, type: 3} propertyPath: m_Enabled @@ -60125,6 +60957,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3710013875214198927, guid: f62f20488cebebc428af1bebd40494e5, + type: 3} + propertyPath: m_AdditionalShaderChannelsFlag + value: 25 + objectReference: {fileID: 0} - target: {fileID: 3842171853955724570, guid: f62f20488cebebc428af1bebd40494e5, type: 3} propertyPath: m_Enabled @@ -60472,9 +61309,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 574762314427081364, guid: f62f20488cebebc428af1bebd40494e5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6616200632571278177} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f62f20488cebebc428af1bebd40494e5, type: 3} +--- !u!198 &2251667513129494709 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 4448465256878189217, guid: f62f20488cebebc428af1bebd40494e5, + type: 3} + m_PrefabInstance: {fileID: 2486998791559496212} + m_PrefabAsset: {fileID: 0} +--- !u!224 &2700593517713940608 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 574762314427081364, guid: f62f20488cebebc428af1bebd40494e5, + type: 3} + m_PrefabInstance: {fileID: 2486998791559496212} + m_PrefabAsset: {fileID: 0} --- !u!224 &6170217028071363112 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8584594862215024700, guid: f62f20488cebebc428af1bebd40494e5, diff --git a/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/SeccionItem.cs b/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/SeccionItem.cs index 606aeb817..6ec67802e 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/SeccionItem.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/SeccionItem.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -10,4 +8,21 @@ public class SeccionItem : MonoBehaviour public Button btn_SelectGameRoom; public TextMeshProUGUI txt_VenueInfo; // 场地信息：初级场/中级场/高级场 public TextMeshProUGUI txt_EntryCondition; // 入场条件文字 + + [Header("快速进入按钮按下缩放")] + public float pressScale = 0.95f; // 按下时卡片缩放比例 + public float pressDuration = 0.1f; // 缩放动画时长 + + private void Awake() + { + if (btn_JoinGame == null) return; + + // 「快速进入」按钮：按下缩小卡片，抬起还原 + // 用只处理按下/抬起、不含拖动接口的 UIPressScale，避免抢走所在 ScrollRect 的滑动 + var effect = btn_JoinGame.gameObject.GetComponent(); + if (effect == null) effect = btn_JoinGame.gameObject.AddComponent(); + effect.target = transform; // 缩放整个 SeccionItem 卡片 + effect.pressScale = pressScale; + effect.duration = pressDuration; + } } diff --git a/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/UIPressScale.cs b/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/UIPressScale.cs new file mode 100644 index 000000000..c9a3ef31f --- /dev/null +++ b/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/UIPressScale.cs @@ -0,0 +1,50 @@ +using DG.Tweening; +using UnityEngine; +using UnityEngine.EventSystems; + +/// +/// 按下缩小、抬起还原。 +/// 只实现 IPointerDownHandler / IPointerUpHandler，不实现 IDragHandler 等拖动接口， +/// 所以挂在 ScrollRect 内的按钮上不会抢走 ScrollRect 的滑动。 +/// +public class UIPressScale : MonoBehaviour, IPointerDownHandler, IPointerUpHandler +{ + [Tooltip("缩放目标，留空则缩放自身")] + public Transform target; + public float pressScale = 0.95f; // 按下时缩放比例 + public float duration = 0.1f; // 缩放动画时长 + + private Vector3 _standardScale; + private bool _captured; + private bool _isPressing; + + private Transform Target => target != null ? target : transform; + + public void OnPointerDown(PointerEventData eventData) => SetPressing(true); + public void OnPointerUp(PointerEventData eventData) => SetPressing(false); + + private void SetPressing(bool pressing) + { + if (_isPressing == pressing) return; + _isPressing = pressing; + + var t = Target; + if (!_captured) + { + _standardScale = t.localScale; // 首次使用时记录原缩放 + _captured = true; + } + t.DOKill(); + t.DOScale(pressing ? _standardScale * pressScale : _standardScale, duration) + .SetEase(Ease.OutQuad); + } + + // 被隐藏时立即还原，避免按下瞬间目标被关掉而停在缩小状态 + private void OnDisable() + { + _isPressing = false; + if (!_captured) return; + Target.DOKill(); + Target.localScale = _standardScale; + } +} diff --git a/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/UIPressScale.cs.meta b/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/UIPressScale.cs.meta new file mode 100644 index 000000000..d9193bb2e --- /dev/null +++ b/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/UIPressScale.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1435cae0f5e87f24c9f0c3581b81f36a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/Home/UIHomeMain.cs b/Assets/MyGame/aa/UI/Home/UIHomeMain.cs index 7af0d13cb..44867c589 100644 --- a/Assets/MyGame/aa/UI/Home/UIHomeMain.cs +++ b/Assets/MyGame/aa/UI/Home/UIHomeMain.cs @@ -55,6 +55,8 @@ public class UIHomeMain : UIBase public SeccionItem HHWKButton1; public SeccionItem HHWKButton2; public SeccionItem HHWKButton3; + + public Button btn_KuaiSuKaiShi; [Header("中国象棋")] public Button ZGXQBtn; @@ -153,6 +155,8 @@ public class UIHomeMain : UIBase BindRoomLevelItem(HHWKButton1, GameType.HHWK, 1); BindRoomLevelItem(HHWKButton2, GameType.HHWK, 2); BindRoomLevelItem(HHWKButton3, GameType.HHWK, 3); + // 快速开始：在所有场次中随机进入 + if (btn_KuaiSuKaiShi != null) btn_KuaiSuKaiShi.onClick.AddListener(QuickStartRandom); #endregion #region left @@ -341,6 +345,19 @@ public class UIHomeMain : UIBase }); } + /// 快速开始：在所有玩法场次（风雷之渊/星际迷航/黑化悟空 × 初/中/高级场）中随机进入一个 + private void QuickStartRandom() + { + var rooms = new (GameType gameType, int leave)[] + { + (GameType.FLZY, 1), (GameType.FLZY, 2), (GameType.FLZY, 3), + (GameType.XJMH, 1), (GameType.XJMH, 2), (GameType.XJMH, 3), + (GameType.HHWK, 1), (GameType.HHWK, 2), (GameType.HHWK, 3), + }; + var pick = rooms[UnityEngine.Random.Range(0, rooms.Length)]; + QuickJoinRoom(pick.gameType, pick.leave); + } + /// 手动选座：VIP 校验通过后按正常子UI流程打开房间列表面板，并拉取该场次房间列表 private void ManualSelectRoom(GameType gameType, int leave) { diff --git a/Assets/MyGame/aa/UI/Home/homemainsub/SelectRoomLV2_FXZY_1.prefab b/Assets/MyGame/aa/UI/Home/homemainsub/SelectRoomLV2_FXZY_1.prefab index 6de6b2ac3..9feab673a 100644 --- a/Assets/MyGame/aa/UI/Home/homemainsub/SelectRoomLV2_FXZY_1.prefab +++ b/Assets/MyGame/aa/UI/Home/homemainsub/SelectRoomLV2_FXZY_1.prefab @@ -587,8 +587,6 @@ GameObject: - component: {fileID: 8853572317385043517} - component: {fileID: 9049912857469479422} - component: {fileID: 6955909806736836364} - - component: {fileID: 6754374072825034577} - - component: {fileID: 4946178425992029769} m_Layer: 5 m_Name: SelectRoomLV2_FXZY_1 m_TagString: Untagged @@ -642,46 +640,8 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 7142047261565016865} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 2928962507984365505} ---- !u!223 &6754374072825034577 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1872093705705470253} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &4946178425992029769 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1872093705705470253} - 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 + pressScale: 0.95 + pressDuration: 0.1 --- !u!1 &1894325380142951813 GameObject: m_ObjectHideFlags: 0 @@ -3011,6 +2971,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6436429307221650635, guid: bddd0261a39953e448c469636a3ec884, + type: 3} + propertyPath: m_MeshSharing + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7323817790329658132, guid: bddd0261a39953e448c469636a3ec884, type: 3} propertyPath: m_SortingLayer diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/Mainhome.mat b/Assets/TextMesh Pro/Resources/Fonts & Materials/Mainhome.mat new file mode 100644 index 000000000..87b4064b0 --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/Mainhome.mat @@ -0,0 +1,195 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mainhome + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - GLOW_ON + - UNDERLAY_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: -5242640295693195929, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpFace: 0 + - _BumpOutline: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _ColorMask: 15 + - _Cull: 2 + - _CullMode: 0 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _Diffuse: 0.5 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FaceDilate: 0.39 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 1 + - _GlowPower: 0.5 + - _GradientScale: 4 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _OutlineSoftness: 0.483 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0.765 + - _Parallax: 0.005 + - _PerspectiveFilter: 0.875 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Reflectivity: 10 + - _ScaleRatioA: 0.31407034 + - _ScaleRatioB: 0 + - _ScaleRatioC: 0 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SpecularPower: 2 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 1 + - _StencilWriteMask: 0 + - _Surface: 0 + - _TextureHeight: 2048 + - _TextureWidth: 4096 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: -0.024 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0.54 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 3 + - _WeightNormal: 1.2 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 0, b: 0, a: 0.5} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0, g: 0.24999996, b: 0.01072526, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/Mainhome.mat.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials/Mainhome.mat.meta new file mode 100644 index 000000000..ede13310e --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/Mainhome.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 890e445e2e441fe419f4853436a28b56 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: