From 1a36f70de4f7ff71cf33c8c4473493796b223d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Sun, 27 Sep 2026 15:47:27 +0800 Subject: [PATCH] 1 --- .../Windows/addressables_content_state.bin | Bin 4130 -> 4130 bytes Assets/Art/FengLei/ResLY/Texture/baozang.png | Bin 0 -> 9216 bytes .../FengLei/ResLY/Texture/baozang.png.meta | 153 ++++++++++++++++++ Assets/Art/FengLei/ResLY/Texture/宝藏.png | Bin 0 -> 3548 bytes .../Art/FengLei/ResLY/Texture/宝藏.png.meta | 153 ++++++++++++++++++ Assets/MyGame/Scenes/UIScene.unity | 98 ++++++++--- .../Characters/Monster/MonsterContral.cs | 9 ++ .../Characters/Monster/MonsterMoveLine.cs | 90 ++++------- .../Scripts/Net/WebSocketManager_Message.cs | 1 + .../Game/HHWK/Fish/Fish_2011 Variant.prefab | 18 ++- .../Game/HHWK/Fish/Fish_2013 Variant.prefab | 20 ++- .../Game/HHWK/Fish/fish_1022 Variant.prefab | 12 +- .../Game/HHWK/Fish/fish_2010 Variant.prefab | 2 +- .../Game/HHWK/Fish/fish_3003 Variant.prefab | 30 +++- .../DefaultPanel/BossBoardCarstGongGao.prefab | 10 +- .../aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab | 9 +- .../aa/UI/Game/GameMainPanel_FishBase.cs | 36 +++++ .../aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab | 31 +++- Assets/MyGame/aa/UI/Game/右上.prefab | 90 +++++++++++ Assets/MyGame/aa/UI/Game/左上.prefab | 90 +++++++++++ Assets/MyGame/aa/UI/Game/左下.prefab | 34 ++-- Assets/MyGame/aa/UI/Home/MainPanel.prefab | 73 ++++++--- .../MyGame/aa/UI/Home/Sub/UISignView.prefab | 82 +++++----- 23 files changed, 864 insertions(+), 177 deletions(-) create mode 100644 Assets/Art/FengLei/ResLY/Texture/baozang.png create mode 100644 Assets/Art/FengLei/ResLY/Texture/baozang.png.meta create mode 100644 Assets/Art/FengLei/ResLY/Texture/宝藏.png create mode 100644 Assets/Art/FengLei/ResLY/Texture/宝藏.png.meta diff --git a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin index 7e42c64b7668637f79abd23cff181c2ecd19b759..cbdec3f16cdb30c6b25ab7a6adc61d6c7f5652bf 100644 GIT binary patch delta 350 zcmajZtx5$!6aZj$FX+X~b&J7Z7`dBFbI$ynnYK}bRV){rzXic+G1v`a7z7p57O@Ef z1~vHtHbGzD24BKQ*zXCxfeq~CV#26T7$SPBwFUA>J=g@vaBmY?Y0AUore-oJO(Mw% zh(?lg0LD17K?w~~Ksi`@uNaTU5JmymYaktZjKKvflm``i<#Ic{WLzQVutG}PTKD(|y%I)l_YR7`#U(2I>GVkiw=Q7Nb~&|1Iw{+wE9;b$Wi6kDIRA$oI|FKLuZ9TmS$7 delta 350 zcmajZJxT;I7{+lk3%anZ(^v>vL`b{Kn`Dx_>89NS2wR%ZLa?zE++IN}f`wa7BUlM3 z?erF2z}^!$H<BOFD|^ zHFqf~<8#nD+JG)&-5h=rs+^M;5L~n}Adk5l&rFhIls(V3u=$RvV7$>DQZiD2b5>cw zJ Y`&~J2PuUb(eP3UeZQGNB^4dQ90}MxI9{>OV diff --git a/Assets/Art/FengLei/ResLY/Texture/baozang.png b/Assets/Art/FengLei/ResLY/Texture/baozang.png new file mode 100644 index 0000000000000000000000000000000000000000..e71e7b072a803cb838ba8a147dff1a6ddbbb4157 GIT binary patch literal 9216 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 WyRTp?1DI+60000C4+0*;ocJ-9i5DDwn_CLP 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 0) rollZ = 180f - rollZ; + } child.rotation = Quaternion.Euler(-heading + 180f, 90f, rollZ); } @@ -1065,6 +1070,10 @@ public class MonsterContral : MonoBehaviour { rollZ = -rotationPY; if (useMirrorCompensate && _routeDirX > 0) rollZ = 180f - rollZ; + //if (fishTypeID==13018) + //{ + // Debug.Log("rollZ"+ rollZ+ "---rotationPY"+rotationPY); + //} } transform.rotation = Quaternion.Euler(-heading + 180f, 90f, rollZ); } diff --git a/Assets/MyGame/Scripts/Characters/Monster/MonsterMoveLine.cs b/Assets/MyGame/Scripts/Characters/Monster/MonsterMoveLine.cs index 5d7cbb52a..44be0af6d 100644 --- a/Assets/MyGame/Scripts/Characters/Monster/MonsterMoveLine.cs +++ b/Assets/MyGame/Scripts/Characters/Monster/MonsterMoveLine.cs @@ -83,8 +83,8 @@ public class MonsterMoveLine /// private static void BuildCurvePointsArray(BezierCurveData curve) { - if (_curvePointsArrays.ContainsKey(curve.name)) return; - + // ⭐ 无条件覆盖重建：同名曲线被覆盖时，点数组/节点缓存必须同步重建， + // 否则字典指向新曲线、缓存还是旧曲线的点 → 路线错乱 int total = 2 + curve.controlPoints.Count; // start + controls + end Vector2[] arr = new Vector2[total]; arr[0] = curve.start; @@ -123,6 +123,12 @@ public class MonsterMoveLine public static async Task LoadBezierTxtAsync(string path) { + // ⭐ 加载前先全量清空上一场的路线缓存： + // 各玩法普通路线/鱼阵曲线名完全重名（曲线1~N、鱼阵N）但坐标不同， + // 不清场会把上一玩法的同名坐标带进本场 → 路线错乱（如 HHWK 残留导致 FLZY 鱼按旧路线游）； + // 旧玩法独有的 Boss 路线也会残留越积越多。进游戏只需要当前玩法的路线。 + ClearAllBezierCache(); + List keys = new List(); keys.Add(path); keys.Add(GameManager.Instance.gameData.currGameType.ToString()); @@ -131,7 +137,7 @@ public class MonsterMoveLine keys, null, Addressables.MergeMode.Intersection); await handles.Task; - // ⭐ 没有资源 → 直接跳出，不报错 + // ⭐ 没有资源 → 直接跳出，不报错（缓存已清空，保持干净状态） if (handles.Result == null || handles.Result.Count == 0) { Debug.LogWarning($"Bezier 曲线加载跳过：未找到标签 {path} + {GameManager.Instance.gameData.currGameType}"); @@ -173,13 +179,10 @@ public class MonsterMoveLine curves.Add(curve); - // 不覆盖旧数据 - if (!dic_BezierCurveDatas.ContainsKey(curve.name)) - { - dic_BezierCurveDatas.Add(curve.name, curve); - // ⭐ 同步构建点数组缓存（批量加载路径） - BuildCurvePointsArray(curve); - } + // ⭐ 同名直接覆盖（清场后理论上无重复，防御性覆盖确保永远用当前玩法数据） + dic_BezierCurveDatas[curve.name] = curve; + // ⭐ 同步构建点数组缓存（批量加载路径） + BuildCurvePointsArray(curve); } } @@ -189,58 +192,25 @@ public class MonsterMoveLine public static async Task UnLoadBezierTxtAsync(string path) { - List keys = new List(); - keys.Add(path); - keys.Add(GameManager.Instance.gameData.currGameType.ToString()); - - AsyncOperationHandle> handles = Addressables.LoadAssetsAsync( - keys, null, Addressables.MergeMode.Intersection); - await handles.Task; - - // ⭐ 没有资源 → 直接跳出，不报错 - if (handles.Result == null || handles.Result.Count == 0) - { - Debug.LogWarning($"Bezier 曲线卸载跳过：未找到标签 {path} + {GameManager.Instance.gameData.currGameType}"); - Addressables.Release(handles); - return; - } - - foreach (var text in handles.Result) - { - var lines = text.text.Split('\n'); - foreach (var line in lines) - { - if (string.IsNullOrWhiteSpace(line)) - continue; - - var parts = line.Split(';'); - if (parts.Length == 0) - continue; - - string curveName = parts[0]; - if (string.IsNullOrWhiteSpace(curveName)) - continue; - - // 字典存在才移除 - if (dic_BezierCurveDatas.ContainsKey(curveName)) - { - dic_BezierCurveDatas.Remove(curveName); - } - - // ⭐ 同步清理点数组缓存 - _curvePointsArrays.Remove(curveName); - - // ⭐ 同步清理 B样条节点向量缓存 - _curveKnotArrays.Remove(curveName); - - // 列表移除所有同名曲线 - curves.RemoveAll(c => c.name == curveName); - } - } - - Addressables.Release(handles); + // ⭐ 全量同步清空，不再按 currGameType 重查 Addressables 删除： + // 1. 卸载依赖 currGameType 有时序风险 —— 选房面板在玩家点选新玩法时就改了全局类型， + // 延迟执行的卸载（OnHide 补卸载/异常重跑）会按新玩法 txt 去删 → 旧玩法 Boss 路线全部残留； + // 甚至可能把新玩法刚加载的路线误删。 + // 2. 原实现标签查询为空时静默 return，什么都清不掉。 + // 卸载只发生在离房时，场上只有当前玩法的路线，直接全清最干净且无竞态。 + ClearAllBezierCache(); Debug.Log("曲线卸载完成，剩余曲线数量：" + dic_BezierCurveDatas.Count); + await Task.CompletedTask; + } + + /// 全量清空路线缓存（曲线字典/列表 + 点数组缓存 + B样条节点缓存） + private static void ClearAllBezierCache() + { + dic_BezierCurveDatas.Clear(); + curves.Clear(); + _curvePointsArrays.Clear(); + _curveKnotArrays.Clear(); } private static Vector2 ParseVector(string s) diff --git a/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs b/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs index d8c9e86b1..450752436 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs @@ -613,6 +613,7 @@ namespace Assets.MyGame.Scripts.Net case 1009: // 金币参数超出范围 case 1012: // 道具配置不存在 case 1015: // 炮倍参数无效 + break; default: // 0=未知错误 UIManager.Instance.ShowBoardError(ex.message); break; diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab index 9781f5223..06e52f9f9 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab @@ -303,6 +303,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -0 objectReference: {fileID: 0} + - target: {fileID: 4946936116752871, guid: e8de1e789364d344f862d822074c3f90, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4946936116752871, guid: e8de1e789364d344f862d822074c3f90, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4946936116752871, guid: e8de1e789364d344f862d822074c3f90, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4946936116752871, guid: e8de1e789364d344f862d822074c3f90, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 114969106005120503, guid: e8de1e789364d344f862d822074c3f90, type: 3} - {fileID: 135726790013014859, guid: e8de1e789364d344f862d822074c3f90, type: 3} @@ -686,7 +702,7 @@ MonoBehaviour: - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} - rotationPY: 90 + rotationPY: 60 useMirrorCompensate: 1 useRollSignFlip: 0 useRouteFlipX: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab index f5d3d8de0..391a9e197 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab @@ -386,13 +386,13 @@ MonoBehaviour: - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} - rotationPY: 90 + rotationPY: 60 useMirrorCompensate: 1 useRollSignFlip: 0 useRouteFlipX: 0 baseMmove: 0 isRotate: 1 - isNot1: 0 + isNot1: 1 ischild0: 1 depthOffset: 860 is2DFish: 0 @@ -864,6 +864,22 @@ PrefabInstance: propertyPath: m_TagString value: Fish objectReference: {fileID: 0} + - target: {fileID: 4436073260064126, guid: b3920823ccb1c1c42b1627122ebc589b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4436073260064126, guid: b3920823ccb1c1c42b1627122ebc589b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4436073260064126, guid: b3920823ccb1c1c42b1627122ebc589b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4436073260064126, guid: b3920823ccb1c1c42b1627122ebc589b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4632746491512912, guid: b3920823ccb1c1c42b1627122ebc589b, type: 3} propertyPath: m_LocalPosition.x value: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab index caf25b7f8..d323c8bbe 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab @@ -285,23 +285,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalRotation.w - value: 0.5 + value: 0.60419357 objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalRotation.x - value: -0.5 + value: -0.60419357 objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalRotation.y - value: 0.5 + value: 0.36735559 objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalRotation.z - value: 0.5 + value: -0.36735559 objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -90 + value: -27.4 objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -309,7 +309,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0 + value: -90 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 114884547391421755, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab index 2a1726b48..87a9ca48a 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab @@ -344,7 +344,7 @@ MonoBehaviour: createVideoClip: {fileID: 0} rotationPY: 90 useMirrorCompensate: 1 - useRollSignFlip: 0 + useRollSignFlip: 1 useRouteFlipX: 0 baseMmove: 0 isRotate: 1 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab index 5fa095aa3..e2a55b74e 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab @@ -220,6 +220,34 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4371939378208658, guid: a87bdbcfa12d35644b5c34825a6e6591, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4371939378208658, guid: a87bdbcfa12d35644b5c34825a6e6591, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4371939378208658, guid: a87bdbcfa12d35644b5c34825a6e6591, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4371939378208658, guid: a87bdbcfa12d35644b5c34825a6e6591, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4371939378208658, guid: a87bdbcfa12d35644b5c34825a6e6591, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4371939378208658, guid: a87bdbcfa12d35644b5c34825a6e6591, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4371939378208658, guid: a87bdbcfa12d35644b5c34825a6e6591, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4918264173551851, guid: a87bdbcfa12d35644b5c34825a6e6591, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -724,7 +752,7 @@ MonoBehaviour: - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} - rotationPY: 90 + rotationPY: 60 useMirrorCompensate: 1 useRollSignFlip: 0 useRouteFlipX: 0 diff --git a/Assets/MyGame/aa/UI/DefaultPanel/BossBoardCarstGongGao.prefab b/Assets/MyGame/aa/UI/DefaultPanel/BossBoardCarstGongGao.prefab index 71987edf0..59c238f35 100644 --- a/Assets/MyGame/aa/UI/DefaultPanel/BossBoardCarstGongGao.prefab +++ b/Assets/MyGame/aa/UI/DefaultPanel/BossBoardCarstGongGao.prefab @@ -205,7 +205,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: -6.8, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -261,8 +261,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: 2.611908, y: -1.0000019} - m_SizeDelta: {x: -141.938, y: 0} + m_AnchoredPosition: {x: 1.9764099, y: -1.0000019} + m_SizeDelta: {x: -186.4173, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &670689317359163242 CanvasRenderer: @@ -351,8 +351,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -5.9392, y: -94.737915} - m_SizeDelta: {x: 561.2, y: 45.4758} + m_AnchoredPosition: {x: -5.9392, y: -79} + m_SizeDelta: {x: 756.41, y: 45.4758} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4157826458431261933 CanvasRenderer: diff --git a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab index 6b0b4da42..f92923944 100644 --- a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab +++ b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab @@ -4647,7 +4647,7 @@ PrefabInstance: - target: {fileID: 531956785893877782, guid: 78d0ab279487b3d449ab990658edac74, type: 3} propertyPath: m_AnchoredPosition.x - value: -399.3 + value: -400 objectReference: {fileID: 0} - target: {fileID: 531956785893877782, guid: 78d0ab279487b3d449ab990658edac74, type: 3} @@ -6127,7 +6127,7 @@ PrefabInstance: - target: {fileID: 8456731491629334137, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_AnchoredPosition.x - value: -399.30005 + value: -400 objectReference: {fileID: 0} - target: {fileID: 8456731491629334137, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} @@ -6190,6 +6190,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8080891624328096898} m_Modifications: + - target: {fileID: 992911195842070766, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -8.900024 + objectReference: {fileID: 0} - target: {fileID: 2075051064728197762, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, type: 3} propertyPath: m_Name diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs index b0884ffa2..45de1588d 100644 --- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs +++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs @@ -1116,8 +1116,22 @@ public class GameMainPanel_FishBase : GameMainPanel_Base #endregion #region 资源加载模块 + + /// + /// ⭐ 资源流程令牌（static：新老游戏面板实例共享，GameMainPanel_FishBase 一脉）。 + /// 每次 LoadResources / 卸载流程启动时递增并捕获；async 恢复后若令牌已变， + /// 说明期间已有新一轮流程启动（加载中退出、旧面板延迟卸载撞上新面板加载等）， + /// 本轮残留流程必须立即终止 —— 否则旧加载流程会在卸载完成后继续 + /// EnterRoom/出鱼/置位 isResources，把已退出房间的出鱼系统重新武装， + /// 污染下一个房间的鱼和路线（跨玩法路线混乱的流程层根源）。 + /// + private static int _resourceFlowToken = 0; + public async void LoadResources() { + // ⭐ 捕获本轮令牌：同时使之前所有在途的加载/卸载残留流程作废 + int flow = ++_resourceFlowToken; + // ⭐ 切换房间：隐藏新面板自带的进度条，继续用离房时留下的合并进度条 // （挂在 uiRoot、盖在最上层），避免"退出+加入"显示两条进度条 if (_changeRoomBar != null) @@ -1129,23 +1143,29 @@ public class GameMainPanel_FishBase : GameMainPanel_Base // ⭐ 重置卸载标记，下次进入可重新加载 _resourcesUnloaded = false; await AudioResourcesData.LoadAudioGame(); + if (flow != _resourceFlowToken) return; // ⭐ 期间已退出/切换，本轮作废 SetLoadProgress(0.2f); await MonsterMoveLine.LoadBezier(); + if (flow != _resourceFlowToken) return; SetLoadProgress(0.4f); await FishResourcesData.LoadFishAssetsData(); + if (flow != _resourceFlowToken) return; SetLoadProgress(0.6f); await Addressables.LoadAssetsAsync("Audio", clip => { + if (flow != _resourceFlowToken) return; // 残留流程不再写面板字段 if (clip.name == "PW_Shoot") bulletClip = clip; }).Task; + if (flow != _resourceFlowToken) return; SetLoadProgress(0.8f); await Task.Delay(100); + if (flow != _resourceFlowToken) return; CreateFishManager.Instance.EnterRoom(gameType); @@ -1174,9 +1194,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base GameManager.Instance.gameData.currRoomData.activeFishes = null; } await Task.Delay(2000); + if (flow != _resourceFlowToken) return; // ⭐ 2秒等待期间退出的情况最多，必须拦 SetLoadProgress(1); await Task.Delay(300); + if (flow != _resourceFlowToken) return; // ⭐ 切换房间：合并进度条走完 → 隐藏并销毁；平时隐藏面板自己的进度条 if (_changeRoomBar != null) @@ -1191,11 +1213,18 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public async void UnLoadResources() { if (_resourcesUnloaded) return; + // ⭐ 捕获本轮令牌：同时使在途的加载流程作废（OnHide 卸载意味着本房加载不应再继续）； + // 已卸载时提前 return 不动令牌，避免误杀新面板正在进行的加载 + int flow = ++_resourceFlowToken; + CreateFishManager.Instance.ExitRoom(); CreateFishManager.Instance.isResources = false; await FishResourcesData.UnLoadFishAssetsData(); + if (flow != _resourceFlowToken) return; // ⭐ 期间已有新流程（新面板加载），剩余卸载作废 await AudioResourcesData.UnLoadAudioGame(); + if (flow != _resourceFlowToken) return; await MonsterMoveLine.UnLoadBezier(); + if (flow != _resourceFlowToken) return; // ⭐ 清空子弹池 + 特效池（鱼池已在 UnLoadFishAssetsData 内清理） BulletPool.Instance.ClearAll(); EffectPool.Instance.ClearAll(); @@ -1245,6 +1274,13 @@ public class GameMainPanel_FishBase : GameMainPanel_Base return; } + // ⭐ 使在途的 LoadResources 立即作废（加载中退出的场景）： + // 否则残留加载流程会在卸载完成后继续 EnterRoom/出鱼/置位 isResources， + // 把已退出房间的出鱼系统重新武装，污染下一个房间的鱼和路线。 + // 本流程不再加恢复检查：期间不可能有新加载启动（home 在 finally 之后才显示）， + // 且必须完整走完（finally 关面板切 home），保证退出流程不被打断。 + _resourceFlowToken++; + try { if (JinDuTiao != null) JinDuTiao.Show(); diff --git a/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab b/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab index b53f509be..bc94b62d2 100644 --- a/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab +++ b/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab @@ -4596,12 +4596,12 @@ PrefabInstance: - target: {fileID: 531956785893877782, guid: 78d0ab279487b3d449ab990658edac74, type: 3} propertyPath: m_AnchoredPosition.x - value: -396.30005 + value: -400 objectReference: {fileID: 0} - target: {fileID: 531956785893877782, guid: 78d0ab279487b3d449ab990658edac74, type: 3} propertyPath: m_AnchoredPosition.y - value: -186.59003 + value: -190.24 objectReference: {fileID: 0} - target: {fileID: 531956785893877782, guid: 78d0ab279487b3d449ab990658edac74, type: 3} @@ -4753,6 +4753,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3143871120987220581, guid: 78d0ab279487b3d449ab990658edac74, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 356.00006 + objectReference: {fileID: 0} - target: {fileID: 3257416574651221545, guid: 78d0ab279487b3d449ab990658edac74, type: 3} propertyPath: m_SortingLayer @@ -5043,6 +5048,16 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 6708146167536542185, guid: 78d0ab279487b3d449ab990658edac74, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6708146167536542185, guid: 78d0ab279487b3d449ab990658edac74, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6819505804973323004, guid: 78d0ab279487b3d449ab990658edac74, type: 3} propertyPath: m_SortingLayer @@ -6375,6 +6390,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 6333265975610226044, guid: 94d3fc7f95c28da4ca340a4f561c8b5d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 168.3 + objectReference: {fileID: 0} - target: {fileID: 6457399759500822375, guid: 94d3fc7f95c28da4ca340a4f561c8b5d, type: 3} propertyPath: m_SortingLayer @@ -7294,7 +7314,7 @@ PrefabInstance: - target: {fileID: 8456731491629334137, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_AnchoredPosition.x - value: -399.30005 + value: -400 objectReference: {fileID: 0} - target: {fileID: 8456731491629334137, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} @@ -7747,6 +7767,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8080891624328096898} m_Modifications: + - target: {fileID: 992911195842070766, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -8.900024 + objectReference: {fileID: 0} - target: {fileID: 2075051064728197762, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, type: 3} propertyPath: m_Name diff --git a/Assets/MyGame/aa/UI/Game/右上.prefab b/Assets/MyGame/aa/UI/Game/右上.prefab index 7aa129364..66784a84b 100644 --- a/Assets/MyGame/aa/UI/Game/右上.prefab +++ b/Assets/MyGame/aa/UI/Game/右上.prefab @@ -18,6 +18,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 67770134780427119, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 18.799938 + objectReference: {fileID: 0} - target: {fileID: 271272466032533888, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer @@ -28,21 +33,41 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 408368242857714059, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 22.699947 + objectReference: {fileID: 0} - target: {fileID: 445869218037981981, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 532242058726479889, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 18.799938 + objectReference: {fileID: 0} - target: {fileID: 583385851353875695, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 626320242793571373, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 18.799938 + objectReference: {fileID: 0} - target: {fileID: 700620470412138326, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 777875199350172899, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 18.799938 + objectReference: {fileID: 0} - target: {fileID: 803496181402112815, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer @@ -158,6 +183,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 1249527017143906131, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 18.799938 + objectReference: {fileID: 0} - target: {fileID: 1406382055824919916, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer @@ -253,6 +283,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 2687123096174394835, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 23.199947 + objectReference: {fileID: 0} - target: {fileID: 2696558720825331995, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer @@ -263,6 +298,11 @@ PrefabInstance: propertyPath: m_LocalScale.y value: -1 objectReference: {fileID: 0} + - target: {fileID: 2875165055555739366, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 18.799938 + objectReference: {fileID: 0} - target: {fileID: 2875316202554539604, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_LocalScale.x @@ -283,6 +323,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 2953641683845917047, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 23.199947 + objectReference: {fileID: 0} - target: {fileID: 2995126846715700931, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer @@ -428,6 +473,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4013491016302863243, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 43.100006 + objectReference: {fileID: 0} + - target: {fileID: 4013491016302863243, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 23.199959 + objectReference: {fileID: 0} - target: {fileID: 4050916237064905887, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer @@ -498,6 +553,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 4317665819325610510, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 68.3 + objectReference: {fileID: 0} - target: {fileID: 4441870259444223699, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer @@ -563,6 +623,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 4834796081389259816, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 18.799938 + objectReference: {fileID: 0} - target: {fileID: 4841040901763049418, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer @@ -788,6 +853,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 6400811186926782952, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 18.799938 + objectReference: {fileID: 0} - target: {fileID: 6457314950014680074, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_AnchorMax.x @@ -853,6 +923,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 6664632392738112667, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 18.799957 + objectReference: {fileID: 0} - target: {fileID: 6696014626349211864, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer @@ -883,6 +958,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 7058831405172920504, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 18.799938 + objectReference: {fileID: 0} - target: {fileID: 7064704381591608131, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer @@ -893,6 +973,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 7309145505202828742, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 18.799938 + objectReference: {fileID: 0} - target: {fileID: 7379690363624457519, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_SortingLayer @@ -1008,6 +1093,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 8423781486570994012, guid: 509192cd5f627cf409a54e9be694a24d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 22.199947 + objectReference: {fileID: 0} - target: {fileID: 8456731491629334137, guid: 509192cd5f627cf409a54e9be694a24d, type: 3} propertyPath: m_Pivot.x diff --git a/Assets/MyGame/aa/UI/Game/左上.prefab b/Assets/MyGame/aa/UI/Game/左上.prefab index bec16e75c..831a6192b 100644 --- a/Assets/MyGame/aa/UI/Game/左上.prefab +++ b/Assets/MyGame/aa/UI/Game/左上.prefab @@ -33,6 +33,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 170493075043388505, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 25.19998 + objectReference: {fileID: 0} - target: {fileID: 229705595697333229, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer @@ -88,6 +93,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 956562576048143304, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20.799973 + objectReference: {fileID: 0} - target: {fileID: 956991969047616378, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_LocalScale.x @@ -118,6 +128,16 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 1146821148729989373, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 25.19998 + objectReference: {fileID: 0} + - target: {fileID: 1246276458258865952, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 70.3 + objectReference: {fileID: 0} - target: {fileID: 1274750478710656607, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_LocalRotation.w @@ -283,6 +303,16 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 2094753452532434597, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 43.100006 + objectReference: {fileID: 0} + - target: {fileID: 2094753452532434597, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 25.199993 + objectReference: {fileID: 0} - target: {fileID: 2129234106690109089, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_LocalScale.x @@ -313,6 +343,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2336056100020177357, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20.799973 + objectReference: {fileID: 0} - target: {fileID: 2405971011163688543, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_Texture @@ -323,6 +358,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 2454995109357601027, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20.799973 + objectReference: {fileID: 0} - target: {fileID: 2501852592714539457, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_AnchoredPosition.y @@ -428,6 +468,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3048940719251889729, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20.799973 + objectReference: {fileID: 0} - target: {fileID: 3092036488978181276, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer @@ -438,6 +483,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3297233813803253055, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20.799973 + objectReference: {fileID: 0} - target: {fileID: 3332759288714861708, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_Enabled @@ -448,6 +498,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3389547211398939813, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 24.69998 + objectReference: {fileID: 0} - target: {fileID: 3474185499508581916, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_TargetTexture @@ -518,6 +573,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 4321188215555983997, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20.799973 + objectReference: {fileID: 0} - target: {fileID: 4458366748039097746, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer @@ -648,6 +708,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 5428744352102364566, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20.799973 + objectReference: {fileID: 0} - target: {fileID: 5508732527700195132, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_LocalScale.x @@ -688,6 +753,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 5750967972584607976, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20.799973 + objectReference: {fileID: 0} - target: {fileID: 5925412083069679843, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_TargetTexture @@ -748,6 +818,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 6793556187093621874, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 24.199982 + objectReference: {fileID: 0} - target: {fileID: 6843445545329226229, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer @@ -938,6 +1013,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 145 objectReference: {fileID: 0} + - target: {fileID: 7617947147448903942, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20.799973 + objectReference: {fileID: 0} - target: {fileID: 7702690943730251830, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer @@ -1008,6 +1088,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 8247489662781893830, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20.799973 + objectReference: {fileID: 0} - target: {fileID: 8288222949658198362, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_Enabled @@ -1058,6 +1143,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 8565072587787051445, guid: c9c177e60fd350e49844955f7e8a5874, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20.799992 + objectReference: {fileID: 0} - target: {fileID: 8658233748141460870, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer diff --git a/Assets/MyGame/aa/UI/Game/左下.prefab b/Assets/MyGame/aa/UI/Game/左下.prefab index d7478ead5..7243d0d02 100644 --- a/Assets/MyGame/aa/UI/Game/左下.prefab +++ b/Assets/MyGame/aa/UI/Game/左下.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 44.745132, y: 24.399994} + m_AnchoredPosition: {x: 45.52028, y: 26.399988} m_SizeDelta: {x: 83.0901, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &939075357221539841 @@ -467,7 +467,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 47.200073, y: 20.99998} + m_AnchoredPosition: {x: 47.97522, y: 22.999977} m_SizeDelta: {x: 64, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7068578546255737722 @@ -1109,7 +1109,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 44.745132, y: 25.399992} + m_AnchoredPosition: {x: 45.52028, y: 27.399986} m_SizeDelta: {x: 83.0901, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5518507213745826613 @@ -1426,7 +1426,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 40.700073, y: 20.99998} + m_AnchoredPosition: {x: 41.47522, y: 22.999977} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1086207817666691744 @@ -1635,7 +1635,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 42.32489, y: 25.4} + m_AnchoredPosition: {x: 43.1, y: 27.4} m_SizeDelta: {x: 78.2499, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3478998171396289274 @@ -2330,7 +2330,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 40.700073, y: 20.99998} + m_AnchoredPosition: {x: 41.47522, y: 22.999977} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1439673781816471195 @@ -2890,7 +2890,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 41.200226, y: 20.99998} + m_AnchoredPosition: {x: 41.975372, y: 22.999977} m_SizeDelta: {x: 52, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4430190150721293563 @@ -3156,7 +3156,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 45.14824, y: 24.899992} + m_AnchoredPosition: {x: 45.923386, y: 26.899986} m_SizeDelta: {x: 83.8968, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6359790639086632546 @@ -3231,7 +3231,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 40.700073, y: 20.99998} + m_AnchoredPosition: {x: 41.47522, y: 22.999977} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7553169601699106405 @@ -3306,7 +3306,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 40.700073, y: 20.99998} + m_AnchoredPosition: {x: 41.47522, y: 22.999977} m_SizeDelta: {x: 49, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3062482307563368506 @@ -3516,7 +3516,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 44.745132, y: 25.399992} + m_AnchoredPosition: {x: 45.52028, y: 27.399986} m_SizeDelta: {x: 83.0901, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6995607045978658789 @@ -3757,7 +3757,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 40.700073, y: 20.99998} + m_AnchoredPosition: {x: 41.47522, y: 22.999977} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1724657610333687412 @@ -3988,7 +3988,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 40.7, y: 21} + m_AnchoredPosition: {x: 41.475143, y: 22.999996} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &256452233577848298 @@ -4272,7 +4272,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 40.700073, y: 20.99998} + m_AnchoredPosition: {x: 41.47522, y: 22.999977} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &694978334991620813 @@ -4347,7 +4347,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 40.700073, y: 20.99998} + m_AnchoredPosition: {x: 41.47522, y: 22.999977} m_SizeDelta: {x: 51, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1825487224143377863 @@ -4497,7 +4497,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 41.200226, y: 20.99998} + m_AnchoredPosition: {x: 41.975372, y: 22.999977} m_SizeDelta: {x: 52, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3597029131539317174 @@ -5062,7 +5062,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 43.3, y: 70.3} + m_AnchoredPosition: {x: 44.5, y: 72.5} m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6645034468252132292 diff --git a/Assets/MyGame/aa/UI/Home/MainPanel.prefab b/Assets/MyGame/aa/UI/Home/MainPanel.prefab index e029595d3..a7b4a5862 100644 --- a/Assets/MyGame/aa/UI/Home/MainPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/MainPanel.prefab @@ -36,10 +36,10 @@ RectTransform: - {fileID: 2569752025301705985} m_Father: {fileID: 8977123748561868288} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -53.800167, y: -142.49998} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 96, y: 99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1970090694985202520 CanvasRenderer: @@ -1569,7 +1569,6 @@ RectTransform: - {fileID: 4653724501418068477} - {fileID: 10590606596356465} - {fileID: 6391811923979739103} - - {fileID: 754207876655879297} m_Father: {fileID: 1168244435367184264} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} @@ -2096,15 +2095,15 @@ RectTransform: m_GameObject: {fileID: 1389274016140767289} 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_LocalScale: {x: 0.7967, y: 0.7967, z: 0.7967} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 8977123748561868288} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -52.799973, y: -52.99997} - m_SizeDelta: {x: 80, y: 79} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 96, y: 99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1706670609260147924 CanvasRenderer: @@ -2867,7 +2866,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 546.56573, y: -55} + m_AnchoredPosition: {x: 581.1655, y: -45} m_SizeDelta: {x: 250, y: 49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3222381102658342430 @@ -3452,10 +3451,10 @@ RectTransform: - {fileID: 6594108526266856967} m_Father: {fileID: 8977123748561868288} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -52.8, y: -259} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 96, y: 99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4014603020473580318 CanvasRenderer: @@ -5154,7 +5153,7 @@ RectTransform: - {fileID: 8376844023977205408} - {fileID: 6414066859031838871} - {fileID: 8167822235931876412} - m_Father: {fileID: 2564644207036948081} + m_Father: {fileID: 8977123748561868288} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5776,7 +5775,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -52.8, y: -259} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 96, y: 99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5992715552352852301 CanvasRenderer: @@ -6484,6 +6483,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8977123748561868288} + - component: {fileID: 402980061548531720} m_Layer: 5 m_Name: RightButton m_TagString: Untagged @@ -6507,6 +6507,7 @@ RectTransform: - {fileID: 116709192338210670} - {fileID: 6274682360574130250} - {fileID: 5548704721294189509} + - {fileID: 754207876655879297} m_Father: {fileID: 1168244435367184264} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} @@ -6514,6 +6515,32 @@ RectTransform: m_AnchoredPosition: {x: -66.33203, y: 0} m_SizeDelta: {x: 132.6641, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &402980061548531720 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3694406386257790078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 25 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 16.43 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &3839403544657675136 GameObject: m_ObjectHideFlags: 0 @@ -6971,7 +6998,7 @@ RectTransform: m_GameObject: {fileID: 4143233725467842866} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6292649, y: 0.6292649, z: 0.6292649} + m_LocalScale: {x: 0.9790164, y: 0.9790164, z: 0.9790164} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 754207876655879297} @@ -6979,7 +7006,7 @@ RectTransform: 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: 94, y: 108} + m_SizeDelta: {x: 76, y: 59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2337425923804060939 CanvasRenderer: @@ -7009,7 +7036,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6f64d15ebfb301546b50ad911656a2b2, type: 3} + m_Sprite: {fileID: 21300000, guid: 2ca6f316f44d3e04ab51baa0d83f32c8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7790,7 +7817,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0197bfd5ac31f1244afb10fa558db0f1, type: 3} + m_Sprite: {fileID: 21300000, guid: edd13ac38bf0ab94e8c20f138f4c4686, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11870,7 +11897,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 893.4002, y: -55} + m_AnchoredPosition: {x: 928, y: -45} m_SizeDelta: {x: 266.8004, y: 49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4364771594772233180 diff --git a/Assets/MyGame/aa/UI/Home/Sub/UISignView.prefab b/Assets/MyGame/aa/UI/Home/Sub/UISignView.prefab index d8fd2dda8..cec0d5f40 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UISignView.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/UISignView.prefab @@ -744,6 +744,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 224880619614767448, guid: 2e30023d05e54a540a373fe965310b32, + type: 3} + propertyPath: m_SizeDelta.x + value: -364.6108 + objectReference: {fileID: 0} + - target: {fileID: 224880619614767448, guid: 2e30023d05e54a540a373fe965310b32, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 130 + objectReference: {fileID: 0} - target: {fileID: 224949593803130734, guid: 2e30023d05e54a540a373fe965310b32, type: 3} propertyPath: m_AnchorMax.y @@ -1174,7 +1184,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -1204,7 +1214,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -1366,7 +1376,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -1396,7 +1406,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -1462,7 +1472,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -1492,7 +1502,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -1851,7 +1861,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -1881,7 +1891,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -2019,8 +2029,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278255615 - m_fontColor: {r: 1, g: 1, b: 0, a: 1} + rgba: 4278199039 + m_fontColor: {r: 1, g: 0.1336182, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2043,7 +2053,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -2073,7 +2083,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -2664,7 +2674,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -2694,7 +2704,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -2760,7 +2770,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -2790,7 +2800,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -3504,8 +3514,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278255615 - m_fontColor: {r: 1, g: 1, b: 0, a: 1} + rgba: 4278199039 + m_fontColor: {r: 1, g: 0.1336182, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3528,7 +3538,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -3558,7 +3568,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -3624,7 +3634,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -3654,7 +3664,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -3912,7 +3922,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -3942,7 +3952,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -4200,7 +4210,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -4230,7 +4240,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -4488,7 +4498,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -4518,7 +4528,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -4584,7 +4594,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -4614,7 +4624,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -4968,7 +4978,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -4998,7 +5008,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -5159,7 +5169,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -5189,7 +5199,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -5255,7 +5265,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -5285,7 +5295,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: -5.44, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0