wz1531/5.24BuYu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wz1531
2026-09-27 15:47:27 +08:00
parent cbaf4afd95
commit 1a36f70de4
23 changed files with 864 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/Windows/addressables_content_state.bin
BIN
View File
Binary file not shown.
Assets/Art/FengLei/ResLY/Texture/baozang.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

Assets/Art/FengLei/ResLY/Texture/baozang.png.meta
+153
View File
@@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 2ca6f316f44d3e04ab51baa0d83f32c8
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: 0, y: 0, z: 0, w: 0}
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: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Art/FengLei/ResLY/Texture/宝藏.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

Assets/Art/FengLei/ResLY/Texture/宝藏.png.meta
+153
View File
@@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: edd13ac38bf0ab94e8c20f138f4c4686
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: 0, y: 0, z: 0, w: 0}
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: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/MyGame/Scenes/UIScene.unity
+78 -20
View File
@@ -1929,12 +1929,31 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 59c98b7739d292e409a9c611858e6ee5, type: 3}
m_Name:
m_EditorClassIdentifier:
obj_Background: {fileID: 0}
cellSize: {x: 120, y: 140}
cellSpacing: 15
rowSpacing: 20
iconSize: 85
itemId: 0
prefab_DrawEffect: {fileID: 0}
iconRatio: 0.85
iconOffsetY: 0
fontSize: 28
drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5}
maskSprite: {fileID: 0}
prize:
prizeId:
name:
icon:
type: 0
count: 0
otherId:
product:
number:
name:
desc:
imageUrl:
type: 0
level: 0
weight: 0
totalCount: 0
drawnCount: 0
isDrawn: 0
--- !u!1 &757015530
GameObject:
m_ObjectHideFlags: 0
@@ -3377,12 +3396,31 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 59c98b7739d292e409a9c611858e6ee5, type: 3}
m_Name:
m_EditorClassIdentifier:
obj_Background: {fileID: 0}
cellSize: {x: 120, y: 140}
cellSpacing: 15
rowSpacing: 20
iconSize: 85
itemId: 0
prefab_DrawEffect: {fileID: 0}
iconRatio: 0.85
iconOffsetY: 0
fontSize: 28
drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5}
maskSprite: {fileID: 0}
prize:
prizeId:
name:
icon:
type: 0
count: 0
otherId:
product:
number:
name:
desc:
imageUrl:
type: 0
level: 0
weight: 0
totalCount: 0
drawnCount: 0
isDrawn: 0
--- !u!1 &1969162102
GameObject:
m_ObjectHideFlags: 0
@@ -4181,8 +4219,9 @@ MonoBehaviour:
spawnList: []
isCreateFish: 0
isFrozen: 0
debugSpawnFishNumber: 11040
debugSpawnFishNumber: 11005
isleft: 1
debugSpawnAllLines: 1
fishList_All: []
fishList_Small: []
fishList_Boss: []
@@ -4374,10 +4413,6 @@ PrefabInstance:
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3836616254723645817, guid: fa7bc334f6405104db8bcd505104c32e,
type: 3}
insertIndex: -1
addedObject: {fileID: 6956010706034629502}
- targetCorrespondingSourceObject: {fileID: 7473913208363182890, guid: fa7bc334f6405104db8bcd505104c32e,
type: 3}
insertIndex: -1
@@ -4386,6 +4421,10 @@ PrefabInstance:
type: 3}
insertIndex: -1
addedObject: {fileID: 1956001693}
- targetCorrespondingSourceObject: {fileID: 3836616254723645817, guid: fa7bc334f6405104db8bcd505104c32e,
type: 3}
insertIndex: -1
addedObject: {fileID: 6956010706034629502}
m_SourcePrefab: {fileID: 100100000, guid: fa7bc334f6405104db8bcd505104c32e, type: 3}
--- !u!224 &6956010706034629467 stripped
RectTransform:
@@ -4423,12 +4462,31 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 59c98b7739d292e409a9c611858e6ee5, type: 3}
m_Name:
m_EditorClassIdentifier:
obj_Background: {fileID: 0}
cellSize: {x: 120, y: 140}
cellSpacing: 15
rowSpacing: 20
iconSize: 85
itemId: 0
prefab_DrawEffect: {fileID: 0}
iconRatio: 0.85
iconOffsetY: 0
fontSize: 28
drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5}
maskSprite: {fileID: 0}
prize:
prizeId:
name:
icon:
type: 0
count: 0
otherId:
product:
number:
name:
desc:
imageUrl:
type: 0
level: 0
weight: 0
totalCount: 0
drawnCount: 0
isDrawn: 0
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
+9
View File
@@ -962,6 +962,10 @@ public class MonsterContral : MonoBehaviour
// → 模型闪 + Y欧拉±90跳。环形路线起终点相同(_routeDirX==0)天然不补偿
rollZ = -rotationPY;
if (useMirrorCompensate && _routeDirX < 0) rollZ = 180f - rollZ;
//if (fishTypeID == 13018)
//{
// Debug.Log("rollZ" + rollZ + "---rotationPY" + rotationPY);
//}
}
child.rotation = Quaternion.Euler(-heading, 90f, rollZ);
}
@@ -981,6 +985,7 @@ public class MonsterContral : MonoBehaviour
// ⭐ 反面补偿模式(与Z case条件相反):向右路线才补偿
rollZ = -rotationPY;
if (useMirrorCompensate && _routeDirX > 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);
}
Assets/MyGame/Scripts/Characters/Monster/MonsterMoveLine.cs
+30 -60
View File
@@ -83,8 +83,8 @@ public class MonsterMoveLine
/// </summary>
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<string> keys = new List<string>();
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<string> keys = new List<string>();
keys.Add(path);
keys.Add(GameManager.Instance.gameData.currGameType.ToString());
AsyncOperationHandle<IList<TextAsset>> handles = Addressables.LoadAssetsAsync<TextAsset>(
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;
}
/// <summary>全量清空路线缓存（曲线字典/列表 + 点数组缓存 + B样条节点缓存）</summary>
private static void ClearAllBezierCache()
{
dic_BezierCurveDatas.Clear();
curves.Clear();
_curvePointsArrays.Clear();
_curveKnotArrays.Clear();
}
private static Vector2 ParseVector(string s)
Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs
+1
View File
@@ -613,6 +613,7 @@ namespace Assets.MyGame.Scripts.Net
case 1009: // 金币参数超出范围
case 1012: // 道具配置不存在
case 1015: // 炮倍参数无效
break;
default: // 0=未知错误
UIManager.Instance.ShowBoardError(ex.message);
break;
Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab
+17 -1
View File
@@ -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
Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab
+18 -2
View File
@@ -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
Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab
+6 -6
View File
@@ -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}
Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab
+1 -1
View File
@@ -344,7 +344,7 @@ MonoBehaviour:
createVideoClip: {fileID: 0}
rotationPY: 90
useMirrorCompensate: 1
useRollSignFlip: 0
useRollSignFlip: 1
useRouteFlipX: 0
baseMmove: 0
isRotate: 1
Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab
+29 -1
View File
@@ -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
Assets/MyGame/aa/UI/DefaultPanel/BossBoardCarstGongGao.prefab
+5 -5
View File
@@ -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:
Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
+7 -2
View File
@@ -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
Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+36
View File
@@ -1116,8 +1116,22 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
#endregion
#region 资源加载模块
/// <summary>
/// ⭐ 资源流程令牌（static：新老游戏面板实例共享，GameMainPanel_FishBase 一脉）。
/// 每次 LoadResources / 卸载流程启动时递增并捕获；async 恢复后若令牌已变，
/// 说明期间已有新一轮流程启动（加载中退出、旧面板延迟卸载撞上新面板加载等），
/// 本轮残留流程必须立即终止 —— 否则旧加载流程会在卸载完成后继续
/// EnterRoom/出鱼/置位 isResources，把已退出房间的出鱼系统重新武装，
/// 污染下一个房间的鱼和路线（跨玩法路线混乱的流程层根源）。
/// </summary>
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<AudioClip>("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();
Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab
+28 -3
View File
@@ -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
Assets/MyGame/aa/UI/Game/右上.prefab
+90
View File
@@ -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
Assets/MyGame/aa/UI/Game/左上.prefab
+90
View File
@@ -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
Assets/MyGame/aa/UI/Game/左下.prefab
+17 -17
View File
@@ -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
Assets/MyGame/aa/UI/Home/MainPanel.prefab
+50 -23
View File
@@ -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
Assets/MyGame/aa/UI/Home/Sub/UISignView.prefab
+46 -36
View File
@@ -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