diff --git a/Assets/MyGame/aa/Game/ZhanShen/DaQiao/display_wargod_in_14053_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/DaQiao/display_wargod_in_14053_0_dev.prefab index f4ca85947..67589f764 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/DaQiao/display_wargod_in_14053_0_dev.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/DaQiao/display_wargod_in_14053_0_dev.prefab @@ -2748,5 +2748,51 @@ PrefabInstance: - {fileID: 1881839632867299237, guid: 947c6e603406a744cb3de57c401cc516, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6110568047410905518, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7631072287571022996} m_SourcePrefab: {fileID: 100100000, guid: 947c6e603406a744cb3de57c401cc516, type: 3} +--- !u!1 &4400983289994395771 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6110568047410905518, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + m_PrefabInstance: {fileID: 7628666483438797269} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7631072287571022996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4400983289994395771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a75d94f05f865448bfb611dc53d6e0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: + setPosData: {fileID: 0} + tra_BulletStartPosition: {fileID: 0} + tra_RotationPivot: {fileID: 0} + bulletPrefab_Two: {fileID: 0} + bulletPrefab: {fileID: 0} + turretNumber: 0 + turretType: 1 + displayName: + quality: 1 + unlockLevel: 0 + uiIconSprite: {fileID: 21300000, guid: f0277d5948835d94bae3af07480375d6, type: 3} + description: + skeletonAnimation: {fileID: 0} + old_CurrAnimation: {fileID: 0} + new_CurrAnimation: {fileID: 0} + currTurretType: 0 + isFrenzy: 0 + idleAnim: + attackAnim: + frenzyAttackAnim: + laserStartAnim: + laserLoopAnim: + laserEndAnim: diff --git a/Assets/MyGame/aa/Game/ZhanShen/GeSiLa/display_FishEntry_4022.prefab b/Assets/MyGame/aa/Game/ZhanShen/GeSiLa/display_FishEntry_4022.prefab index b9c11a256..3f63572be 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/GeSiLa/display_FishEntry_4022.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/GeSiLa/display_FishEntry_4022.prefab @@ -541,5 +541,51 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8846314109612470248, guid: 7e0903bef36c5774aaf557493ed48469, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7078287029531899276} m_SourcePrefab: {fileID: 100100000, guid: 7e0903bef36c5774aaf557493ed48469, type: 3} +--- !u!1 &3853027303704493578 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8846314109612470248, guid: 7e0903bef36c5774aaf557493ed48469, + type: 3} + m_PrefabInstance: {fileID: 5745704973502894562} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7078287029531899276 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3853027303704493578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a75d94f05f865448bfb611dc53d6e0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: + setPosData: {fileID: 0} + tra_BulletStartPosition: {fileID: 0} + tra_RotationPivot: {fileID: 0} + bulletPrefab_Two: {fileID: 0} + bulletPrefab: {fileID: 0} + turretNumber: 0 + turretType: 1 + displayName: + quality: 1 + unlockLevel: 0 + uiIconSprite: {fileID: 21300000, guid: 71c9749eb6ba3fc47bb2edca35a9a31b, type: 3} + description: + skeletonAnimation: {fileID: 0} + old_CurrAnimation: {fileID: 0} + new_CurrAnimation: {fileID: 0} + currTurretType: 0 + isFrenzy: 0 + idleAnim: + attackAnim: + frenzyAttackAnim: + laserStartAnim: + laserLoopAnim: + laserEndAnim: diff --git a/Assets/MyGame/aa/Game/ZhanShen/MeiRenYu/display_FishEntry_6004.prefab b/Assets/MyGame/aa/Game/ZhanShen/MeiRenYu/display_FishEntry_6004.prefab index 1249e8ca3..cd10a3b93 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/MeiRenYu/display_FishEntry_6004.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/MeiRenYu/display_FishEntry_6004.prefab @@ -4070,5 +4070,51 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3013444685122459850, guid: b0b2f211485160f47b509fd3e92cd465, + type: 3} + insertIndex: -1 + addedObject: {fileID: -6372912813471141665} m_SourcePrefab: {fileID: 100100000, guid: b0b2f211485160f47b509fd3e92cd465, type: 3} +--- !u!1 &3679548091494954370 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3013444685122459850, guid: b0b2f211485160f47b509fd3e92cd465, + type: 3} + m_PrefabInstance: {fileID: 1927970033502694728} + m_PrefabAsset: {fileID: 0} +--- !u!114 &-6372912813471141665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3679548091494954370} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a75d94f05f865448bfb611dc53d6e0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: + setPosData: {fileID: 0} + tra_BulletStartPosition: {fileID: 0} + tra_RotationPivot: {fileID: 0} + bulletPrefab_Two: {fileID: 0} + bulletPrefab: {fileID: 0} + turretNumber: 0 + turretType: 1 + displayName: + quality: 1 + unlockLevel: 0 + uiIconSprite: {fileID: 21300000, guid: 16ab7a0b63cd4634da7050e12dc6b53e, type: 3} + description: + skeletonAnimation: {fileID: 0} + old_CurrAnimation: {fileID: 0} + new_CurrAnimation: {fileID: 0} + currTurretType: 0 + isFrenzy: 0 + idleAnim: + attackAnim: + frenzyAttackAnim: + laserStartAnim: + laserLoopAnim: + laserEndAnim: diff --git a/Assets/MyGame/aa/Game/ZhanShen/SunWuKong/display_wargod_14902_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/SunWuKong/display_wargod_14902_0_dev.prefab index 15ccbcd1c..197f687ba 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/SunWuKong/display_wargod_14902_0_dev.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/SunWuKong/display_wargod_14902_0_dev.prefab @@ -2729,5 +2729,51 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5496570507378448893, guid: eb7cc0ebc66628846a0a5dcb05fee776, + type: 3} + insertIndex: -1 + addedObject: {fileID: -9012517035053230575} m_SourcePrefab: {fileID: 100100000, guid: eb7cc0ebc66628846a0a5dcb05fee776, type: 3} +--- !u!1 &4092126732376455684 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5496570507378448893, guid: eb7cc0ebc66628846a0a5dcb05fee776, + type: 3} + m_PrefabInstance: {fileID: 8398538566153790457} + m_PrefabAsset: {fileID: 0} +--- !u!114 &-9012517035053230575 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4092126732376455684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a75d94f05f865448bfb611dc53d6e0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: + setPosData: {fileID: 0} + tra_BulletStartPosition: {fileID: 0} + tra_RotationPivot: {fileID: 0} + bulletPrefab_Two: {fileID: 0} + bulletPrefab: {fileID: 0} + turretNumber: 0 + turretType: 1 + displayName: + quality: 1 + unlockLevel: 0 + uiIconSprite: {fileID: 21300000, guid: e3465109cd9a7dc4ab52c0c25127c927, type: 3} + description: + skeletonAnimation: {fileID: 0} + old_CurrAnimation: {fileID: 0} + new_CurrAnimation: {fileID: 0} + currTurretType: 0 + isFrenzy: 0 + idleAnim: + attackAnim: + frenzyAttackAnim: + laserStartAnim: + laserLoopAnim: + laserEndAnim: diff --git a/Assets/MyGame/aa/Game/ZhanShen/XiongMao/display_14080_0_DaTing.prefab b/Assets/MyGame/aa/Game/ZhanShen/XiongMao/display_14080_0_DaTing.prefab index 71900228f..306db0b28 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/XiongMao/display_14080_0_DaTing.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/XiongMao/display_14080_0_DaTing.prefab @@ -1085,5 +1085,51 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 764733842295227409, guid: 83df656fb865a1f4fa71a03b80f69f5a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 579859225457281675} m_SourcePrefab: {fileID: 100100000, guid: 83df656fb865a1f4fa71a03b80f69f5a, type: 3} +--- !u!1 &4389039766472923932 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 764733842295227409, guid: 83df656fb865a1f4fa71a03b80f69f5a, + type: 3} + m_PrefabInstance: {fileID: 3924290080706174733} + m_PrefabAsset: {fileID: 0} +--- !u!114 &579859225457281675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4389039766472923932} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a75d94f05f865448bfb611dc53d6e0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: + setPosData: {fileID: 0} + tra_BulletStartPosition: {fileID: 0} + tra_RotationPivot: {fileID: 0} + bulletPrefab_Two: {fileID: 0} + bulletPrefab: {fileID: 0} + turretNumber: 0 + turretType: 1 + displayName: + quality: 1 + unlockLevel: 0 + uiIconSprite: {fileID: 21300000, guid: 7567a70f6ccea3b45b705973b24c0832, type: 3} + description: + skeletonAnimation: {fileID: 0} + old_CurrAnimation: {fileID: 0} + new_CurrAnimation: {fileID: 0} + currTurretType: 0 + isFrenzy: 0 + idleAnim: + attackAnim: + frenzyAttackAnim: + laserStartAnim: + laserLoopAnim: + laserEndAnim: diff --git a/Assets/MyGame/aa/Game/ZhanShen/YangJian/display_wargod_14901_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/YangJian/display_wargod_14901_0_dev.prefab index 5184527c2..d3023715c 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/YangJian/display_wargod_14901_0_dev.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/YangJian/display_wargod_14901_0_dev.prefab @@ -2556,5 +2556,51 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2741246652997821880, guid: 5a049c75272666d4e841346408b004d9, + type: 3} + insertIndex: -1 + addedObject: {fileID: -8064379128552912567} m_SourcePrefab: {fileID: 100100000, guid: 5a049c75272666d4e841346408b004d9, type: 3} +--- !u!1 &5890814918114320178 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2741246652997821880, guid: 5a049c75272666d4e841346408b004d9, + type: 3} + m_PrefabInstance: {fileID: 8631920249457834634} + m_PrefabAsset: {fileID: 0} +--- !u!114 &-8064379128552912567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5890814918114320178} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a75d94f05f865448bfb611dc53d6e0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: + setPosData: {fileID: 0} + tra_BulletStartPosition: {fileID: 0} + tra_RotationPivot: {fileID: 0} + bulletPrefab_Two: {fileID: 0} + bulletPrefab: {fileID: 0} + turretNumber: 0 + turretType: 1 + displayName: + quality: 1 + unlockLevel: 0 + uiIconSprite: {fileID: 21300000, guid: 11856430d23b062489300a32ed378b37, type: 3} + description: + skeletonAnimation: {fileID: 0} + old_CurrAnimation: {fileID: 0} + new_CurrAnimation: {fileID: 0} + currTurretType: 0 + isFrenzy: 0 + idleAnim: + attackAnim: + frenzyAttackAnim: + laserStartAnim: + laserLoopAnim: + laserEndAnim: diff --git a/Assets/MyGame/aa/UI/Home/Sub/Turret/ZhanShen.renderTexture b/Assets/MyGame/aa/UI/Home/Sub/Turret/ZhanShen.renderTexture index 5700b6e76..2aeb2ec45 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/Turret/ZhanShen.renderTexture +++ b/Assets/MyGame/aa/UI/Home/Sub/Turret/ZhanShen.renderTexture @@ -19,10 +19,10 @@ RenderTexture: m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 94 - m_ColorFormat: 4 + m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 - m_SRGB: 1 + m_SRGB: 0 m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 diff --git a/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab index 357b872b6..e78af3b99 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab @@ -7437,7 +7437,7 @@ Camera: m_TargetTexture: {fileID: 8400000, guid: 88507e399a88aa744970855b92a576a8, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 - m_HDR: 1 + m_HDR: 0 m_AllowMSAA: 1 m_AllowDynamicResolution: 0 m_ForceIntoRT: 0