Merge branch 'feature/newWork' of http://git.wzaxr.top/5.24BuYu into feature/newWork

This commit is contained in:
xiaohaiwudi
2026-04-26 18:13:34 +08:00
23 changed files with 646 additions and 703 deletions
@@ -154,7 +154,7 @@ MonoBehaviour:
m_Key: HostingServiceUploadSpeed m_Key: HostingServiceUploadSpeed
- m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
m_ClassName: System.String m_ClassName: System.String
m_Data: Library/com.unity.addressables/aa/Android/Android;ServerData/Android m_Data: Library/com.unity.addressables/aa/Android/Android
m_Key: ContentRoot m_Key: ContentRoot
- m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
m_ClassName: System.Boolean m_ClassName: System.Boolean
@@ -34,9 +34,9 @@ MonoBehaviour:
m_RedirectLimit: -1 m_RedirectLimit: -1
m_RetryCount: 0 m_RetryCount: 0
m_BuildPath: m_BuildPath:
m_Id: 2ada5ea4c995904498bf2d2905ef9b81 m_Id: 2dc81615c3947e64493d7c6552a3f24d
m_LoadPath: m_LoadPath:
m_Id: 6e73997731c000940a437485b1ba76c4 m_Id: 6bd5fad857b09dd439c8b71f4ae1a9d8
m_BundleMode: 0 m_BundleMode: 0
m_AssetBundleProviderType: m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+3 -3
View File
@@ -15081,14 +15081,14 @@ RectTransform:
m_GameObject: {fileID: 1819495567} m_GameObject: {fileID: 1819495567}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: [] m_Children: []
m_Father: {fileID: 1096182889} m_Father: {fileID: 1096182889}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -190, y: -91} m_AnchoredPosition: {x: -133, y: -67.054}
m_SizeDelta: {x: 332, y: 150} m_SizeDelta: {x: 332, y: 150}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1819495572 --- !u!114 &1819495572
@@ -1,4 +1,5 @@
using Assets.MyGame.Scripts.Net.APIResponses.Enum; using Assets.MyGame.Scripts.Net.APIResponses.Enum;
using Assets.MyGame.Scripts.Net.WebResponses;
using DG.Tweening; using DG.Tweening;
using System; using System;
using System.Collections; using System.Collections;
@@ -28,7 +29,7 @@ public class MonsterControl_BossBase : MonsterContral
base.Awake(); base.Awake();
} }
public void BigPrize() public void BigPrize(int min = 2, int max = 4)
{ {
if (layeredPool==null) if (layeredPool==null)
{ {
@@ -47,6 +48,8 @@ public class MonsterControl_BossBase : MonsterContral
} }
turretNum = CreateFishManager.Instance.currGameType.currSitData.consumeGoldNum; turretNum = CreateFishManager.Instance.currGameType.currSitData.consumeGoldNum;
GameManager.Instance. StartCoroutine(ShowBigPrize()); GameManager.Instance. StartCoroutine(ShowBigPrize());
GameManager.Instance.StartCoroutine(jiafen());
} }
bool isJia = false; bool isJia = false;
public void BigPrizeAll() public void BigPrizeAll()
@@ -68,8 +71,10 @@ public class MonsterControl_BossBase : MonsterContral
{ {
bossScoreValue += item.Amount; bossScoreValue += item.Amount;
} }
GameManager.Instance.StartCoroutine(ShowBigPrize());
turretNum = CreateFishManager.Instance.currGameType.currSitData.consumeGoldNum; turretNum = CreateFishManager.Instance.currGameType.currSitData.consumeGoldNum;
GameManager.Instance.StartCoroutine(ShowBigPrize());
GameManager.Instance.StartCoroutine(jiafen());
} }
long turretNum; long turretNum;
IEnumerator ShowBigPrize() IEnumerator ShowBigPrize()
@@ -94,6 +99,30 @@ public class MonsterControl_BossBase : MonsterContral
} }
} }
public IEnumerator jiafen()
{
yield return new WaitForSeconds(1.5f);
Transform tra = tMP_CurrBossScore.transform.parent;
GameObject obj = CreateFishManager.Instance.dieFXPrefabAwardTmp_AddScore;
List<RedPacketRecord> redRecords = new List<RedPacketRecord>();
redRecords = redPacketRecords[0];
redPacketRecords.RemoveAt(0);
foreach (var item in redRecords)
{
yield return new WaitForSeconds(0.15f);
Instantiate(obj, tra.position, Quaternion.identity, tra).transform.GetChild(0).GetComponent<TextMeshProUGUI>().text = CoinScript.NumAdd(item.Amount.ToString());
}
}
public override void DieFish(RoomKillNotice obj = null)
{
GameManager.Instance.cameraShake.ShakePresets.Explosion2D(3f, 4f, 1f);
if (obj != null)
{
poolNum = obj.gold;
}
}
public void EndBigPrize() public void EndBigPrize()
{ {
@@ -167,7 +196,7 @@ public class MonsterControl_BossBase : MonsterContral
} }
IEnumerator yanchidie() IEnumerator yanchidie()
{ {
yield return new WaitForSeconds(5f); yield return new WaitForSeconds(3f);
tMP_CurrBossScore.transform.parent.DOMove(CreateFishManager.Instance.currGameType.currSitData.tMP_GoldNum.transform.position, 0.5f).OnComplete(() => tMP_CurrBossScore.transform.parent.DOMove(CreateFishManager.Instance.currGameType.currSitData.tMP_GoldNum.transform.position, 0.5f).OnComplete(() =>
{ {
@@ -18,7 +18,6 @@ using Unity.Collections;
using Unity.Jobs; using Unity.Jobs;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using static UnityEditor.Progress;
using Random = UnityEngine.Random; using Random = UnityEngine.Random;
public class CreateFishManager : MonoSingleton<CreateFishManager> public class CreateFishManager : MonoSingleton<CreateFishManager>
@@ -426,14 +425,14 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
{ {
list.Add(item); list.Add(item);
} }
//list[Random.Range(0, list.Count)].isCreate = 2; list[Random.Range(0, list.Count)].isCreate = 2;
foreach (var item in list) //foreach (var item in list)
{ //{
if (item.fishNumber == 13030.ToString()) // if (item.fishNumber == 13028.ToString())
{ // {
item.isCreate = 2; // item.isCreate = 2;
} // }
} //}
} }
boss = 25; boss = 25;
} }
@@ -1156,7 +1156,7 @@
}, },
{ {
"fishNumber": 13032, "fishNumber": 13032,
"prefabFishResourcesPath": "Game177_wukong_skill", "prefabFishResourcesPath": "Game177_wukong",
"showAudio": 0, "showAudio": 0,
"moveAudio": 0, "moveAudio": 0,
"dieAudio": 0, "dieAudio": 0,
@@ -1189,7 +1189,7 @@
}, },
{ {
"fishNumber": 13035, "fishNumber": 13035,
"prefabFishResourcesPath": "Game177_zhubajie_skill_meihuo", "prefabFishResourcesPath": "Game177_zhubajie",
"showAudio": 0, "showAudio": 0,
"moveAudio": 0, "moveAudio": 0,
"dieAudio": 0, "dieAudio": 0,
@@ -11,6 +11,8 @@ public class HHWK_BGJ_Boss : MonsterControl_BossBase
public Camera subCamera; public Camera subCamera;
public override void DieFish(RoomKillNotice obj = null) public override void DieFish(RoomKillNotice obj = null)
{ {
base.DieFish(obj);
idleAnim.CrossFade("hit", 0.3f); idleAnim.CrossFade("hit", 0.3f);
//idleAnim.gameObject.SetActive(false); //idleAnim.gameObject.SetActive(false);
//dieAnim.gameObject.SetActive(true); //dieAnim.gameObject.SetActive(true);
@@ -13,13 +13,9 @@ public class HHWK_CE_Boss : MonsterControl_BossBase
string pathId="2"; string pathId="2";
public override void DieFish(RoomKillNotice obj = null) public override void DieFish(RoomKillNotice obj = null)
{ {
GameManager.Instance.cameraShake.ShakePresets.Explosion2D(3f, 4f, 1f); base.DieFish(obj);
if (obj!=null)
{
poolNum = obj.gold;
} isMove = false;
isMove =false;
//base.DieFish(obj); //base.DieFish(obj);
transform.position = new Vector3(0, 0, 0); transform.position = new Vector3(0, 0, 0);
defaultAnim.transform.parent.gameObject.SetActive(false); defaultAnim.transform.parent.gameObject.SetActive(false);
File diff suppressed because it is too large Load Diff
@@ -1,4 +1,5 @@
using Assets.MyGame.Scripts.Net.WebResponses; using Assets.MyGame.Scripts.Net.APIResponses.Enum;
using Assets.MyGame.Scripts.Net.WebResponses;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@@ -21,10 +22,19 @@ public class HHWK_ShaSeng_Boss : MonsterControl_BossBase
obj_Skill103Effect.SetActive(false); obj_Skill103Effect.SetActive(false);
obj_Skill2Effect .SetActive(false); obj_Skill2Effect .SetActive(false);
obj_Skill3Effect .SetActive(false); obj_Skill3Effect .SetActive(false);
prizeCount = 8;
}
public override void OnMoveUpdata()
{
base.OnMoveUpdata();
if (moveTime>=monsterData.moveLine.moveTime)
{
Destroy(gameObject);
}
} }
public override void DieFish(RoomKillNotice obj = null) public override void DieFish(RoomKillNotice obj = null)
{ {
base.DieFish(obj);
currState = CharacterStateType.idle; currState = CharacterStateType.idle;
idleAnim.CrossFade("hit",0.3f); idleAnim.CrossFade("hit",0.3f);
} }
@@ -1,3 +1,4 @@
using Assets.MyGame.Scripts.Net.APIResponses.Enum;
using Assets.MyGame.Scripts.Net.WebResponses; using Assets.MyGame.Scripts.Net.WebResponses;
using System; using System;
using System.Collections; using System.Collections;
@@ -12,13 +13,10 @@ public class HHWK_TSGZ_Boss : MonsterControl_BossBase
string pathId="2"; string pathId="2";
public override void DieFish(RoomKillNotice obj = null) public override void DieFish(RoomKillNotice obj = null)
{ {
GameManager.Instance.cameraShake.ShakePresets.Explosion2D(3f, 4f, 1f); base.DieFish(obj);
if (obj!=null) currState = CharacterStateType.idle;
{
poolNum = obj.gold;
} isMove = false;
isMove =false;
//base.DieFish(obj); //base.DieFish(obj);
transform.position = new Vector3(0, 0, 0); transform.position = new Vector3(0, 0, 0);
defaultAnim.transform.parent.gameObject.SetActive(false); defaultAnim.transform.parent.gameObject.SetActive(false);
@@ -45,30 +43,17 @@ public class HHWK_TSGZ_Boss : MonsterControl_BossBase
} }
float setMoveTime=20; float setMoveTime=20;
bool isEnd=false; bool isEnd=false;
public override void Init(string pathId, float Time, bool isyuzhen = false, string yzID = "")
{
base.Init(pathId, Time, isyuzhen, yzID);
}
public override void OnMoveUpdata() public override void OnMoveUpdata()
{ {
base.OnMoveUpdata(); base.OnMoveUpdata();
if (moveTime>= setMoveTime && pathId=="2") if (moveTime >= monsterData.moveLine.moveTime)
{
pathId = "3";
var v = defaultAnim.transform.localScale;v.x=Mathf.Abs(v.x)* -1;
defaultAnim.transform.localScale = v;
init?.Invoke("3");
}
if (moveTime >= setMoveTime&& pathId == "3")
{ {
if (isEnd) Destroy(gameObject);
{
Destroy(gameObject);
}
isEnd=true;
isMove = false;
defaultAnim.CrossFade("leave", 0.3f);
pathId = "2";
} }
} }
} }
@@ -46,12 +46,8 @@ public class HHWK_BLM_Boss : MonsterControl_BossBase
} }
public override void DieFish(RoomKillNotice obj = null) public override void DieFish(RoomKillNotice obj = null)
{ {
GameManager.Instance.cameraShake.ShakePresets.Explosion2D(3f, 4f, 1f); base.DieFish(obj);
if (obj != null)
{
poolNum = obj.gold;
}
ani_LongToLM.SetActive(false); ani_LongToLM.SetActive(false);
ani_LMDefault.SetActive(false); ani_LMDefault.SetActive(false);
ani_LMToLong.SetActive(false); ani_LMToLong.SetActive(false);
@@ -64,13 +64,20 @@ MonoBehaviour:
currState: 0 currState: 0
HP: 5 HP: 5
effect_Die: {fileID: 0} effect_Die: {fileID: 0}
effect_DieAward: {fileID: 0}
isMove: 1 isMove: 1
is3D: 0 is3D: 0
forwordXYZ: forwordXYZ:
fishenum: 0
moveTime: 0 moveTime: 0
isyz: 0 isyz: 0
yzID: yzID:
bossName: "\u4E5D\u9F99\u7389\u73BA" bossName: "\u4E5D\u9F99\u7389\u73BA"
tMP_CurrBossScore: {fileID: 0}
currBossScoreValue: 0
bossScoreValue: 0
poolNum: 0
prizeCount: 0
YuXiIdle: {fileID: 7257884918830399258} YuXiIdle: {fileID: 7257884918830399258}
Skill1: {fileID: 7646974360807019699} Skill1: {fileID: 7646974360807019699}
Skill2: {fileID: 5278187979067370685} Skill2: {fileID: 5278187979067370685}
@@ -10,8 +10,15 @@ public class HHWK_YX_BOSS : MonsterControl_BossBase
public GameObject Skill1; public GameObject Skill1;
public GameObject Skill2; public GameObject Skill2;
public override void Awake()
{
base.Awake();
prizeCount = 1;
}
public override void DieFish(RoomKillNotice obj = null) public override void DieFish(RoomKillNotice obj = null)
{ {
base.DieFish(obj);
currState = CharacterStateType.idle; currState = CharacterStateType.idle;
YuXiIdle.transform.GetChild(1).gameObject.SetActive(false); YuXiIdle.transform.GetChild(1).gameObject.SetActive(false);
@@ -31,8 +31,8 @@ RectTransform:
m_GameObject: {fileID: 2258378551980177528} m_GameObject: {fileID: 2258378551980177528}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.01, y: 1.01, z: 1.01}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 4291601664812101764} - {fileID: 4291601664812101764}
- {fileID: 2064425942989115630} - {fileID: 2064425942989115630}
@@ -128,6 +128,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
player: {fileID: 8053605273848260111} player: {fileID: 8053605273848260111}
image_Bg: {fileID: 3732645741845648369} image_Bg: {fileID: 3732645741845648369}
fadeTime: 1.3
--- !u!223 &-8634983503678138505 --- !u!223 &-8634983503678138505
Canvas: Canvas:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -367,3 +368,4 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
player: {fileID: 0} player: {fileID: 0}
image_Bg: {fileID: 0} image_Bg: {fileID: 0}
fadeTime: 1.3
+1
View File
@@ -27,6 +27,7 @@ public class LoginPanel : UIBase
public override void Show(object args = null) public override void Show(object args = null)
{ {
base.Show(args); base.Show(args);
Destroy(GameManager.Instance.btn_Skip.gameObject);
if (loadingParent.activeSelf) if (loadingParent.activeSelf)
{ {
loadingParent.SetActive(false); loadingParent.SetActive(false);
@@ -11,21 +11,21 @@ public class Eff_longDie_AniEvent : MonoBehaviour
hHWK_BLM_Boss = transform.parent.parent.GetComponent<HHWK_BLM_Boss>(); hHWK_BLM_Boss = transform.parent.parent.GetComponent<HHWK_BLM_Boss>();
} }
bool isFirst=true; bool isFirst=true;
public IEnumerator jiafen() //public IEnumerator jiafen()
{ //{
yield return new WaitForSeconds(2f); // yield return new WaitForSeconds(1.5f);
Transform tra = hHWK_BLM_Boss.tMP_CurrBossScore.transform.parent; // Transform tra = hHWK_BLM_Boss.tMP_CurrBossScore.transform.parent;
GameObject obj = CreateFishManager.Instance.dieFXPrefabAwardTmp_AddScore; // GameObject obj = CreateFishManager.Instance.dieFXPrefabAwardTmp_AddScore;
List<RedPacketRecord> redPacketRecords = new List<RedPacketRecord>(); // List<RedPacketRecord> redPacketRecords = new List<RedPacketRecord>();
redPacketRecords = hHWK_BLM_Boss.redPacketRecords[0]; // redPacketRecords = hHWK_BLM_Boss.redPacketRecords[0];
hHWK_BLM_Boss.redPacketRecords.RemoveAt(0); // hHWK_BLM_Boss.redPacketRecords.RemoveAt(0);
foreach (var item in redPacketRecords) // foreach (var item in redPacketRecords)
{ // {
yield return new WaitForSeconds(0.15f); // yield return new WaitForSeconds(0.15f);
Instantiate(obj, tra.position, Quaternion.identity, tra).transform.GetChild(0).GetComponent<TextMeshProUGUI>().text = CoinScript.NumAdd(item.Amount.ToString()); // Instantiate(obj, tra.position, Quaternion.identity, tra).transform.GetChild(0).GetComponent<TextMeshProUGUI>().text = CoinScript.NumAdd(item.Amount.ToString());
} // }
} //}
public void End() public void End()
{ {
hHWK_BLM_Boss.ani_LongDieState3.SetActive(true); hHWK_BLM_Boss.ani_LongDieState3.SetActive(true);
@@ -36,7 +36,7 @@ public class Eff_longDie_AniEvent : MonoBehaviour
hHWK_BLM_Boss.BigPrize(); hHWK_BLM_Boss.BigPrize();
GameManager.Instance.StartCoroutine(jiafen()); //GameManager.Instance.StartCoroutine(jiafen());
if (isFirst) if (isFirst)
{ {
@@ -11,21 +11,7 @@ public class Eff_longDie_AniEvent1 : MonoBehaviour
{ {
hHWK_BLM_Boss = transform.parent.parent.GetComponent<HHWK_BLM_Boss>(); hHWK_BLM_Boss = transform.parent.parent.GetComponent<HHWK_BLM_Boss>();
} }
public IEnumerator jiafen()
{
yield return new WaitForSeconds(1.5f);
Transform tra = hHWK_BLM_Boss.tMP_CurrBossScore.transform.parent;
GameObject obj = CreateFishManager.Instance.dieFXPrefabAwardTmp_AddScore;
List<RedPacketRecord> redPacketRecords = new List<RedPacketRecord>();
redPacketRecords = hHWK_BLM_Boss.redPacketRecords[0];
hHWK_BLM_Boss.redPacketRecords.RemoveAt(0);
foreach (var item in redPacketRecords)
{
yield return new WaitForSeconds(0.15f);
Instantiate(obj, tra.position, Quaternion.identity, tra).transform.GetChild(0).GetComponent<TextMeshProUGUI>().text = CoinScript.NumAdd(item.Amount.ToString());
}
}
public void End() public void End()
{ {
hHWK_BLM_Boss.ani_LongDieState3.SetActive(true); hHWK_BLM_Boss.ani_LongDieState3.SetActive(true);
@@ -33,7 +19,6 @@ public class Eff_longDie_AniEvent1 : MonoBehaviour
v3.z *= -1; v3.z *= -1;
hHWK_BLM_Boss.BigPrize(); hHWK_BLM_Boss.BigPrize();
GameManager.Instance.StartCoroutine(jiafen());
hHWK_BLM_Boss.ani_LongDieState3.transform.localScale=v3; hHWK_BLM_Boss.ani_LongDieState3.transform.localScale=v3;
@@ -42,6 +42,7 @@ public class Eff_shaseng_Skill1_AniEvent : MonoBehaviour
HHWK_ShaSeng_Boss.obj_Skill101Effect.SetActive(true); HHWK_ShaSeng_Boss.obj_Skill101Effect.SetActive(true);
HHWK_ShaSeng_Boss.obj_Skill102Effect.SetActive(true); HHWK_ShaSeng_Boss.obj_Skill102Effect.SetActive(true);
HHWK_ShaSeng_Boss.obj_Skill103Effect.SetActive(true); HHWK_ShaSeng_Boss.obj_Skill103Effect.SetActive(true);
HHWK_ShaSeng_Boss.BigPrize(2, 4);
} }
public void eventSkill1End() public void eventSkill1End()
{ {
@@ -57,6 +58,8 @@ public class Eff_shaseng_Skill1_AniEvent : MonoBehaviour
count++; count++;
nextAnimationClip = "skill1"; nextAnimationClip = "skill1";
HHWK_ShaSeng_Boss.obj_Skill2Effect.SetActive(true); HHWK_ShaSeng_Boss.obj_Skill2Effect.SetActive(true);
HHWK_ShaSeng_Boss.BigPrize(2, 4);
} }
@@ -5,6 +5,7 @@ public class Eff_yuxiSkill_AniEvent : MonoBehaviour
public void playSkill1() public void playSkill1()
{ {
transform.parent.parent.GetComponent<HHWK_YX_BOSS>(). Skill1.SetActive(true); transform.parent.parent.GetComponent<HHWK_YX_BOSS>(). Skill1.SetActive(true);
transform.parent.parent.GetComponent<HHWK_YX_BOSS>().BigPrizeAll();
} }
/* /*
Dummy class. This could have happened for several reasons: Dummy class. This could have happened for several reasons:
+4 -33
View File
@@ -33,14 +33,6 @@ MonoBehaviour:
m_EnableLODCrossFade: 1 m_EnableLODCrossFade: 1
m_LODCrossFadeDitheringType: 1 m_LODCrossFadeDitheringType: 1
m_ShEvalMode: 0 m_ShEvalMode: 0
m_LightProbeSystem: 0
m_ProbeVolumeMemoryBudget: 1024
m_ProbeVolumeBlendingMemoryBudget: 256
m_SupportProbeVolumeGPUStreaming: 0
m_SupportProbeVolumeDiskStreaming: 0
m_SupportProbeVolumeScenarios: 0
m_SupportProbeVolumeScenarioBlending: 0
m_ProbeVolumeSHBands: 1
m_MainLightRenderingMode: 1 m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 1 m_MainLightShadowsSupported: 1
m_MainLightShadowmapResolution: 1024 m_MainLightShadowmapResolution: 1024
@@ -53,7 +45,6 @@ MonoBehaviour:
m_AdditionalLightsShadowResolutionTierHigh: 512 m_AdditionalLightsShadowResolutionTierHigh: 512
m_ReflectionProbeBlending: 0 m_ReflectionProbeBlending: 0
m_ReflectionProbeBoxProjection: 0 m_ReflectionProbeBoxProjection: 0
m_ReflectionProbeAtlas: 1
m_ShadowDistance: 50 m_ShadowDistance: 50
m_ShadowCascadeCount: 1 m_ShadowCascadeCount: 1
m_Cascade2Split: 0.25 m_Cascade2Split: 0.25
@@ -76,30 +67,21 @@ MonoBehaviour:
m_SupportsLightLayers: 0 m_SupportsLightLayers: 0
m_DebugLevel: 0 m_DebugLevel: 0
m_StoreActionsOptimization: 0 m_StoreActionsOptimization: 0
m_EnableRenderGraph: 0
m_UseAdaptivePerformance: 1 m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0 m_ColorGradingMode: 0
m_ColorGradingLutSize: 32 m_ColorGradingLutSize: 32
m_AllowPostProcessAlphaOutput: 0
m_UseFastSRGBLinearConversion: 0 m_UseFastSRGBLinearConversion: 0
m_SupportDataDrivenLensFlare: 1 m_SupportDataDrivenLensFlare: 1
m_SupportScreenSpaceLensFlare: 1
m_GPUResidentDrawerMode: 0
m_SmallMeshScreenPercentage: 0
m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0
m_ShadowType: 1 m_ShadowType: 1
m_LocalShadowsSupported: 0 m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256 m_LocalShadowsAtlasResolution: 256
m_MaxPixelLights: 0 m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256 m_ShadowAtlasResolution: 256
m_VolumeFrameworkUpdateMode: 0 m_VolumeFrameworkUpdateMode: 0
m_VolumeProfile: {fileID: 0} m_Textures:
apvScenesData: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
obsoleteSceneBounds: bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
m_Keys: []
m_Values: []
obsoleteHasProbeVolumes:
m_Keys: []
m_Values:
m_PrefilteringModeMainLightShadows: 3 m_PrefilteringModeMainLightShadows: 3
m_PrefilteringModeAdditionalLight: 3 m_PrefilteringModeAdditionalLight: 3
m_PrefilteringModeAdditionalLightShadows: 0 m_PrefilteringModeAdditionalLightShadows: 0
@@ -110,7 +92,6 @@ MonoBehaviour:
m_PrefilterDebugKeywords: 1 m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 1 m_PrefilterWriteRenderingLayers: 1
m_PrefilterHDROutput: 1 m_PrefilterHDROutput: 1
m_PrefilterAlphaOutput: 1
m_PrefilterSSAODepthNormals: 1 m_PrefilterSSAODepthNormals: 1
m_PrefilterSSAOSourceDepthLow: 0 m_PrefilterSSAOSourceDepthLow: 0
m_PrefilterSSAOSourceDepthMedium: 1 m_PrefilterSSAOSourceDepthMedium: 1
@@ -128,16 +109,6 @@ MonoBehaviour:
m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadowsQualityHigh: 1
m_PrefilterSoftShadows: 0 m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1 m_PrefilterScreenCoord: 1
m_PrefilterScreenSpaceIrradiance: 1
m_PrefilterNativeRenderPass: 1 m_PrefilterNativeRenderPass: 1
m_PrefilterUseLegacyLightmaps: 0
m_PrefilterBicubicLightmapSampling: 1
m_PrefilterReflectionProbeRotation: 1
m_PrefilterReflectionProbeBlending: 1
m_PrefilterReflectionProbeBoxProjection: 1
m_PrefilterReflectionProbeAtlas: 1
m_ShaderVariantLogLevel: 0 m_ShaderVariantLogLevel: 0
m_ShadowCascades: 0 m_ShadowCascades: 0
m_Textures:
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
+4 -33
View File
@@ -33,14 +33,6 @@ MonoBehaviour:
m_EnableLODCrossFade: 1 m_EnableLODCrossFade: 1
m_LODCrossFadeDitheringType: 1 m_LODCrossFadeDitheringType: 1
m_ShEvalMode: 0 m_ShEvalMode: 0
m_LightProbeSystem: 0
m_ProbeVolumeMemoryBudget: 1024
m_ProbeVolumeBlendingMemoryBudget: 256
m_SupportProbeVolumeGPUStreaming: 0
m_SupportProbeVolumeDiskStreaming: 0
m_SupportProbeVolumeScenarios: 0
m_SupportProbeVolumeScenarioBlending: 0
m_ProbeVolumeSHBands: 1
m_MainLightRenderingMode: 1 m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 1 m_MainLightShadowsSupported: 1
m_MainLightShadowmapResolution: 4096 m_MainLightShadowmapResolution: 4096
@@ -53,7 +45,6 @@ MonoBehaviour:
m_AdditionalLightsShadowResolutionTierHigh: 512 m_AdditionalLightsShadowResolutionTierHigh: 512
m_ReflectionProbeBlending: 1 m_ReflectionProbeBlending: 1
m_ReflectionProbeBoxProjection: 1 m_ReflectionProbeBoxProjection: 1
m_ReflectionProbeAtlas: 1
m_ShadowDistance: 150 m_ShadowDistance: 150
m_ShadowCascadeCount: 4 m_ShadowCascadeCount: 4
m_Cascade2Split: 0.25 m_Cascade2Split: 0.25
@@ -76,30 +67,21 @@ MonoBehaviour:
m_SupportsLightLayers: 0 m_SupportsLightLayers: 0
m_DebugLevel: 0 m_DebugLevel: 0
m_StoreActionsOptimization: 0 m_StoreActionsOptimization: 0
m_EnableRenderGraph: 0
m_UseAdaptivePerformance: 1 m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0 m_ColorGradingMode: 0
m_ColorGradingLutSize: 32 m_ColorGradingLutSize: 32
m_AllowPostProcessAlphaOutput: 0
m_UseFastSRGBLinearConversion: 0 m_UseFastSRGBLinearConversion: 0
m_SupportDataDrivenLensFlare: 1 m_SupportDataDrivenLensFlare: 1
m_SupportScreenSpaceLensFlare: 1
m_GPUResidentDrawerMode: 0
m_SmallMeshScreenPercentage: 0
m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0
m_ShadowType: 1 m_ShadowType: 1
m_LocalShadowsSupported: 0 m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256 m_LocalShadowsAtlasResolution: 256
m_MaxPixelLights: 0 m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256 m_ShadowAtlasResolution: 256
m_VolumeFrameworkUpdateMode: 0 m_VolumeFrameworkUpdateMode: 0
m_VolumeProfile: {fileID: 0} m_Textures:
apvScenesData: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
obsoleteSceneBounds: bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
m_Keys: []
m_Values: []
obsoleteHasProbeVolumes:
m_Keys: []
m_Values:
m_PrefilteringModeMainLightShadows: 3 m_PrefilteringModeMainLightShadows: 3
m_PrefilteringModeAdditionalLight: 3 m_PrefilteringModeAdditionalLight: 3
m_PrefilteringModeAdditionalLightShadows: 2 m_PrefilteringModeAdditionalLightShadows: 2
@@ -110,7 +92,6 @@ MonoBehaviour:
m_PrefilterDebugKeywords: 1 m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 1 m_PrefilterWriteRenderingLayers: 1
m_PrefilterHDROutput: 1 m_PrefilterHDROutput: 1
m_PrefilterAlphaOutput: 1
m_PrefilterSSAODepthNormals: 0 m_PrefilterSSAODepthNormals: 0
m_PrefilterSSAOSourceDepthLow: 1 m_PrefilterSSAOSourceDepthLow: 1
m_PrefilterSSAOSourceDepthMedium: 1 m_PrefilterSSAOSourceDepthMedium: 1
@@ -128,16 +109,6 @@ MonoBehaviour:
m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadowsQualityHigh: 1
m_PrefilterSoftShadows: 0 m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1 m_PrefilterScreenCoord: 1
m_PrefilterScreenSpaceIrradiance: 1
m_PrefilterNativeRenderPass: 1 m_PrefilterNativeRenderPass: 1
m_PrefilterUseLegacyLightmaps: 0
m_PrefilterBicubicLightmapSampling: 1
m_PrefilterReflectionProbeRotation: 1
m_PrefilterReflectionProbeBlending: 0
m_PrefilterReflectionProbeBoxProjection: 0
m_PrefilterReflectionProbeAtlas: 1
m_ShaderVariantLogLevel: 0 m_ShaderVariantLogLevel: 0
m_ShadowCascades: 1 m_ShadowCascades: 1
m_Textures:
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
+4 -33
View File
@@ -33,14 +33,6 @@ MonoBehaviour:
m_EnableLODCrossFade: 1 m_EnableLODCrossFade: 1
m_LODCrossFadeDitheringType: 1 m_LODCrossFadeDitheringType: 1
m_ShEvalMode: 0 m_ShEvalMode: 0
m_LightProbeSystem: 0
m_ProbeVolumeMemoryBudget: 1024
m_ProbeVolumeBlendingMemoryBudget: 256
m_SupportProbeVolumeGPUStreaming: 0
m_SupportProbeVolumeDiskStreaming: 0
m_SupportProbeVolumeScenarios: 0
m_SupportProbeVolumeScenarioBlending: 0
m_ProbeVolumeSHBands: 1
m_MainLightRenderingMode: 1 m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 0 m_MainLightShadowsSupported: 0
m_MainLightShadowmapResolution: 1024 m_MainLightShadowmapResolution: 1024
@@ -53,7 +45,6 @@ MonoBehaviour:
m_AdditionalLightsShadowResolutionTierHigh: 512 m_AdditionalLightsShadowResolutionTierHigh: 512
m_ReflectionProbeBlending: 0 m_ReflectionProbeBlending: 0
m_ReflectionProbeBoxProjection: 0 m_ReflectionProbeBoxProjection: 0
m_ReflectionProbeAtlas: 1
m_ShadowDistance: 50 m_ShadowDistance: 50
m_ShadowCascadeCount: 1 m_ShadowCascadeCount: 1
m_Cascade2Split: 0.25 m_Cascade2Split: 0.25
@@ -76,30 +67,21 @@ MonoBehaviour:
m_SupportsLightLayers: 0 m_SupportsLightLayers: 0
m_DebugLevel: 0 m_DebugLevel: 0
m_StoreActionsOptimization: 0 m_StoreActionsOptimization: 0
m_EnableRenderGraph: 0
m_UseAdaptivePerformance: 1 m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0 m_ColorGradingMode: 0
m_ColorGradingLutSize: 16 m_ColorGradingLutSize: 16
m_AllowPostProcessAlphaOutput: 0
m_UseFastSRGBLinearConversion: 0 m_UseFastSRGBLinearConversion: 0
m_SupportDataDrivenLensFlare: 1 m_SupportDataDrivenLensFlare: 1
m_SupportScreenSpaceLensFlare: 1
m_GPUResidentDrawerMode: 0
m_SmallMeshScreenPercentage: 0
m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0
m_ShadowType: 1 m_ShadowType: 1
m_LocalShadowsSupported: 0 m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256 m_LocalShadowsAtlasResolution: 256
m_MaxPixelLights: 0 m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256 m_ShadowAtlasResolution: 256
m_VolumeFrameworkUpdateMode: 0 m_VolumeFrameworkUpdateMode: 0
m_VolumeProfile: {fileID: 0} m_Textures:
apvScenesData: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
obsoleteSceneBounds: bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
m_Keys: []
m_Values: []
obsoleteHasProbeVolumes:
m_Keys: []
m_Values:
m_PrefilteringModeMainLightShadows: 0 m_PrefilteringModeMainLightShadows: 0
m_PrefilteringModeAdditionalLight: 0 m_PrefilteringModeAdditionalLight: 0
m_PrefilteringModeAdditionalLightShadows: 0 m_PrefilteringModeAdditionalLightShadows: 0
@@ -110,7 +92,6 @@ MonoBehaviour:
m_PrefilterDebugKeywords: 1 m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 1 m_PrefilterWriteRenderingLayers: 1
m_PrefilterHDROutput: 1 m_PrefilterHDROutput: 1
m_PrefilterAlphaOutput: 1
m_PrefilterSSAODepthNormals: 1 m_PrefilterSSAODepthNormals: 1
m_PrefilterSSAOSourceDepthLow: 1 m_PrefilterSSAOSourceDepthLow: 1
m_PrefilterSSAOSourceDepthMedium: 1 m_PrefilterSSAOSourceDepthMedium: 1
@@ -128,16 +109,6 @@ MonoBehaviour:
m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadowsQualityHigh: 1
m_PrefilterSoftShadows: 0 m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1 m_PrefilterScreenCoord: 1
m_PrefilterScreenSpaceIrradiance: 1
m_PrefilterNativeRenderPass: 1 m_PrefilterNativeRenderPass: 1
m_PrefilterUseLegacyLightmaps: 0
m_PrefilterBicubicLightmapSampling: 1
m_PrefilterReflectionProbeRotation: 1
m_PrefilterReflectionProbeBlending: 1
m_PrefilterReflectionProbeBoxProjection: 1
m_PrefilterReflectionProbeAtlas: 1
m_ShaderVariantLogLevel: 0 m_ShaderVariantLogLevel: 0
m_ShadowCascades: 0 m_ShadowCascades: 0
m_Textures:
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}