From a1a4beac5b75e128e2bc187c7ecb10891cbab3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Tue, 15 Sep 2026 16:30:20 +0800 Subject: [PATCH] 1 --- Assets/MyGame/Scenes/UIScene.unity | 298 +------ .../Net/WebResponses/RoomChangeResponse.cs | 6 + .../Net/WebResponses/RoomJoinNotice.cs | 5 + Assets/MyGame/Scripts/Turret/SitPosData.cs | 65 +- Assets/MyGame/Scripts/Turret/TurretData.cs | 4 + .../aa/Game/FLZY/BOSS/SLZP/SLZPDieEvent.cs | 4 +- .../PW_Effect_Explosion_3 Variant.prefab | 24 +- .../XJMH/Boss/JiXieXie/PW_Enemy_3000.prefab | 6 +- .../aa/UI/Game/GameMainPanel_FishBase.cs | 63 +- .../aa/UI/Game/XJMH/GameMainPanelXJMH.prefab | 833 +++++++++++++++++- Assets/MyGame/aa/UI/Game/左下.prefab | 534 +++++++---- Assets/MyGame/aa/UI/Home/Sub/RankPanel.prefab | 6 +- Assets/MyGame/aa/UI/Home/Sub/VIPPanel.prefab | 4 +- Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab | 27 +- .../Resources/Fonts & Materials/GongGao.mat | 112 +++ .../Fonts & Materials/GongGao.mat.meta | 8 + .../Fonts & Materials/SourceHanSans SDF.asset | 38 +- .../Resources/Fonts & Materials/XJMHSkill.mat | 10 +- .../jinbikuang_yangcheng.png.meta | 2 +- .../Game/场内游戏金币框/条.png.meta | 4 +- 20 files changed, 1500 insertions(+), 553 deletions(-) create mode 100644 Assets/TextMesh Pro/Resources/Fonts & Materials/GongGao.mat create mode 100644 Assets/TextMesh Pro/Resources/Fonts & Materials/GongGao.mat.meta diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index 05d3258b0..94c31220c 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -7416,7 +7416,7 @@ MonoBehaviour: spawnList: [] isCreateFish: 0 isFrozen: 0 - debugSpawnFishNumber: 11024 + debugSpawnFishNumber: 11028 isleft: 1 fishList_All: [] fishList_Small: [] @@ -8105,79 +8105,6 @@ RectTransform: m_AnchoredPosition: {x: 171, y: 28} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &5517909479827642959 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2935226408657113831, guid: 846a92ef031e2db4b83c6fb1907dfe10, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2935226408657113831, guid: 846a92ef031e2db4b83c6fb1907dfe10, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2935226408657113831, guid: 846a92ef031e2db4b83c6fb1907dfe10, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2935226408657113831, guid: 846a92ef031e2db4b83c6fb1907dfe10, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2935226408657113831, guid: 846a92ef031e2db4b83c6fb1907dfe10, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2935226408657113831, guid: 846a92ef031e2db4b83c6fb1907dfe10, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2935226408657113831, guid: 846a92ef031e2db4b83c6fb1907dfe10, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2935226408657113831, guid: 846a92ef031e2db4b83c6fb1907dfe10, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2935226408657113831, guid: 846a92ef031e2db4b83c6fb1907dfe10, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2935226408657113831, guid: 846a92ef031e2db4b83c6fb1907dfe10, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5298206228828390981, guid: 846a92ef031e2db4b83c6fb1907dfe10, - type: 3} - propertyPath: m_Name - value: 99 - objectReference: {fileID: 0} - - target: {fileID: 5298206228828390981, guid: 846a92ef031e2db4b83c6fb1907dfe10, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 846a92ef031e2db4b83c6fb1907dfe10, type: 3} --- !u!1 &5849201756975285597 GameObject: m_ObjectHideFlags: 0 @@ -8227,152 +8154,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1001 &6003232428400230030 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3953321038491269476, guid: 0f63d788461d79d43bb397c3a10358db, - type: 3} - propertyPath: m_Name - value: 97 - objectReference: {fileID: 0} - - target: {fileID: 3953321038491269476, guid: 0f63d788461d79d43bb397c3a10358db, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6565048473168804846, guid: 0f63d788461d79d43bb397c3a10358db, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6565048473168804846, guid: 0f63d788461d79d43bb397c3a10358db, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6565048473168804846, guid: 0f63d788461d79d43bb397c3a10358db, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6565048473168804846, guid: 0f63d788461d79d43bb397c3a10358db, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6565048473168804846, guid: 0f63d788461d79d43bb397c3a10358db, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6565048473168804846, guid: 0f63d788461d79d43bb397c3a10358db, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6565048473168804846, guid: 0f63d788461d79d43bb397c3a10358db, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6565048473168804846, guid: 0f63d788461d79d43bb397c3a10358db, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6565048473168804846, guid: 0f63d788461d79d43bb397c3a10358db, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6565048473168804846, guid: 0f63d788461d79d43bb397c3a10358db, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0f63d788461d79d43bb397c3a10358db, type: 3} ---- !u!1001 &6025246563366954422 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4141578610890475905, guid: 4bbbc5d48a3642e40a44205c580ab0df, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4141578610890475905, guid: 4bbbc5d48a3642e40a44205c580ab0df, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4141578610890475905, guid: 4bbbc5d48a3642e40a44205c580ab0df, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4141578610890475905, guid: 4bbbc5d48a3642e40a44205c580ab0df, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4141578610890475905, guid: 4bbbc5d48a3642e40a44205c580ab0df, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4141578610890475905, guid: 4bbbc5d48a3642e40a44205c580ab0df, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4141578610890475905, guid: 4bbbc5d48a3642e40a44205c580ab0df, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4141578610890475905, guid: 4bbbc5d48a3642e40a44205c580ab0df, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4141578610890475905, guid: 4bbbc5d48a3642e40a44205c580ab0df, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4141578610890475905, guid: 4bbbc5d48a3642e40a44205c580ab0df, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8368701640573121997, guid: 4bbbc5d48a3642e40a44205c580ab0df, - type: 3} - propertyPath: m_Name - value: 96 - objectReference: {fileID: 0} - - target: {fileID: 8368701640573121997, guid: 4bbbc5d48a3642e40a44205c580ab0df, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4bbbc5d48a3642e40a44205c580ab0df, type: 3} --- !u!114 &6222733871438046543 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8706,79 +8487,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5849201756975285597} m_CullTransparentMesh: 1 ---- !u!1001 &8692747469306311293 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5491040485429761723, guid: 31145db0967ced743aa6ab0b5e222b9a, - type: 3} - propertyPath: m_Name - value: 98 - objectReference: {fileID: 0} - - target: {fileID: 5491040485429761723, guid: 31145db0967ced743aa6ab0b5e222b9a, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7180615919663793265, guid: 31145db0967ced743aa6ab0b5e222b9a, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7180615919663793265, guid: 31145db0967ced743aa6ab0b5e222b9a, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7180615919663793265, guid: 31145db0967ced743aa6ab0b5e222b9a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7180615919663793265, guid: 31145db0967ced743aa6ab0b5e222b9a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7180615919663793265, guid: 31145db0967ced743aa6ab0b5e222b9a, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7180615919663793265, guid: 31145db0967ced743aa6ab0b5e222b9a, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7180615919663793265, guid: 31145db0967ced743aa6ab0b5e222b9a, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7180615919663793265, guid: 31145db0967ced743aa6ab0b5e222b9a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7180615919663793265, guid: 31145db0967ced743aa6ab0b5e222b9a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7180615919663793265, guid: 31145db0967ced743aa6ab0b5e222b9a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 31145db0967ced743aa6ab0b5e222b9a, type: 3} --- !u!114 &8755369822791440297 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8834,7 +8542,3 @@ SceneRoots: - {fileID: 1184862095} - {fileID: 1663842063} - {fileID: 1810983795} - - {fileID: 6025246563366954422} - - {fileID: 6003232428400230030} - - {fileID: 8692747469306311293} - - {fileID: 5517909479827642959} diff --git a/Assets/MyGame/Scripts/Net/WebResponses/RoomChangeResponse.cs b/Assets/MyGame/Scripts/Net/WebResponses/RoomChangeResponse.cs index f71099300..63aa6a5bc 100644 --- a/Assets/MyGame/Scripts/Net/WebResponses/RoomChangeResponse.cs +++ b/Assets/MyGame/Scripts/Net/WebResponses/RoomChangeResponse.cs @@ -91,6 +91,12 @@ public class RoomPlayerInfo /// VIP 等级 public int vipLevel; + /// 玩家等级（后端 RoomInfo 下发） + public int level; + + /// 玩家经验（0~1，后端暂未下发，字段先占位等补充） + public float exp; + /// 卡牌等级 public int userCardLevel; diff --git a/Assets/MyGame/Scripts/Net/WebResponses/RoomJoinNotice.cs b/Assets/MyGame/Scripts/Net/WebResponses/RoomJoinNotice.cs index c368f3c4d..95ee1179f 100644 --- a/Assets/MyGame/Scripts/Net/WebResponses/RoomJoinNotice.cs +++ b/Assets/MyGame/Scripts/Net/WebResponses/RoomJoinNotice.cs @@ -38,6 +38,11 @@ namespace Assets.MyGame.Scripts.Net.WebResponses /// public int Level { get; set; } = 0; + /// + /// 玩家经验（0~1，后端暂未下发，字段先占位等补充） + /// + public float Exp { get; set; } = 0f; + /// /// Vip等级 /// diff --git a/Assets/MyGame/Scripts/Turret/SitPosData.cs b/Assets/MyGame/Scripts/Turret/SitPosData.cs index 246521f27..2e9307167 100644 --- a/Assets/MyGame/Scripts/Turret/SitPosData.cs +++ b/Assets/MyGame/Scripts/Turret/SitPosData.cs @@ -69,10 +69,12 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler // 玩家基础信息 // ------------------------- [Header("玩家信息")] - public string user; - public TextMeshProUGUI tmp_UserNumber; - public TextMeshProUGUI tmp_UserName; - public Image img_Head; + public string user;//玩家唯一ID + public TextMeshProUGUI tmp_UserNumber;//ID:玩家编号 + public TextMeshProUGUI tmp_UserName;//名字 + public TextMeshProUGUI tmp_UserLevel;//LV:等级 + public Slider slider_UserLevelEXP;//EXP:经验条 + public Image img_Head;//头像 public Image img_Vip; public List sprite_VipList;//这里一共有11个正好对应0-10级vip public List sprite_VipLevelBG; //这里有5个 每两级对应一个0级用最基础的 @@ -978,14 +980,16 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler /// 头像名/URL（走 GameManager 头像缓存，找不到回退默认头像） /// VIP 等级 0~10 /// 玩家编号（短ID，显示在 tmp_UserNumber；空则回退显示 userId） - public void SetUserInfo(string userId, string userName, string avatar, int vipLevel, string userNumber = null) + /// 玩家等级（显示在 tmp_UserLevel） + /// 玩家经验 0~1（显示在 slider_UserLevelEXP；后端暂未下发，先占位） + public void SetUserInfo(string userId, string userName, string avatar, int vipLevel, string userNumber = null, int level = 0, float exp = 0f) { - // 玩家 ID：优先显示后端下发的短编号 UserNumber，没有再用 userId + // 玩家 ID：优先显示后端下发的短编号 UserNumber，没有再用 userId。带 "ID:" 前缀 if (tmp_UserNumber != null) { string displayId = string.IsNullOrEmpty(userNumber) ? userId : userNumber; if (!string.IsNullOrEmpty(displayId)) - tmp_UserNumber.text = displayId; + tmp_UserNumber.text = "ID:" + displayId; } // 昵称：非本人的名字打码（前2后2保留，中间***），自己原样显示 @@ -994,6 +998,14 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler ? userName : MaskUserName(userName); + // 等级：带 "LV:" 前缀显示玩家等级 + if (tmp_UserLevel != null && level > 0) + tmp_UserLevel.text = "LV:" + level; + + // 经验条：exp 为 0~1 的进度值（后端经验值字段暂未下发，明天补充后直接生效） + if (slider_UserLevelEXP != null) + slider_UserLevelEXP.value = Mathf.Clamp01(exp); + // 头像：优先 GameManager 头像缓存（Resources/Avatar），查不到用默认头像 if (img_Head != null) { @@ -1671,6 +1683,45 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler WebSocketSendList.ChangeGunMultiple(roomId, user, newConsume); } + /// + /// 非本地座位隐藏加减炮倍 UI（GameMainPanel 进房时对自己以外的座位调用）： + /// - Normal：隐藏座位上的 btn_TurretAdd / btn_TurretMinus（未拖引用为 null 时跳过） + /// - XJMH：加减倍按钮适配在炮台上（TurretData.obj_Add / obj_Down），座位上没有按钮引用， + /// 把 XJMH 炮台列表里每把炮台的加减倍都隐藏（全部藏，之后切换炮台新炮台的也不会再显示） + /// + public void HideTurretAddMinusUI() + { + if (btn_TurretAdd != null) + btn_TurretAdd.gameObject.SetActive(false); + if (btn_TurretMinus != null) + btn_TurretMinus.gameObject.SetActive(false); + + if (turretControlMode != TurretControlMode.XJMH) return; + + if (xjmhTurretList != null && xjmhTurretList.Count > 0) + { + foreach (var td in xjmhTurretList) + HideTurretAddDown(td); + } + else + { + // 兜底：列表未配置时扫 turretParent 子对象（与 SwitchTurretChild 回退一致） + Transform parent = turretParent != null ? turretParent : transform; + for (int i = 0; i < parent.childCount; i++) + HideTurretAddDown(parent.GetChild(i).GetComponent()); + } + } + + /// 隐藏一把 XJMH 炮台上的加减倍对象（obj_Add / obj_Down，未拖引用跳过） + private static void HideTurretAddDown(TurretData td) + { + if (td == null) return; + if (td.obj_Add != null) + td.obj_Add.SetActive(false); + if (td.obj_Down != null) + td.obj_Down.SetActive(false); + } + public void ChangeTurretMinusConsumeNum() { // ⭐ paoBeiList 为从大到小排列：减号=更小的炮倍=更大的索引，到尾（最小档）回绕到头部（最大档） diff --git a/Assets/MyGame/Scripts/Turret/TurretData.cs b/Assets/MyGame/Scripts/Turret/TurretData.cs index 20b9157c5..71c954dda 100644 --- a/Assets/MyGame/Scripts/Turret/TurretData.cs +++ b/Assets/MyGame/Scripts/Turret/TurretData.cs @@ -96,6 +96,10 @@ public class TurretData : MonoBehaviour [Tooltip("待机动画变体索引：0=Idle0 1=Idle1...")] public int idleIndex = 0; + [Header("XJMH加减炮倍")] + public GameObject obj_Add; + public GameObject obj_Down; + // ---- 战神模式运行时缓存（首次 PlayAnimator 时检测）---- private bool _warGodAnimChecked; // 是否已检测过参数 private bool _warGodAnimMode; // true=战神 PlayFire 约定 diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/SLZPDieEvent.cs b/Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/SLZPDieEvent.cs index 9ff20fa84..c98386127 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/SLZPDieEvent.cs +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/SLZPDieEvent.cs @@ -54,9 +54,9 @@ public class SLZPDieEvent : BJRedPacketEvent [Header("三圈数值表（-1=升级格，必须与转盘美术格子数值一致）")] [Tooltip("外圈数值(wai)：抽到-1升级到中圈")] - private int[] waiValues = new int[] { -1, 300, 350, 500, 550, 600, 650, 700 }; + private int[] waiValues = new int[] { -1, 50, 100, 200, 300, 400, 500, 600 }; [Tooltip("中圈数值(zhong)：抽到-1升级到内圈")] - private int[] zhongValues = new int[] { -1, 300, 500, 600, 800, 1000 }; + private int[] zhongValues = new int[] { -1, 100, 200, 300, 400, 500 }; [Tooltip("内圈数值(nei)：直接出最终倍数")] private int[] neiValues = new int[] { -1, 10000, 20000 }; diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/JiXieXie/PW_Effect_Explosion_3 Variant.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/JiXieXie/PW_Effect_Explosion_3 Variant.prefab index a9fefbaa0..02a4238f4 100644 --- a/Assets/MyGame/aa/Game/XJMH/Boss/JiXieXie/PW_Effect_Explosion_3 Variant.prefab +++ b/Assets/MyGame/aa/Game/XJMH/Boss/JiXieXie/PW_Effect_Explosion_3 Variant.prefab @@ -283,35 +283,38 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bjEndUI: {fileID: -382508373279050920, guid: 17dc9a98813d87f49ba228f1fdb93a53, type: 3} - useScorePanel: 1 - tMP_Score: {fileID: 0} - scorePanelPrefab: {fileID: 0} - currScore: 0 - maxScore: 0 - scoreCount: 0 + bjEndUIOffsetY: 150 posID: 0 paoBei: 0 fishScore: 0 bJbeishu: 0 + maxScore: 0 + startOffset: {x: 0, y: 0, z: -100} + isSelf: 0 + isScoreEnd: 0 + useScorePanel: 0 + tMP_Score: {fileID: 0} + scorePanelPrefab: {fileID: 0} + currScore: 0 + scoreCount: 0 + bigPrizeFishMode: 0 showDelay: 3 moveDuration: 0.5 moveEase: 6 - startOffset: {x: 0, y: 0, z: -100} - bjEndUIOffsetY: 150 coinFlyDuration: 0.5 coinArrivalInterval: 0.1 showAddScoreFX: 1 - isSelf: 0 autoFinishOnScoreFull: 1 totalBJCount: 0 currBJCount: 0 isEffEnd: 0 isScoreStart: 0 - isScoreEnd: 0 isGoldEffectStart: 0 config: {fileID: 11400000, guid: 4adb4d6d53ad6b74cabd5722c72c2d25, type: 2} chipCount: 10 minPartAmount: 1 + purpleBaseBeishu: 300 + splitConcentration: 1.4 gemAppearInterval: 0.03 spawnYRatio: 0.78 flyToCenterDuration: 0.8 @@ -320,6 +323,7 @@ MonoBehaviour: gridSpacingX: 120 gridRowGap: 160 flipInterval: 0.4 + flipEndDelay: 1 flyToSeatDuration: 0.6 gemGreenIndex: 0 gemBlueIndex: 1 diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/JiXieXie/PW_Enemy_3000.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/JiXieXie/PW_Enemy_3000.prefab index dc3161f06..84d557faa 100644 --- a/Assets/MyGame/aa/Game/XJMH/Boss/JiXieXie/PW_Enemy_3000.prefab +++ b/Assets/MyGame/aa/Game/XJMH/Boss/JiXieXie/PW_Enemy_3000.prefab @@ -143,10 +143,13 @@ MonoBehaviour: yzID: colliderList: [] lockPoint: {fileID: 0} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRouteFlipX: 1 baseMmove: 0 isRotate: 0 isNot1: 0 @@ -167,6 +170,7 @@ MonoBehaviour: v3: {x: 0, y: 0, z: 0} isLocalCoin: 0 killerSitPos: -1 + bossLifeTime: 30 --- !u!114 &8745352577998363756 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 114517790449158321, guid: 75d387735e7c6cb4d806a8603178a855, diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs index 2b05eb65b..9a207f197 100644 --- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs +++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs @@ -181,6 +181,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public Toggle toggle_Lock; public Toggle toggle_Three; public Toggle toggle_Shuang; + // ⭐ 双倍开火：toggle_Shuang 开启后计时 shuangDuration 秒自动关闭(DaoJiShi 驱动)， + // child0 的 Image(Filled 360°) 做环形倒计时显示（GetShuangFillImage 懒获取） + float shuangDuration = 15f; + public float currShuangTime = 0f; + private Image _shuangFillImage; public Toggle toggle_BaoZou; public TextMeshProUGUI tmp_BaoZouCount; public Image img_BaoZou; @@ -332,11 +337,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base } else { - // ⭐ 各游戏prefab未拖拽加减倍按钮时为null，做保护（XJMH座位没有该按钮） - if (item.btn_TurretAdd != null) - item.btn_TurretAdd.gameObject.SetActive(false); - if (item.btn_TurretMinus != null) - item.btn_TurretMinus.gameObject.SetActive(false); + // ⭐ 非本地座位隐藏加减炮倍：Normal 藏座位按钮（未拖引用为 null 跳过）， + // XJMH 藏炮台上的加减倍（TurretData.obj_Add / obj_Down） + item.HideTurretAddMinusUI(); // ⭐ 自动攻击开关与加减倍按钮一样：非本地座位隐藏 if (item.toggle_AutoAttack != null) item.toggle_AutoAttack.gameObject.SetActive(false); @@ -823,6 +826,26 @@ public class GameMainPanel_FishBase : GameMainPanel_Base GameManager.Instance.user.id, "40003", 0); }); + // ⭐ 双倍开火开关：开启(重新)计时 15 秒 + 满环开始倒计时，关闭停表清环。 + // isDouble 不需要同步开关状态：每次开火随 SyncFire 的 twoRTruect 传给服务端， + // 三处开火入口(TryFire/HandleAutoFire/OnFlyTurretUpwardFire)都实时读 isOn + if (toggle_Shuang != null) + { + toggle_Shuang.onValueChanged.AddListener(on => + { + var fill = GetShuangFillImage(); + if (on) + { + currShuangTime = shuangDuration; + if (fill != null) fill.fillAmount = 1f; + } + else + { + currShuangTime = 0f; + if (fill != null) fill.fillAmount = 0f; + } + }); + } @@ -2503,6 +2526,33 @@ public class GameMainPanel_FishBase : GameMainPanel_Base if (_bingFengInstance != null) _bingFengInstance.SetActive(false); } } + + // ⭐ 双倍开火倒计时：child0 的环形填充图(Image Filled 360°)随时间耗尽， + // 15 秒后自动关闭。SetIsOnWithoutNotify 不触发 onValueChanged(避免重置计时逻辑)； + // 关闭后三处开火入口读 isOn=false，后续 SyncFire 的 twoRTruect 自动恢复单倍 + if (toggle_Shuang != null && toggle_Shuang.isOn && shuangDuration > 0) + { + var fill = GetShuangFillImage(); + if (fill != null) + fill.fillAmount = Mathf.Clamp01(currShuangTime / shuangDuration); + + currShuangTime -= Time.deltaTime; + + if (currShuangTime <= 0) + { + toggle_Shuang.SetIsOnWithoutNotify(false); + currShuangTime = 0f; + if (fill != null) fill.fillAmount = 0f; + } + } + } + + /// toggle_Shuang.child0 的环形填充图(Image Filled 360°)，首次调用懒获取并缓存 + private Image GetShuangFillImage() + { + if (_shuangFillImage == null && toggle_Shuang != null && toggle_Shuang.transform.childCount > 0) + _shuangFillImage = toggle_Shuang.transform.GetChild(0).GetComponent(); + return _shuangFillImage; } #endregion @@ -4152,7 +4202,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base // （RoomChangeResponse 用户列表，RoomInfo 消息下发），按 userId 查询 var playerInfo = GameManager.Instance.gameData?.currRoomData?.players? .Find(p => p.userId == sit.user); - sit.SetUserInfo(sit.user, playerInfo?.userName, playerInfo?.avatar, playerInfo?.vipLevel ?? 0, playerInfo?.userNumber); + sit.SetUserInfo(sit.user, playerInfo?.userName, playerInfo?.avatar, playerInfo?.vipLevel ?? 0, + playerInfo?.userNumber, playerInfo?.level ?? 0, playerInfo?.exp ?? 0f); // ⭐ 记录金币流水：已加钱（进房设置初始金币，本地已执行） GameManager.LogGoldFlowAppliedGain("JoinGame", $"座位={sitNum} 初始金币={goldNum} 钻石={diamondNum} 炮台消耗={consumeGold} 房间={GameManager.Instance.gameData?.currRoomData?.roomId}"); diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab index 167c9ded7..80d8d62a4 100644 --- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab +++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab @@ -362,6 +362,8 @@ MonoBehaviour: idleIndexParam: IdleIndex fireIndex: 0 idleIndex: 0 + obj_Add: {fileID: 7218901645302023225} + obj_Down: {fileID: 6542138374165343523} --- !u!1 &448370382151683116 GameObject: m_ObjectHideFlags: 0 @@ -2611,6 +2613,8 @@ MonoBehaviour: idleIndexParam: IdleIndex fireIndex: 0 idleIndex: 0 + obj_Add: {fileID: 5793598482317687512} + obj_Down: {fileID: 7079531305881953847} --- !u!1 &2242422221712062153 GameObject: m_ObjectHideFlags: 0 @@ -3907,6 +3911,7 @@ MonoBehaviour: toggle_Lock: {fileID: 1095565694137767186} toggle_Three: {fileID: 557993769889242771} toggle_Shuang: {fileID: 6788830007509759241} + currShuangTime: 0 toggle_BaoZou: {fileID: 7018376083791635923} tmp_BaoZouCount: {fileID: 7639431059393200537} img_BaoZou: {fileID: 704441504674685449} @@ -4081,6 +4086,156 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2876098314891158200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6387983736414451045} + - component: {fileID: 7132202310369962278} + - component: {fileID: 1107085961548478999} + - component: {fileID: 2470197510833874295} + 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 &6387983736414451045 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2876098314891158200} + 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: 5051125627447431353} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 88.955, y: -41.68058} + m_SizeDelta: {x: 145.91, y: 83.3611} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7132202310369962278 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2876098314891158200} + m_CullTransparentMesh: 1 +--- !u!114 &1107085961548478999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2876098314891158200} + 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: New Text + 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: 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: 36 + m_fontSizeBase: 36 + 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: 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!114 &2470197510833874295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2876098314891158200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &3195561058214679262 GameObject: m_ObjectHideFlags: 0 @@ -4631,6 +4786,8 @@ MonoBehaviour: idleIndexParam: IdleIndex fireIndex: 0 idleIndex: 0 + obj_Add: {fileID: 2666824335004537571} + obj_Down: {fileID: 1792796439090489014} --- !u!1 &3712232115700564997 GameObject: m_ObjectHideFlags: 0 @@ -4773,6 +4930,8 @@ MonoBehaviour: idleIndexParam: IdleIndex fireIndex: 0 idleIndex: 0 + obj_Add: {fileID: 0} + obj_Down: {fileID: 0} takeoffAnim: flyLoopAnim: flyDuration: 0.6 @@ -4828,6 +4987,8 @@ MonoBehaviour: idleIndexParam: IdleIndex fireIndex: 0 idleIndex: 0 + obj_Add: {fileID: 4152865804266843820} + obj_Down: {fileID: 2459370714256853255} --- !u!1 &3734467322145035046 GameObject: m_ObjectHideFlags: 0 @@ -5075,6 +5236,42 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 0 +--- !u!1 &3923185502297022385 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7530737594881433190} + m_Layer: 5 + m_Name: BiaoQing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7530737594881433190 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3923185502297022385} + 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: 3282627621816497731} + m_Father: {fileID: 8019622945320605939} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -59, y: 105} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3938569826077464161 GameObject: m_ObjectHideFlags: 0 @@ -5218,6 +5415,8 @@ MonoBehaviour: idleIndexParam: IdleIndex fireIndex: 0 idleIndex: 0 + obj_Add: {fileID: 2641911827055036630} + obj_Down: {fileID: 2585300302372891818} --- !u!1 &3966380266866215544 GameObject: m_ObjectHideFlags: 0 @@ -5293,6 +5492,124 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3980075890905792529 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5051125627447431353} + - component: {fileID: 5499354681911254061} + - component: {fileID: 525484077301244210} + - component: {fileID: 4616053100707578666} + - component: {fileID: 5050457908392306627} + m_Layer: 5 + m_Name: WenZi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5051125627447431353 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3980075890905792529} + 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: 6387983736414451045} + m_Father: {fileID: 8019622945320605939} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -69.099976, y: 105.00001} + m_SizeDelta: {x: 181.91, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5499354681911254061 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3980075890905792529} + m_CullTransparentMesh: 1 +--- !u!114 &525484077301244210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3980075890905792529} + 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: d8ec08878eeaf7e49b3cb798efeae9e7, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4616053100707578666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3980075890905792529} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 1 + m_VerticalFit: 0 +--- !u!114 &5050457908392306627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3980075890905792529} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 16 + m_Right: 20 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &4142888621280387456 GameObject: m_ObjectHideFlags: 0 @@ -5960,6 +6277,8 @@ MonoBehaviour: idleIndexParam: IdleIndex fireIndex: 0 idleIndex: 0 + obj_Add: {fileID: 4508178292270846436} + obj_Down: {fileID: 8940839315860294475} --- !u!1 &4508178292270846436 GameObject: m_ObjectHideFlags: 0 @@ -7035,6 +7354,42 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5338753519626441518 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4487808903415790459} + m_Layer: 5 + m_Name: BiaoQing (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4487808903415790459 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5338753519626441518} + 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: 3640852211436091331} + m_Father: {fileID: 4415992113508979064} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -56.900024, y: 90.00001} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5465197065111961780 GameObject: m_ObjectHideFlags: 0 @@ -7853,6 +8208,8 @@ RectTransform: - {fileID: 1233422057346441001} - {fileID: 7085073037580773451} - {fileID: 7615908867748091854} + - {fileID: 7530737594881433190} + - {fileID: 5051125627447431353} m_Father: {fileID: 245637205031072731} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -7872,8 +8229,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 16cfaab69e1fa404dbb8432276bd7537, type: 3} m_Name: m_EditorClassIdentifier: - spineObj: {fileID: 0} - ziObj: {fileID: 0} + spineObj: {fileID: 3923185502297022385} + ziObj: {fileID: 3980075890905792529} btn_SelectPaoBei: {fileID: 0} selectPaoBeiPanel: {fileID: 0} paobeiItemPrefab: {fileID: 0} @@ -8079,6 +8436,8 @@ RectTransform: - {fileID: 2413956885708360307} - {fileID: 6653005916962043100} - {fileID: 5616506029895326100} + - {fileID: 2687761682467722475} + - {fileID: 4487808903415790459} m_Father: {fileID: 245637205031072731} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -8098,8 +8457,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 16cfaab69e1fa404dbb8432276bd7537, type: 3} m_Name: m_EditorClassIdentifier: - spineObj: {fileID: 0} - ziObj: {fileID: 0} + spineObj: {fileID: 5338753519626441518} + ziObj: {fileID: 7535913058969029298} btn_SelectPaoBei: {fileID: 0} selectPaoBeiPanel: {fileID: 0} paobeiItemPrefab: {fileID: 0} @@ -8433,6 +8792,8 @@ MonoBehaviour: idleIndexParam: IdleIndex fireIndex: 0 idleIndex: 0 + obj_Add: {fileID: 716188205867705744} + obj_Down: {fileID: 4652016079381531545} --- !u!1 &6110699967402531193 GameObject: m_ObjectHideFlags: 0 @@ -9704,6 +10065,97 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6992751343432837984 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3640852211436091331} + - component: {fileID: 7932609276773975186} + - component: {fileID: 4731554108893939069} + m_Layer: 5 + m_Name: BiaoQing (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3640852211436091331 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6992751343432837984} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 4487808903415790459} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7932609276773975186 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6992751343432837984} + m_CullTransparentMesh: 1 +--- !u!114 &4731554108893939069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6992751343432837984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 283c274e61f95194397402073efe8b1c, type: 2} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: bbb + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 --- !u!1 &7036475454652917956 GameObject: m_ObjectHideFlags: 0 @@ -10276,6 +10728,8 @@ MonoBehaviour: idleIndexParam: IdleIndex fireIndex: 0 idleIndex: 0 + obj_Add: {fileID: 6972981723818927919} + obj_Down: {fileID: 7632770156268954557} --- !u!1 &7218901645302023225 GameObject: m_ObjectHideFlags: 0 @@ -10792,6 +11246,124 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7535913058969029298 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2687761682467722475} + - component: {fileID: 5419776033616735320} + - component: {fileID: 2207302780825073500} + - component: {fileID: 5677159833454097191} + - component: {fileID: 3982542574475288957} + m_Layer: 5 + m_Name: WenZi (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2687761682467722475 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7535913058969029298} + 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: 6983850312207902834} + m_Father: {fileID: 4415992113508979064} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -67, y: 90} + m_SizeDelta: {x: 181.91, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5419776033616735320 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7535913058969029298} + m_CullTransparentMesh: 1 +--- !u!114 &2207302780825073500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7535913058969029298} + 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: d8ec08878eeaf7e49b3cb798efeae9e7, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5677159833454097191 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7535913058969029298} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 1 + m_VerticalFit: 0 +--- !u!114 &3982542574475288957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7535913058969029298} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 16 + m_Right: 20 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &7632770156268954557 GameObject: m_ObjectHideFlags: 0 @@ -12446,6 +13018,247 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8749652989991025509 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3282627621816497731} + - component: {fileID: 7975980080484684028} + - component: {fileID: 1105657279139889864} + m_Layer: 5 + m_Name: BiaoQing (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3282627621816497731 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8749652989991025509} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7530737594881433190} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7975980080484684028 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8749652989991025509} + m_CullTransparentMesh: 1 +--- !u!114 &1105657279139889864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8749652989991025509} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 283c274e61f95194397402073efe8b1c, type: 2} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: bbb + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 +--- !u!1 &8800987476502268818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6983850312207902834} + - component: {fileID: 4503221738664209609} + - component: {fileID: 5892092497735625754} + - component: {fileID: 8949028961727426246} + 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 &6983850312207902834 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8800987476502268818} + 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: 2687761682467722475} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 88.955, y: -41.68058} + m_SizeDelta: {x: 145.91, y: 83.3611} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4503221738664209609 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8800987476502268818} + m_CullTransparentMesh: 1 +--- !u!114 &5892092497735625754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8800987476502268818} + 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: New Text + 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: 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: 36 + m_fontSizeBase: 36 + 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: 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!114 &8949028961727426246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8800987476502268818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &8828026033782523779 GameObject: m_ObjectHideFlags: 0 @@ -12761,15 +13574,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6603774, g: 0.6603774, b: 0.6603774, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.5529412} 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_Sprite: {fileID: 21300000, guid: 5f61dc9638459a54f9deafcad4b6cba9, type: 3} + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -13124,7 +13937,7 @@ PrefabInstance: - target: {fileID: 3429558903206714841, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} @@ -13134,7 +13947,7 @@ PrefabInstance: - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6114408877341087527, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} @@ -13269,7 +14082,7 @@ PrefabInstance: - target: {fileID: 7125234996501131867, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7125234996501131867, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} diff --git a/Assets/MyGame/aa/UI/Game/左下.prefab b/Assets/MyGame/aa/UI/Game/左下.prefab index e7f3258ec..89660ad05 100644 --- a/Assets/MyGame/aa/UI/Game/左下.prefab +++ b/Assets/MyGame/aa/UI/Game/左下.prefab @@ -150,6 +150,95 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &151789417065334470 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2501852592714539457} + - component: {fileID: 2701583448577859658} + m_Layer: 0 + m_Name: Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2501852592714539457 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151789417065334470} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 9213791771909281229} + - {fileID: 9163417271774981327} + m_Father: {fileID: 4710570228793354968} + 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: 131.37505, y: -3.3250427} + m_SizeDelta: {x: 60, y: 12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2701583448577859658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151789417065334470} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 0} + m_FillRect: {fileID: 397833008454374056} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &213261970891505624 GameObject: m_ObjectHideFlags: 0 @@ -666,82 +755,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 570503617379538941} m_CullTransparentMesh: 1 ---- !u!1 &866009965387904772 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3796582310799277073} - - component: {fileID: 3634096452784061158} - - component: {fileID: 463101364850485396} - m_Layer: 0 - m_Name: "\u8FDB\u5EA6\u6761\u5730" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3796582310799277073 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866009965387904772} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6599412530834680981} - m_Father: {fileID: 4710570228793354968} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -8.6249695, y: -3.3250427} - m_SizeDelta: {x: 59, y: 11} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3634096452784061158 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866009965387904772} - m_CullTransparentMesh: 1 ---- !u!114 &463101364850485396 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866009965387904772} - 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: f78df629bc3cea249bfe765bb80141e2, 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 &916762197708610206 GameObject: m_ObjectHideFlags: 0 @@ -2148,81 +2161,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2267845634196581589 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6599412530834680981} - - component: {fileID: 2092874098819867927} - - component: {fileID: 8553250344073291929} - m_Layer: 0 - m_Name: "\u6761" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6599412530834680981 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2267845634196581589} - 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: 3796582310799277073} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -15.5, y: -0.5} - m_SizeDelta: {x: 28, y: 10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2092874098819867927 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2267845634196581589} - m_CullTransparentMesh: 1 ---- !u!114 &8553250344073291929 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2267845634196581589} - 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: e33c9398d0163144c9567a72b1f3fdba, 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 &2423142081813339218 GameObject: m_ObjectHideFlags: 0 @@ -2872,13 +2810,13 @@ RectTransform: m_Children: - {fileID: 973905160343307270} - {fileID: 7835193491978159751} - - {fileID: 3796582310799277073} + - {fileID: 2501852592714539457} m_Father: {fileID: 7609364501153394415} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 43.5, y: 77.49994} - m_SizeDelta: {x: 261, y: 37} + m_AnchoredPosition: {x: 34.5, y: 77.49994} + m_SizeDelta: {x: 279, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7598986287992324467 CanvasRenderer: @@ -2993,6 +2931,42 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3519498156901156696 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9163417271774981327} + m_Layer: 0 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9163417271774981327 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3519498156901156696} + 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: 397833008454374056} + m_Father: {fileID: 2501852592714539457} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 2.5, y: 0} + m_SizeDelta: {x: -5, y: 6} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3553224552234172136 GameObject: m_ObjectHideFlags: 0 @@ -3405,9 +3379,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4710570228793354968} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -52.5, y: -2.7000427} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 216.8, y: -2.7000427} m_SizeDelta: {x: 87, y: 13} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2271467992873135901 @@ -4055,6 +4029,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6321793987731802364 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9213791771909281229} + - component: {fileID: 3751734414891338564} + - component: {fileID: 3697211720079586913} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9213791771909281229 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6321793987731802364} + 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: 2501852592714539457} + 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.062600136} + m_SizeDelta: {x: 0, y: -2.1269} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3751734414891338564 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6321793987731802364} + m_CullTransparentMesh: 1 +--- !u!114 &3697211720079586913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6321793987731802364} + 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: f78df629bc3cea249bfe765bb80141e2, 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 &6481819140571940076 GameObject: m_ObjectHideFlags: 0 @@ -5745,7 +5794,7 @@ GameObject: m_Component: - component: {fileID: 7835193491978159751} - component: {fileID: 4580168597633069950} - - component: {fileID: 3204247540150277790} + - component: {fileID: 8897278052107138521} m_Layer: 0 m_Name: LV:21 m_TagString: Untagged @@ -5767,10 +5816,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4710570228793354968} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -73, y: -2.7} - m_SizeDelta: {x: 38, y: 12} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 67.5, y: -1.9819} + m_SizeDelta: {x: 38, y: 13.149} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4580168597633069950 CanvasRenderer: @@ -5780,7 +5829,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8715748350172511410} m_CullTransparentMesh: 1 ---- !u!114 &3204247540150277790 +--- !u!114 &8897278052107138521 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5789,7 +5838,7 @@ MonoBehaviour: m_GameObject: {fileID: 8715748350172511410} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -5800,16 +5849,76 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dfad6d04aec8344468ffd7b3c3fffcc8, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_text: LV:211 + 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: 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: 16.25 + m_fontSizeBase: 16.25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + 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 &8722353448971975848 GameObject: m_ObjectHideFlags: 0 @@ -6014,6 +6123,8 @@ MonoBehaviour: user: tmp_UserNumber: {fileID: 1804455107074044710} tmp_UserName: {fileID: 2853228117627657869} + tmp_UserLevel: {fileID: 8897278052107138521} + slider_UserLevelEXP: {fileID: 2701583448577859658} img_Head: {fileID: 1453585280564476710} img_Vip: {fileID: 0} sprite_VipList: @@ -6066,6 +6177,81 @@ MonoBehaviour: JGFXLeftParent: {fileID: 2149982692187042854} JGFXRightParent: {fileID: 5292304484277486404} biaoQingDuration: 3 +--- !u!1 &8840001006222499998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 397833008454374056} + - component: {fileID: 8723785260067974101} + - component: {fileID: 2094186785616168593} + m_Layer: 0 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &397833008454374056 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8840001006222499998} + 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: 9163417271774981327} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -2.8022, y: 0.034800053} + m_SizeDelta: {x: 5.6044, y: -2.1355} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8723785260067974101 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8840001006222499998} + m_CullTransparentMesh: 1 +--- !u!114 &2094186785616168593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8840001006222499998} + 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: e33c9398d0163144c9567a72b1f3fdba, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8920975059421097852 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Home/Sub/RankPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/RankPanel.prefab index b432254b6..a07863a4f 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/RankPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/RankPanel.prefab @@ -3943,7 +3943,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6915133228241666243} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: @@ -4068,8 +4068,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2dae17c3f3238644694b12e66eb98eb6, type: 2} - m_Type: 0 + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/MyGame/aa/UI/Home/Sub/VIPPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/VIPPanel.prefab index 83018b5f0..603479235 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/VIPPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/VIPPanel.prefab @@ -3607,8 +3607,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2dae17c3f3238644694b12e66eb98eb6, type: 2} - m_Type: 0 + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab b/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab index 8caaf4d6d..bddec37b1 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab @@ -11215,8 +11215,8 @@ RectTransform: m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6347363921804520606} - {fileID: 3762389931883143099} + - {fileID: 6347363921804520606} m_Father: {fileID: 4805843542476982587} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -13100,7 +13100,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6347363921804520606 RectTransform: m_ObjectHideFlags: 0 @@ -13117,8 +13117,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 382.1291, y: 0} + m_SizeDelta: {x: -764.2581, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1902607958090717157 CanvasRenderer: @@ -13150,16 +13150,15 @@ MonoBehaviour: m_Calls: [] m_text: 123456789 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} - m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, - type: 2} + m_fontAsset: {fileID: 11400000, guid: 7cb7af7685a457443a295fdaa17beeea, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: a407b419f8c2f204ca3540b6dc7b51bd, 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} + rgba: 4290115837 + m_fontColor: {r: 0.9921569, g: 0.9725491, b: 0.70980394, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -13176,14 +13175,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 44.66 - m_fontSizeBase: 44.66 + m_fontSize: 96.6 + m_fontSizeBase: 96.6 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_fontStyle: 1 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -13212,7 +13211,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: 111.34, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/GongGao.mat b/Assets/TextMesh Pro/Resources/Fonts & Materials/GongGao.mat new file mode 100644 index 000000000..57853f016 --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/GongGao.mat @@ -0,0 +1,112 @@ +%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: GongGao + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - GLOW_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: + - _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} + - _FaceTex: + m_Texture: {fileID: 2800000, guid: d9574ed699990a447ba707410faefb75, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: -5781150936191496100, guid: 7cb7af7685a457443a295fdaa17beeea, + type: 2} + 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} + m_Ints: [] + m_Floats: + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BumpFace: 0 + - _BumpOutline: 0 + - _ColorMask: 15 + - _CullMode: 0 + - _Diffuse: 0.5 + - _FaceDilate: -0.131 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlowInner: 1 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 3 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0.287 + - _PerspectiveFilter: 0.875 + - _Reflectivity: 10 + - _ScaleRatioA: 0.6666667 + - _ScaleRatioB: 0.42066666 + - _ScaleRatioC: 0.42066666 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _SpecularPower: 2 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 512 + - _TextureWidth: 512 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 2 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1.0566038, g: 1.0566038, b: 1.0566038, a: 1} + - _GlowColor: {r: 0.125, g: 0.01602005, b: 0, a: 0.5372549} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0.40899786, g: 0.63681936, b: 0.9528302, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, 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/GongGao.mat.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials/GongGao.mat.meta new file mode 100644 index 000000000..c0fa32de4 --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/GongGao.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a407b419f8c2f204ca3540b6dc7b51bd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/SourceHanSans SDF.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/SourceHanSans SDF.asset index cef32307e..d7d191e19 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/SourceHanSans SDF.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/SourceHanSans SDF.asset @@ -10535,6 +10535,21 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 + - m_Index: 11755 + m_Metrics: + m_Width: 25.609375 + m_Height: 26.28125 + m_HorizontalBearingX: 1.015625 + m_HorizontalBearingY: 24.25 + m_HorizontalAdvance: 29 + m_GlyphRect: + m_X: 378 + m_Y: 1275 + m_Width: 26 + m_Height: 28 + m_Scale: 1 + m_AtlasIndex: 1 + m_ClassDefinitionType: 0 - m_Index: 11758 m_Metrics: m_Width: 26.0625 @@ -106595,21 +106610,6 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 - - m_Index: 11755 - m_Metrics: - m_Width: 25.609375 - m_Height: 26.28125 - m_HorizontalBearingX: 1.015625 - m_HorizontalBearingY: 24.25 - m_HorizontalAdvance: 29 - m_GlyphRect: - m_X: 378 - m_Y: 1275 - m_Width: 26 - m_Height: 28 - m_Scale: 1 - m_AtlasIndex: 1 - m_ClassDefinitionType: 0 m_CharacterTable: - m_ElementType: 1 m_Unicode: 32 @@ -109387,6 +109387,10 @@ MonoBehaviour: m_Unicode: 21367 m_GlyphIndex: 11753 m_Scale: 1 + - m_ElementType: 1 + m_Unicode: 21368 + m_GlyphIndex: 11755 + m_Scale: 1 - m_ElementType: 1 m_Unicode: 21370 m_GlyphIndex: 11758 @@ -135003,10 +135007,6 @@ MonoBehaviour: m_Unicode: 65509 m_GlyphIndex: 59218 m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 21368 - m_GlyphIndex: 11755 - m_Scale: 1 m_AtlasTextures: - {fileID: -5242640295693195929} - {fileID: -4985352658726325108} diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/XJMHSkill.mat b/Assets/TextMesh Pro/Resources/Fonts & Materials/XJMHSkill.mat index a7fb12887..dc96384d6 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/XJMHSkill.mat +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/XJMHSkill.mat @@ -133,7 +133,7 @@ Material: - _DstBlend: 0 - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - - _FaceDilate: -0.045 + - _FaceDilate: 0.1 - _FaceUVSpeedX: 0 - _FaceUVSpeedY: 0 - _GlossMapScale: 0 @@ -152,15 +152,15 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.268 + - _OutlineWidth: 0.274 - _Parallax: 0.005 - _PerspectiveFilter: 0.875 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Reflectivity: 10 - _ScaleRatioA: 0.9 - - _ScaleRatioB: 0.82799995 - - _ScaleRatioC: 0.82799995 + - _ScaleRatioB: 0.6975 + - _ScaleRatioC: 0.6975 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 @@ -199,7 +199,7 @@ Material: - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _GlowColor: {r: 0.14126332, g: 0.89626956, b: 0.9559735, a: 1} - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} - - _OutlineColor: {r: 0.14126332, g: 0.89626956, b: 0.9559735, a: 1} + - _OutlineColor: {r: 0.19103774, g: 0.42806768, b: 0.5, 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} diff --git a/Assets/UIResources/Game/场内游戏金币框/jinbikuang_yangcheng.png.meta b/Assets/UIResources/Game/场内游戏金币框/jinbikuang_yangcheng.png.meta index b71531d37..4b8c2f93e 100644 --- a/Assets/UIResources/Game/场内游戏金币框/jinbikuang_yangcheng.png.meta +++ b/Assets/UIResources/Game/场内游戏金币框/jinbikuang_yangcheng.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 60, y: 0, z: 28, w: 0} + spriteBorder: {x: 53, y: 0, z: 14, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/UIResources/Game/场内游戏金币框/条.png.meta b/Assets/UIResources/Game/场内游戏金币框/条.png.meta index bdd7d0d1b..16659ddff 100644 --- a/Assets/UIResources/Game/场内游戏金币框/条.png.meta +++ b/Assets/UIResources/Game/场内游戏金币框/条.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 3, y: 0, z: 4, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -139,7 +139,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: []