diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index e62b8f59b..75df7e388 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -112,6 +112,13 @@ MonoBehaviour: - Default - PT FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 194e09c929d77b4428470b6f3861cbaf + m_Address: Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005.prefab + m_ReadOnly: 0 + m_SerializedLabels: + - FLZY + - FishPrefab + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 196d79e8ed0d1bf42bd89220e0317bb5 m_Address: Assets/MyGame/aa/Game/Turrets/paotai11029.prefab m_ReadOnly: 0 diff --git a/Assets/Art/FengLei/Boss/6005/6005.prefab b/Assets/Art/FengLei/Boss/6005/6005.prefab index ac4d207e1..f9f2e7963 100644 --- a/Assets/Art/FengLei/Boss/6005/6005.prefab +++ b/Assets/Art/FengLei/Boss/6005/6005.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4433423390948869} - m_Layer: 24 + m_Layer: 6 m_Name: Bone026(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -43,7 +43,7 @@ GameObject: - component: {fileID: 4783779107388163} - component: {fileID: 198281231760189089} - component: {fileID: 199653423740801080} - m_Layer: 24 + m_Layer: 6 m_Name: bing m_TagString: Untagged m_Icon: {fileID: 0} @@ -2493,7 +2493,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4074959504287787} - m_Layer: 24 + m_Layer: 6 m_Name: Bone010(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2525,7 +2525,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4316103760576102} - m_Layer: 24 + m_Layer: 6 m_Name: Bone002 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2558,7 +2558,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4830242018006074} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Clavicle m_TagString: Untagged m_Icon: {fileID: 0} @@ -2590,7 +2590,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4097883504790399} - m_Layer: 24 + m_Layer: 6 m_Name: eff_4014_idle_01_Bone004 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2625,7 +2625,7 @@ GameObject: - component: {fileID: 4169707789450731} - component: {fileID: 198269389972526972} - component: {fileID: 199859646394481051} - m_Layer: 24 + m_Layer: 6 m_Name: fire (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -4945,7 +4945,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4200851692536855} - m_Layer: 24 + m_Layer: 6 m_Name: Bone025(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -4979,7 +4979,7 @@ GameObject: - component: {fileID: 4509764970073907} - component: {fileID: 198080741681748217} - component: {fileID: 199889519016086571} - m_Layer: 24 + m_Layer: 6 m_Name: dl03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -7309,7 +7309,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4743508022943478} - m_Layer: 24 + m_Layer: 6 m_Name: Bone017 m_TagString: Untagged m_Icon: {fileID: 0} @@ -7340,7 +7340,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4668578182966654} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Forearm m_TagString: Untagged m_Icon: {fileID: 0} @@ -7375,7 +7375,7 @@ GameObject: - component: {fileID: 4351217015923373} - component: {fileID: 198076582155789559} - component: {fileID: 199957743171276567} - m_Layer: 24 + m_Layer: 6 m_Name: glow_liang (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -9709,7 +9709,7 @@ GameObject: m_Component: - component: {fileID: 4421206360369816} - component: {fileID: 137730948556687584} - m_Layer: 24 + m_Layer: 6 m_Name: ice_6005 m_TagString: Untagged m_Icon: {fileID: 0} @@ -9901,7 +9901,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4309255331205404} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 Spine m_TagString: Untagged m_Icon: {fileID: 0} @@ -9937,7 +9937,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4773012692550930} - m_Layer: 24 + m_Layer: 6 m_Name: Bone025 m_TagString: Untagged m_Icon: {fileID: 0} @@ -9969,7 +9969,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4083856431597427} - m_Layer: 0 + m_Layer: 6 m_Name: Collision2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -10001,7 +10001,7 @@ GameObject: m_Component: - component: {fileID: 4306300360399952} - component: {fileID: 320336462471690087} - m_Layer: 24 + m_Layer: 6 m_Name: root m_TagString: Untagged m_Icon: {fileID: 0} @@ -10074,7 +10074,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4609926105589882} - m_Layer: 24 + m_Layer: 6 m_Name: Bone012 m_TagString: Untagged m_Icon: {fileID: 0} @@ -10106,7 +10106,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4847859616705473} - m_Layer: 24 + m_Layer: 6 m_Name: Bone034 m_TagString: Untagged m_Icon: {fileID: 0} @@ -10138,7 +10138,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4902855784035771} - m_Layer: 24 + m_Layer: 6 m_Name: Bone026 m_TagString: Untagged m_Icon: {fileID: 0} @@ -10170,7 +10170,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4731507199667363} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Thigh m_TagString: Untagged m_Icon: {fileID: 0} @@ -10202,7 +10202,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4443471157584809} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 Head m_TagString: Untagged m_Icon: {fileID: 0} @@ -10245,7 +10245,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4587953766127037} - m_Layer: 24 + m_Layer: 6 m_Name: Bone005 m_TagString: Untagged m_Icon: {fileID: 0} @@ -10276,7 +10276,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4327481658183503} - m_Layer: 24 + m_Layer: 6 m_Name: Bone035 m_TagString: Untagged m_Icon: {fileID: 0} @@ -10307,7 +10307,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4521479246378500} - m_Layer: 24 + m_Layer: 6 m_Name: Bone040 m_TagString: Untagged m_Icon: {fileID: 0} @@ -10340,7 +10340,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4652413757758945} - m_Layer: 24 + m_Layer: 6 m_Name: 6005 m_TagString: Untagged m_Icon: {fileID: 0} @@ -10357,7 +10357,7 @@ Transform: serializedVersion: 2 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_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4306300360399952} @@ -10375,7 +10375,7 @@ GameObject: - component: {fileID: 4680817001632413} - component: {fileID: 198596500629182385} - component: {fileID: 199092644975317261} - m_Layer: 24 + m_Layer: 6 m_Name: pao m_TagString: Untagged m_Icon: {fileID: 0} @@ -12666,7 +12666,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4787443874935716} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Thigh m_TagString: Untagged m_Icon: {fileID: 0} @@ -12700,7 +12700,7 @@ GameObject: - component: {fileID: 4890120903638641} - component: {fileID: 198177905018071274} - component: {fileID: 199963407829234377} - m_Layer: 24 + m_Layer: 6 m_Name: wenli2 (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -15042,7 +15042,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4558599399934472} - m_Layer: 24 + m_Layer: 6 m_Name: Bone003 m_TagString: Untagged m_Icon: {fileID: 0} @@ -15075,7 +15075,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4880617692211534} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Finger0 m_TagString: Untagged m_Icon: {fileID: 0} @@ -15107,7 +15107,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4163210004451462} - m_Layer: 24 + m_Layer: 6 m_Name: Bone042 m_TagString: Untagged m_Icon: {fileID: 0} @@ -15140,7 +15140,7 @@ GameObject: - component: {fileID: 4587433328780984} - component: {fileID: 198873834651150022} - component: {fileID: 199941871671397196} - m_Layer: 24 + m_Layer: 6 m_Name: hua m_TagString: Untagged m_Icon: {fileID: 0} @@ -17439,7 +17439,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4070736856698654} - m_Layer: 24 + m_Layer: 6 m_Name: Bone008 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17471,7 +17471,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4306322843194639} - m_Layer: 24 + m_Layer: 6 m_Name: Bone010 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17503,7 +17503,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4145760148256793} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Finger21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17534,7 +17534,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4710142821032189} - m_Layer: 0 + m_Layer: 6 m_Name: autoFire_3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17565,7 +17565,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4690404408597099} - m_Layer: 24 + m_Layer: 6 m_Name: Bone024 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17597,7 +17597,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4239036637520039} - m_Layer: 24 + m_Layer: 6 m_Name: Bone022(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -17629,7 +17629,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4813453683763029} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Finger1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17661,7 +17661,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4819686004279206} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 Neck2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17696,7 +17696,7 @@ GameObject: - component: {fileID: 4688452100684938} - component: {fileID: 198313832915534364} - component: {fileID: 199440120998094151} - m_Layer: 24 + m_Layer: 6 m_Name: huan1 (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -20083,7 +20083,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4050699557145671} - m_Layer: 24 + m_Layer: 6 m_Name: Bone022 m_TagString: Untagged m_Icon: {fileID: 0} @@ -20115,7 +20115,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4974281979121395} - m_Layer: 24 + m_Layer: 6 m_Name: Bone001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -20149,7 +20149,7 @@ GameObject: - component: {fileID: 4701292736811479} - component: {fileID: 198253088458957428} - component: {fileID: 199420463945269974} - m_Layer: 24 + m_Layer: 6 m_Name: 02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -22462,7 +22462,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4208828307058324} - m_Layer: 24 + m_Layer: 6 m_Name: Bone029 m_TagString: Untagged m_Icon: {fileID: 0} @@ -22494,7 +22494,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4345996095418147} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Toe11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -22526,7 +22526,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4798901525202560} - m_Layer: 24 + m_Layer: 6 m_Name: eff_4014_idle_01_Bone040 m_TagString: Untagged m_Icon: {fileID: 0} @@ -22560,7 +22560,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4269246007814783} - m_Layer: 24 + m_Layer: 6 m_Name: Bone039 m_TagString: Untagged m_Icon: {fileID: 0} @@ -22592,7 +22592,7 @@ GameObject: m_Component: - component: {fileID: 4483840545973381} - component: {fileID: 95123053346010301} - m_Layer: 24 + m_Layer: 6 m_Name: eff_4014_idle_01_root m_TagString: Untagged m_Icon: {fileID: 0} @@ -22652,7 +22652,7 @@ GameObject: - component: {fileID: 4866585155809608} - component: {fileID: 198791442780028598} - component: {fileID: 199257737707143759} - m_Layer: 24 + m_Layer: 6 m_Name: fire m_TagString: Untagged m_Icon: {fileID: 0} @@ -24972,7 +24972,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4479889422183033} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Clavicle m_TagString: Untagged m_Icon: {fileID: 0} @@ -25004,7 +25004,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4099812082669859} - m_Layer: 24 + m_Layer: 6 m_Name: Bone012(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -25038,7 +25038,7 @@ GameObject: - component: {fileID: 4721930835593731} - component: {fileID: 198408099920943817} - component: {fileID: 199046322631762624} - m_Layer: 24 + m_Layer: 6 m_Name: xian m_TagString: Untagged m_Icon: {fileID: 0} @@ -27506,7 +27506,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4935310885360691} - m_Layer: 0 + m_Layer: 6 m_Name: Collision4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -27537,7 +27537,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4702879910204256} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Finger2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -27571,7 +27571,7 @@ GameObject: - component: {fileID: 4483075472445664} - component: {fileID: 198723580753712607} - component: {fileID: 199720463559184940} - m_Layer: 24 + m_Layer: 6 m_Name: lizi01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -30001,7 +30001,7 @@ GameObject: - component: {fileID: 4980454100113386} - component: {fileID: 198859341317501897} - component: {fileID: 199588617620145171} - m_Layer: 24 + m_Layer: 6 m_Name: wenli1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -32325,7 +32325,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4583220663553118} - m_Layer: 24 + m_Layer: 6 m_Name: Bone006 m_TagString: Untagged m_Icon: {fileID: 0} @@ -32364,7 +32364,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4113386083903500} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Calf m_TagString: Untagged m_Icon: {fileID: 0} @@ -32396,7 +32396,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4197009380176272} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Finger01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -32429,7 +32429,7 @@ GameObject: - component: {fileID: 4939799129881162} - component: {fileID: 198528169240958163} - component: {fileID: 199593276264630712} - m_Layer: 24 + m_Layer: 6 m_Name: huan1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -34816,7 +34816,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4729650215461431} - m_Layer: 0 + m_Layer: 6 m_Name: autoFire m_TagString: Untagged m_Icon: {fileID: 0} @@ -34847,7 +34847,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4177615931968502} - m_Layer: 24 + m_Layer: 6 m_Name: Bone015 m_TagString: Untagged m_Icon: {fileID: 0} @@ -34879,7 +34879,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4728966282624680} - m_Layer: 24 + m_Layer: 6 m_Name: Bone013 m_TagString: Untagged m_Icon: {fileID: 0} @@ -34913,7 +34913,7 @@ GameObject: - component: {fileID: 4910553921432374} - component: {fileID: 95279329855065681} - component: {fileID: 65134994468272912} - m_Layer: 24 + m_Layer: 6 m_Name: 6005 m_TagString: Untagged m_Icon: {fileID: 0} @@ -34994,7 +34994,7 @@ GameObject: - component: {fileID: 4078766219469438} - component: {fileID: 198347454916627924} - component: {fileID: 199338211352359832} - m_Layer: 24 + m_Layer: 6 m_Name: lizi01 (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -37426,7 +37426,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4226430823332764} - m_Layer: 24 + m_Layer: 6 m_Name: Bone018 m_TagString: Untagged m_Icon: {fileID: 0} @@ -37458,7 +37458,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4496979414175142} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 Pelvis m_TagString: Untagged m_Icon: {fileID: 0} @@ -37491,7 +37491,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4680422471735558} - m_Layer: 24 + m_Layer: 6 m_Name: root m_TagString: Untagged m_Icon: {fileID: 0} @@ -37524,7 +37524,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4621739739897269} - m_Layer: 24 + m_Layer: 6 m_Name: Bone032 m_TagString: Untagged m_Icon: {fileID: 0} @@ -37558,7 +37558,7 @@ GameObject: - component: {fileID: 4194936195964202} - component: {fileID: 198335655230347338} - component: {fileID: 199646171974525002} - m_Layer: 24 + m_Layer: 6 m_Name: glow_an m_TagString: Untagged m_Icon: {fileID: 0} @@ -39893,7 +39893,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4356987410178291} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R UpperArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -39925,7 +39925,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4043145286802355} - m_Layer: 0 + m_Layer: 6 m_Name: Collision1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -39957,7 +39957,7 @@ GameObject: m_Component: - component: {fileID: 4143414520130861} - component: {fileID: 137965715484305066} - m_Layer: 24 + m_Layer: 6 m_Name: ice_6005_Guike m_TagString: Untagged m_Icon: {fileID: 0} @@ -40042,7 +40042,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4323317268504043} - m_Layer: 24 + m_Layer: 6 m_Name: Bone030 m_TagString: Untagged m_Icon: {fileID: 0} @@ -40074,7 +40074,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4954455173596384} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Toe21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -40106,7 +40106,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4042321954467302} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 Neck m_TagString: Untagged m_Icon: {fileID: 0} @@ -40142,7 +40142,7 @@ GameObject: - component: {fileID: 4102031562759159} - component: {fileID: 198342101734702326} - component: {fileID: 199275874121509045} - m_Layer: 24 + m_Layer: 6 m_Name: xian m_TagString: Untagged m_Icon: {fileID: 0} @@ -42612,7 +42612,7 @@ GameObject: - component: {fileID: 4388470968399278} - component: {fileID: 198429234619969281} - component: {fileID: 199720713939646086} - m_Layer: 24 + m_Layer: 6 m_Name: smock m_TagString: Untagged m_Icon: {fileID: 0} @@ -44972,7 +44972,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4301844766694862} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Forearm m_TagString: Untagged m_Icon: {fileID: 0} @@ -45006,7 +45006,7 @@ GameObject: - component: {fileID: 4382556219171585} - component: {fileID: 198352605010683124} - component: {fileID: 199625110464226267} - m_Layer: 24 + m_Layer: 6 m_Name: G m_TagString: Untagged m_Icon: {fileID: 0} @@ -47318,7 +47318,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4809589792969428} - m_Layer: 24 + m_Layer: 6 m_Name: Bone020 m_TagString: Untagged m_Icon: {fileID: 0} @@ -47351,7 +47351,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4937008231619454} - m_Layer: 24 + m_Layer: 6 m_Name: Bone014(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -47383,7 +47383,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4605338307297027} - m_Layer: 24 + m_Layer: 6 m_Name: Bone028(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -47415,7 +47415,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4326670400180047} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Finger11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -47446,7 +47446,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4274850217535487} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Toe0 m_TagString: Untagged m_Icon: {fileID: 0} @@ -47479,7 +47479,7 @@ GameObject: m_Component: - component: {fileID: 4912612845900424} - component: {fileID: 137069602758574548} - m_Layer: 24 + m_Layer: 6 m_Name: 6005 m_TagString: Untagged m_Icon: {fileID: 0} @@ -47673,7 +47673,7 @@ GameObject: - component: {fileID: 4432145909618922} - component: {fileID: 198638401502125164} - component: {fileID: 199363507130127804} - m_Layer: 24 + m_Layer: 6 m_Name: cici1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -50036,7 +50036,7 @@ GameObject: - component: {fileID: 4512440709952407} - component: {fileID: 198353749590758947} - component: {fileID: 199351255519148554} - m_Layer: 24 + m_Layer: 6 m_Name: 01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -52351,7 +52351,7 @@ GameObject: - component: {fileID: 4752287006280274} - component: {fileID: 198889689405010500} - component: {fileID: 199497470574716458} - m_Layer: 24 + m_Layer: 6 m_Name: dilie m_TagString: Untagged m_Icon: {fileID: 0} @@ -54686,7 +54686,7 @@ GameObject: - component: {fileID: 4778390824119175} - component: {fileID: 198791061104725372} - component: {fileID: 199681076140770883} - m_Layer: 24 + m_Layer: 6 m_Name: wenli1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -57011,7 +57011,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4487944738838480} - m_Layer: 24 + m_Layer: 6 m_Name: eff_4014_guike m_TagString: Untagged m_Icon: {fileID: 0} @@ -57045,7 +57045,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4521457321001960} - m_Layer: 0 + m_Layer: 6 m_Name: Collision0 m_TagString: Untagged m_Icon: {fileID: 0} @@ -57076,7 +57076,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4032560936813539} - m_Layer: 24 + m_Layer: 6 m_Name: Bone033 m_TagString: Untagged m_Icon: {fileID: 0} @@ -57108,7 +57108,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4205615985990792} - m_Layer: 24 + m_Layer: 6 m_Name: Bone015(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -57140,7 +57140,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4254086831398018} - m_Layer: 24 + m_Layer: 6 m_Name: Bone039(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -57171,7 +57171,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4520647193178352} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Toe2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -57203,7 +57203,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4961699977925304} - m_Layer: 24 + m_Layer: 6 m_Name: Bone016(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -57235,7 +57235,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4405062918493647} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Toe11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -57266,7 +57266,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4982440603233153} - m_Layer: 24 + m_Layer: 6 m_Name: Bone007 m_TagString: Untagged m_Icon: {fileID: 0} @@ -57298,7 +57298,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4054012565321367} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Foot m_TagString: Untagged m_Icon: {fileID: 0} @@ -57332,7 +57332,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4590504484409607} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Toe01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -57364,7 +57364,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4930103903076224} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -57404,7 +57404,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4154120779412304} - m_Layer: 24 + m_Layer: 6 m_Name: Bone017(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -57435,7 +57435,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4958540376366698} - m_Layer: 24 + m_Layer: 6 m_Name: Bone038(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -57466,7 +57466,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4377509267655456} - m_Layer: 24 + m_Layer: 6 m_Name: Bone037(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -57499,7 +57499,7 @@ GameObject: - component: {fileID: 4610560200392798} - component: {fileID: 198187499373088940} - component: {fileID: 199793346481547653} - m_Layer: 24 + m_Layer: 6 m_Name: fire m_TagString: Untagged m_Icon: {fileID: 0} @@ -59783,7 +59783,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4023682802293557} - m_Layer: 24 + m_Layer: 6 m_Name: Bone023(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -59815,7 +59815,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4068275325899181} - m_Layer: 24 + m_Layer: 6 m_Name: Bone024(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -59847,7 +59847,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4960308098937359} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Finger2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -59879,7 +59879,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4418901823760920} - m_Layer: 0 + m_Layer: 6 m_Name: autoFire_2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -59910,7 +59910,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4851268873363802} - m_Layer: 24 + m_Layer: 6 m_Name: Bone019 m_TagString: Untagged m_Icon: {fileID: 0} @@ -59945,7 +59945,7 @@ GameObject: - component: {fileID: 4325653474665073} - component: {fileID: 198355910700832744} - component: {fileID: 199958206910476351} - m_Layer: 24 + m_Layer: 6 m_Name: AN m_TagString: Untagged m_Icon: {fileID: 0} @@ -62260,7 +62260,7 @@ GameObject: - component: {fileID: 4551665788510654} - component: {fileID: 198770058339022499} - component: {fileID: 199193185375119265} - m_Layer: 24 + m_Layer: 6 m_Name: cici2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -64589,7 +64589,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4234305194749983} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Finger11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -64622,7 +64622,7 @@ GameObject: - component: {fileID: 4437887726509962} - component: {fileID: 198408106416167271} - component: {fileID: 199184550735412891} - m_Layer: 24 + m_Layer: 6 m_Name: dl04 m_TagString: Untagged m_Icon: {fileID: 0} @@ -66961,7 +66961,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4806261221001020} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Calf m_TagString: Untagged m_Icon: {fileID: 0} @@ -66995,7 +66995,7 @@ GameObject: - component: {fileID: 4583730136601856} - component: {fileID: 198387482069120402} - component: {fileID: 199183931471149883} - m_Layer: 24 + m_Layer: 6 m_Name: lizi01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -69447,7 +69447,7 @@ GameObject: - component: {fileID: 4794159828145879} - component: {fileID: 198743236504111021} - component: {fileID: 199924562111650557} - m_Layer: 24 + m_Layer: 6 m_Name: eff_bingdong_103 m_TagString: Untagged m_Icon: {fileID: 0} @@ -71750,7 +71750,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4992392277440602} - m_Layer: 24 + m_Layer: 6 m_Name: Bone009 m_TagString: Untagged m_Icon: {fileID: 0} @@ -71783,7 +71783,7 @@ GameObject: - component: {fileID: 4635570004059613} - component: {fileID: 198875266805698863} - component: {fileID: 199020178776344175} - m_Layer: 24 + m_Layer: 6 m_Name: yanwu m_TagString: Untagged m_Icon: {fileID: 0} @@ -74100,7 +74100,7 @@ GameObject: - component: {fileID: 4189075442046154} - component: {fileID: 198456206059818072} - component: {fileID: 199400898290734768} - m_Layer: 24 + m_Layer: 6 m_Name: dl01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -76430,7 +76430,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4171116201914167} - m_Layer: 24 + m_Layer: 6 m_Name: 0001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -76472,7 +76472,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4270323543748917} - m_Layer: 24 + m_Layer: 6 m_Name: Bone032(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -76506,7 +76506,7 @@ GameObject: - component: {fileID: 4512518902447893} - component: {fileID: 198688275435790645} - component: {fileID: 199916623311214954} - m_Layer: 24 + m_Layer: 6 m_Name: wenli m_TagString: Untagged m_Icon: {fileID: 0} @@ -78832,7 +78832,7 @@ GameObject: - component: {fileID: 4422995497020199} - component: {fileID: 198775789968746209} - component: {fileID: 199955739876875219} - m_Layer: 24 + m_Layer: 6 m_Name: lizi01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -81284,7 +81284,7 @@ GameObject: - component: {fileID: 4114623222832731} - component: {fileID: 198180539584762433} - component: {fileID: 199410484744608545} - m_Layer: 24 + m_Layer: 6 m_Name: huan5 m_TagString: Untagged m_Icon: {fileID: 0} @@ -83671,7 +83671,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4570136267066933} - m_Layer: 24 + m_Layer: 6 m_Name: IceEff_6005 m_TagString: Untagged m_Icon: {fileID: 0} @@ -83704,7 +83704,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4854792610688938} - m_Layer: 0 + m_Layer: 6 m_Name: Collision6 m_TagString: Untagged m_Icon: {fileID: 0} @@ -83735,7 +83735,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4073518694275987} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Toe2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -83767,7 +83767,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4902068626018784} - m_Layer: 24 + m_Layer: 6 m_Name: Bone011(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -83801,7 +83801,7 @@ GameObject: - component: {fileID: 4627329213661781} - component: {fileID: 198926163564764020} - component: {fileID: 199545470691813295} - m_Layer: 24 + m_Layer: 6 m_Name: xixian m_TagString: Untagged m_Icon: {fileID: 0} @@ -86270,7 +86270,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4186133902200382} - m_Layer: 24 + m_Layer: 6 m_Name: Bone013(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -86304,7 +86304,7 @@ GameObject: - component: {fileID: 4113772192857411} - component: {fileID: 198866867378692222} - component: {fileID: 199143010755899804} - m_Layer: 24 + m_Layer: 6 m_Name: glow_liang m_TagString: Untagged m_Icon: {fileID: 0} @@ -88639,7 +88639,7 @@ GameObject: - component: {fileID: 4206326036093425} - component: {fileID: 198091362633861974} - component: {fileID: 199042961213356316} - m_Layer: 24 + m_Layer: 6 m_Name: sx01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -90938,7 +90938,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4066339420624231} - m_Layer: 24 + m_Layer: 6 m_Name: Bone037 m_TagString: Untagged m_Icon: {fileID: 0} @@ -90969,7 +90969,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4353555347308992} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Toe0 m_TagString: Untagged m_Icon: {fileID: 0} @@ -91003,7 +91003,7 @@ GameObject: - component: {fileID: 4905110834941834} - component: {fileID: 198308313547879176} - component: {fileID: 199929699166154019} - m_Layer: 24 + m_Layer: 6 m_Name: lizi02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -93480,7 +93480,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4363858328811616} - m_Layer: 24 + m_Layer: 6 m_Name: Bone027 m_TagString: Untagged m_Icon: {fileID: 0} @@ -93514,7 +93514,7 @@ GameObject: - component: {fileID: 4035413797802494} - component: {fileID: 198428776378905598} - component: {fileID: 199160009235689095} - m_Layer: 24 + m_Layer: 6 m_Name: shitou m_TagString: Untagged m_Icon: {fileID: 0} @@ -95831,7 +95831,7 @@ GameObject: - component: {fileID: 4613788598730409} - component: {fileID: 198587721231648782} - component: {fileID: 199208069088290844} - m_Layer: 24 + m_Layer: 6 m_Name: lizi02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -98272,7 +98272,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4454300764336379} - m_Layer: 24 + m_Layer: 6 m_Name: Bone016 m_TagString: Untagged m_Icon: {fileID: 0} @@ -98304,7 +98304,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4679351029216982} - m_Layer: 0 + m_Layer: 6 m_Name: Collision5 m_TagString: Untagged m_Icon: {fileID: 0} @@ -98335,7 +98335,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4524285395497039} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Finger0 m_TagString: Untagged m_Icon: {fileID: 0} @@ -98369,7 +98369,7 @@ GameObject: - component: {fileID: 4850580783717416} - component: {fileID: 198343510452420623} - component: {fileID: 199992848434825754} - m_Layer: 24 + m_Layer: 6 m_Name: xixian (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -100840,7 +100840,7 @@ GameObject: - component: {fileID: 4629058678590959} - component: {fileID: 198893846597503305} - component: {fileID: 199784229320243697} - m_Layer: 24 + m_Layer: 6 m_Name: fire (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -103160,7 +103160,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4461267084447721} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Hand m_TagString: Untagged m_Icon: {fileID: 0} @@ -103196,7 +103196,7 @@ GameObject: - component: {fileID: 4971209558762503} - component: {fileID: 198395324569975071} - component: {fileID: 199890003824914307} - m_Layer: 24 + m_Layer: 6 m_Name: lizi01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -105628,7 +105628,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4601010924597392} - m_Layer: 24 + m_Layer: 6 m_Name: Bone029(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -105660,7 +105660,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4224906976044090} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Toe01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -105692,7 +105692,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4805470655259655} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Toe21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -105724,7 +105724,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4301405209026748} - m_Layer: 24 + m_Layer: 6 m_Name: eff_4014_idle_UI m_TagString: Untagged m_Icon: {fileID: 0} @@ -105756,7 +105756,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4966241836056950} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 Neck1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -105788,7 +105788,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4386042371923710} - m_Layer: 24 + m_Layer: 6 m_Name: Bone004 m_TagString: Untagged m_Icon: {fileID: 0} @@ -105821,7 +105821,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4027804322259061} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Foot m_TagString: Untagged m_Icon: {fileID: 0} @@ -105855,7 +105855,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4859520657387317} - m_Layer: 0 + m_Layer: 6 m_Name: Collision7 m_TagString: Untagged m_Icon: {fileID: 0} @@ -105888,7 +105888,7 @@ GameObject: - component: {fileID: 4698277338201301} - component: {fileID: 198853558550924981} - component: {fileID: 199187187685639286} - m_Layer: 24 + m_Layer: 6 m_Name: fire (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -108172,7 +108172,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4997806581634436} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L UpperArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -108204,7 +108204,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4909871388831704} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Finger01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -108235,7 +108235,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4694745547757211} - m_Layer: 24 + m_Layer: 6 m_Name: Bone041 m_TagString: Untagged m_Icon: {fileID: 0} @@ -108268,7 +108268,7 @@ GameObject: m_Component: - component: {fileID: 4423321067592847} - component: {fileID: 137276128810991376} - m_Layer: 24 + m_Layer: 6 m_Name: 6005_Guike m_TagString: Untagged m_Icon: {fileID: 0} @@ -108355,7 +108355,7 @@ GameObject: - component: {fileID: 4425844707481953} - component: {fileID: 198466971093898243} - component: {fileID: 199964375310087150} - m_Layer: 24 + m_Layer: 6 m_Name: shitou m_TagString: Untagged m_Icon: {fileID: 0} @@ -110670,7 +110670,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4684721051342141} - m_Layer: 24 + m_Layer: 6 m_Name: Bone030(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -110702,7 +110702,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4281280046592099} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Finger21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -110733,7 +110733,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4513611421586401} - m_Layer: 24 + m_Layer: 6 m_Name: Bone031 m_TagString: Untagged m_Icon: {fileID: 0} @@ -110765,7 +110765,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4350811731346326} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Finger1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -110799,7 +110799,7 @@ GameObject: - component: {fileID: 4829234311608091} - component: {fileID: 198640041847168439} - component: {fileID: 199979345899415508} - m_Layer: 24 + m_Layer: 6 m_Name: fire (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -113137,7 +113137,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4829742364916075} - m_Layer: 24 + m_Layer: 6 m_Name: Bone023 m_TagString: Untagged m_Icon: {fileID: 0} @@ -113169,7 +113169,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4571081934875588} - m_Layer: 24 + m_Layer: 6 m_Name: eff m_TagString: Untagged m_Icon: {fileID: 0} @@ -113214,7 +113214,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4413414075407306} - m_Layer: 24 + m_Layer: 6 m_Name: Bone011 m_TagString: Untagged m_Icon: {fileID: 0} @@ -113246,7 +113246,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4532504215679803} - m_Layer: 24 + m_Layer: 6 m_Name: Bone028 m_TagString: Untagged m_Icon: {fileID: 0} @@ -113278,7 +113278,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4259594124831070} - m_Layer: 24 + m_Layer: 6 m_Name: Bone014 m_TagString: Untagged m_Icon: {fileID: 0} @@ -113310,7 +113310,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4975779270063977} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Toe1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -113344,7 +113344,7 @@ GameObject: - component: {fileID: 4896025268679426} - component: {fileID: 198448141191186673} - component: {fileID: 199823558476420026} - m_Layer: 24 + m_Layer: 6 m_Name: 03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -115656,7 +115656,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4070587278938985} - m_Layer: 24 + m_Layer: 6 m_Name: Bone021 m_TagString: Untagged m_Icon: {fileID: 0} @@ -115687,7 +115687,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4062231851047330} - m_Layer: 0 + m_Layer: 6 m_Name: Collision3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -115720,7 +115720,7 @@ GameObject: - component: {fileID: 4325998272838733} - component: {fileID: 198891995767988396} - component: {fileID: 199039281836076802} - m_Layer: 24 + m_Layer: 6 m_Name: smock m_TagString: Untagged m_Icon: {fileID: 0} @@ -118044,7 +118044,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4621239577998307} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 L Hand m_TagString: Untagged m_Icon: {fileID: 0} @@ -118078,7 +118078,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4219083502109815} - m_Layer: 24 + m_Layer: 6 m_Name: Bone031(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -118110,7 +118110,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4640860336826542} - m_Layer: 24 + m_Layer: 6 m_Name: Bone038 m_TagString: Untagged m_Icon: {fileID: 0} @@ -118141,7 +118141,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4857460699080375} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 Spine1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -118173,7 +118173,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4485410518180956} - m_Layer: 24 + m_Layer: 6 m_Name: Camera001.Target m_TagString: Untagged m_Icon: {fileID: 0} @@ -118206,7 +118206,7 @@ GameObject: - component: {fileID: 4727600519382273} - component: {fileID: 198975850336750078} - component: {fileID: 199226291264488589} - m_Layer: 24 + m_Layer: 6 m_Name: eff_bingdong_101 m_TagString: Untagged m_Icon: {fileID: 0} @@ -120531,7 +120531,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4477884760534829} - m_Layer: 24 + m_Layer: 6 m_Name: eff m_TagString: Untagged m_Icon: {fileID: 0} @@ -120564,7 +120564,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4395617029929138} - m_Layer: 24 + m_Layer: 6 m_Name: Bip001 R Toe1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -120596,7 +120596,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4700481005391302} - m_Layer: 24 + m_Layer: 6 m_Name: Bone027(mirrored) m_TagString: Untagged m_Icon: {fileID: 0} @@ -120628,7 +120628,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4558876150691191} - m_Layer: 24 + m_Layer: 6 m_Name: eff m_TagString: Untagged m_Icon: {fileID: 0} @@ -120665,7 +120665,7 @@ GameObject: - component: {fileID: 4959968205899817} - component: {fileID: 198577604529593546} - component: {fileID: 199566389951180144} - m_Layer: 24 + m_Layer: 6 m_Name: dl02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -122997,7 +122997,7 @@ GameObject: - component: {fileID: 4208181268886417} - component: {fileID: 198741389593471698} - component: {fileID: 199777676488739826} - m_Layer: 24 + m_Layer: 6 m_Name: g01 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Art/FengLei/Boss/6005/6005_Appear.prefab b/Assets/Art/FengLei/Boss/6005/6005_Appear.prefab index bc5f912e1..3d635b7c8 100644 --- a/Assets/Art/FengLei/Boss/6005/6005_Appear.prefab +++ b/Assets/Art/FengLei/Boss/6005/6005_Appear.prefab @@ -104455,7 +104455,7 @@ Transform: 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_ConstrainProportionsScale: 1 m_Children: - {fileID: 4141736620951438} - {fileID: 4224090225784821} diff --git a/Assets/Art/FengLei/Boss/6005/6005_Timeline.prefab b/Assets/Art/FengLei/Boss/6005/6005_Timeline.prefab index f7417fcce..97fbd906c 100644 --- a/Assets/Art/FengLei/Boss/6005/6005_Timeline.prefab +++ b/Assets/Art/FengLei/Boss/6005/6005_Timeline.prefab @@ -221170,7 +221170,7 @@ Transform: serializedVersion: 2 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_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4031595288955731} diff --git a/Assets/Art/FengLei/Fish/10.prefab b/Assets/Art/FengLei/Fish/10.prefab index 383fe4297..a5d554da8 100644 --- a/Assets/Art/FengLei/Fish/10.prefab +++ b/Assets/Art/FengLei/Fish/10.prefab @@ -116,7 +116,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4078363723584466 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/53.prefab b/Assets/Art/FengLei/Fish/53.prefab index 4b173ffa1..8c41dd4d1 100644 --- a/Assets/Art/FengLei/Fish/53.prefab +++ b/Assets/Art/FengLei/Fish/53.prefab @@ -15650,8 +15650,8 @@ Transform: serializedVersion: 2 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: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 4321846029186879} - {fileID: 4269242581144960} diff --git a/Assets/Art/FengLei/ResLY/bundles/by_fish_update/bundles/fish/6005/6005_Appear_Timeline.playable b/Assets/Art/FengLei/ResLY/bundles/by_fish_update/bundles/fish/6005/6005_Appear_Timeline.playable index e679e077f..2b2c89850 100644 --- a/Assets/Art/FengLei/ResLY/bundles/by_fish_update/bundles/fish/6005/6005_Appear_Timeline.playable +++ b/Assets/Art/FengLei/ResLY/bundles/by_fish_update/bundles/fish/6005/6005_Appear_Timeline.playable @@ -91,7 +91,8 @@ MonoBehaviour: m_PreExtrapolationTime: 0.6 m_DisplayName: guike_idle_enter m_Markers: - m_Objects: [] + m_Objects: + - {fileID: -3933417496393116756} m_InfiniteClipPreExtrapolation: 0 m_InfiniteClipPostExtrapolation: 0 m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0} @@ -340,6 +341,22 @@ MonoBehaviour: m_DisplayName: eff m_Markers: m_Objects: [] +--- !u!114 &-3933417496393116756 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} + m_Name: Signal Emitter + m_EditorClassIdentifier: + m_Time: 3.2 + m_Retroactive: 0 + m_EmitOnce: 0 + m_Asset: {fileID: 0} --- !u!114 &-1334769003419259166 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index e37559ecc..954b20c99 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -500,7 +500,7 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 1, g: 0.9649341, b: 0.8537736, a: 1} - m_Intensity: 1 + m_Intensity: 3 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -591,7 +591,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.y - value: 0.7807017 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMin.y @@ -607,7 +607,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 210.65625 + value: 165.4 objectReference: {fileID: 0} - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.y @@ -615,7 +615,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 923.9531 + value: 720.3 objectReference: {fileID: 0} - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y @@ -631,7 +631,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 210.65625 + value: 165.4 objectReference: {fileID: 0} - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.y @@ -639,7 +639,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 1134.6094 + value: 885.7 objectReference: {fileID: 0} - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y @@ -735,7 +735,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 210.65625 + value: 165.4 objectReference: {fileID: 0} - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.y @@ -743,7 +743,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 1555.9219 + value: 1216.5 objectReference: {fileID: 0} - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y @@ -771,7 +771,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 210.65625 + value: 165.4 objectReference: {fileID: 0} - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.y @@ -779,7 +779,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 315.98438 + value: 248.09999 objectReference: {fileID: 0} - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y @@ -795,7 +795,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 210.65625 + value: 165.4 objectReference: {fileID: 0} - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.y @@ -803,7 +803,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 1345.2656 + value: 1051.1 objectReference: {fileID: 0} - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y @@ -822,7 +822,7 @@ PrefabInstance: - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 397.3125 + value: 306.8 objectReference: {fileID: 0} - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} @@ -832,7 +832,7 @@ PrefabInstance: - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 619.96875 + value: 484.19998 objectReference: {fileID: 0} - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} @@ -852,7 +852,7 @@ PrefabInstance: - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 210.65625 + value: 165.4 objectReference: {fileID: 0} - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} @@ -862,7 +862,7 @@ PrefabInstance: - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 105.328125 + value: 82.7 objectReference: {fileID: 0} - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} diff --git a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs index c15a3f68d..6252e4db1 100644 --- a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs +++ b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs @@ -615,7 +615,7 @@ public class CreateFishManager : MonoSingleton return; foreach (var item in bossList) { - if (item.fishNumber == "11042") + if (item.fishNumber == "11035") { item.isCreate = 2; } @@ -1413,8 +1413,11 @@ public class CreateFishManager : MonoSingleton public void Id_DieFish_FX(string fishId, RedPacketRecord coinNum, Vector3 v3Point) { if (!fishDatas_hashCodekey.TryGetValue(fishId, out var monster)) return; + if (false) + { + AudioManager.Instance.PlayerFX(60004); - AudioManager.Instance.PlayerFX(60004); + } // 死亡粒子特效 Instantiate( diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/BWX/1614.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/BWX/1614.prefab index 974ba6807..c7cb9c827 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/BWX/1614.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/BWX/1614.prefab @@ -18,7 +18,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1762314594274149, guid: 18de46de860592b41811159997387914, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1762314594274149, guid: 18de46de860592b41811159997387914, type: 3} propertyPath: m_TagString @@ -146,6 +146,7 @@ MonoBehaviour: isyz: 0 yzID: colliderList: [] + rotationPY: 60 isRotate: 1 ischild0: 0 depthOffset: 0 diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/Image.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/Image.prefab index 1cf076268..f99e28c22 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/Image.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/Image.prefab @@ -83,6 +83,49 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2228169962128689794, guid: 3098188d5a351294099bcec3fd687086, + type: 3} + propertyPath: m_text + value: 123456789 + objectReference: {fileID: 0} + - target: {fileID: 2228169962128689794, guid: 3098188d5a351294099bcec3fd687086, + type: 3} + propertyPath: m_fontSize + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 2228169962128689794, guid: 3098188d5a351294099bcec3fd687086, + type: 3} + propertyPath: m_margin.y + value: -2.5832825 + objectReference: {fileID: 0} + - target: {fileID: 2228169962128689794, guid: 3098188d5a351294099bcec3fd687086, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: fdd40eef2e75f6d46b51c289c46fe60b, + type: 2} + - target: {fileID: 2228169962128689794, guid: 3098188d5a351294099bcec3fd687086, + type: 3} + propertyPath: m_spriteAsset + value: + objectReference: {fileID: 11400000, guid: b5a3b539bfcb41e46ad594b9b14d7732, + type: 2} + - target: {fileID: 2228169962128689794, guid: 3098188d5a351294099bcec3fd687086, + type: 3} + propertyPath: m_fontSizeBase + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 2228169962128689794, guid: 3098188d5a351294099bcec3fd687086, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 581533097809427942, guid: fdd40eef2e75f6d46b51c289c46fe60b, + type: 2} + - target: {fileID: 2228169962128689794, guid: 3098188d5a351294099bcec3fd687086, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4037318567371660720, guid: 3098188d5a351294099bcec3fd687086, type: 3} propertyPath: m_Sprite @@ -104,6 +147,26 @@ PrefabInstance: propertyPath: m_Color.r value: 1 objectReference: {fileID: 0} + - target: {fileID: 5779279776821071037, guid: 3098188d5a351294099bcec3fd687086, + type: 3} + propertyPath: m_SizeDelta.x + value: 81.3734 + objectReference: {fileID: 0} + - target: {fileID: 5779279776821071037, guid: 3098188d5a351294099bcec3fd687086, + type: 3} + propertyPath: m_SizeDelta.y + value: 50.3739 + objectReference: {fileID: 0} + - target: {fileID: 5779279776821071037, guid: 3098188d5a351294099bcec3fd687086, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 40.6866 + objectReference: {fileID: 0} + - target: {fileID: 5779279776821071037, guid: 3098188d5a351294099bcec3fd687086, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 25.187 + objectReference: {fileID: 0} - target: {fileID: 6975063179180105496, guid: 3098188d5a351294099bcec3fd687086, type: 3} propertyPath: m_Name diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/Image Variant 1.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/Image Variant 1.prefab index 950a25bc6..fdc221083 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/Image Variant 1.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/Image Variant 1.prefab @@ -8,6 +8,12 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3080829888871638985, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_spriteAsset + value: + objectReference: {fileID: 11400000, guid: b5a3b539bfcb41e46ad594b9b14d7732, + type: 2} - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, type: 3} propertyPath: m_Pivot.x @@ -111,7 +117,7 @@ PrefabInstance: - target: {fileID: 6116211215255876179, guid: 45afc82bd78fcde4094d06a4b547efa8, type: 3} propertyPath: m_Name - value: Image Variant + value: Image Variant 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004_Timeline Variant.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004_Timeline Variant.prefab index 12bafd267..b6563537f 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004_Timeline Variant.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004_Timeline Variant.prefab @@ -435,7 +435,8 @@ MonoBehaviour: bjEndUI: {fileID: 4300126860111980404, guid: 9d8938fe92e976a49a8a28b11dca817b, type: 3} useScorePanel: 1 tMP_Score: {fileID: 0} - scorePanelPrefab: {fileID: 0} + scorePanelPrefab: {fileID: 8000219247718126128, guid: 16f64cb9e376a534ea6090f7f5526ff9, + type: 3} currScore: 0 maxScore: 0 scoreCount: 0 diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/RYGZDieEvent.cs b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/RYGZDieEvent.cs index e3e714b1e..02d9bc3ab 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/RYGZDieEvent.cs +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/RYGZDieEvent.cs @@ -9,12 +9,6 @@ public class RYGZDieEvent : BJEventBase public PlayableDirector playable; public List bJ_BeiShu; - private void Awake() - { - playable.Play(); - playable.played += PlayEnd; - } - public override void Init(int goldCount, int posID, int paobei, int fishScore, int beishu, Action action, Action action1 = null) { base.Init(goldCount, posID, paobei, fishScore, beishu, action, action1); diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/1507.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/1507.prefab index 3ce3face9..e55b89fef 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/1507.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/1507.prefab @@ -8,14 +8,442 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1000047880255153, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1020388254303257, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1023899527961757, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1025044711767928, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1047958318575695, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1061673907817928, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1064875186042315, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1069150622783442, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1069891472032752, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1081515072166144, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1083889986615464, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1100337083335907, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1110385042379022, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1117026477734570, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1122108844505147, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1125674073784959, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1129526986025474, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1148789023174892, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1148986985590682, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1151245071096528, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1159211273766745, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1159967300087648, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1182512113284877, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1224251199135591, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1224550794541798, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1229653892597655, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1234936929235536, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1249437346254066, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1259584948038424, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1261644085789916, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1274560706977207, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1282815660588215, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1295172476761185, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1304005453343461, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1310389160897549, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1324993696190721, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1330988605608859, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1335117653653260, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1340277374273723, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1344870923720478, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1379378357267925, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1387346643493430, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1391480474478590, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1391604356014761, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1401720884462265, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1410429789288692, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1413696254824043, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1419657819823412, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1437068440523723, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1458347476734841, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1465643657839552, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1482600274428945, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1485600149289145, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1499242402983650, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1527552168043532, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1530466710150290, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1535982419230924, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1537833327291216, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1539040401261604, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1552726463583007, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1572673379867170, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1577572035993366, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1587514997101303, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1594108478372419, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1601068982136337, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1623451375703384, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1624617529756087, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1642988724029594, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1657461969813361, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1663476039215666, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1673105902146238, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1679763498316899, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1692557646033256, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1705991581996953, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1726660070587331, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1733711511207116, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1745557620440368, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1780397149185839, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1781802954892212, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1781849000304793, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1806979888850343, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1855650179603083, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1863601004407466, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1874330608169405, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1877577515217831, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1878516596444722, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1882116526746628, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1882730725278054, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1885227567516516, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1894675376595670, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1909173923938689, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1916969490939988, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1933880046699581, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1942873585626616, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1944322898946275, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1962820162793673, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1962974997976134, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 1977958631779273, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} propertyPath: m_Name value: 1507 objectReference: {fileID: 0} + - target: {fileID: 1977958631779273, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 1977958631779273, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1977958631779273, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} + - target: {fileID: 1985387598508205, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1986779738316112, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1988490561141676, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1989970529829203, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1993322998707240, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1993514855697307, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1994948400744769, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1998396180302994, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 4188195127505461, guid: f11065bf68488f64e9d9b8acc8c4caff, type: 3} propertyPath: m_LocalScale.x value: 5 @@ -172,12 +600,13 @@ MonoBehaviour: currEffect_DieAward: {fileID: 0} isMove: 1 is3D: 0 - forwordXYZ: + forwordXYZ: -X fishenum: 0 moveTime: 0 isyz: 0 yzID: colliderList: [] + rotationPY: 60 isRotate: 0 ischild0: 1 depthOffset: 210 diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/SYEY/1615.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/SYEY/1615.prefab index b1a996ebd..b36f3556f 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/SYEY/1615.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/SYEY/1615.prefab @@ -1,5 +1,82 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3364939045682014482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8411304848490810974} + - component: {fileID: 8099614756553645666} + m_Layer: 6 + m_Name: GameObject + m_TagString: Fish + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8411304848490810974 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3364939045682014482} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071068, 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: 8409221660937945569} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &8099614756553645666 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3364939045682014482} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 1.1071548, y: 0.9448999} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 13.980446, y: 2.8898003} + m_EdgeRadius: 0 --- !u!1001 &7788930918133232126 PrefabInstance: m_ObjectHideFlags: 0 @@ -18,7 +95,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1062856682836742, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4548145363799769, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} propertyPath: m_LocalScale.x @@ -137,14 +214,15 @@ MonoBehaviour: currEffect_DieAward: {fileID: 0} isMove: 1 is3D: 0 - forwordXYZ: X + forwordXYZ: Z fishenum: 0 moveTime: 0 isyz: 0 yzID: colliderList: [] + rotationPY: 90 isRotate: 1 - ischild0: 0 + ischild0: 1 depthOffset: 0 bossName: "\u6DF1\u6E0A\u9CC4\u9C7C" isToUI: 1 @@ -205,6 +283,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1062856682836742, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1062856682836742, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} propertyPath: m_TagString value: Fish @@ -533,6 +615,34 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 4422366095995752, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4422366095995752, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4422366095995752, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4422366095995752, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4422366095995752, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4422366095995752, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4422366095995752, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4548145363799769, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -547,7 +657,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4548145363799769, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 4548145363799769, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} propertyPath: m_LocalRotation.x @@ -555,7 +665,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4548145363799769, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 4548145363799769, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} propertyPath: m_LocalRotation.z @@ -567,7 +677,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4548145363799769, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 4548145363799769, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -575,64 +685,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 1062856682836742, guid: 15beeda2ce626134eb1be15b3aaac6a1, + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4548145363799769, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} insertIndex: -1 - addedObject: {fileID: 887737559524805349} + addedObject: {fileID: 8411304848490810974} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15beeda2ce626134eb1be15b3aaac6a1, type: 3} ---- !u!1 &8403823153414331454 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1062856682836742, guid: 15beeda2ce626134eb1be15b3aaac6a1, - type: 3} - m_PrefabInstance: {fileID: 8404743884729601848} - m_PrefabAsset: {fileID: 0} ---- !u!61 &887737559524805349 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8403823153414331454} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.997592, y: 0.5421695} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 14.27231, y: 3.1253042} - m_EdgeRadius: 0 --- !u!4 &8409221660937945569 stripped Transform: m_CorrespondingSourceObject: {fileID: 4548145363799769, guid: 15beeda2ce626134eb1be15b3aaac6a1, diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/Image Variant 1.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/Image Variant 1.prefab index 4469d5fb3..59939c771 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/Image Variant 1.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/Image Variant 1.prefab @@ -20,6 +20,41 @@ PrefabInstance: value: objectReference: {fileID: 2016389554, guid: 68e4fec764425b4438eb6a06c7b99c16, type: 3} + - target: {fileID: 3080829888871638985, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_SizeDelta.x + value: 286 + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_SizeDelta.y + value: 179 + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalScale.x + value: 0.68171525 + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalScale.y + value: 0.68171525 + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalScale.z + value: 0.68171525 + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 15 + objectReference: {fileID: 0} - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, type: 3} propertyPath: m_Pivot.x diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/UI_baojiang 7.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/UI_baojiang 7.prefab deleted file mode 100644 index 9365c274b..000000000 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/UI_baojiang 7.prefab +++ /dev/null @@ -1,349 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &2200719792388851550 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1054457973298401984, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_SizeDelta.x - value: 266.4422 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_SizeDelta.y - value: 128.3306 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalScale.x - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalScale.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalScale.z - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -365.77893 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -143.83472 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1661708344126307675, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2144753057044015635, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_Name - value: UI_baojiang - objectReference: {fileID: 0} - - target: {fileID: 2499807387639965376, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_text - value: 700 - objectReference: {fileID: 0} - - target: {fileID: 2499807387639965376, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_fontSize - value: 31.9 - objectReference: {fileID: 0} - - target: {fileID: 2499807387639965376, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: fdd40eef2e75f6d46b51c289c46fe60b, - type: 2} - - target: {fileID: 2499807387639965376, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_spriteAsset - value: - objectReference: {fileID: 11400000, guid: b5a3b539bfcb41e46ad594b9b14d7732, - type: 2} - - target: {fileID: 2499807387639965376, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_fontSizeBase - value: 31.9 - objectReference: {fileID: 0} - - target: {fileID: 2499807387639965376, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 581533097809427942, guid: fdd40eef2e75f6d46b51c289c46fe60b, - type: 2} - - target: {fileID: 2499807387639965376, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_VerticalAlignment - value: 512 - objectReference: {fileID: 0} - - target: {fileID: 2499807387639965376, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2499807387639965376, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_hasFontAssetChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2670611888380530387, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_SizeDelta.x - value: 361.872 - objectReference: {fileID: 0} - - target: {fileID: 2670611888380530387, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_SizeDelta.y - value: 89.772 - objectReference: {fileID: 0} - - target: {fileID: 2670611888380530387, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 23.282 - objectReference: {fileID: 0} - - target: {fileID: 2670611888380530387, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -182.003 - objectReference: {fileID: 0} - - target: {fileID: 5805751044334051617, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5805751044334051617, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5805751044334051617, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5805751044334051617, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5805751044334051617, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 129 - objectReference: {fileID: 0} - - target: {fileID: 5805751044334051617, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 6769213647795418602, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 86 - objectReference: {fileID: 0} - - target: {fileID: 6769213647795418602, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 64 - objectReference: {fileID: 0} - - target: {fileID: 7745405151849361746, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_text - value: 123456789 - objectReference: {fileID: 0} - - target: {fileID: 7745405151849361746, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_fontSize - value: 25.7 - objectReference: {fileID: 0} - - target: {fileID: 7745405151849361746, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: fdd40eef2e75f6d46b51c289c46fe60b, - type: 2} - - target: {fileID: 7745405151849361746, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_spriteAsset - value: - objectReference: {fileID: 11400000, guid: b5a3b539bfcb41e46ad594b9b14d7732, - type: 2} - - target: {fileID: 7745405151849361746, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_fontSizeBase - value: 25.7 - objectReference: {fileID: 0} - - target: {fileID: 7745405151849361746, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 581533097809427942, guid: fdd40eef2e75f6d46b51c289c46fe60b, - type: 2} - - target: {fileID: 7745405151849361746, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_VerticalAlignment - value: 512 - objectReference: {fileID: 0} - - target: {fileID: 7745405151849361746, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_enableWordWrapping - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7745405151849361746, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - propertyPath: m_hasFontAssetChanged - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 2144753057044015635, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1790254316978060978} - m_SourcePrefab: {fileID: 100100000, guid: 016cca90246ec334390dabcc5bdb6207, type: 3} ---- !u!1 &236781439713602893 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2144753057044015635, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - m_PrefabInstance: {fileID: 2200719792388851550} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1790254316978060978 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 236781439713602893} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f0df2f946ba608449970c84418dade5, type: 3} - m_Name: - m_EditorClassIdentifier: - tMP_beishu: {fileID: 4340237964197962142} - tMP_score: {fileID: 8500458599698691596} ---- !u!114 &4340237964197962142 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2499807387639965376, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - m_PrefabInstance: {fileID: 2200719792388851550} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &8500458599698691596 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7745405151849361746, guid: 016cca90246ec334390dabcc5bdb6207, - type: 3} - m_PrefabInstance: {fileID: 2200719792388851550} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG.meta b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG.meta new file mode 100644 index 000000000..dc6334107 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 321cde4ba9212814ab4a9b6108df1967 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005.prefab new file mode 100644 index 000000000..2193b4168 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005.prefab @@ -0,0 +1,444 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5936053923819694911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7130714379129045313} + - component: {fileID: 4627129963463613125} + m_Layer: 6 + m_Name: GameObject + m_TagString: Fish + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7130714379129045313 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5936053923819694911} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.6374519, z: -0, w: 0.77049017} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8126880669741268042} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &4627129963463613125 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5936053923819694911} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.055077314, y: 2.8720133} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 7.0064616, y: 6.7440267} + m_EdgeRadius: 0 +--- !u!1001 &3685090983822051395 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6471471867699274942} + m_Modifications: + - target: {fileID: 1764548201235383, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} + propertyPath: m_Name + value: 6005_Appear + objectReference: {fileID: 0} + - target: {fileID: 1764548201235383, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4692244219125431, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4692244219125431, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4692244219125431, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4692244219125431, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4692244219125431, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4692244219125431, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4692244219125431, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4692244219125431, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4692244219125431, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4692244219125431, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1969649125323101, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4329792064066470381} + m_SourcePrefab: {fileID: 100100000, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, type: 3} +--- !u!1 &3684768970059495710 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1969649125323101, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, + type: 3} + m_PrefabInstance: {fileID: 3685090983822051395} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4329792064066470381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3684768970059495710} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Events: + m_Signals: + - {fileID: 11400000, guid: 1508e534c5cd88d459d245dd3557a1c6, type: 2} + m_Events: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2844307387191905378} + m_TargetAssemblyTypeName: FLZY_Boss_YGLG, Assembly-CSharp + m_MethodName: BossStart + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!4 &3689777591512995572 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4692244219125431, guid: 675c7eb7cddeefa48bf0e5c4f4b3332e, + type: 3} + m_PrefabInstance: {fileID: 3685090983822051395} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6476121529720977759 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1180172148385199, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_Name + value: 6005 + objectReference: {fileID: 0} + - target: {fileID: 1180172148385199, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 1719214193864927, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + - {fileID: 1123687199864811, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8131162540304285179} + - targetCorrespondingSourceObject: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3689777591512995572} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1180172148385199, guid: 24f1136b5772c7a428221f9ea1e47092, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2844307387191905378} + m_SourcePrefab: {fileID: 100100000, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} +--- !u!4 &6471471867699274942 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, + type: 3} + m_PrefabInstance: {fileID: 6476121529720977759} + m_PrefabAsset: {fileID: 0} +--- !u!1 &6475049694655061232 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1180172148385199, guid: 24f1136b5772c7a428221f9ea1e47092, + type: 3} + m_PrefabInstance: {fileID: 6476121529720977759} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2844307387191905378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6475049694655061232} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e7aa4894c2708f478638bccf6d66d1a, type: 3} + m_Name: + m_EditorClassIdentifier: + beilv: 0 + guid: + monsterData: + die_Score: 0 + isDie: 0 + fishTypeConfig: + fishNumber: + fishName: + fishType: 0 + fishScore: 0 + killWeight: 0 + pathList: + skeleton: {fileID: 0} + isSpine: 1 + fishTypeID: 11035 + currState: 1 + HP: 5 + effect_Die: {fileID: 0} + effect_DieAward: {fileID: 2983011714766503801, guid: c73d8b17820f88f4a99ee2beb0caca6e, + type: 3} + currEffect_DieAward: {fileID: 0} + isMove: 1 + is3D: 0 + forwordXYZ: Z + fishenum: 0 + moveTime: 0 + isyz: 0 + yzID: + colliderList: [] + rotationPY: 0 + isRotate: 1 + ischild0: 1 + depthOffset: 130 + bossName: "\u8FDC\u53E4\u9F99\u9F9F" + isToUI: 1 + tMP_CurrBossScore: {fileID: 0} + currBossScoreValue: 0 + bossScoreValue: 0 + poolNum: 0 + prizeCount: 8 + ZhuCam: {fileID: 0} + isDieFish: 0 + dieTime: 3 + v3: {x: 0, y: 0, z: 0} + playable: {fileID: 0} +--- !u!1001 &8126523871117287450 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6471471867699274942} + m_Modifications: + - target: {fileID: 1180172148385199, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_Name + value: 6005 (1) + objectReference: {fileID: 0} + - target: {fileID: 1180172148385199, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalScale.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 320336462471690087, guid: 24f1136b5772c7a428221f9ea1e47092, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4306300360399952, guid: 24f1136b5772c7a428221f9ea1e47092, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7130714379129045313} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 24f1136b5772c7a428221f9ea1e47092, type: 3} +--- !u!4 &8126880669741268042 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4306300360399952, guid: 24f1136b5772c7a428221f9ea1e47092, + type: 3} + m_PrefabInstance: {fileID: 8126523871117287450} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8131162540304285179 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4652413757758945, guid: 24f1136b5772c7a428221f9ea1e47092, + type: 3} + m_PrefabInstance: {fileID: 8126523871117287450} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/UI_baojiang 7.prefab.meta b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005.prefab.meta similarity index 74% rename from Assets/MyGame/aa/Game/FLZY/BOSS/TSK/UI_baojiang 7.prefab.meta rename to Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005.prefab.meta index 110a42b73..2503f744f 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/UI_baojiang 7.prefab.meta +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ea378f0485df17446abc2541b0c150fa +guid: 194e09c929d77b4428470b6f3861cbaf PrefabImporter: externalObjects: {} userData: diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005_Timeline Variant.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005_Timeline Variant.prefab new file mode 100644 index 000000000..3a225c077 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005_Timeline Variant.prefab @@ -0,0 +1,179 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2981400861485360273 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1646037670075368, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_Name + value: 6005_Timeline Variant + objectReference: {fileID: 0} + - target: {fileID: 4091516237691967, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4091516237691967, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4091516237691967, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4091516237691967, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4091516237691967, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4091516237691967, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4091516237691967, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4091516237691967, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4091516237691967, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4091516237691967, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4944758566893129, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalRotation.w + value: 0.66092944 + objectReference: {fileID: 0} + - target: {fileID: 4944758566893129, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalRotation.x + value: 0.101996854 + objectReference: {fileID: 0} + - target: {fileID: 4944758566893129, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7354274 + objectReference: {fileID: 0} + - target: {fileID: 4944758566893129, guid: 185787de59441cf49be38e6b31956cd1, type: 3} + propertyPath: m_LocalRotation.z + value: 0.10915822 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1646037670075368, guid: 185787de59441cf49be38e6b31956cd1, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5786818863089195692} + - targetCorrespondingSourceObject: {fileID: 1461080587964743, guid: 185787de59441cf49be38e6b31956cd1, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5171096580736390918} + m_SourcePrefab: {fileID: 100100000, guid: 185787de59441cf49be38e6b31956cd1, type: 3} +--- !u!1 &2982826138642937302 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1461080587964743, guid: 185787de59441cf49be38e6b31956cd1, + type: 3} + m_PrefabInstance: {fileID: 2981400861485360273} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5171096580736390918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2982826138642937302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Events: + m_Signals: + - {fileID: 11400000, guid: 344d1087c2077664ebcfebc51d6cf167, type: 2} + - {fileID: 11400000, guid: aca498d52b11314418047bc8d6c097ae, type: 2} + m_Events: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5786818863089195692} + m_TargetAssemblyTypeName: YGLGDieEvent, Assembly-CSharp + m_MethodName: SetScore + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5786818863089195692} + m_TargetAssemblyTypeName: YGLGDieEvent, Assembly-CSharp + m_MethodName: Die + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &2983011714766503801 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1646037670075368, guid: 185787de59441cf49be38e6b31956cd1, + type: 3} + m_PrefabInstance: {fileID: 2981400861485360273} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5786818863089195692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2983011714766503801} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e416a1c176714f447aa45de6795b08bb, type: 3} + m_Name: + m_EditorClassIdentifier: + bjEndUI: {fileID: 4300126860111980404, guid: 2d989bfd6e356cf47a36dbc1ed304ace, type: 3} + useScorePanel: 1 + tMP_Score: {fileID: 0} + scorePanelPrefab: {fileID: 8000219247718126128, guid: 5be97201583512e43815b3964e390070, + type: 3} + currScore: 0 + maxScore: 0 + scoreCount: 0 + posID: 0 + paoBei: 0 + fishScore: 0 + bJbeishu: 0 + showDelay: 3 + moveDuration: 0.5 + moveEase: 6 + startOffset: {x: 0, y: 0, z: -100} + bjEndUIOffsetY: 150 + coinFlyDuration: 0.5 + coinArrivalInterval: 0.1 + isSelf: 0 + totalBJCount: 0 + currBJCount: 0 + isEffEnd: 0 + isScoreStart: 0 + isScoreEnd: 0 + isGoldEffectStart: 0 + playable: {fileID: 0} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005_Timeline Variant.prefab.meta b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005_Timeline Variant.prefab.meta new file mode 100644 index 000000000..26cd3e8a5 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005_Timeline Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c73d8b17820f88f4a99ee2beb0caca6e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/FLZY_Boss_YGLG.cs b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/FLZY_Boss_YGLG.cs new file mode 100644 index 000000000..502fb2203 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/FLZY_Boss_YGLG.cs @@ -0,0 +1,80 @@ +using Assets.MyGame.Scripts.Net.WebResponses; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Playables; + +public class FLZY_Boss_YGLG : MonsterControl_BossBase +{ + public PlayableDirector playable; + public override void OnEnable() + { + base.OnEnable(); + //playable.Play(); + //playable.played += PlayEnd; + currState = CharacterStateType.idle; + + transform.GetChild(1).gameObject.SetActive(true); + transform.GetChild(0).gameObject.SetActive(false); + } + public void BossStart() + { + transform.GetChild(1).gameObject.SetActive(false); + transform.GetChild(0).gameObject.SetActive(true); + currState=CharacterStateType.move; + + } + //public void PlayEnd(PlayableDirector playableDirector) + //{ + // CreateFishManager.Instance.Id_DieFish_NotFX(guid); + //} + public void PlayEnd() + { + CreateFishManager.Instance.Id_DieFish_NotFX(guid); + } + public override void Init(string pathId, float Time, bool isyuzhen = false, string yzID = "") + { + base.Init(pathId, Time, isyuzhen, yzID); + transform.position = Vector3.zero; + + } + public override void OnMoveUpdata() + { + base.OnMoveUpdata(); + if (moveTime >= monsterData.moveLine.moveTime) + { + CreateFishManager.Instance.Id_DieFish_NotFX(guid); + } + + } + public override void DieFish(RoomKillNotice obj = null) + { + base.DieFish(obj); + CreateFishManager.Instance.Id_DieFish_NotFX(guid); + action_effect_DieAward = (o) => + { + if (obj == null) return; + + foreach (var item in CreateFishManager.Instance.currGameType.list_Sits) + { + if (item.user == obj.userId) + { + + + + var v = o.GetComponent(); + v.Init( + obj.gold, // goldCount + item.posID, // posID + obj.skillsGold, // paobei + obj.fishScore, // fishScore + obj.beishu, // beishu + JiaFen, // action + () => { v.obj = obj.param; } + ); + + } + } + }; + } +} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/FLZY_Boss_YGLG.cs.meta b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/FLZY_Boss_YGLG.cs.meta new file mode 100644 index 000000000..762b0b2b9 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/FLZY_Boss_YGLG.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9e7aa4894c2708f478638bccf6d66d1a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/Image Variant 1.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/Image Variant 1.prefab new file mode 100644 index 000000000..975ba9a0d --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/Image Variant 1.prefab @@ -0,0 +1,202 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4316516302973657187 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 876563005888737531, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b7bca2181223d0746b70268e4d33efd2, + type: 3} + - target: {fileID: 2271959875426919958, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -1793308419, guid: 68e4fec764425b4438eb6a06c7b99c16, + type: 3} + - target: {fileID: 3080829888871638985, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_text + value: 123456789 + objectReference: {fileID: 0} + - target: {fileID: 3080829888871638985, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_fontSize + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3080829888871638985, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_fontSizeBase + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_SizeDelta.x + value: 289 + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_SizeDelta.y + value: 207 + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalScale.x + value: 0.68171525 + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalScale.y + value: 0.68171525 + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalScale.z + value: 0.68171525 + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3832223424831496137, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 90.7 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_SizeDelta.x + value: 259.86 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -244 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5057580892980106450, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6116211215255876179, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_Name + value: Image Variant 1 + objectReference: {fileID: 0} + - target: {fileID: 7212905019190616566, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_SizeDelta.x + value: 89.5732 + objectReference: {fileID: 0} + - target: {fileID: 7212905019190616566, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_SizeDelta.y + value: 56.5669 + objectReference: {fileID: 0} + - target: {fileID: 7212905019190616566, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 44.786613 + objectReference: {fileID: 0} + - target: {fileID: 7212905019190616566, guid: 45afc82bd78fcde4094d06a4b547efa8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 28.283417 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 45afc82bd78fcde4094d06a4b547efa8, type: 3} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/Image Variant 1.prefab.meta b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/Image Variant 1.prefab.meta new file mode 100644 index 000000000..314cf7b5e --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/Image Variant 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5be97201583512e43815b3964e390070 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/UI_baojiang Variant 11.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/UI_baojiang Variant 11.prefab new file mode 100644 index 000000000..91015a138 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/UI_baojiang Variant 11.prefab @@ -0,0 +1,156 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2555049829235497414 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 236781439713602893, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_Name + value: UI_baojiang Variant 11 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_SizeDelta.x + value: 260.1427 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_SizeDelta.y + value: 133.8018 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -368.92865 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -141.09912 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2278261232015200288, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -1793308419, guid: 68e4fec764425b4438eb6a06c7b99c16, + type: 3} + - target: {fileID: 4213903445032130685, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_SizeDelta.x + value: 289 + objectReference: {fileID: 0} + - target: {fileID: 4213903445032130685, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_SizeDelta.y + value: 207 + objectReference: {fileID: 0} + - target: {fileID: 4213903445032130685, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalScale.x + value: 3.7860532 + objectReference: {fileID: 0} + - target: {fileID: 4213903445032130685, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalScale.y + value: 3.7860532 + objectReference: {fileID: 0} + - target: {fileID: 4213903445032130685, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_LocalScale.z + value: 3.7860532 + objectReference: {fileID: 0} + - target: {fileID: 4213903445032130685, guid: a96966a1d55149a4f83724f224013303, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 61 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a96966a1d55149a4f83724f224013303, type: 3} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/UI_baojiang Variant 11.prefab.meta b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/UI_baojiang Variant 11.prefab.meta new file mode 100644 index 000000000..3bf9562c3 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/UI_baojiang Variant 11.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2d989bfd6e356cf47a36dbc1ed304ace +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/YGLGDieEvent.cs b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/YGLGDieEvent.cs new file mode 100644 index 000000000..0b6b62aa2 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/YGLGDieEvent.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Playables; + +public class YGLGDieEvent : BJEventBase +{ + public PlayableDirector playable; + + public override void Init(int goldCount, int posID, int paobei, int fishScore, int beishu, Action action, Action action1 = null) + { + base.Init(goldCount, posID, paobei, fishScore, beishu, action, action1); + } + public void SetScore() + { + int target = bJbeishu; + StartCoroutine(ScrollTo(target, () => MoveToSit() )); + + } + public void Die() + { + transform.GetChild(0).gameObject.SetActive(false); + } + /// 从 currScore 滚动到 target,同时爆破金币效果,完成回调 onComplete + private IEnumerator ScrollTo(int target, Action onComplete) + { + int from = currScore; + float duration = 5f; + float elapsed = 0f; + float coinInterval = 0.12f; + float nextCoinTime = 0f; + + while (elapsed < duration) + { + elapsed += Time.deltaTime; + float t = elapsed / duration; + currScore = (int)Mathf.Lerp(from, target, t); + if (tMP_Score != null) + tMP_Score.text = currScore.ToString(); + + // 每隔 coinInterval 爆一波金币 + if (elapsed >= nextCoinTime) + { + + nextCoinTime += coinInterval; + } + + yield return null; + } + + currScore = target; + if (tMP_Score != null) + tMP_Score.text = target.ToString(); + + //// 最后补一波金币 + //layeredPool = new LayeredPool(paoBei * fishScore / 2, 1); + //BigPrize(5, 10); + //yield return new WaitForSeconds(0.3f); // 等最后一批金币飞到 + + onComplete?.Invoke(); + } +} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/YGLGDieEvent.cs.meta b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/YGLGDieEvent.cs.meta new file mode 100644 index 000000000..ba20f37e6 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/YGLGDieEvent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e416a1c176714f447aa45de6795b08bb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/appear.signal b/Assets/MyGame/aa/Game/FLZY/BOSS/appear.signal new file mode 100644 index 000000000..32802849e --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/appear.signal @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6fa2d92fc1b3f34da284357edf89c3b, type: 3} + m_Name: appear + m_EditorClassIdentifier: diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/appear.signal.meta b/Assets/MyGame/aa/Game/FLZY/BOSS/appear.signal.meta new file mode 100644 index 000000000..39fe97b35 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/appear.signal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1508e534c5cd88d459d245dd3557a1c6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs index de729139f..394648d9a 100644 --- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs +++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs @@ -538,10 +538,13 @@ public class GameMainPanel_FishBase : GameMainPanel_Base if (!input.isPressed && !input.wasPressedThisFrame && !input.wasReleasedThisFrame) return; + if (input.wasPressedThisFrame) + { + // ⭐ UI 点击过滤 + if (IsPointerOverUI(input.position)) + return; + } - // ⭐ UI 点击过滤 - if (IsPointerOverUI(input.position)) - return; // 按下 if (input.wasPressedThisFrame)