From 30c757e6044d27440a3146bcb4c8e0eb2006f7f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com>
Date: Sun, 11 Oct 2026 12:31:05 +0800
Subject: [PATCH] 1
---
.../AssetGroups/Fish_FLZY.asset | 7 -
.../model/fish/s/4022/material/4022 1.mat | 236 +++++++
.../fish/s/4022/material/4022 1.mat.meta | 8 +
Assets/Art/TuJianFishTexture/4052.asset | 620 +++++-------------
Assets/Art/TuJianFishTexture/7005.asset | 484 +++++---------
.../MyGame/aa/Game/FLZY/BOSS/GSL/4022.prefab | 545 ++++++++++++++-
.../BOSS/GSL/4022_Timeline Variant.prefab | 21 +-
.../MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab | 21 +-
.../XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab | 7 +-
.../aa/UI/Game/FLZY/GameMainPanel_FLZY.cs | 5 +-
.../aa/UI/Game/GameMainPanel_FishBase.cs | 10 +
.../aa/UI/Game/HHWK/GameMainPanel_HHWK.cs | 5 +-
.../aa/UI/Game/XJMH/GameMainPanel_XJMH.cs | 3 +
Assets/MyGame/aa/UI/Home/Sub/ShopPanel.prefab | 8 +-
Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab | 132 +++-
Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab | 7 +-
16 files changed, 1303 insertions(+), 816 deletions(-)
create mode 100644 Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/s/4022/material/4022 1.mat
create mode 100644 Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/s/4022/material/4022 1.mat.meta
diff --git a/Assets/AddressableAssetsData/AssetGroups/Fish_FLZY.asset b/Assets/AddressableAssetsData/AssetGroups/Fish_FLZY.asset
index 37b881152..05f27b003 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Fish_FLZY.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Fish_FLZY.asset
@@ -799,13 +799,6 @@ MonoBehaviour:
- Audio
- FLZY
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: ffff53a53d592684eb4bfe5ac0d70b48
- m_Address: Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/4052.prefab
- m_ReadOnly: 0
- m_SerializedLabels:
- - FLZY
- - FishPrefab
- FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 3d7ea06370502a34e82011fabf822b45, type: 2}
m_SchemaSet:
diff --git a/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/s/4022/material/4022 1.mat b/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/s/4022/material/4022 1.mat
new file mode 100644
index 000000000..c058f6711
--- /dev/null
+++ b/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/s/4022/material/4022 1.mat
@@ -0,0 +1,236 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: 4022 1
+ m_Shader: {fileID: 4800000, guid: b4718caa1a00b5f448f74c5f56545772, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords:
+ - _CUSTOMLIGHT_ADD
+ - _MATCAP_ON
+ - _USEINDIRSPECULAR_ON
+ m_InvalidKeywords:
+ - _CUSTOMLIGHT_ON_ON
+ - _DIRECTIONALFRESNEL_ON
+ - _EMISSION_COLOR
+ - _Hit_RIM
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 2000
+ stringTagMap:
+ RenderType: Opaque
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _ClearcoatCubemap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _CompMask:
+ m_Texture: {fileID: 2800000, guid: 1c49757f009697444ac14538d9500d04, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DissolveTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionTex:
+ m_Texture: {fileID: 2700000, guid: 0000000deadbeef15deadf00d0000000, type: 2}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _FrozenCubeMap:
+ m_Texture: {fileID: 2700000, guid: 0000000deadbeef15deadf00d0000000, type: 2}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _FrozenNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _FrozenSpecularMap:
+ m_Texture: {fileID: 2800000, guid: 09b3408148e3e50409a934eea467a268, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _FrozenTexture:
+ m_Texture: {fileID: 2800000, guid: 20fcdf3e22fb6c842a179350528030f7, type: 3}
+ m_Scale: {x: 1.45, y: 1.3}
+ m_Offset: {x: 0.46, y: 2.61}
+ - _IndirCubeMap:
+ m_Texture: {fileID: 8900000, guid: b0a4cad9653bde841ae391342a330f1f, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 7dd747268f594344eb2c6ed3f3317550, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MatcapMaskTexture:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MatcapTexture:
+ m_Texture: {fileID: 2800000, guid: 09b3408148e3e50409a934eea467a268, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalTex:
+ m_Texture: {fileID: 2800000, guid: 119073b3336f40b4eacdd1812fddd5f9, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _SparkTexture:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ThicknessMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _ACES_Enable: 0
+ - _AOScale: 1
+ - _AlphaClip: 1
+ - _AlphaIgnoreMetallicEnable: 0
+ - _AlphaTestEnable: 0
+ - _AlphaThrehold: 0
+ - _BloomClamp: 1
+ - _Brightness: 2
+ - _CUSTOMLIGHT_ADD: 1
+ - _CUSTOMLIGHT_ON: 1
+ - _CameraFOV: 126.81
+ - _ClearcoatContrast: 1
+ - _ClearcoatEnable: 0
+ - _ClearcoatIntensity: 1
+ - _ClearcoatMipmapLevel: 0
+ - _ClearcoatSaturation: 1
+ - _ClearcoatSmooth: 0.25
+ - _ClearcoatThreshold: 0
+ - _Contrast: 1.03
+ - _CullMode: 2
+ - _CustomAddLightIntensity: 1
+ - _CustomMainLightIntensity: 1
+ - _DISSOLVE_ON: 0
+ - _DarkSmooth: 0.4
+ - _DarkThreshold: 0.3
+ - _DirectionalFresnel: 1
+ - _DissAmount: 0
+ - _DissolveSpread: 0.11
+ - _DstBlend: 0
+ - _EdgeIntensity: 10
+ - _EdgeWidth: 0.5
+ - _EmissionBlend: 1
+ - _EmissionChannel: 0
+ - _EmissionExposure: 1
+ - _EnablePersp: 0
+ - _FalloffFactor: 0.5
+ - _FixBrightness: 1.05
+ - _FixContrast: 1.05
+ - _FixSaturation: 1
+ - _FixSubstancePainter: 0
+ - _FresnelIntensity: 1
+ - _FresnelSmooth: 0.1
+ - _FresnelThreshold: 0.9
+ - _FrozenAlpha: 1
+ - _FrozenCubeIndensity: 1.3
+ - _FrozenCubeMipmapLevel: 1
+ - _FrozenDiffuseIntensity: 0.2
+ - _FrozenDisortion: 0
+ - _FrozenEnable: 0
+ - _FrozenNormalMapScale: 1
+ - _FrozenSpecularPow: 5
+ - _HalfLambertFactor: 0.5
+ - _HitRimHardness: 5
+ - _HitRimRange: 1.2
+ - _Hit_RIM: 1
+ - _IgnoreRoughness: 0
+ - _IndirPow: 1.26
+ - _IndirRadius: 0.1
+ - _Iridescence: 1
+ - _IridescenceEnhance: 1
+ - _IridescenceThickness: 1
+ - _IridescenceThickness2: 1
+ - _Iridescence_Enhance_On: 0
+ - _Iridescence_On: 0
+ - _LocalPositionRange: 0
+ - _MainTexMipmapBias: 0
+ - _MatcapEnable: 1
+ - _MatcapPow: 1
+ - _MatcapRotation: 160
+ - _MatcapScale: 0.38
+ - _MedSmooth: 0.25
+ - _MedThreshold: 0.5
+ - _MetalCompensate: 1
+ - _MetalReflProbeIntensity: 1.6
+ - _MetalicRemapMax: 1
+ - _MetalicRemapMin: 0
+ - _MetallicScale: 1
+ - _MipmapLevel: 2
+ - _Mode: 0
+ - _NometalReflProbeIntensity: 0.3
+ - _NormalScale: 1
+ - _ObejectUVSwitch: 0
+ - _QueueOffset: 0
+ - _RIM_ON: 0
+ - _RealAlpha: 1
+ - _ReflectSmooth: 0.25
+ - _ReflectThreshold: 0.3
+ - _RimHardness: 3.54
+ - _RimMultiSelfColor: 0
+ - _RimRange: 0.91
+ - _RotateAngleX: 250
+ - _RotateAngleY: 238
+ - _RotateSpeedX: 0
+ - _RotateSpeedY: 0
+ - _RoughnessRemapMax: 1
+ - _RoughnessRemapMin: 0.9
+ - _RoughnessScale: 1
+ - _SSSEnable: 0
+ - _SSSStrength: 1
+ - _Saturation1: 0.8
+ - _SecondLobeWeight: 0.5
+ - _SelfShadowSwitch: 0
+ - _SparkDensity: 20
+ - _SparkIntensity: 1
+ - _SparkRange: 0.5
+ - _SrcBlend: 1
+ - _ThicknessMax: 1
+ - _ThicknessMin: 0
+ - _UseCompAO: 0
+ - _UseIndirSpecular: 1
+ - _UseLocalPosDissolve: 0
+ - _VertexFragNormalSwitch: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _CustomAddLightColor: {r: 1, g: 1, b: 1, a: 0}
+ - _CustomAddLightDir: {r: 0, g: 0, b: -1, a: 1}
+ - _CustomMainLightColor: {r: 1, g: 1, b: 1, a: 0}
+ - _CustomMainLightDir: {r: 3.68, g: 45, b: -7.7, a: 0}
+ - _DarkColor: {r: 0.5773585, g: 0.3823638, b: 0.5045992, a: 1}
+ - _EdgeColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0}
+ - _EmissionCol: {r: 2.131138, g: 0.5640787, b: 3.98616, a: 0}
+ - _FalloffColor: {r: 1, g: 1, b: 1, a: 1}
+ - _FrozenColor: {r: 1, g: 1, b: 1, a: 1}
+ - _FrozenCubeColor: {r: 1, g: 1, b: 1, a: 1}
+ - _FrozenDiffuseDownColor: {r: 0.24999997, g: 0.24999997, b: 0.24999997, a: 1}
+ - _FrozenDiffuseSideColor: {r: 0, g: 0.27999997, b: 0.45999992, a: 1}
+ - _FrozenDiffuseUpColor: {r: 0.72, g: 0.9, b: 1, a: 1}
+ - _FrozenLight: {r: 1, g: 1, b: 1, a: 1}
+ - _HitRimDirection: {r: 0, g: 0, b: 0, a: 0}
+ - _IndirColor: {r: 0, g: 0.35, b: 0.94716984, a: 1}
+ - _LocalPosDir: {r: 0, g: 1, b: 0, a: 0}
+ - _MatcapColor: {r: 0.31328952, g: 0.23945165, b: 0.6377357, a: 1}
+ - _MedColor: {r: 1, g: 1, b: 1, a: 1}
+ - _OverlayColor: {r: 0.8867924, g: 0.31317115, b: 0.22588095, a: 0}
+ - _ReflectColor: {r: 0.14200792, g: 0.110751115, b: 0.23018861, a: 0}
+ - _RimColor: {r: 6.309434, g: 1.1376873, b: 0.17856781, a: 0}
+ - _RimViewDirOffsetXYZ: {r: 0, g: 0, b: 5, a: 0}
+ - _SSSColor: {r: 0.5, g: 0.28, b: 0.23, a: 0}
+ - _SpecularColor: {r: 0.8792453, g: 0.8404047, b: 0.781367, a: 0}
+ - _TintColor: {r: 1.3, g: 1.3, b: 1.3, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/s/4022/material/4022 1.mat.meta b/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/s/4022/material/4022 1.mat.meta
new file mode 100644
index 000000000..cb147bbc4
--- /dev/null
+++ b/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/s/4022/material/4022 1.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 44c6151fcaa72da4eab1e0d754efac21
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Art/TuJianFishTexture/4052.asset b/Assets/Art/TuJianFishTexture/4052.asset
index 622d9ff8f..82c33b56b 100644
--- a/Assets/Art/TuJianFishTexture/4052.asset
+++ b/Assets/Art/TuJianFishTexture/4052.asset
@@ -11,18 +11,18 @@ Sprite:
serializedVersion: 2
x: 0
y: 0
- width: 558
- height: 346
+ width: 279
+ height: 173
m_Offset: {x: 0, y: 0}
m_Border: {x: 0, y: 0, z: 0, w: 0}
- m_PixelsToUnits: 100
+ m_PixelsToUnits: 50
m_Pivot: {x: 0.5, y: 0.5}
m_Extrude: 1
m_IsPolygon: 0
m_AtlasName:
m_PackingTag:
m_RenderDataKey:
- 68e4fec764425b4438eb6a06c7b99c16: -914534354
+ d81aa35a7b37a4945820dcbb223796a1: 21300000
m_AtlasTags: []
m_SpriteAtlas: {fileID: 0}
m_RD:
@@ -109,12 +109,12 @@ Sprite:
serializedVersion: 2
x: 0
y: 0
- width: 558
- height: 346
+ width: 279
+ height: 173
textureRectOffset: {x: 0, y: 0}
atlasRectOffset: {x: -1, y: -1}
settingsRaw: 0
- uvTransform: {x: 100, y: 279, z: 100, w: 173}
+ uvTransform: {x: 50, y: 139.5, z: 50, w: 86.5}
downscaleMultiplier: 1
m_AtlasRD:
serializedVersion: 3
@@ -200,468 +200,166 @@ Sprite:
serializedVersion: 2
x: 0
y: 0
- width: 558
- height: 346
+ width: 279
+ height: 173
textureRectOffset: {x: 0, y: 0}
atlasRectOffset: {x: -1, y: -1}
settingsRaw: 0
- uvTransform: {x: 100, y: 279, z: 100, w: 173}
+ uvTransform: {x: 50, y: 139.5, z: 50, w: 86.5}
downscaleMultiplier: 1
m_PhysicsShape:
- - - {x: -0.84, y: -1.63}
- - {x: -0.82, y: -1.62}
- - {x: -0.78, y: -1.5799999}
- - {x: -0.76, y: -1.48}
- - {x: -0.77, y: -1.31}
- - {x: -0.72999996, y: -1.3}
- - {x: -0.71999997, y: -1.1899999}
- - {x: -0.78, y: -1.12}
- - {x: -0.81, y: -1.0699999}
- - {x: -0.63, y: -1.12}
- - {x: -0.48999998, y: -1.15}
- - {x: -0.14999999, y: -1.1999999}
- - {x: 0.29999998, y: -1.18}
- - {x: 0.77, y: -1.1}
- - {x: 0.95, y: -1.06}
- - {x: 1.4699999, y: -0.94}
- - {x: 1.75, y: -0.83}
- - {x: 1.9599999, y: -0.71999997}
- - {x: 2.1, y: -0.59999996}
- - {x: 2.12, y: -0.53}
- - {x: 2.1299999, y: -0.5}
- - {x: 2.1299999, y: -0.44}
- - {x: 2.09, y: -0.32999998}
- - {x: 2.06, y: -0.25}
- - {x: 2.19, y: -0.089999996}
- - {x: 2.19, y: -0.03}
- - {x: 2.33, y: 0.11}
- - {x: 2.54, y: 0.26}
- - {x: 2.54, y: 0.32}
- - {x: 2.5, y: 0.35999998}
- - {x: 2.44, y: 0.35999998}
- - {x: 2.4099998, y: 0.45999998}
- - {x: 2.4199998, y: 0.53}
- - {x: 2.46, y: 0.47}
- - {x: 2.62, y: 0.5}
- - {x: 2.69, y: 0.58}
+ - - {x: 0.03, y: -1.2099999}
+ - {x: 0.47, y: -1.17}
+ - {x: 0.84999996, y: -1.13}
+ - {x: 1.67, y: -0.89}
+ - {x: 2.03, y: -0.69}
+ - {x: 2.21, y: -0.51}
+ - {x: 2.09, y: -0.25}
+ - {x: 2.1499999, y: -0.17}
+ - {x: 2.21, y: -0.03}
+ - {x: 2.57, y: 0.25}
+ - {x: 2.53, y: 0.41}
+ - {x: 2.4299998, y: 0.45}
+ - {x: 2.61, y: 0.47}
+ - {x: 2.69, y: 0.57}
+ - {x: 2.69, y: 0.66999996}
- {x: 2.6499999, y: 0.77}
- - {x: 2.53, y: 0.90999997}
- - {x: 2.6399999, y: 0.93}
- - {x: 2.69, y: 1}
- - {x: 2.69, y: 1.18}
- - {x: 2.6499999, y: 1.2099999}
- - {x: 2.58, y: 1.06}
- - {x: 2.54, y: 1.06}
- - {x: 2.4199998, y: 1.01}
- - {x: 2.3999999, y: 0.96}
- - {x: 2.47, y: 0.88}
- - {x: 2.5, y: 0.75}
- - {x: 2.34, y: 0.71999997}
- - {x: 2.29, y: 0.69}
- - {x: 2.3, y: 0.65999997}
- - {x: 2.37, y: 0.61}
- - {x: 2.37, y: 0.62}
+ - {x: 2.55, y: 0.87}
+ - {x: 2.49, y: 0.84999996}
+ - {x: 2.31, y: 0.71}
- {x: 2.31, y: 0.59}
- - {x: 2.24, y: 0.59}
- - {x: 2.06, y: 0.58}
- - {x: 1.9499999, y: 0.71999997}
- - {x: 2.07, y: 0.71}
- - {x: 2.1499999, y: 0.84}
- - {x: 2.19, y: 0.91999996}
- - {x: 2.03, y: 1}
- - {x: 1.9399999, y: 0.88}
- - {x: 1.86, y: 0.76}
- - {x: 1.86, y: 0.85999995}
- - {x: 1.8299999, y: 0.93}
- - {x: 1.74, y: 1.12}
- - {x: 1.7099999, y: 1.14}
- - {x: 1.61, y: 1.1}
- - {x: 1.49, y: 1.1999999}
- - {x: 1.42, y: 1.3}
- - {x: 1.4399999, y: 1.42}
- - {x: 1.41, y: 1.4499999}
- - {x: 1.35, y: 1.38}
- - {x: 1.24, y: 1.39}
- - {x: 1.29, y: 1.4499999}
- - {x: 1.38, y: 1.5}
- - {x: 1.35, y: 1.55}
- - {x: 1.2099999, y: 1.55}
- - {x: 1.0799999, y: 1.5999999}
- - {x: 0.81, y: 1.56}
- - {x: 0.77, y: 1.6999999}
- - {x: 0.64, y: 1.5699999}
- - {x: 0.58, y: 1.5899999}
- - {x: 0.57, y: 1.73}
- - {x: 0.55, y: 1.73}
- - {x: 0.48, y: 1.67}
- - {x: 0.42, y: 1.67}
- - {x: 0.35, y: 1.61}
- - {x: 0.29, y: 1.53}
- - {x: 0.32999998, y: 1.5799999}
- - {x: 0.32999998, y: 1.5899999}
- - {x: 0.37, y: 1.63}
- - {x: 0.37, y: 1.64}
- - {x: 0.35999998, y: 1.6999999}
- - {x: 0.32, y: 1.73}
+ - {x: 2.11, y: 0.61}
+ - {x: 1.9499999, y: 0.72999996}
+ - {x: 2.1299999, y: 0.78999996}
+ - {x: 2.19, y: 0.83}
+ - {x: 2.1499999, y: 0.98999995}
+ - {x: 1.77, y: 1.0699999}
+ - {x: 1.79, y: 1.11}
+ - {x: 1.51, y: 1.25}
+ - {x: 1.4499999, y: 1.37}
+ - {x: 1.41, y: 1.41}
+ - {x: 1.3299999, y: 1.5899999}
+ - {x: 0.81, y: 1.61}
+ - {x: 0.71, y: 1.65}
+ - {x: 0.57, y: 1.67}
+ - {x: 0.53, y: 1.7099999}
+ - {x: 0.47, y: 1.6899999}
+ - {x: 0.42999998, y: 1.5899999}
+ - {x: 0.32999998, y: 1.7099999}
- {x: 0.29, y: 1.73}
- - {x: 0.22999999, y: 1.6899999}
- - {x: 0.11, y: 1.5999999}
- - {x: 0.04, y: 1.5799999}
- - {x: -0.12, y: 1.43}
- - {x: -0.16, y: 1.63}
- - {x: -0.17999999, y: 1.68}
- - {x: -0.26, y: 1.73}
- - {x: -0.29, y: 1.7099999}
- - {x: -0.28, y: 1.5}
- - {x: -0.38, y: 1.22}
- - {x: -0.39999998, y: 1.16}
- - {x: -0.38, y: 1.03}
- - {x: -0.39, y: 0.94}
- - {x: -0.45, y: 1}
- - {x: -0.5, y: 0.96999997}
- - {x: -0.48, y: 0.93}
- - {x: -0.42999998, y: 0.77}
- - {x: -0.55, y: 0.90999997}
- - {x: -0.58, y: 0.90999997}
- - {x: -0.65, y: 0.84999996}
- - {x: -0.62, y: 0.78999996}
- - {x: -0.52, y: 0.68}
- - {x: -0.68, y: 0.76}
- - {x: -0.71999997, y: 0.77}
- - {x: -0.84999996, y: 0.84}
- - {x: -0.97999996, y: 0.82}
- - {x: -0.93, y: 0.75}
- - {x: -1.0799999, y: 0.74}
- - {x: -1.12, y: 0.82}
- - {x: -1.15, y: 0.83}
- - {x: -1.1899999, y: 0.71999997}
- - {x: -1.3299999, y: 0.71999997}
- - {x: -1.4499999, y: 0.65999997}
- - {x: -1.52, y: 0.58}
- - {x: -1.65, y: 0.53}
- - {x: -1.61, y: 0.48999998}
- - {x: -1.67, y: 0.29999998}
- - {x: -1.73, y: 0.35}
- - {x: -2.33, y: 0.29}
- - {x: -2.4299998, y: 0.35}
+ - {x: 0.25, y: 1.73}
+ - {x: -0.049999997, y: 1.53}
+ - {x: -0.21, y: 1.73}
+ - {x: -0.26999998, y: 1.73}
+ - {x: -0.31, y: 1.7099999}
+ - {x: -0.29, y: 1.4699999}
+ - {x: -0.37, y: 1.2099999}
+ - {x: -0.42999998, y: 1.01}
+ - {x: -0.53, y: 0.96999997}
+ - {x: -0.71, y: 0.78999996}
+ - {x: -0.90999997, y: 0.84999996}
+ - {x: -1.17, y: 0.81}
+ - {x: -1.67, y: 0.55}
+ - {x: -1.61, y: 0.45}
+ - {x: -1.75, y: 0.39}
+ - {x: -2.37, y: 0.37}
- {x: -2.47, y: 0.32999998}
- - {x: -2.47, y: 0.26999998}
- - {x: -2.32, y: 0.17999999}
- - {x: -2.25, y: 0.17999999}
- - {x: -2.1299999, y: 0.22}
- - {x: -2.01, y: 0.16}
- - {x: -1.9599999, y: 0.14999999}
- - {x: -1.78, y: 0.26}
- - {x: -1.76, y: 0.11}
- - {x: -1.81, y: -0.01}
- - {x: -1.99, y: -0.22}
- - {x: -2.01, y: -0.37}
- - {x: -2.06, y: -0.53}
- - {x: -2.09, y: -0.72999996}
- - {x: -2.07, y: -0.76}
- - {x: -2, y: -0.81}
- - {x: -1.99, y: -0.88}
- - {x: -2.1399999, y: -0.82}
- - {x: -2.27, y: -0.82}
- - {x: -2.33, y: -0.89}
- - {x: -2.36, y: -1.06}
- - {x: -2.28, y: -1.15}
- - {x: -2.25, y: -1.13}
- - {x: -2.24, y: -1.1}
- - {x: -2.25, y: -1.13}
- - {x: -2.26, y: -1.18}
- - {x: -2.1699998, y: -1.23}
- - {x: -2.06, y: -1.06}
- - {x: -2.05, y: -1.14}
- - {x: -2.02, y: -1.25}
- - {x: -1.87, y: -1.29}
- - {x: -1.78, y: -1.24}
- - {x: -1.73, y: -1.0699999}
- - {x: -1.73, y: -0.96999997}
- - {x: -1.64, y: -0.83}
- - {x: -1.5899999, y: -0.71999997}
- - {x: -1.48, y: -0.82}
- - {x: -1.0699999, y: -1.02}
- - {x: -1.11, y: -1.3}
- - {x: -1.1899999, y: -1.3299999}
- - {x: -1.25, y: -1.43}
- - {x: -1.25, y: -1.5999999}
- - {x: -1.13, y: -1.66}
- - {x: -1.1, y: -1.62}
- - {x: -1.0799999, y: -1.62}
- - {x: -1.02, y: -1.7099999}
- - {x: -0.96999997, y: -1.7099999}
- - {x: -0.95, y: -1.6899999}
- - {x: -0.91999996, y: -1.4699999}
- - {x: -0.89, y: -1.56}
- - - {x: -0.17, y: -0.38}
- - {x: -0.17999999, y: -0.34}
- - {x: -0.21, y: -0.32}
- - {x: -0.22, y: -0.32}
- - {x: -0.26, y: -0.35}
- - {x: -0.26, y: -0.37}
- - {x: -0.29999998, y: -0.34}
- - {x: -0.34, y: -0.34}
- - {x: -0.35, y: -0.32999998}
- - {x: -0.42999998, y: -0.32999998}
- - {x: -0.44, y: -0.32}
- - {x: -0.47, y: -0.32}
- - {x: -0.5, y: -0.29}
- - {x: -0.52, y: -0.29}
- - {x: -0.53999996, y: -0.28}
- - {x: -0.53999996, y: -0.24}
- - {x: -0.57, y: -0.21}
- - {x: -0.58, y: -0.21}
- - {x: -0.61, y: -0.22999999}
- - {x: -0.62, y: -0.26}
- - {x: -0.62, y: -0.25}
- - {x: -0.64, y: -0.22999999}
- - {x: -0.64, y: -0.22}
- - {x: -0.68, y: -0.17999999}
- - {x: -0.69, y: -0.14}
- - {x: -0.7, y: -0.11}
- - {x: -0.68, y: -0.07}
- - {x: -0.71, y: -0.04}
- - {x: -0.76, y: -0.04}
- - {x: -0.78, y: -0.06}
- - {x: -0.85999995, y: 0.02}
- - {x: -1.0799999, y: 0.12}
- - {x: -1.02, y: 0.12}
- - {x: -1.01, y: 0.13}
- - {x: -0.95, y: 0.13}
- - {x: -0.94, y: 0.14}
- - {x: -0.74, y: 0.14}
- - {x: -0.72999996, y: 0.13}
- - {x: -0.69, y: 0.13}
- - {x: -0.68, y: 0.12}
- - {x: -0.65, y: 0.12}
- - {x: -0.59, y: 0.089999996}
- - {x: -0.57, y: 0.089999996}
- - {x: -0.53, y: 0.06}
- - {x: -0.51, y: 0.06}
- - {x: -0.48999998, y: 0.03}
- - {x: -0.32999998, y: -0.049999997}
- - {x: -0.31, y: -0.07}
- - {x: -0.22, y: -0.11}
- - {x: -0.19999999, y: -0.11}
- - {x: -0.14999999, y: -0.14999999}
- - {x: -0.11, y: -0.16}
- - {x: -0.02, y: -0.21}
- - {x: 0, y: -0.21}
- - {x: 0.049999997, y: -0.24}
- - {x: 0.08, y: -0.24}
- - {x: 0.11, y: -0.26}
- - {x: 0.13, y: -0.26}
- - {x: 0.17, y: -0.28}
- - {x: 0.19999999, y: -0.28}
- - {x: 0.22999999, y: -0.29999998}
- - {x: 0.25, y: -0.32}
- - {x: 0.22999999, y: -0.31}
- - {x: 0.22, y: -0.32}
- - {x: 0.19, y: -0.32}
- - {x: 0.17999999, y: -0.32999998}
- - {x: 0.14999999, y: -0.32999998}
- - {x: 0.14, y: -0.34}
- - {x: 0.089999996, y: -0.34}
- - {x: 0.06, y: -0.31}
- - {x: 0.04, y: -0.31}
- - {x: 0, y: -0.35999998}
- - {x: 0.01, y: -0.39}
- - {x: 0.02, y: -0.38}
- - {x: -0.01, y: -0.35}
- - {x: -0.02, y: -0.35}
- - {x: -0.049999997, y: -0.38}
- - {x: -0.049999997, y: -0.39}
- - {x: -0.14, y: -0.39}
- - {x: -0.14999999, y: -0.38}
- - - {x: 1.75, y: -0.049999997}
- - {x: 1.6999999, y: -0.049999997}
- - {x: 1.76, y: 0}
- - {x: 1.77, y: 0.049999997}
- - {x: 1.79, y: -0.02}
- - {x: 1.8199999, y: -0.06}
- - {x: 1.8, y: -0.08}
- - {x: 1.81, y: -0.08}
- - {x: 1.8, y: -0.07}
- - - {x: 2.07, y: 0.21}
- - {x: 2.07, y: 0.29}
- - {x: 2.08, y: 0.29999998}
- - {x: 2.08, y: 0.31}
- - {x: 2.07, y: 0.31}
- - {x: 2.08, y: 0.17}
- - {x: 2.09, y: 0.17999999}
- - - {x: 0.45, y: 0.28}
- - {x: 0.42999998, y: 0.29999998}
- - {x: 0.38, y: 0.32}
- - {x: 0.35999998, y: 0.32999998}
- - {x: 0.37, y: 0.32999998}
- - {x: 0.41, y: 0.35}
- - {x: 0.42, y: 0.34}
- - {x: 0.42999998, y: 0.35}
- - {x: 0.42, y: 0.34}
- - {x: 0.42999998, y: 0.29999998}
- - {x: 0.48999998, y: 0.22999999}
- - {x: 0.52, y: 0.22999999}
- - {x: 0.5, y: 0.25}
- - - {x: 0.68, y: 0.29999998}
- - {x: 0.66999996, y: 0.31}
- - {x: 0.63, y: 0.31}
- - {x: 0.59, y: 0.32999998}
- - {x: 0.55, y: 0.32999998}
- - {x: 0.48, y: 0.35999998}
- - {x: 0.52, y: 0.39999998}
- - {x: 0.52, y: 0.42}
- - {x: 0.53, y: 0.42999998}
- - {x: 0.53999996, y: 0.42999998}
- - {x: 0.57, y: 0.45999998}
- - {x: 0.57, y: 0.48}
- - {x: 0.53999996, y: 0.51}
- - {x: 0.53, y: 0.51}
- - {x: 0.51, y: 0.48999998}
- - {x: 0.55, y: 0.5}
- - {x: 0.57, y: 0.5}
- - {x: 0.59999996, y: 0.52}
- - {x: 0.61, y: 0.53999996}
- - {x: 0.69, y: 0.53999996}
- - {x: 0.7, y: 0.53}
- - {x: 0.84, y: 0.53}
- - {x: 0.84999996, y: 0.53999996}
- - {x: 0.93, y: 0.53999996}
- - {x: 0.94, y: 0.55}
- - {x: 0.97999996, y: 0.55}
- - {x: 0.98999995, y: 0.56}
- - {x: 1.05, y: 0.57}
- - {x: 1.0799999, y: 0.59999996}
- - {x: 1.0799999, y: 0.61}
- - {x: 1.05, y: 0.64}
- - {x: 1.01, y: 0.64}
- - {x: 1, y: 0.63}
- - {x: 0.94, y: 0.63}
- - {x: 0.93, y: 0.62}
- - {x: 0.84, y: 0.62}
- - {x: 0.83, y: 0.61}
- - {x: 0.7, y: 0.61}
- - {x: 0.69, y: 0.62}
- - {x: 0.65, y: 0.61}
- - {x: 0.65999997, y: 0.59999996}
- - {x: 0.69, y: 0.62}
- - {x: 0.71, y: 0.65999997}
- - {x: 0.72999996, y: 0.66999996}
- - {x: 0.75, y: 0.65}
- - {x: 0.76, y: 0.65}
- - {x: 0.78999996, y: 0.68}
- - {x: 0.78999996, y: 0.71}
- - {x: 0.75, y: 0.76}
- - {x: 0.74, y: 0.75}
- - {x: 0.75, y: 0.74}
- - {x: 0.81, y: 0.78999996}
- - {x: 0.82, y: 0.81}
- - {x: 0.84, y: 0.81}
- - {x: 0.9, y: 0.78}
- - {x: 0.91999996, y: 0.78}
- - {x: 0.96, y: 0.75}
- - {x: 0.96999997, y: 0.75}
- - {x: 0.97999996, y: 0.72999996}
- - {x: 1.01, y: 0.71999997}
- - {x: 1.04, y: 0.7}
- - {x: 1.05, y: 0.7}
- - {x: 1.12, y: 0.63}
- - {x: 1.12, y: 0.62}
- - {x: 1.15, y: 0.59}
- - {x: 1.15, y: 0.58}
- - {x: 1.18, y: 0.53999996}
- - {x: 1.14, y: 0.51}
- - {x: 1.13, y: 0.48}
- - {x: 1.13, y: 0.45}
- - {x: 1.14, y: 0.44}
- - {x: 1.14, y: 0.39999998}
- - {x: 1.09, y: 0.45}
- - {x: 1.05, y: 0.45}
- - {x: 1, y: 0.39999998}
- - {x: 1, y: 0.32999998}
- - {x: 1.01, y: 0.32}
- - {x: 0.78999996, y: 0.32999998}
- - {x: 0.75, y: 0.29}
- - {x: 0.76, y: 0.28}
- - {x: 0.74, y: 0.29}
- - - {x: 2.21, y: 0.32999998}
- - {x: 2.22, y: 0.32999998}
- - {x: 2.22, y: 0.34}
- - {x: 2.21, y: 0.32}
- - - {x: -2.57, y: 0.35999998}
- - {x: -2.54, y: 0.32999998}
- - {x: -2.48, y: 0.32999998}
- - {x: -2.48, y: 0.38}
- - {x: -2.51, y: 0.42999998}
- - {x: -2.54, y: 0.44}
- - {x: -2.57, y: 0.42999998}
- - - {x: 2.09, y: 0.44}
- - {x: 2.08, y: 0.45}
- - {x: 2.08, y: 0.48}
- - {x: 2.07, y: 0.48999998}
- - {x: 2.06, y: 0.52}
- - {x: 2.07, y: 0.51}
- - {x: 2.09, y: 0.51}
- - {x: 2.09, y: 0.48}
- - {x: 2.07, y: 0.45}
- - {x: 2.08, y: 0.39999998}
- - {x: 2.09, y: 0.41}
- - - {x: -2.32, y: 0.48}
- - {x: -2.29, y: 0.48999998}
- - {x: -2.29, y: 0.52}
- - {x: -2.32, y: 0.53}
- - {x: -2.34, y: 0.51}
- - - {x: -2.4199998, y: 0.52}
- - {x: -2.4099998, y: 0.48999998}
- - {x: -2.3799999, y: 0.48999998}
- - {x: -2.34, y: 0.52}
- - {x: -2.35, y: 0.55}
- - {x: -2.3799999, y: 0.55}
- - - {x: -2.31, y: 0.56}
- - {x: -2.31, y: 0.53999996}
- - {x: -2.28, y: 0.48999998}
- - {x: -2.26, y: 0.48999998}
- - {x: -2.24, y: 0.51}
- - {x: -2.25, y: 0.55}
- - {x: -2.28, y: 0.58}
- - {x: -2.3, y: 0.58}
- - - {x: -2.3799999, y: 0.58}
- - {x: -2.35, y: 0.55}
- - {x: -2.32, y: 0.56}
- - {x: -2.32, y: 0.58}
- - {x: -2.35, y: 0.61}
- - {x: -2.37, y: 0.61}
- - - {x: -2.46, y: 0.71}
- - {x: -2.44, y: 0.69}
- - {x: -2.4099998, y: 0.7}
- - {x: -2.4099998, y: 0.72999996}
- - {x: -2.4299998, y: 0.75}
- - {x: -2.46, y: 0.74}
- - - {x: 1.91, y: 0.97999996}
- - {x: 1.9399999, y: 0.98999995}
- - {x: 1.9399999, y: 1.02}
- - {x: 1.91, y: 1.03}
- - {x: 1.89, y: 1.01}
- - - {x: 2.4199998, y: 1.12}
- - {x: 2.4199998, y: 1.1}
- - {x: 2.44, y: 1.0799999}
- - {x: 2.48, y: 1.09}
- - {x: 2.5, y: 1.11}
- - {x: 2.49, y: 1.14}
- - {x: 2.44, y: 1.14}
- - - {x: 2.58, y: 1.16}
- - {x: 2.53, y: 1.13}
- - {x: 2.53, y: 1.11}
- - {x: 2.54, y: 1.09}
- - {x: 2.58, y: 1.09}
- - {x: 2.6299999, y: 1.13}
- - {x: 2.6299999, y: 1.15}
- - {x: 2.61, y: 1.16}
- - - {x: -0.13, y: 1.28}
- - {x: -0.13, y: 1.31}
- - {x: -0.11, y: 1.29}
- - {x: -0.099999994, y: 1.25}
- - {x: -0.099999994, y: 1.24}
- - {x: -0.099999994, y: 1.25}
+ - {x: -2.47, y: 0.25}
+ - {x: -2.33, y: 0.14999999}
+ - {x: -2.05, y: 0.11}
+ - {x: -1.81, y: 0.19}
+ - {x: -1.8499999, y: -0.07}
+ - {x: -2.01, y: -0.19}
+ - {x: -2.11, y: -0.75}
+ - {x: -2.29, y: -0.78999996}
+ - {x: -2.35, y: -0.89}
+ - {x: -2.37, y: -1.05}
+ - {x: -2.23, y: -1.25}
+ - {x: -2.11, y: -1.1899999}
+ - {x: -2.03, y: -1.25}
+ - {x: -1.81, y: -1.31}
+ - {x: -1.75, y: -1.1899999}
+ - {x: -1.61, y: -0.81}
+ - {x: -1.49, y: -0.84999996}
+ - {x: -1.09, y: -1.01}
+ - {x: -1.05, y: -1.25}
+ - {x: -1.17, y: -1.29}
+ - {x: -1.29, y: -1.41}
+ - {x: -1.27, y: -1.5899999}
+ - {x: -1.09, y: -1.73}
+ - {x: -0.96999997, y: -1.73}
+ - {x: -0.75, y: -1.61}
+ - {x: -0.69, y: -1.2099999}
+ - {x: -0.72999996, y: -1.15}
+ - {x: -0.37, y: -1.1899999}
+ - - {x: -0.22999999, y: -0.31}
+ - {x: -0.41, y: -0.31}
+ - {x: -0.55, y: -0.17}
+ - {x: -0.63, y: -0.11}
+ - {x: -0.71, y: 0.01}
+ - {x: -0.84999996, y: 0.049999997}
+ - {x: -1.03, y: 0.11}
+ - {x: -1.01, y: 0.089999996}
+ - {x: -0.98999995, y: 0.11}
+ - {x: -0.69, y: 0.089999996}
+ - {x: -0.45, y: -0.03}
+ - {x: -0.26999998, y: -0.13}
+ - {x: -0.089999996, y: -0.21}
+ - {x: 0.11, y: -0.29}
+ - {x: 0.14999999, y: -0.29}
+ - {x: 0.21, y: -0.31}
+ - {x: 0.19, y: -0.29}
+ - {x: 0.17, y: -0.31}
+ - {x: 0.049999997, y: -0.29}
+ - {x: -0.03, y: -0.37}
+ - - {x: 1.73, y: -0.049999997}
+ - {x: 1.79, y: 0.01}
+ - {x: 1.77, y: 0.01}
+ - {x: 1.79, y: -0.049999997}
+ - {x: 1.77, y: -0.03}
+ - - {x: 0.57, y: 0.35}
+ - {x: 0.51, y: 0.37}
+ - {x: 0.59, y: 0.45}
+ - {x: 0.59, y: 0.47}
+ - {x: 0.57, y: 0.48999998}
+ - {x: 0.57, y: 0.47}
+ - {x: 0.61, y: 0.51}
+ - {x: 0.69, y: 0.51}
+ - {x: 0.75, y: 0.57}
+ - {x: 0.75, y: 0.59}
+ - {x: 0.71, y: 0.63}
+ - {x: 0.75, y: 0.63}
+ - {x: 0.81, y: 0.69}
+ - {x: 0.81, y: 0.72999996}
+ - {x: 0.78999996, y: 0.75}
+ - {x: 0.83, y: 0.78999996}
+ - {x: 0.84999996, y: 0.77}
+ - {x: 0.89, y: 0.77}
+ - {x: 1.01, y: 0.69}
+ - {x: 1.03, y: 0.69}
+ - {x: 1.11, y: 0.59}
+ - {x: 1.15, y: 0.53}
+ - {x: 1.11, y: 0.48999998}
+ - {x: 1.11, y: 0.47}
+ - {x: 1.05, y: 0.47}
+ - {x: 0.96999997, y: 0.39}
+ - {x: 0.96999997, y: 0.35}
+ - {x: 0.78999996, y: 0.35}
+ - {x: 0.75, y: 0.31}
+ - {x: 0.71, y: 0.32999998}
+ - - {x: -2.55, y: 0.42999998}
+ - {x: -2.59, y: 0.41}
+ - {x: -2.59, y: 0.32999998}
+ - {x: -2.57, y: 0.31}
+ - {x: -2.49, y: 0.31}
+ - {x: -2.47, y: 0.35}
+ - {x: -2.47, y: 0.39}
+ - {x: -2.53, y: 0.42999998}
+ - - {x: 0.78999996, y: 0.59}
+ - {x: 0.81, y: 0.53}
+ - {x: 0.93, y: 0.53}
+ - {x: 0.96999997, y: 0.57}
+ - {x: 0.95, y: 0.63}
+ - {x: 0.83, y: 0.63}
m_Bones: []
m_SpriteID: 6689393a63b700342ae0d75ecfe142ff
diff --git a/Assets/Art/TuJianFishTexture/7005.asset b/Assets/Art/TuJianFishTexture/7005.asset
index b646f11c9..7d49f815e 100644
--- a/Assets/Art/TuJianFishTexture/7005.asset
+++ b/Assets/Art/TuJianFishTexture/7005.asset
@@ -9,20 +9,20 @@ Sprite:
m_Name: 7005
m_Rect:
serializedVersion: 2
- x: 548
+ x: 274
y: 0
- width: 494
- height: 356
+ width: 247
+ height: 178
m_Offset: {x: 0, y: 0}
m_Border: {x: 0, y: 0, z: 0, w: 0}
- m_PixelsToUnits: 100
+ m_PixelsToUnits: 50
m_Pivot: {x: 0.5, y: 0.5}
m_Extrude: 1
m_IsPolygon: 0
m_AtlasName:
m_PackingTag:
m_RenderDataKey:
- 68e4fec764425b4438eb6a06c7b99c16: 1246215499
+ 46e6d9f333971754995bac388dbdbbb1: 21300000
m_AtlasTags: []
m_SpriteAtlas: {fileID: 0}
m_RD:
@@ -107,14 +107,14 @@ Sprite:
m_Bindpose: []
textureRect:
serializedVersion: 2
- x: 548
+ x: 274
y: 0
- width: 494
- height: 356
+ width: 247
+ height: 178
textureRectOffset: {x: 0, y: 0}
atlasRectOffset: {x: -1, y: -1}
settingsRaw: 0
- uvTransform: {x: 100, y: 795, z: 100, w: 178}
+ uvTransform: {x: 50, y: 397.5, z: 50, w: 89}
downscaleMultiplier: 1
m_AtlasRD:
serializedVersion: 3
@@ -198,327 +198,171 @@ Sprite:
m_Bindpose: []
textureRect:
serializedVersion: 2
- x: 548
+ x: 274
y: 0
- width: 494
- height: 356
+ width: 247
+ height: 178
textureRectOffset: {x: 0, y: 0}
atlasRectOffset: {x: -1, y: -1}
settingsRaw: 0
- uvTransform: {x: 100, y: 795, z: 100, w: 178}
+ uvTransform: {x: 50, y: 397.5, z: 50, w: 89}
downscaleMultiplier: 1
m_PhysicsShape:
- - - {x: -0.84, y: -1.7199999}
- - {x: -0.79999995, y: -1.66}
- - {x: -0.78999996, y: -1.4699999}
- - {x: -0.75, y: -1.29}
- - {x: -0.78, y: -1.25}
- - {x: -0.82, y: -1.1999999}
- - {x: -0.76, y: -1.18}
- - {x: -0.53999996, y: -1.23}
- - {x: -0.35, y: -1.27}
- - {x: 0, y: -1.28}
- - {x: 0.37, y: -1.25}
- - {x: 0.91999996, y: -1.15}
- - {x: 1.41, y: -1.03}
- - {x: 1.64, y: -0.95}
- - {x: 1.87, y: -0.83}
- - {x: 2.05, y: -0.69}
- - {x: 2.1, y: -0.55}
- - {x: 2.03, y: -0.39999998}
- - {x: 1.9799999, y: -0.32999998}
- - {x: 2.05, y: -0.29999998}
- - {x: 2.1299999, y: -0.16}
- - {x: 2.3, y: 0.03}
- - {x: 2.47, y: 0.14999999}
+ - - {x: -0.77, y: -1.18}
+ - {x: -0.69, y: -1.22}
+ - {x: -0.35, y: -1.3}
+ - {x: 0.37, y: -1.28}
+ - {x: 0.84999996, y: -1.1999999}
+ - {x: 1.41, y: -1.04}
+ - {x: 1.5899999, y: -0.97999996}
+ - {x: 1.9699999, y: -0.78}
+ - {x: 2.07, y: -0.68}
+ - {x: 2.11, y: -0.5}
+ - {x: 2.11, y: -0.24}
+ - {x: 2.47, y: 0.14}
- {x: 2.47, y: 0.26}
- - {x: 2.44, y: 0.28}
+ - {x: 2.4299998, y: 0.29999998}
+ - {x: 2.35, y: 0.28}
- {x: 2.37, y: 0.29999998}
- - {x: 2.36, y: 0.35999998}
- - {x: 2.32, y: 0.42}
- - {x: 2.25, y: 0.42}
- - {x: 2.18, y: 0.38}
- - {x: 2.05, y: 0.42}
- - {x: 2.03, y: 0.35}
- - {x: 2.03, y: 0.25}
- - {x: 2.02, y: 0.14999999}
- - {x: 2.03, y: 0.25}
- - {x: 2.03, y: 0.35}
- - {x: 2, y: 0.5}
- - {x: 1.88, y: 0.64}
- - {x: 1.8199999, y: 0.68}
- - {x: 1.8299999, y: 0.78999996}
- - {x: 1.7099999, y: 0.91999996}
- - {x: 1.6899999, y: 1.04}
- - {x: 1.66, y: 1.05}
- - {x: 1.63, y: 1.03}
- - {x: 1.36, y: 1.18}
- - {x: 1.39, y: 1.3199999}
- - {x: 1.36, y: 1.3399999}
- - {x: 1.23, y: 1.29}
- - {x: 1.3199999, y: 1.42}
- - {x: 1.31, y: 1.4699999}
- - {x: 1.06, y: 1.4399999}
- - {x: 1.06, y: 1.5}
- - {x: 1.03, y: 1.51}
- - {x: 0.77, y: 1.48}
- - {x: 0.71999997, y: 1.5799999}
- - {x: 0.7, y: 1.5699999}
- - {x: 0.68, y: 1.55}
- - {x: 0.64, y: 1.61}
+ - {x: 2.37, y: 0.38}
+ - {x: 2.33, y: 0.42}
+ - {x: 2.27, y: 0.42}
+ - {x: 2.21, y: 0.35999998}
+ - {x: 2.1299999, y: 0.42}
+ - {x: 1.8299999, y: 0.71999997}
+ - {x: 1.8499999, y: 0.78}
+ - {x: 1.7099999, y: 1.04}
+ - {x: 1.65, y: 1.06}
+ - {x: 1.37, y: 1.18}
+ - {x: 1.43, y: 1.3199999}
+ - {x: 1.27, y: 1.48}
+ - {x: 1.05, y: 1.52}
+ - {x: 0.78999996, y: 1.48}
+ - {x: 0.77, y: 1.5799999}
+ - {x: 0.59, y: 1.76}
- {x: 0.57, y: 1.76}
- - {x: 0.55, y: 1.76}
- - {x: 0.52, y: 1.74}
- - {x: 0.47, y: 1.48}
- - {x: 0.41, y: 1.51}
- - {x: 0.39, y: 1.49}
- - {x: 0.39, y: 1.4699999}
- - {x: 0.35999998, y: 1.42}
- - {x: 0.39999998, y: 1.55}
- - {x: 0.37, y: 1.5699999}
- - {x: 0.32, y: 1.52}
- - {x: 0.29, y: 1.48}
- - {x: 0.32, y: 1.53}
- - {x: 0.32999998, y: 1.5999999}
- - {x: 0.26999998, y: 1.66}
- - {x: 0.21, y: 1.63}
- - {x: 0.089999996, y: 1.53}
- - {x: 0.01, y: 1.4699999}
- - {x: -0.08, y: 1.52}
- - {x: -0.13, y: 1.5}
- - {x: -0.16, y: 1.52}
- - {x: -0.26999998, y: 1.75}
- - {x: -0.29999998, y: 1.76}
- - {x: -0.32999998, y: 1.76}
- - {x: -0.37, y: 1.6999999}
- - {x: -0.38, y: 1.61}
- - {x: -0.38, y: 1.54}
- - {x: -0.34, y: 1.29}
- - {x: -0.41, y: 1.39}
- - {x: -0.45999998, y: 1.41}
- - {x: -0.48, y: 1.37}
- - {x: -0.48, y: 1.28}
- - {x: -0.45999998, y: 1.23}
- - {x: -0.42, y: 1.18}
- - {x: -0.53999996, y: 1.12}
- - {x: -0.52, y: 1.06}
- - {x: -0.48, y: 0.84}
- - {x: -0.59, y: 0.93}
- - {x: -0.61, y: 0.93}
- - {x: -0.64, y: 0.90999997}
- - {x: -0.61, y: 0.84}
- - {x: -0.5, y: 0.74}
- - {x: -0.61, y: 0.83}
- - {x: -0.63, y: 0.83}
- - {x: -0.65, y: 0.81}
- - {x: -0.65999997, y: 0.84999996}
- - {x: -0.7, y: 1}
- - {x: -0.78, y: 1.17}
- - {x: -0.85999995, y: 1.29}
- - {x: -0.93, y: 1.36}
- - {x: -0.96, y: 1.35}
- - {x: -0.96, y: 1.3199999}
- - {x: -0.75, y: 0.94}
- - {x: -0.7, y: 0.72999996}
- - {x: -0.75, y: 0.68}
- - {x: -0.89, y: 0.76}
- - {x: -1.01, y: 0.71999997}
- - {x: -0.98999995, y: 0.69}
- - {x: -1.12, y: 0.64}
- - {x: -1.15, y: 0.72999996}
- - {x: -1.2099999, y: 0.7}
- - {x: -1.23, y: 0.64}
- - {x: -1.4399999, y: 0.64}
- - {x: -1.5, y: 0.53}
- - {x: -1.4599999, y: 0.52}
- - {x: -1.62, y: 0.47}
- - {x: -1.67, y: 0.42}
- - {x: -1.66, y: 0.38}
- - {x: -1.61, y: 0.38}
- - {x: -1.65, y: 0.29}
- - {x: -1.76, y: 0.13}
- - {x: -1.8299999, y: -0.099999994}
- - {x: -2.01, y: -0.29}
- - {x: -2.04, y: -0.35999998}
- - {x: -2.03, y: -0.5}
- - {x: -2.1, y: -0.72999996}
- - {x: -2.11, y: -0.79999995}
- - {x: -2.08, y: -0.89}
- - {x: -1.9799999, y: -0.95}
- - {x: -2.1499999, y: -0.90999997}
- - {x: -2.29, y: -0.89}
- - {x: -2.36, y: -0.94}
- - {x: -2.37, y: -0.97999996}
- - {x: -2.37, y: -1.18}
- - {x: -2.24, y: -1.3}
- - {x: -2.2, y: -1.3}
- - {x: -2.11, y: -1.12}
- - {x: -2.09, y: -1.1999999}
- - {x: -2.06, y: -1.3299999}
- - {x: -2.02, y: -1.31}
- - {x: -1.9699999, y: -1.27}
- - {x: -1.92, y: -1.3}
- - {x: -1.9, y: -1.39}
- - {x: -1.79, y: -1.31}
- - {x: -1.77, y: -1.1}
- - {x: -1.6999999, y: -0.94}
- - {x: -1.61, y: -0.82}
- - {x: -1.53, y: -0.88}
- - {x: -1.3, y: -1.01}
- - {x: -1.23, y: -1.03}
- - {x: -1.06, y: -1.18}
- - {x: -1.0699999, y: -1.28}
- - {x: -1.1899999, y: -1.39}
- - {x: -1.29, y: -1.49}
- - {x: -1.3, y: -1.56}
- - {x: -1.27, y: -1.67}
- - {x: -1.2099999, y: -1.74}
- - {x: -1.12, y: -1.6999999}
- - {x: -1.1, y: -1.77}
- - {x: -1.0799999, y: -1.78}
- - {x: -0.98999995, y: -1.78}
- - {x: -0.97999996, y: -1.76}
- - {x: -0.96, y: -1.55}
- - {x: -0.91999996, y: -1.67}
- - - {x: -0.19999999, y: -0.47}
- - {x: -0.22, y: -0.42999998}
- - {x: -0.25, y: -0.39999998}
- - {x: -0.26, y: -0.39999998}
- - {x: -0.29999998, y: -0.42999998}
- - {x: -0.29999998, y: -0.45}
- - {x: -0.35, y: -0.42}
- - {x: -0.42, y: -0.42}
- - {x: -0.42999998, y: -0.41}
- - {x: -0.52, y: -0.41}
- - {x: -0.53, y: -0.39999998}
- - {x: -0.58, y: -0.39}
- - {x: -0.58, y: -0.32}
- - {x: -0.61, y: -0.29}
- - {x: -0.62, y: -0.29}
+ - {x: 0.51, y: 1.7199999}
+ - {x: 0.19, y: 1.62}
+ - {x: 0.01, y: 1.5}
+ - {x: -0.19, y: 1.5799999}
+ - {x: -0.26999998, y: 1.7199999}
+ - {x: -0.31, y: 1.76}
+ - {x: -0.37, y: 1.74}
+ - {x: -0.39, y: 1.66}
+ - {x: -0.39, y: 1.48}
+ - {x: -0.37, y: 1.4}
+ - {x: -0.45, y: 1.36}
+ - {x: -0.48999998, y: 1.3199999}
+ - {x: -0.51, y: 1.26}
+ - {x: -0.42999998, y: 1.14}
+ - {x: -0.55, y: 1.1}
+ - {x: -0.59, y: 0.9}
+ - {x: -0.69, y: 0.74}
+ - {x: -0.96999997, y: 0.79999995}
+ - {x: -1.01, y: 0.68}
+ - {x: -1.2099999, y: 0.71999997}
+ - {x: -1.7099999, y: 0.45999998}
+ - {x: -1.8499999, y: -0.099999994}
+ - {x: -2.05, y: -0.29999998}
+ - {x: -2.1299999, y: -0.68}
+ - {x: -2.1699998, y: -0.85999995}
+ - {x: -2.31, y: -0.85999995}
+ - {x: -2.3899999, y: -0.97999996}
+ - {x: -2.3899999, y: -1.18}
+ - {x: -2.25, y: -1.3199999}
+ - {x: -2.19, y: -1.3}
+ - {x: -2.07, y: -1.3399999}
+ - {x: -1.8499999, y: -1.4}
+ - {x: -1.75, y: -1.26}
+ - {x: -1.65, y: -0.91999996}
+ - {x: -1.51, y: -0.91999996}
+ - {x: -1.2099999, y: -1.06}
+ - {x: -1.11, y: -1.26}
+ - {x: -1.3299999, y: -1.5}
+ - {x: -1.3299999, y: -1.68}
+ - {x: -1.15, y: -1.78}
+ - {x: -0.95, y: -1.78}
+ - {x: -0.72999996, y: -1.68}
+ - {x: -0.72999996, y: -1.24}
+ - {x: -0.83, y: -1.18}
+ - {x: -0.87, y: -1.18}
+ - - {x: -0.19, y: -0.44}
+ - {x: -0.25, y: -0.38}
+ - {x: -0.26999998, y: -0.38}
+ - {x: -0.31, y: -0.42}
+ - {x: -0.32999998, y: -0.39999998}
+ - {x: -0.41, y: -0.39999998}
+ - {x: -0.42999998, y: -0.38}
+ - {x: -0.55, y: -0.38}
+ - {x: -0.55, y: -0.35999998}
+ - {x: -0.61, y: -0.29999998}
- {x: -0.65, y: -0.32}
- - {x: -0.65999997, y: -0.35}
- - {x: -0.65, y: -0.35}
- - {x: -0.66999996, y: -0.29999998}
- - {x: -0.72999996, y: -0.24}
- - {x: -0.71999997, y: -0.17}
- - {x: -0.71999997, y: -0.14999999}
- - {x: -0.75, y: -0.12}
- - {x: -0.78, y: -0.12}
- - {x: -0.82, y: -0.14}
- - {x: -0.9, y: -0.07}
- - {x: -0.94, y: -0.04}
- - {x: -0.98999995, y: -0.02}
- - {x: -1.01, y: -0.02}
- - {x: -1.06, y: 0.01}
- - {x: -1.1, y: 0.03}
- - {x: -1.01, y: 0.04}
- - {x: -1, y: 0.049999997}
- - {x: -0.91999996, y: 0.049999997}
- - {x: -0.90999997, y: 0.06}
- - {x: -0.77, y: 0.06}
- - {x: -0.76, y: 0.049999997}
- - {x: -0.71, y: 0.049999997}
- - {x: -0.66999996, y: 0.03}
- - {x: -0.61, y: 0.02}
- - {x: -0.42, y: -0.08}
- - {x: -0.35999998, y: -0.12}
- - {x: -0.29, y: -0.14999999}
- - {x: -0.26999998, y: -0.17}
- - {x: 0.06, y: -0.32999998}
- - {x: 0.08, y: -0.32999998}
- - {x: 0.14, y: -0.35999998}
- - {x: 0.19999999, y: -0.38}
- - {x: 0.19999999, y: -0.39}
- - {x: 0.22, y: -0.41}
- - {x: 0.17, y: -0.39999998}
- - {x: 0.13, y: -0.41}
- - {x: 0.07, y: -0.42}
- - {x: 0.03, y: -0.39}
- - {x: -0.01, y: -0.39999998}
- - {x: -0.04, y: -0.42999998}
- - {x: -0.06, y: -0.44}
- - {x: -0.089999996, y: -0.47}
- - {x: -0.089999996, y: -0.48}
- - {x: -0.14999999, y: -0.47}
- - - {x: 1.7199999, y: -0.14999999}
- - {x: 1.7099999, y: -0.14}
- - {x: 1.65, y: -0.14}
- - {x: 1.6999999, y: -0.089999996}
- - {x: 1.6999999, y: -0.08}
- - {x: 1.7199999, y: -0.06}
- - {x: 1.7199999, y: -0.03}
- - {x: 1.7099999, y: -0.04}
- - {x: 1.73, y: -0.089999996}
- - {x: 1.75, y: -0.11}
- - {x: 1.77, y: -0.14}
- - {x: 1.77, y: -0.17}
- - {x: 1.76, y: -0.16}
- - - {x: 0.41, y: 0.19}
- - {x: 0.39, y: 0.21}
- - {x: 0.35, y: 0.22}
- - {x: 0.35, y: 0.21}
- - {x: 0.42, y: 0.26999998}
- - {x: 0.45, y: 0.29}
- - {x: 0.52, y: 0.29}
- - {x: 0.59999996, y: 0.31}
- - {x: 0.65999997, y: 0.32999998}
- - {x: 0.71, y: 0.35}
- - {x: 0.74, y: 0.37}
- - {x: 0.85999995, y: 0.48}
- - {x: 0.91999996, y: 0.57}
- - {x: 0.95, y: 0.64}
- - {x: 0.96999997, y: 0.63}
- - {x: 0.96999997, y: 0.62}
- - {x: 1.1, y: 0.5}
- - {x: 1.15, y: 0.45}
- - {x: 1.15, y: 0.45999998}
- - {x: 1.1, y: 0.42}
- - {x: 1.0799999, y: 0.39}
- - {x: 1.1, y: 0.32}
- - {x: 1.05, y: 0.35999998}
- - {x: 1.01, y: 0.35999998}
- - {x: 0.95, y: 0.32999998}
- - {x: 0.94, y: 0.24}
- - {x: 0.96999997, y: 0.22999999}
- - {x: 0.72999996, y: 0.24}
- - {x: 0.69, y: 0.22999999}
- - {x: 0.64, y: 0.22}
- - {x: 0.47, y: 0.26}
- - {x: 0.41, y: 0.29}
- - {x: 0.38, y: 0.26}
- - {x: 0.38, y: 0.22}
- - {x: 0.44, y: 0.14999999}
- - {x: 0.47, y: 0.14999999}
- - {x: 0.45, y: 0.17}
- - - {x: 0.53999996, y: 0.38}
- - {x: 0.53999996, y: 0.42999998}
- - {x: 0.52, y: 0.47}
- - {x: 0.63, y: 0.58}
- - {x: 0.68, y: 0.58}
- - {x: 0.71, y: 0.61}
- - {x: 0.71, y: 0.64}
- - {x: 0.65999997, y: 0.69}
- - {x: 0.7, y: 0.74}
- - {x: 0.74, y: 0.72999996}
- - {x: 0.79999995, y: 0.71}
- - {x: 0.88, y: 0.69}
- - {x: 0.9, y: 0.66999996}
- - {x: 0.9, y: 0.68}
- - {x: 0.88, y: 0.66999996}
- - {x: 0.83, y: 0.58}
- - {x: 0.82, y: 0.55}
- - {x: 0.71, y: 0.44}
- - {x: 0.64, y: 0.41}
- - {x: 0.58, y: 0.39}
+ - {x: -0.69, y: -0.26}
+ - {x: -0.71, y: -0.19999999}
+ - {x: -0.69, y: -0.16}
+ - {x: -0.75, y: -0.099999994}
+ - {x: -0.78999996, y: -0.099999994}
+ - {x: -0.81, y: -0.12}
+ - {x: -0.90999997, y: -0.02}
+ - {x: -1.01, y: 0.02}
+ - {x: -1.05, y: 0.02}
+ - {x: -0.90999997, y: 0.02}
+ - {x: -0.89, y: 0.04}
+ - {x: -0.78999996, y: 0.04}
+ - {x: -0.77, y: 0.02}
+ - {x: -0.69, y: 0.02}
+ - {x: -0.66999996, y: 0}
+ - {x: -0.57, y: -0.02}
+ - {x: -0.51, y: -0.08}
+ - {x: -0.32999998, y: -0.16}
+ - {x: -0.29, y: -0.19999999}
+ - {x: 0.01, y: -0.34}
+ - {x: 0.049999997, y: -0.34}
+ - {x: 0.11, y: -0.38}
+ - {x: 0.14999999, y: -0.38}
+ - {x: 0.19, y: -0.39999998}
+ - {x: 0.049999997, y: -0.39999998}
+ - {x: 0.03, y: -0.38}
+ - {x: -0.01, y: -0.38}
+ - {x: -0.07, y: -0.44}
+ - {x: -0.13, y: -0.45999998}
+ - {x: -0.14999999, y: -0.44}
+ - - {x: 1.6899999, y: -0.12}
+ - {x: 1.7099999, y: -0.099999994}
+ - {x: 1.75, y: -0.14}
+ - {x: 1.73, y: -0.12}
+ - - {x: 0.61, y: 0.24}
+ - {x: 0.59, y: 0.26}
+ - {x: 0.53, y: 0.26}
+ - {x: 0.47, y: 0.29999998}
+ - {x: 0.45, y: 0.28}
+ - {x: 0.51, y: 0.26}
+ - {x: 0.57, y: 0.32}
+ - {x: 0.55, y: 0.35999998}
- {x: 0.57, y: 0.38}
- - {x: 0.48999998, y: 0.35999998}
- - {x: 0.51, y: 0.35}
- - - {x: -0.59, y: 0.62}
- - {x: -0.62, y: 0.64}
- - {x: -0.62, y: 0.65}
- - {x: -0.63, y: 0.7}
- - {x: -0.59999996, y: 0.65}
- - {x: -0.56, y: 0.59}
- - {x: -0.55, y: 0.59999996}
+ - {x: 0.57, y: 0.42}
+ - {x: 0.53, y: 0.45999998}
+ - {x: 0.63, y: 0.53999996}
+ - {x: 0.69, y: 0.56}
+ - {x: 0.72999996, y: 0.62}
+ - {x: 0.69, y: 0.7}
+ - {x: 0.71, y: 0.71999997}
+ - {x: 0.72999996, y: 0.71999997}
+ - {x: 0.84999996, y: 0.65999997}
+ - {x: 0.89, y: 0.65999997}
+ - {x: 0.90999997, y: 0.62}
+ - {x: 0.96999997, y: 0.59999996}
+ - {x: 1.05, y: 0.53999996}
+ - {x: 1.05, y: 0.52}
+ - {x: 1.11, y: 0.45999998}
+ - {x: 1.0699999, y: 0.39999998}
+ - {x: 1.09, y: 0.34}
+ - {x: 1.05, y: 0.38}
+ - {x: 0.98999995, y: 0.38}
+ - {x: 0.93, y: 0.32}
+ - {x: 0.93, y: 0.26}
+ - {x: 0.75, y: 0.26}
+ - {x: 0.71, y: 0.22}
+ - {x: 0.66999996, y: 0.24}
m_Bones: []
m_SpriteID: 2827d64a66b65ba4fa9561f8cc902e98
diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022.prefab
index 6aef0163f..9cd7cef47 100644
--- a/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022.prefab
+++ b/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022.prefab
@@ -17,7 +17,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &6829091818195909040
Transform:
m_ObjectHideFlags: 0
@@ -121,7 +121,8 @@ MonoBehaviour:
yzID:
colliderList: []
lockPoint: {fileID: 2241474319393315657}
- bingDongEffect: []
+ bingDongEffect:
+ - {fileID: 8432976849779275627}
needLockEvent: 0
createVideoClip: {fileID: 0}
rotationPY: 60
@@ -151,6 +152,156 @@ MonoBehaviour:
v3: {x: 0, y: 0, z: 0}
isLocalCoin: 0
killerSitPos: -1
+--- !u!1 &8432976849779275627
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1078815191692259220}
+ - component: {fileID: 4417982164893482866}
+ m_Layer: 10
+ m_Name: 4022 (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &1078815191692259220
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8432976849779275627}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: -0.7071068}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 6424649994567532690}
+ m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+--- !u!137 &4417982164893482866
+SkinnedMeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8432976849779275627}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 0
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 44c6151fcaa72da4eab1e0d754efac21, type: 2}
+ - {fileID: 2100000, guid: fbb307dc441f0bb4a812b34bf89889c6, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ serializedVersion: 2
+ m_Quality: 0
+ m_UpdateWhenOffscreen: 0
+ m_SkinnedMotionVectors: 1
+ m_Mesh: {fileID: 4300000, guid: 37f178806f121f94b9017d3edeebb792, type: 2}
+ m_Bones:
+ - {fileID: 2241474319393315657}
+ - {fileID: 7159672387256688284}
+ - {fileID: 895238981931077578}
+ - {fileID: 8628662308298853933}
+ - {fileID: 4854407239208553904}
+ - {fileID: 6088542975721689950}
+ - {fileID: 561711153387741589}
+ - {fileID: 6073736394106483880}
+ - {fileID: 669415848163593448}
+ - {fileID: 1321054577834407571}
+ - {fileID: 5616524963006926588}
+ - {fileID: 1268951532512197000}
+ - {fileID: 4757418368885686386}
+ - {fileID: 1829696433180510524}
+ - {fileID: 1065772988028510595}
+ - {fileID: 8112892692154681551}
+ - {fileID: 7086483120379192294}
+ - {fileID: 2581467707347561644}
+ - {fileID: 5054703612892214637}
+ - {fileID: 5828259451202889719}
+ - {fileID: 1634680009229623245}
+ - {fileID: 7900993211201389521}
+ - {fileID: 3234428941494891231}
+ - {fileID: 8009748028426764526}
+ - {fileID: 1498300234187653504}
+ - {fileID: 6337430946825022853}
+ - {fileID: 7390182761305640485}
+ - {fileID: 6727541891110450426}
+ - {fileID: 7596225534787259058}
+ - {fileID: 9206537195439330164}
+ - {fileID: 617925527288914515}
+ - {fileID: 4549943527099698211}
+ - {fileID: 5708435042684042011}
+ - {fileID: 7021542355195509118}
+ - {fileID: 1587505677842122961}
+ - {fileID: 4650468819151625423}
+ - {fileID: 714928960703610678}
+ - {fileID: 6633341159357210799}
+ - {fileID: 8766276351932509647}
+ - {fileID: 5893678473514373597}
+ - {fileID: 7298718280516913961}
+ - {fileID: 1859333512562843087}
+ - {fileID: 4826380689367912697}
+ - {fileID: 2033438582626201390}
+ - {fileID: 2528902225661484296}
+ - {fileID: 7056261313723073353}
+ - {fileID: 9044328500152824364}
+ - {fileID: 7639433607758454716}
+ - {fileID: 6150874412751665085}
+ - {fileID: 2752004746179234878}
+ - {fileID: 7267574542418664245}
+ - {fileID: 3651239831174995841}
+ - {fileID: 902743295807770206}
+ - {fileID: 8765148640454318571}
+ - {fileID: 6327411185415114832}
+ - {fileID: 7227684096962073697}
+ - {fileID: 2650444510149847696}
+ - {fileID: 1548210537621367886}
+ - {fileID: 7902509965953923296}
+ - {fileID: 8297719359740921233}
+ - {fileID: 6236062104951489242}
+ - {fileID: 4210558299534594957}
+ - {fileID: 5814907025644479147}
+ - {fileID: 5545275894505122854}
+ m_BlendShapeWeights: []
+ m_RootBone: {fileID: 4854407239208553904}
+ m_AABB:
+ m_Center: {x: 1.3712993, y: -3.5106, z: -0.5969871}
+ m_Extent: {x: 8.03437, y: 8.639906, z: 3.738863}
+ m_DirtyAABB: 0
--- !u!1001 &6761449844163995739
PrefabInstance:
m_ObjectHideFlags: 0
@@ -883,7 +1034,11 @@ PrefabInstance:
m_RemovedComponents:
- {fileID: -684069750954902368, guid: 164b4561f2395514098c98f5cb31a9a7, type: 3}
m_RemovedGameObjects: []
- m_AddedGameObjects: []
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: 359601798638086345, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ insertIndex: 1
+ addedObject: {fileID: 1078815191692259220}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1371714648199521916, guid: 164b4561f2395514098c98f5cb31a9a7,
type: 3}
@@ -1028,6 +1183,48 @@ CircleCollider2D:
m_Offset: {x: 0.10069761, y: -0.23483162}
serializedVersion: 2
m_Radius: 1.0216199
+--- !u!4 &561711153387741589 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6493882379110631886, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &617925527288914515 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6144652830259038728, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &669415848163593448 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6097663775136883891, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &714928960703610678 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6070446394670536557, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &895238981931077578 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5889012672985720721, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &902743295807770206 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5859832865881007621, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &1065772988028510595 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5989537011351325144, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1187999272466028255 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5596252243994181252, guid: 164b4561f2395514098c98f5cb31a9a7,
@@ -1069,12 +1266,114 @@ CircleCollider2D:
m_Offset: {x: 0.09972517, y: -0.15416075}
serializedVersion: 2
m_Radius: 1.3461838
+--- !u!4 &1268951532512197000 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5497002324286001619, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &1321054577834407571 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5728625923020480200, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &1498300234187653504 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5268779252641180123, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &1548210537621367886 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5235759510025651221, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &1587505677842122961 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5463581921876500618, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &1634680009229623245 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5438925590265837462, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &1829696433180510524 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4949770422796542311, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &1859333512562843087 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4906904019668727188, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &2033438582626201390 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4750531596338186101, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &2241474319393315657 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4813837603928978194, guid: 164b4561f2395514098c98f5cb31a9a7,
type: 3}
m_PrefabInstance: {fileID: 6761449844163995739}
m_PrefabAsset: {fileID: 0}
+--- !u!4 &2528902225661484296 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 9136970092523599187, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &2581467707347561644 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 9081027047997048055, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &2650444510149847696 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 8727197563555300043, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &2752004746179234878 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 8927378503627711589, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &3234428941494891231 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 8158131306266909316, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &3651239831174995841 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 8034053979844556762, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &4210558299534594957 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 7474733724741336022, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &4549943527099698211 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 7129720784181683320, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &4634016007934139999 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2133065539765974532, guid: 164b4561f2395514098c98f5cb31a9a7,
@@ -1116,6 +1415,18 @@ CircleCollider2D:
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 0.5
+--- !u!4 &4650468819151625423 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2115766101380166804, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &4757418368885686386 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2292543332491618345, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &4785151558115333572 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2287049271739743647, guid: 164b4561f2395514098c98f5cb31a9a7,
@@ -1157,6 +1468,36 @@ CircleCollider2D:
m_Offset: {x: 0.10069761, y: -0.23483162}
serializedVersion: 2
m_Radius: 1.0216199
+--- !u!4 &4826380689367912697 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2247227379365165218, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &4854407239208553904 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2200904955083073003, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &5054703612892214637 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2013272761535896886, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &5545275894505122854 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1234472026513622141, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &5616524963006926588 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1163223368001365671, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &5682471784799145511 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1371714648199521916, guid: 164b4561f2395514098c98f5cb31a9a7,
@@ -1208,6 +1549,78 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 5.5302353, y: 2.4065356}
m_EdgeRadius: 0
+--- !u!4 &5708435042684042011 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1363765651768939328, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &5814907025644479147 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 965967070694312688, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &5828259451202889719 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 952333029173432236, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &5893678473514373597 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 873684683575212422, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &6073736394106483880 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 693345286257892595, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &6088542975721689950 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 696834583950572293, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &6150874412751665085 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 615081647147704294, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &6236062104951489242 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 819531705607744129, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &6327411185415114832 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 727898952875358219, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &6337430946825022853 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 731391910183257566, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &6424649994567532690 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 359601798638086345, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &6633341159357210799 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 133738465307461876, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &6647705587894928147 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 113746460454464328, guid: 164b4561f2395514098c98f5cb31a9a7,
@@ -1249,6 +1662,12 @@ CircleCollider2D:
m_Offset: {x: 0.1575917, y: -0.14439161}
serializedVersion: 2
m_Radius: 0.75501406
+--- !u!4 &6727541891110450426 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 38414170167794849, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &6942941975768149791 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4435823799271475012, guid: 164b4561f2395514098c98f5cb31a9a7,
@@ -1290,6 +1709,12 @@ CircleCollider2D:
m_Offset: {x: 1.3896028, y: 0.17599179}
serializedVersion: 2
m_Radius: 2.320322
+--- !u!4 &7021542355195509118 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4369891717370499365, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &7053307581607970816 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4338971054284464219, guid: 164b4561f2395514098c98f5cb31a9a7,
@@ -1331,6 +1756,90 @@ CircleCollider2D:
m_Offset: {x: 0.09006529, y: -0.33669606}
serializedVersion: 2
m_Radius: 0.80138046
+--- !u!4 &7056261313723073353 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4339674023820028690, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &7086483120379192294 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4579386856805960637, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &7159672387256688284 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4506197588773992135, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &7227684096962073697 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4150237116592946234, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &7267574542418664245 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4111472299097109358, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &7298718280516913961 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4080049418938590066, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &7390182761305640485 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4276813114706847358, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &7596225534787259058 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3800554505917752041, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &7639433607758454716 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4022214381228816359, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &7900993211201389521 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3490441141532060554, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &7902509965953923296 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3494270212187427003, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &8009748028426764526 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3674138688486418613, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &8112892692154681551 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3261650821564981396, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &8297719359740921233 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3382789377624026570, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &8303935386256961567 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3380232942028036164, guid: 164b4561f2395514098c98f5cb31a9a7,
@@ -1413,3 +1922,33 @@ CircleCollider2D:
m_Offset: {x: 0.10115133, y: -0.73803973}
serializedVersion: 2
m_Radius: 1.0911689
+--- !u!4 &8628662308298853933 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3056348104337352310, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &8765148640454318571 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2626002038794023344, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &8766276351932509647 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2629379984570697108, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &9044328500152824364 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2330214875685395063, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &9206537195439330164 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2454829043625163567, guid: 164b4561f2395514098c98f5cb31a9a7,
+ type: 3}
+ m_PrefabInstance: {fileID: 6761449844163995739}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_Timeline Variant.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_Timeline Variant.prefab
index a1657759a..0c4395e6a 100644
--- a/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_Timeline Variant.prefab
+++ b/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_Timeline Variant.prefab
@@ -2217,6 +2217,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
+ - target: {fileID: 2674256517178600808, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 2686226043775217977, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
type: 3}
propertyPath: m_Layer
@@ -5097,6 +5102,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
+ - target: {fileID: 5775210030477550351, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 5781146825322796927, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
type: 3}
propertyPath: m_Layer
@@ -5740,7 +5750,7 @@ PrefabInstance:
- target: {fileID: 6697986194447116423, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 6727806731254963401, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
type: 3}
@@ -7447,6 +7457,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
+ - target: {fileID: 8497002445075296340, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 8499361055972804529, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
type: 3}
propertyPath: m_LocalPosition.x
@@ -8221,6 +8236,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
subCamera: {fileID: 0}
+ isFishCamera: 0
--- !u!4 &1460210969051644729 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4432265720714709115, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
@@ -8252,7 +8268,6 @@ MonoBehaviour:
fishScore: 0
bJbeishu: 0
maxScore: 0
- startOffset: {x: 0, y: 0, z: -100}
isSelf: 0
isScoreEnd: 0
useScorePanel: 1
@@ -8355,6 +8370,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
subCamera: {fileID: 0}
+ isFishCamera: 0
--- !u!1 &7420106599670529210 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5708496905382672376, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
@@ -8374,6 +8390,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
subCamera: {fileID: 0}
+ isFishCamera: 0
--- !u!1001 &8906284674362371613
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab
index a9badb046..d565546a8 100644
--- a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab
+++ b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab
@@ -321,7 +321,7 @@ PrefabInstance:
- target: {fileID: 1030775455358288214, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 1033492699765897026, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
@@ -718,6 +718,16 @@ PrefabInstance:
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
+ - target: {fileID: 3052892675599499800, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Camera
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 3052892675599499800, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_RenderMode
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3058207423941177080, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -1618,6 +1628,11 @@ PrefabInstance:
propertyPath: m_CameraType
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 6217352291952289784, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Cameras.Array.data[0]
+ value:
+ objectReference: {fileID: 0}
- target: {fileID: 6218685022970385525, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -2994,7 +3009,8 @@ PrefabInstance:
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
- m_RemovedGameObjects: []
+ m_RemovedGameObjects:
+ - {fileID: 3882252625413371882, guid: cf762c0a6428e1c42b456cb87803660f, type: 3}
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 8577029329742161438, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -6876,6 +6892,7 @@ MonoBehaviour:
forwordXYZ:
fishenum: 0
moveTime: 0
+ yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList:
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab
index 8137d3276..f088826fb 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab
@@ -18,15 +18,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3}
propertyPath: m_LocalScale.x
- value: 7
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3}
propertyPath: m_LocalScale.y
- value: 7
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3}
propertyPath: m_LocalScale.z
- value: 7
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3}
propertyPath: m_LocalPosition.x
@@ -1696,6 +1696,7 @@ MonoBehaviour:
forwordXYZ:
fishenum: 0
moveTime: 0
+ yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
diff --git a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.cs b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.cs
index 6d9a052ed..b66cb82b7 100644
--- a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.cs
+++ b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -9,4 +9,7 @@ public class GameMainPanel_FLZY : GameMainPanel_FishBase
base.OnShow(args);
AudioManager.Instance.ChangeBG(62024);
}
+
+ /// 玩法 BGM（加载完成确认点会再置一次，防止被大厅面板 Hide 覆盖）
+ protected override int GameBgmAudioId => 62024;
}
diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
index 41e47a18f..ff3f43c20 100644
--- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
@@ -1368,6 +1368,12 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
GameManager.Instance.gameData.currRoomData.activeFishes = null;
}
+ // ⭐ 最终确认玩法 BGM：进入房间时"选房/大厅面板 Hide→ChangeBG(69001) 大厅音乐"
+ // 可能晚于面板 Awake/OnShow 执行，把玩法 BGM 覆盖成大厅音乐；
+ // 加载完成这里最终置一次，保证游戏内播放的一定是玩法 BGM
+ if (GameBgmAudioId > 0 && AudioManager.Instance != null)
+ AudioManager.Instance.ChangeBG(GameBgmAudioId);
+
// ⭐ 90% 确认点：走到这里所有资源加载都已完成（上面全是 await 顺序执行）
SetLoadProgress(0.9f);
@@ -1749,6 +1755,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
JinDuTiao.SetProgress(_isChangeRoom ? p * 0.45f : p);
}
+ /// 玩法 BGM 编号（子类覆盖）。加载完成确认点会再置一次，
+ /// 防止进入房间时"选房/大厅面板 Hide → ChangeBG(69001) 大厅音乐"晚于面板 OnShow 把玩法音乐覆盖掉
+ protected virtual int GameBgmAudioId => 0;
+
/// 加载段进度写入：切换房间时映射到合并进度条后半段(55~100%)，平时直接写面板进度条
private void SetLoadProgress(float p)
{
diff --git a/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.cs b/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.cs
index 994558e20..e819f4901 100644
--- a/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.cs
+++ b/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.cs
@@ -1,4 +1,4 @@
-using DG.Tweening;
+using DG.Tweening;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -13,6 +13,9 @@ public class GameMainPanel_HHWK : GameMainPanel_FishBase
AudioManager.Instance.ChangeBG(61004);
}
+ /// 玩法 BGM（加载完成确认点会再置一次，防止被大厅面板 Hide 覆盖）
+ protected override int GameBgmAudioId => 61004;
+
public override void OnDestroy()
{
base.OnDestroy();
diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs
index a8584adc0..50ea3349d 100644
--- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs
+++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs
@@ -219,6 +219,9 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase
AudioManager.Instance.ChangeBG(61109);
}
+ /// 玩法 BGM（加载完成确认点会再置一次，防止被大厅面板 Hide 覆盖）
+ protected override int GameBgmAudioId => 61109;
+
// ==================== 切换面板：初始化 / 显示 / 隐藏 ====================
/// 初始化切换面板：绑定按钮点击、抓原版滑动节点、默认隐藏
diff --git a/Assets/MyGame/aa/UI/Home/Sub/ShopPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/ShopPanel.prefab
index 3223a13a6..7d5e993c4 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/ShopPanel.prefab
+++ b/Assets/MyGame/aa/UI/Home/Sub/ShopPanel.prefab
@@ -2860,7 +2860,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: "1200000000\n1200000000"
+ m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
@@ -6791,7 +6791,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: New Text
+ m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
@@ -8181,8 +8181,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: d8ed9f5bcb119164bba6f337459455cf, type: 3}
- m_Type: 0
+ m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
diff --git a/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab b/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab
index 963d62357..d0ec7f254 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab
+++ b/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab
@@ -1825,7 +1825,7 @@ RectTransform:
- {fileID: 869124775395989096}
- {fileID: 1022521778877026968}
- {fileID: 3519741173535166989}
- m_Father: {fileID: 6421461513398668010}
+ m_Father: {fileID: 4709961208683905114}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4407,7 +4407,7 @@ RectTransform:
- {fileID: 4480698485449847675}
- {fileID: 663181913870858093}
- {fileID: 7577770918653805942}
- m_Father: {fileID: 6421461513398668010}
+ m_Father: {fileID: 4709961208683905114}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -7071,6 +7071,85 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3735347477827138974
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4709961208683905114}
+ - component: {fileID: 5394481391490393534}
+ - component: {fileID: 2877294000540408977}
+ m_Layer: 0
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4709961208683905114
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3735347477827138974}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1898386671018826277}
+ - {fileID: 2142002906238051227}
+ - {fileID: 8721221603741383260}
+ - {fileID: 2212693716560400110}
+ m_Father: {fileID: 6421461513398668010}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5394481391490393534
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3735347477827138974}
+ m_CullTransparentMesh: 1
+--- !u!114 &2877294000540408977
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3735347477827138974}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0, b: 0, a: 0.31764707}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &3765814122780406631
GameObject:
m_ObjectHideFlags: 0
@@ -10531,7 +10610,7 @@ RectTransform:
- {fileID: 8671673001795996502}
- {fileID: 3925705241384746349}
- {fileID: 1750378417408692474}
- m_Father: {fileID: 6421461513398668010}
+ m_Father: {fileID: 4709961208683905114}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -12590,6 +12669,8 @@ GameObject:
m_Component:
- component: {fileID: 6421461513398668010}
- component: {fileID: 6418072855338436596}
+ - component: {fileID: 2282623571559992154}
+ - component: {fileID: 8642091272790412636}
m_Layer: 0
m_Name: UserInfo
m_TagString: Untagged
@@ -12609,10 +12690,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 1898386671018826277}
- - {fileID: 2142002906238051227}
- - {fileID: 8721221603741383260}
- - {fileID: 2212693716560400110}
+ - {fileID: 4709961208683905114}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -12674,6 +12752,44 @@ MonoBehaviour:
parent_AvatarList: {fileID: 2321029881299356511}
parent_AvatarKList: {fileID: 1565989030040883447}
prefab_AvatarItem: {fileID: 4003580760331289794}
+--- !u!222 &2282623571559992154
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6342049672119569556}
+ m_CullTransparentMesh: 1
+--- !u!114 &8642091272790412636
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6342049672119569556}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0, b: 0, a: 0.21960784}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &6364279370851380438
GameObject:
m_ObjectHideFlags: 0
@@ -15609,7 +15725,7 @@ RectTransform:
- {fileID: 9214379475018401134}
- {fileID: 8067795970374156762}
- {fileID: 7095339108781604811}
- m_Father: {fileID: 6421461513398668010}
+ m_Father: {fileID: 4709961208683905114}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
diff --git a/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab b/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab
index bddec37b1..193a62ced 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab
+++ b/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab
@@ -13148,7 +13148,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: 123456789
+ m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 7cb7af7685a457443a295fdaa17beeea, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: a407b419f8c2f204ca3540b6dc7b51bd, type: 2}
@@ -28405,7 +28405,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.00012207031, y: 0.000091552734}
- m_SizeDelta: {x: 0, y: 57.52}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1388862572319082958
MonoBehaviour:
@@ -28449,8 +28449,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: "\u4EB2\u7231\u7684\u73A9\u5BB6\uFF0C\u8FD9\u91CC\u5723\u6D1B\u7684\u6492\u5927\u5927\u5927\u82CF\u6253\uFF0C\u53D1\u53D1\u53D1
- \u53D1\u751F\u53D1\u5927\u82CF\u6253\u3002"
+ m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,