From 1ef5bb6f8d61d84d5715d152b4e6426e4d6da225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Sat, 5 Sep 2026 01:35:47 +0800 Subject: [PATCH] 1 --- .../MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab | 30 +++- .../aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab | 73 +++++---- Assets/MyGame/aa/UI/Game/FLZY/aaa.png | Bin 0 -> 6846 bytes Assets/MyGame/aa/UI/Game/FLZY/aaa.png.meta | 153 ++++++++++++++++++ .../aa/UI/Game/GameMainPanel_FishBase.cs | 62 +++---- Assets/MyGame/aa/UI/Game/左下.prefab | 77 +++++++-- 6 files changed, 308 insertions(+), 87 deletions(-) create mode 100644 Assets/MyGame/aa/UI/Game/FLZY/aaa.png create mode 100644 Assets/MyGame/aa/UI/Game/FLZY/aaa.png.meta diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab index 28e9883ce..ad1e3c63f 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab @@ -1892,12 +1892,12 @@ PrefabInstance: type: 3} propertyPath: m_PlayableAsset value: - objectReference: {fileID: 11400000, guid: 7d141002679607346bf9cd66712ab750, + objectReference: {fileID: 11400000, guid: 28c4daddcfb4cd74284b915a765df43b, type: 2} - target: {fileID: 7072743129047501770, guid: cf762c0a6428e1c42b456cb87803660f, type: 3} propertyPath: m_SceneBindings.Array.size - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 7072743129047501770, guid: cf762c0a6428e1c42b456cb87803660f, type: 3} @@ -1947,6 +1947,12 @@ PrefabInstance: value: objectReference: {fileID: -2140855629934331987, guid: 7d141002679607346bf9cd66712ab750, type: 2} + - target: {fileID: 7072743129047501770, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_SceneBindings.Array.data[8].key + value: + objectReference: {fileID: -4599333712871029093, guid: 28c4daddcfb4cd74284b915a765df43b, + type: 2} - target: {fileID: 7072743129047501770, guid: cf762c0a6428e1c42b456cb87803660f, type: 3} propertyPath: m_SceneBindings.Array.data[0].value @@ -1967,6 +1973,11 @@ PrefabInstance: propertyPath: m_SceneBindings.Array.data[3].value value: objectReference: {fileID: 8681746059678129479} + - target: {fileID: 7072743129047501770, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_SceneBindings.Array.data[8].value + value: + objectReference: {fileID: 5616718759329970667} - target: {fileID: 7083825523422231789, guid: cf762c0a6428e1c42b456cb87803660f, type: 3} propertyPath: m_Layer @@ -5006,6 +5017,18 @@ CircleCollider2D: m_Offset: {x: 0.067006655, y: 0.067188635} serializedVersion: 2 m_Radius: 0.15350284 +--- !u!114 &5616718759329970667 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5292211125166391170, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + m_PrefabInstance: {fileID: 325141021942548073} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5686564747174955474 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5361991151892320187, guid: cf762c0a6428e1c42b456cb87803660f, @@ -6439,7 +6462,8 @@ MonoBehaviour: - {fileID: 8669425856935873171} - {fileID: 7833207766662746742} lockPoint: {fileID: 0} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 diff --git a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab index 49315a2ad..75f5e985b 100644 --- a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab +++ b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab @@ -3169,8 +3169,17 @@ MonoBehaviour: - pf - rjbzd list_BiaoQingZi: - - "\u4F60\u771F\u5E05" - - "\u8FD9\u662F\u4EC0\u4E48" + - "\u5927\u5BB6\u597D\uFF0C\u5F88\u9AD8\u5174\u4E00\u8D77\u6355\u9C7C!" + - "\u54C7!\u5927\u9C7C\u6765\u5566!" + - "\u53D1\u8D22\u7684\u8282\u594F\u554A!" + - "\u723D!\u8FD9\u6CE2\u8D5A\u5927\u4E86" + - "\u52A0\u6CB9\uFF0C\u597D\u8FD0\u9A6C\u4E0A\u6765" + - "\u51B2\u5440\uFF0C\u80DC\u5229\u5728\u671B!" + - "\u4E00\u8D77\u56F4\u6355\uFF0C\u522B\u8BA9\u5B83\u8DD1\u4E86" + - "\u8FD0\u6C14\u4EC0\u4E48\u65F6\u5019\u6765\u554A?" + - "\u4ECA\u5929\u8FD9\u662F\u600E\u4E48\u4E86\uFF0C\u5168\u7A7A!" + - "\u662F\u4E0D\u662F\u6709\u5438\u9C7C\u5927\u6CD5\uFF0C\u6559\u6559\u6211!" + - "\u5C31\u8FD9\uFF1F\u62A2\u4E0D\u8FC7\u6211\u56DE\u5BB6\u79CD\u5730\u53BB\u5427\uFF01" mySitAnim: {fileID: 880553518363789260} toggle_Lock: {fileID: 7956581350814959936} toggle_Three: {fileID: 911966240696267575} @@ -7763,16 +7772,6 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} - - target: {fileID: 916762197708610206, guid: c9c177e60fd350e49844955f7e8a5874, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1005740733241787710, guid: c9c177e60fd350e49844955f7e8a5874, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1138529054820578357, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer @@ -7913,21 +7912,6 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} - - target: {fileID: 2732244402854446462, guid: c9c177e60fd350e49844955f7e8a5874, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2732244402854446462, guid: c9c177e60fd350e49844955f7e8a5874, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2732244402854446462, guid: c9c177e60fd350e49844955f7e8a5874, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -3.5020447 - objectReference: {fileID: 0} - target: {fileID: 2802254370360072598, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer @@ -8343,11 +8327,6 @@ PrefabInstance: propertyPath: m_Name value: "\u5DE6\u4E0B" objectReference: {fileID: 0} - - target: {fileID: 8778181611502174189, guid: c9c177e60fd350e49844955f7e8a5874, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8858139515121809080, guid: c9c177e60fd350e49844955f7e8a5874, type: 3} propertyPath: m_SortingLayer @@ -8424,16 +8403,46 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5578956836258289939, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_Color.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5717037160487506928, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_Color.a + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5754269309123817730, guid: 87a141ee6b07c324b91593c88bd1db9c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5793161139926246324, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_fontSizeMax + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5793161139926246324, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_fontSizeMin + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 5793161139926246324, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_enableAutoSizing + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6025729818399719677, guid: 87a141ee6b07c324b91593c88bd1db9c, type: 3} propertyPath: m_Group value: objectReference: {fileID: 1338375877204293000} + - target: {fileID: 6121721415783472745, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_Color.a + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6787160816943116615, guid: 87a141ee6b07c324b91593c88bd1db9c, type: 3} propertyPath: m_Group diff --git a/Assets/MyGame/aa/UI/Game/FLZY/aaa.png b/Assets/MyGame/aa/UI/Game/FLZY/aaa.png new file mode 100644 index 0000000000000000000000000000000000000000..0e472e7e1b271195455a0c72d1d2465cbfc78fb7 GIT binary patch literal 6846 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 literal 0 HcmV?d00001 diff --git a/Assets/MyGame/aa/UI/Game/FLZY/aaa.png.meta b/Assets/MyGame/aa/UI/Game/FLZY/aaa.png.meta new file mode 100644 index 000000000..c05803548 --- /dev/null +++ b/Assets/MyGame/aa/UI/Game/FLZY/aaa.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: d8ec08878eeaf7e49b3cb798efeae9e7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 27, y: 34, z: 64, w: 41} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs index 4092b3bbc..ee108ac9c 100644 --- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs +++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs @@ -1964,52 +1964,26 @@ public class GameMainPanel_FishBase : GameMainPanel_Base return 0; } - // ⭐ 三发 + 锁定：每发子弹优先瞄准对应目标,目标不足或失效则按默认角度发射 + // ⭐ 安全取值:bullitIDs 不足3个时复用最后一个,避免越界 + string SafeBid(int i) => i < bullitIDs.Count ? bullitIDs[i] : bullitIDs[bullitIDs.Count - 1]; + + // ⭐ 正常炮台 三发 + 锁定：三合一打一个——三发子弹(-20/0/+20)全部追踪主锁目标(最老版本行为) + // 战神+锁定在上面已提前走 FireLaser(分散打三个),能到这里的一定是正常炮台 // 必须保证三发子弹都创建,否则金币消耗和后端对不上 if (isSanShe && isLock) { - // 三发默认角度(无目标时用):左 -20,中 0,右 +20 + // 三发出膛角度:左 -20,中 0,右 +20(锁定子弹会追踪转向主锁目标) float[] defaultAngles = { angle - 20, angle, angle + 20 }; for (int i = 0; i < 3; i++) { - string bulletId = i < bullitIDs.Count ? bullitIDs[i] : bullitIDs[0]; - MonsterContral targetMonster = null; - Transform targetHitPos = null; - - // 尝试按 GUID 查找目标 - if (fireTargetMonsterIDs != null && i < fireTargetMonsterIDs.Count) - { - if (CreateFishManager.Instance.fishDatas_hashCodekey.TryGetValue(fireTargetMonsterIDs[i], out var m) - && m != null && m.gameObject.activeInHierarchy - // ⭐ 手动锁定的主目标(i==0 且是本地玩家主锁)不受路径进度限制 - && ((i == 0 && sit == currSitData && m == currSitData.monCotl_Lock && currSitData.isManualLock) - || IsFishPathLockable(m))) - { - targetMonster = m; - targetHitPos = ResolveLockTransform(m); - } - } - - if (targetMonster != null && targetHitPos != null) - { - // 朝目标发射 - Vector3 targetWorldPos = targetHitPos.position; - Vector2 dir = ((Vector2)targetWorldPos - startPos).normalized; - float targetAngle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg - 90f; - CreateBullet(sit, startPos, targetAngle, isDouble, true, bulletId, targetMonster, targetHitPos, GetBulletGold(i)); - } - else - { - // 目标不足或失效 → 按默认角度发射(不锁定) - CreateBullet(sit, startPos, defaultAngles[i], isDouble, isLock, bulletId, null, null, GetBulletGold(i)); - } + // lockTarget 传 null:CreateBullet 内部兜底会 Lock(sit.monCotl_Lock, sit.monCotl_Lock_Position), + // 三发全部锁定同一条主锁目标;主锁目标为空时按普通子弹发射(不锁定) + CreateBullet(sit, startPos, defaultAngles[i], isDouble, true, SafeBid(i), null, null, GetBulletGold(i)); } } else if (isSanShe) { - // ⭐ 安全取值:bullitIDs 不足3个时复用最后一个,避免越界 - string SafeBid(int i) => i < bullitIDs.Count ? bullitIDs[i] : bullitIDs[bullitIDs.Count - 1]; CreateBullet(sit, startPos, angle - 20, isDouble, isLock, SafeBid(0), null, null, GetBulletGold(0)); CreateBullet(sit, startPos, angle, isDouble, isLock, SafeBid(1), null, null, GetBulletGold(1)); CreateBullet(sit, startPos, angle + 20, isDouble, isLock, SafeBid(2), null, null, GetBulletGold(2)); @@ -2440,13 +2414,16 @@ public class GameMainPanel_FishBase : GameMainPanel_Base { if (currSitData == null) return; - // ⭐ 散射激光模式标记（座位用它激活左右起点球父对象）：三发+锁定开着+有锁定目标就算散射中， + // ⭐ 散射激光模式标记（座位用它激活左右起点球父对象）：战神+三发+锁定开着+有锁定目标就算散射中， // 不依赖实际凑满几个目标（目标不足时散射模式开着也要显示起点球） + // ⭐ 正常炮台三合一打一个，不算散射激光模式（不显示左右起点球） currSitData.isScatterLaserOn = toggle_Three != null && toggle_Three.isOn && toggle_Lock != null && toggle_Lock.isOn - && currSitData.isLock; + && currSitData.isLock + && currSitData.currentZhanShenData != null; - bool isTripleLock = toggle_Three.isOn && toggle_Lock.isOn && currSitData.isLock; + // ⭐ 三发锁定圈（3个圈）只在战神模式显示；正常炮台三合一只有主锁圈（1个） + bool isTripleLock = currSitData.isScatterLaserOn; if (!isTripleLock) { currSitData.HideTripleLockIcons(); @@ -2961,8 +2938,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base auto = currSitData.IsAutoAttackOn }; - // ⭐ 三发 + 锁定：查找 3 个优先级目标，写入 monsterIDs - if (isSanShe && isLock) + // ⭐ 战神 三发 + 锁定：查找 3 个优先级目标，写入 monsterIDs（FireLaser 分散打三个用） + // 正常炮台三合一打主锁目标(monCotl_Lock 已由 SyncLock/SyncBotLock 同步)，不需要 monsterIDs + if (isSanShe && isLock && currSitData.currentZhanShenData != null) { var targets = FindFireTargets(3); if (targets.Count > 0) @@ -3961,9 +3939,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base int count = isSanShe ? 3 : 1; long gold = isDouble ? sit.consumeGoldNum * 2 : sit.consumeGoldNum; - // 三发+锁定 → 找 N 个目标鱼的 GUID + // 三发+锁定+战神 → 找 N 个目标鱼的 GUID（FireLaser 分散打三个用；正常炮台三合一不需要） List monsterIDs = null; - if (isSanShe && isLock && target != null) + if (isSanShe && isLock && target != null && sit.currentZhanShenData != null) { monsterIDs = new List { target.guid }; var extraTargets = FindBotLockTargets(sit, target, 2); diff --git a/Assets/MyGame/aa/UI/Game/左下.prefab b/Assets/MyGame/aa/UI/Game/左下.prefab index 6523e3c50..70bda9a25 100644 --- a/Assets/MyGame/aa/UI/Game/左下.prefab +++ b/Assets/MyGame/aa/UI/Game/左下.prefab @@ -563,6 +563,8 @@ GameObject: - component: {fileID: 8993752013832295830} - component: {fileID: 8545769148968229122} - component: {fileID: 4432649013089002525} + - component: {fileID: 8846910146090747397} + - component: {fileID: 8998155242034225900} m_Layer: 5 m_Name: WenZi m_TagString: Untagged @@ -587,8 +589,8 @@ RectTransform: 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: 57.1, y: 25} - m_SizeDelta: {x: 228.35, y: 100} + m_AnchoredPosition: {x: 47, y: 25} + m_SizeDelta: {x: 181.91, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8545769148968229122 CanvasRenderer: @@ -618,8 +620,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: d8ec08878eeaf7e49b3cb798efeae9e7, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -628,6 +630,46 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8846910146090747397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1005740733241787710} + 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!114 &8998155242034225900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1005740733241787710} + 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 &1025932892669309320 GameObject: m_ObjectHideFlags: 0 @@ -1425,6 +1467,7 @@ GameObject: - component: {fileID: 7093072027987832906} - component: {fileID: 6355606051003280393} - component: {fileID: 3860749127044759352} + - component: {fileID: 1769613101147316312} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -1446,10 +1489,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8993752013832295830} 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_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 &6355606051003280393 CanvasRenderer: @@ -1489,8 +1532,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1549,6 +1592,20 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &1769613101147316312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098956826386245527} + 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 &2215667972261895962 GameObject: m_ObjectHideFlags: 0