diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/ShaSeng/Game177_shaseng.prefab b/Assets/MyGame/aa/Game/HHWK/Boss/ShaSeng/Game177_shaseng.prefab index 3030f6740..ed1276fb3 100644 --- a/Assets/MyGame/aa/Game/HHWK/Boss/ShaSeng/Game177_shaseng.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Boss/ShaSeng/Game177_shaseng.prefab @@ -1,5 +1,125 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2279607656434429985 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3775320556317156851} + - component: {fileID: 3021977562631068786} + m_Layer: 6 + m_Name: Game177_shaseng (1) + m_TagString: Fish + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3775320556317156851 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2279607656434429985} + 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_Children: + - {fileID: 1946658920249368719} + m_Father: {fileID: 3691911676921113414} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3021977562631068786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2279607656434429985} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40a0abcaeb0d1fb4abd5368c6914ea65, type: 3} + m_Name: + m_EditorClassIdentifier: + beilv: 0 + guid: + lastMoveLineId: + monsterData: + die_Score: 0 + isDie: 0 + fishTypeConfig: + fishNumber: + fishName: + fishBrief: + fishType: 0 + fishScore: 0 + killWeight: 0 + pathList: + fishImage: + fishMultipleDesc: + moveLine: + bezierCurveData: + name: + start: {x: 0, y: 0} + controlPoints: [] + end: {x: 0, y: 0} + moveTime: 0 + moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} + skeleton: {fileID: 0} + isSpine: 1 + fishTypeID: 13028 + currState: 0 + HP: 5 + effect_Die: {fileID: 0} + effect_DieAward: {fileID: 6085202769889967028, guid: 8fecf8a07f239c94393def22a6784c11, + type: 3} + currEffect_DieAward: {fileID: 0} + isMove: 1 + is3D: 0 + forwordXYZ: + fishenum: 2 + moveTime: 0 + isyz: 0 + yzID: + colliderList: [] + lockPoint: {fileID: 8631444005545255651} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} + rotationPY: 60 + useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 + baseMmove: 0 + isRotate: 0 + isNot1: 0 + ischild0: 0 + depthOffset: 400 + is2DFish: 0 + sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + bossName: "\u6C99\u50E7" + isToUI: 0 + tMP_CurrBossScore: {fileID: 0} + currBossScoreValue: 0 + bossScoreValue: 0 + poolNum: 0 + prizeCount: 0 + ZhuCam: {fileID: 0} + isDieFish: 0 + dieTime: 3 + v3: {x: 0, y: 0, z: 0} + isLocalCoin: 0 + killerSitPos: -1 --- !u!1 &2453707779032380767 GameObject: m_ObjectHideFlags: 0 @@ -30,7 +150,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5622316814604727880} + - {fileID: 3775320556317156851} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8066460610185843055 @@ -88,7 +208,7 @@ MonoBehaviour: isyz: 0 yzID: colliderList: [] - lockPoint: {fileID: 5523588517107683672} + lockPoint: {fileID: 0} bingDongEffect: - {fileID: 0} needLockEvent: 0 @@ -120,7 +240,7 @@ MonoBehaviour: v3: {x: 0, y: 0, z: 0} isLocalCoin: 0 killerSitPos: -1 ---- !u!1 &6380443974724667463 +--- !u!1 &4222042087147587090 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -128,7 +248,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5523588517107683672} + - component: {fileID: 8631444005545255651} m_Layer: 6 m_Name: GameObject m_TagString: Fish @@ -136,28 +256,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5523588517107683672 +--- !u!4 &8631444005545255651 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6380443974724667463} + m_GameObject: {fileID: 4222042087147587090} serializedVersion: 2 m_LocalRotation: {x: 0.45398954, y: 0.10466393, z: 0.21728721, w: -0.8577443} m_LocalPosition: {x: -0.742086, y: 7.418574, z: 18.002413} m_LocalScale: {x: 2.4999945, y: 2.4999967, z: 2.499996} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5627689215941140724} + m_Father: {fileID: 1953437600203191859} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &5626876811159384006 +--- !u!1001 &1950971259365816577 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 3691911676921113414} + m_TransformParent: {fileID: 3775320556317156851} m_Modifications: - target: {fileID: 1000955326284023, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} propertyPath: m_Layer @@ -2325,11 +2445,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4738892719839630, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 2.7 objectReference: {fileID: 0} - target: {fileID: 4738892719839630, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} propertyPath: m_LocalPosition.z - value: 350 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4738892719839630, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} propertyPath: m_LocalRotation.w @@ -2677,58 +2797,87 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4291547872775986, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} insertIndex: 0 - addedObject: {fileID: 5523588517107683672} + addedObject: {fileID: 8631444005545255651} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 1730242686860875, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} insertIndex: -1 - addedObject: {fileID: 4660662937614575750} + addedObject: {fileID: 1312468311260746097} - targetCorrespondingSourceObject: {fileID: 1705390221481576, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} insertIndex: -1 - addedObject: {fileID: 124463876413493868} + addedObject: {fileID: 557285819775323337} - targetCorrespondingSourceObject: {fileID: 1066778049879928, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} insertIndex: -1 - addedObject: {fileID: 4051001306727277379} + addedObject: {fileID: 9116668664513773261} m_SourcePrefab: {fileID: 100100000, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} ---- !u!4 &5622316814604727880 stripped +--- !u!4 &1946658920249368719 stripped Transform: m_CorrespondingSourceObject: {fileID: 4738892719839630, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} - m_PrefabInstance: {fileID: 5626876811159384006} + m_PrefabInstance: {fileID: 1950971259365816577} m_PrefabAsset: {fileID: 0} ---- !u!1 &5625148767518855565 stripped +--- !u!1 &1950327179598980729 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 1730242686860875, guid: cf19a340494f9464abcb71879f4dd4f8, + m_CorrespondingSourceObject: {fileID: 1066778049879928, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} - m_PrefabInstance: {fileID: 5626876811159384006} + m_PrefabInstance: {fileID: 1950971259365816577} m_PrefabAsset: {fileID: 0} ---- !u!114 &4660662937614575750 +--- !u!114 &9116668664513773261 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5625148767518855565} + m_GameObject: {fileID: 1950327179598980729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1 &1951496402941462346 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1730242686860875, guid: cf19a340494f9464abcb71879f4dd4f8, + type: 3} + m_PrefabInstance: {fileID: 1950971259365816577} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1312468311260746097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951496402941462346} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a9bc305c2f29d6a4ebf54a080bda1ecd, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &5625173706206837166 stripped +--- !u!1 &1951519945626234729 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1705390221481576, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} - m_PrefabInstance: {fileID: 5626876811159384006} + m_PrefabInstance: {fileID: 1950971259365816577} m_PrefabAsset: {fileID: 0} ---- !u!58 &124463876413493868 +--- !u!58 &557285819775323337 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5625173706206837166} + m_GameObject: {fileID: 1951519945626234729} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -2757,38 +2906,9 @@ CircleCollider2D: m_Offset: {x: 4.6485143, y: 3.8147235} serializedVersion: 2 m_Radius: 16.123272 ---- !u!1 &5626513944248987838 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1066778049879928, guid: cf19a340494f9464abcb71879f4dd4f8, - type: 3} - m_PrefabInstance: {fileID: 5626876811159384006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4051001306727277379 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5626513944248987838} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!4 &5627689215941140724 stripped +--- !u!4 &1953437600203191859 stripped Transform: m_CorrespondingSourceObject: {fileID: 4291547872775986, guid: cf19a340494f9464abcb71879f4dd4f8, type: 3} - m_PrefabInstance: {fileID: 5626876811159384006} + m_PrefabInstance: {fileID: 1950971259365816577} m_PrefabAsset: {fileID: 0} diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/SunWuKong/Game177_wukong.prefab b/Assets/MyGame/aa/Game/HHWK/Boss/SunWuKong/Game177_wukong.prefab index c75a39fc4..9e275e689 100644 --- a/Assets/MyGame/aa/Game/HHWK/Boss/SunWuKong/Game177_wukong.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Boss/SunWuKong/Game177_wukong.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &8092108153193932563 +--- !u!1 &4125772151319628705 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,7 +8,127 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5377161894674988511} + - component: {fileID: 4145086412877495279} + - component: {fileID: 3951542238777401794} + m_Layer: 6 + m_Name: Game177_wukong (1) + m_TagString: Fish + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4145086412877495279 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4125772151319628705} + 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_Children: + - {fileID: 247083506409716406} + m_Father: {fileID: 296743792518635746} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3951542238777401794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4125772151319628705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf1f8eeda890392489e1ded7e866cc31, type: 3} + m_Name: + m_EditorClassIdentifier: + beilv: 0 + guid: + lastMoveLineId: + monsterData: + die_Score: 0 + isDie: 0 + fishTypeConfig: + fishNumber: + fishName: + fishBrief: + fishType: 0 + fishScore: 0 + killWeight: 0 + pathList: + fishImage: + fishMultipleDesc: + moveLine: + bezierCurveData: + name: + start: {x: 0, y: 0} + controlPoints: [] + end: {x: 0, y: 0} + moveTime: 0 + moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} + skeleton: {fileID: 0} + isSpine: 1 + fishTypeID: 13032 + currState: 0 + HP: 5 + effect_Die: {fileID: 0} + effect_DieAward: {fileID: 1988577175044556201, guid: 3e0f80ac5264a3f42b0f3213cef2345f, + type: 3} + currEffect_DieAward: {fileID: 0} + isMove: 1 + is3D: 0 + forwordXYZ: + fishenum: 0 + moveTime: 0 + isyz: 0 + yzID: + colliderList: [] + lockPoint: {fileID: 7216698328491846581} + bingDongEffect: + - {fileID: 0} + needLockEvent: 0 + createVideoClip: {fileID: 0} + rotationPY: 60 + useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 + baseMmove: 0 + isRotate: 0 + isNot1: 0 + ischild0: 0 + depthOffset: 350 + is2DFish: 0 + sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + bossName: "\u5B59\u609F\u7A7A" + isToUI: 0 + 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} + isLocalCoin: 0 + killerSitPos: -1 +--- !u!1 &7377240738955039814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7216698328491846581} m_Layer: 6 m_Name: GameObject m_TagString: Fish @@ -16,20 +136,20 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5377161894674988511 +--- !u!4 &7216698328491846581 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8092108153193932563} + m_GameObject: {fileID: 7377240738955039814} 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_Children: [] - m_Father: {fileID: 4310420528037364307} + m_Father: {fileID: 247083506409716406} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8460168515817211196 GameObject: @@ -61,7 +181,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4310420528037364307} + - {fileID: 4145086412877495279} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-7984071144721456973 @@ -119,7 +239,7 @@ MonoBehaviour: isyz: 0 yzID: colliderList: [] - lockPoint: {fileID: 5377161894674988511} + lockPoint: {fileID: 0} bingDongEffect: - {fileID: 0} needLockEvent: 0 @@ -151,13 +271,13 @@ MonoBehaviour: v3: {x: 0, y: 0, z: 0} isLocalCoin: 0 killerSitPos: -1 ---- !u!1001 &4305481844920513146 +--- !u!1001 &251152022574844575 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 296743792518635746} + m_TransformParent: {fileID: 4145086412877495279} m_Modifications: - target: {fileID: 1007513189690300, guid: bfe3df1769c87a94bb45857e06520ed2, type: 3} propertyPath: m_TagString @@ -1535,59 +1655,36 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4948132087033897, guid: bfe3df1769c87a94bb45857e06520ed2, type: 3} insertIndex: -1 - addedObject: {fileID: 5377161894674988511} + addedObject: {fileID: 7216698328491846581} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 1618682377417806, guid: bfe3df1769c87a94bb45857e06520ed2, type: 3} insertIndex: -1 - addedObject: {fileID: 7884143811796653191} + addedObject: {fileID: 7654936897799176486} - targetCorrespondingSourceObject: {fileID: 1007513189690300, guid: bfe3df1769c87a94bb45857e06520ed2, type: 3} insertIndex: -1 - addedObject: {fileID: 4841561270543777572} + addedObject: {fileID: 583745660319881253} m_SourcePrefab: {fileID: 100100000, guid: bfe3df1769c87a94bb45857e06520ed2, type: 3} ---- !u!1 &4306480002018728390 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1007513189690300, guid: bfe3df1769c87a94bb45857e06520ed2, +--- !u!4 &247083506409716406 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4948132087033897, guid: bfe3df1769c87a94bb45857e06520ed2, type: 3} - m_PrefabInstance: {fileID: 4305481844920513146} + m_PrefabInstance: {fileID: 251152022574844575} m_PrefabAsset: {fileID: 0} ---- !u!114 &4841561270543777572 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4306480002018728390} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1 &4307100148803913268 stripped +--- !u!1 &250377771974262481 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1618682377417806, guid: bfe3df1769c87a94bb45857e06520ed2, type: 3} - m_PrefabInstance: {fileID: 4305481844920513146} + m_PrefabInstance: {fileID: 251152022574844575} m_PrefabAsset: {fileID: 0} ---- !u!61 &7884143811796653191 +--- !u!61 &7654936897799176486 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4307100148803913268} + m_GameObject: {fileID: 250377771974262481} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -1626,9 +1723,32 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 54.287575, y: 27.868608} m_EdgeRadius: 0 ---- !u!4 &4310420528037364307 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4948132087033897, guid: bfe3df1769c87a94bb45857e06520ed2, +--- !u!1 &252150163608887587 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1007513189690300, guid: bfe3df1769c87a94bb45857e06520ed2, type: 3} - m_PrefabInstance: {fileID: 4305481844920513146} + m_PrefabInstance: {fileID: 251152022574844575} m_PrefabAsset: {fileID: 0} +--- !u!114 &583745660319881253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 252150163608887587} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/YuXI/Game177_yuxi.prefab b/Assets/MyGame/aa/Game/HHWK/Boss/YuXI/Game177_yuxi.prefab index bdd84e17a..a0931329d 100644 --- a/Assets/MyGame/aa/Game/HHWK/Boss/YuXI/Game177_yuxi.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Boss/YuXI/Game177_yuxi.prefab @@ -2203,6 +2203,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 118.18355 objectReference: {fileID: 0} + - target: {fileID: 4151117949762783, guid: 49acee7e5db085c4a86d1ad72c22468b, type: 3} + propertyPath: m_LocalPosition.y + value: -8.4 + objectReference: {fileID: 0} - target: {fileID: 4151797847433907, guid: 49acee7e5db085c4a86d1ad72c22468b, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 2.4823937 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab index 8ead62b46..4d5cbfcce 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab @@ -340,9 +340,15 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 135044625135789424, guid: 1461200f483c12642a09ef755696d8c4, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 114884547391421755, guid: 1461200f483c12642a09ef755696d8c4, type: 3} - {fileID: 210099118695303065, guid: 1461200f483c12642a09ef755696d8c4, type: 3} + - {fileID: 135044625135789424, guid: 1461200f483c12642a09ef755696d8c4, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4703437598541787, guid: 1461200f483c12642a09ef755696d8c4, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab index 09120e774..7c386f7b8 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab @@ -276,6 +276,10 @@ PrefabInstance: propertyPath: m_TagString value: Fish objectReference: {fileID: 0} + - target: {fileID: 4061268324235159, guid: 51618a9fa649dc84bbbb0f2b2ae34548, type: 3} + propertyPath: m_LocalPosition.x + value: -0.213 + objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: 51618a9fa649dc84bbbb0f2b2ae34548, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -319,6 +323,7 @@ PrefabInstance: m_RemovedComponents: - {fileID: 114884547391421755, guid: 51618a9fa649dc84bbbb0f2b2ae34548, type: 3} - {fileID: 210099118695303065, guid: 51618a9fa649dc84bbbb0f2b2ae34548, type: 3} + - {fileID: 135044625135789424, guid: 51618a9fa649dc84bbbb0f2b2ae34548, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4703437598541787, guid: 51618a9fa649dc84bbbb0f2b2ae34548, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab index b6ffea7d3..1d55e5b3f 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab @@ -290,31 +290,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalRotation.w - value: 0.60419357 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalRotation.x - value: -0.60419357 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalRotation.y - value: 0.36735559 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalRotation.z - value: -0.36735559 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -27.4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -90 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 114884547391421755, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3} diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab index 5dd5dae8c..ce1ec40bc 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab @@ -89,7 +89,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3} propertyPath: m_LocalPosition.z - value: -13.38 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab index 192bbe529..f6a14552b 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab @@ -525,7 +525,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4470112387431263, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621510681728303, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3} + propertyPath: m_LocalPosition.y + value: -0.136 objectReference: {fileID: 0} - target: {fileID: 4632457200066912, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab index 33c69b3c2..ebec6dbd5 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab @@ -746,6 +746,10 @@ PrefabInstance: propertyPath: m_TagString value: Fish objectReference: {fileID: 0} + - target: {fileID: 4220653531496868, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} + propertyPath: m_LocalPosition.y + value: -1.044 + objectReference: {fileID: 0} - target: {fileID: 4472185465350827, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -760,36 +764,52 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4472185465350827, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.74024194 objectReference: {fileID: 0} - target: {fileID: 4472185465350827, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4472185465350827, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.6723407 objectReference: {fileID: 0} - target: {fileID: 4472185465350827, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4472185465350827, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4472185465350827, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0 + value: 84.496 objectReference: {fileID: 0} - target: {fileID: 4472185465350827, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4841364053301648, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4841364053301648, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4841364053301648, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4841364053301648, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4841364053301648, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 114107629493147155, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} - {fileID: 114518489005915545, guid: c61d7b09b58215148aaffc1b82f11bf4, type: 3} diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio.meta new file mode 100644 index 000000000..8f5a12164 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 473e57e3a0e817d44956cfbb6029ff31 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14053_fire.ogg b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14053_fire.ogg new file mode 100644 index 000000000..6c65474ce Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14053_fire.ogg differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14053_fire.ogg.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14053_fire.ogg.meta new file mode 100644 index 000000000..3ec0fa8c6 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14053_fire.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1d9f388857aa12f46b206c224734d00a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14053_fire_violent_effect.ogg b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14053_fire_violent_effect.ogg new file mode 100644 index 000000000..9ee9497de Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14053_fire_violent_effect.ogg differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14053_fire_violent_effect.ogg.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14053_fire_violent_effect.ogg.meta new file mode 100644 index 000000000..d4b63ed56 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14053_fire_violent_effect.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d62315dc349b8a24e9185f0f0c4c5e11 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14080_fire.ogg b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14080_fire.ogg new file mode 100644 index 000000000..988e8883f Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14080_fire.ogg differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14080_fire.ogg.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14080_fire.ogg.meta new file mode 100644 index 000000000..8d521e6b9 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14080_fire.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3242c49d65ce5ea46a2e08223f9efdbf +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14080_fire_violent.ogg b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14080_fire_violent.ogg new file mode 100644 index 000000000..1f7fec81f Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14080_fire_violent.ogg differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14080_fire_violent.ogg.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14080_fire_violent.ogg.meta new file mode 100644 index 000000000..a4b52a49b --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14080_fire_violent.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: cec3a7ee6689f0447813cc27f500f9cf +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14081_fire.ogg b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14081_fire.ogg new file mode 100644 index 000000000..2d7a14fb7 Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14081_fire.ogg differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14081_fire.ogg.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14081_fire.ogg.meta new file mode 100644 index 000000000..bab4e2bff --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14081_fire.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: ec13aff0d55799149ad4623aa6a4c8be +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14081_fire_violent.ogg b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14081_fire_violent.ogg new file mode 100644 index 000000000..2393d874e Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14081_fire_violent.ogg differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14081_fire_violent.ogg.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14081_fire_violent.ogg.meta new file mode 100644 index 000000000..214d842dd --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14081_fire_violent.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1c60a8863ed13294c90a5917617006d8 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14082_fire.ogg b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14082_fire.ogg new file mode 100644 index 000000000..56258e53b Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14082_fire.ogg differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14082_fire.ogg.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14082_fire.ogg.meta new file mode 100644 index 000000000..7e0e2062e --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14082_fire.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1f29c336b73e6564894ad13386c25caa +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14082_fire_violent.ogg b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14082_fire_violent.ogg new file mode 100644 index 000000000..96ab8dde5 Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14082_fire_violent.ogg differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14082_fire_violent.ogg.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14082_fire_violent.ogg.meta new file mode 100644 index 000000000..498595f07 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14082_fire_violent.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 9c84d32017426c64b89da338ac6e3267 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14901_fire.ogg b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14901_fire.ogg new file mode 100644 index 000000000..75611877f Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14901_fire.ogg differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14901_fire.ogg.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14901_fire.ogg.meta new file mode 100644 index 000000000..264a8e084 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14901_fire.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 67a9f36f11a381e4b8e2f31e62212364 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14901_fire_violent_effect.ogg b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14901_fire_violent_effect.ogg new file mode 100644 index 000000000..6c5afb017 Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14901_fire_violent_effect.ogg differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14901_fire_violent_effect.ogg.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14901_fire_violent_effect.ogg.meta new file mode 100644 index 000000000..62c5f56ca --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14901_fire_violent_effect.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3940837f653cae04896b7f69dd9c273e +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14902_fire.ogg b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14902_fire.ogg new file mode 100644 index 000000000..75611877f Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14902_fire.ogg differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14902_fire.ogg.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14902_fire.ogg.meta new file mode 100644 index 000000000..fc13677fb --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14902_fire.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 018b5393a4a0d0447af5d15e34d66fab +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14902_fire_violent.ogg b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14902_fire_violent.ogg new file mode 100644 index 000000000..026a11f60 Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14902_fire_violent.ogg differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14902_fire_violent.ogg.meta b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14902_fire_violent.ogg.meta new file mode 100644 index 000000000..7ebfe66ae --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/LaserAudio/14902_fire_violent.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f8def02954a080746aaccdc0f6513725 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/display_14080_0_DaTing.prefab b/Assets/MyGame/aa/Game/ZhanShen/Game/display_14080_0_DaTing.prefab index f29225e65..b10a13719 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/Game/display_14080_0_DaTing.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/display_14080_0_DaTing.prefab @@ -1866,13 +1866,16 @@ MonoBehaviour: idleIndexParam: IdleIndex fireIndex: 0 idleIndex: 0 + obj_Add: {fileID: 0} + obj_Down: {fileID: 0} JGQiuStartPrefab: {fileID: 3774533120367730850, guid: 9e114e29415d348448005cf3fcebe71c, type: 3} JGStartFXPrefab: {fileID: 1251597548160642572, guid: 28019eff0910e1f4e9062ef1f30bae7b, type: 3} JGHitFXPrefab: {fileID: 1280062159248823723, guid: 4ae19f5b1ceb54e4c9b201c52cc7060c, type: 3} + laserFXDelay: 2 selfOffsetJGStart: {x: -17, y: 130} buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0} topOffsetZSRotateInit: {x: -125, y: 0, z: 0} - laserFXDelay: 2 + laserAudio: {fileID: 8300000, guid: 3242c49d65ce5ea46a2e08223f9efdbf, type: 3} diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_4022.prefab b/Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_4022.prefab index 2fc9366e9..6e344690e 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_4022.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_4022.prefab @@ -643,3 +643,4 @@ MonoBehaviour: selfOffsetJGStart: {x: 0, y: 180} buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0} topOffsetZSRotateInit: {x: -100, y: 0, z: 0} + laserAudio: {fileID: 8300000, guid: 1f29c336b73e6564894ad13386c25caa, type: 3} diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_6004.prefab b/Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_6004.prefab index fea16ff89..3485136ed 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_6004.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_6004.prefab @@ -1187,3 +1187,4 @@ MonoBehaviour: selfOffsetJGStart: {x: 13, y: 203} buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0} topOffsetZSRotateInit: {x: -125, y: 0, z: 0} + laserAudio: {fileID: 8300000, guid: ec13aff0d55799149ad4623aa6a4c8be, type: 3} diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14901_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14901_0_dev.prefab index 67b55d5bc..76c61ee60 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14901_0_dev.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14901_0_dev.prefab @@ -1562,6 +1562,7 @@ MonoBehaviour: selfOffsetJGStart: {x: 30, y: 170} buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0} topOffsetZSRotateInit: {x: -125, y: 0, z: 0} + laserAudio: {fileID: 8300000, guid: 67a9f36f11a381e4b8e2f31e62212364, type: 3} --- !u!95 &8661363738911940257 stripped Animator: m_CorrespondingSourceObject: {fileID: 8284544360685858346, guid: ffe5b917cd8f21941adf54c437e9a701, diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14902_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14902_0_dev.prefab index 22df8a1b0..c592401c9 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14902_0_dev.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14902_0_dev.prefab @@ -3797,6 +3797,7 @@ MonoBehaviour: selfOffsetJGStart: {x: 15, y: 150} buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0} topOffsetZSRotateInit: {x: -125, y: 0, z: 0} + laserAudio: {fileID: 8300000, guid: 018b5393a4a0d0447af5d15e34d66fab, type: 3} --- !u!95 &3827418405087986554 stripped Animator: m_CorrespondingSourceObject: {fileID: 2725459927999047066, guid: 83f830ab856bfc642b235330651c6513, diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab index 7ad412a35..5c45d68e2 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab @@ -961,12 +961,16 @@ MonoBehaviour: idleIndexParam: IdleIndex fireIndex: 0 idleIndex: 0 + obj_Add: {fileID: 0} + obj_Down: {fileID: 0} JGQiuStartPrefab: {fileID: 2223497904095183553, guid: 8f9fe68d9da9d29499ea4e12b20da6d4, type: 3} JGStartFXPrefab: {fileID: 5020808015505471155, guid: f05e1e44f49e29c45a5792409c2a6760, type: 3} JGHitFXPrefab: {fileID: 1235709053033123186, guid: 89047cad758ac60419c56cdc84ec14a8, type: 3} + laserFXDelay: 0 selfOffsetJGStart: {x: 40, y: 200} buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0} topOffsetZSRotateInit: {x: -125, y: 0, z: 0} + laserAudio: {fileID: 8300000, guid: 1d9f388857aa12f46b206c224734d00a, type: 3} diff --git a/Assets/MyGame/aa/Game/ZhanShen/ZhanShenTurretData.cs b/Assets/MyGame/aa/Game/ZhanShen/ZhanShenTurretData.cs index 57ed60247..64bd7cc05 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/ZhanShenTurretData.cs +++ b/Assets/MyGame/aa/Game/ZhanShen/ZhanShenTurretData.cs @@ -18,4 +18,7 @@ public class ZhanShenTurretData : TurretData public Vector3 buttomOffsetZSRotateInit; [Tooltip("上方座位战神初始旋转(欧拉角,直接设置,覆盖该战神预制体原始旋转)。上下视角不一样分开设置。全0=保持默认朝向")] public Vector3 topOffsetZSRotateInit; + + [Tooltip("战神激光开火音效:激光声音与普通开火不同,锁定时每发激光用 AudioManager.PlayFX(AudioClip) 直接播放;为空则回退普通开火音效")] + public AudioClip laserAudio; } diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs index 9f40cb7a4..61ccf45a7 100644 --- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs +++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs @@ -3057,7 +3057,14 @@ public class GameMainPanel_FishBase : GameMainPanel_Base } if (sit.posID == currSitData.posID) - AudioManager.Instance.PlayFX(bulletClip); + { + // ⭐ 战神激光音效:激光声音与普通开火不同——直接读战神配置的 laserAudio 播放 + // (AudioManager.PlayFX 的 AudioClip 重载);未配置时回退普通开火音效 bulletClip + AudioClip laserClip = (sit.currentZhanShenData as ZhanShenTurretData)?.laserAudio; + if (laserClip == null) laserClip = bulletClip; + if (laserClip != null) + AudioManager.Instance.PlayFX(laserClip); + } } ///