shurongsen/Cute_demon_attacks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

Browse Source
This commit is contained in:
liuliang 2024-12-29 11:52:24 +08:00
commit 134a7e4bb4
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meng_yao/Assets/Prefabs/ui/Beat_ZanTing.prefab
View File

@ -850,8 +850,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 462.18054, y: -1051.9258} m_AnchoredPosition: {x: 462.18054, y: -1101.9258}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 725.2872, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5361498673185763723 --- !u!114 &5361498673185763723
MonoBehaviour: MonoBehaviour:
@ -1398,6 +1398,7 @@ MonoBehaviour:
sBtn: {fileID: 0} sBtn: {fileID: 0}
prefab: {fileID: 8208978137248747371, guid: 1e100c9d59699cc4b88606a86dc03688, type: 3} prefab: {fileID: 8208978137248747371, guid: 1e100c9d59699cc4b88606a86dc03688, type: 3}
prefabParent: {fileID: 5361498674124843496} prefabParent: {fileID: 5361498674124843496}
LoadPrefab: {fileID: 6870665346359048685, guid: 6839835fa4bd9ee4082efffc9eccc703, type: 3}
--- !u!1 &5361498673881270029 --- !u!1 &5361498673881270029
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

1
meng_yao/Assets/Prefabs/ui/Challeng_Evictory.prefab
View File

@ -1518,6 +1518,7 @@ MonoBehaviour:
ClosureObj: {fileID: 1531406980403464475} ClosureObj: {fileID: 1531406980403464475}
Victory: {fileID: 6246231775717365985} Victory: {fileID: 6246231775717365985}
failur: {fileID: 714296075271660652} failur: {fileID: 714296075271660652}
LoadPrefab: {fileID: 6870665346359048685, guid: 6839835fa4bd9ee4082efffc9eccc703, type: 3}
retrunBTN: {fileID: 1611523547142466811} retrunBTN: {fileID: 1611523547142466811}
--- !u!1 &1660446482787393010 --- !u!1 &1660446482787393010
GameObject: GameObject:

2
meng_yao/Assets/Prefabs/ui/load/loadingPanel.prefab
View File

@ -194,7 +194,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1} m_Color: {r: 0, g: 0, b: 0, a: 0.8627451}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1

2
meng_yao/Assets/Scenes/scene_Main.unity
View File

@ -79894,7 +79894,7 @@ Canvas:
m_OverridePixelPerfect: 0 m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0 m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0 m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0 m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 1 m_SortingOrder: 1
m_TargetDisplay: 0 m_TargetDisplay: 0

4
meng_yao/Assets/script/A_Fight/Beat_ZanTing.cs
View File

@ -10,6 +10,7 @@ public class Beat_ZanTing:BaseUI
public GameObject prefab; public GameObject prefab;
public GameObject prefabParent; public GameObject prefabParent;
public GameObject LoadPrefab;
private async void Start() private async void Start()
{ {
await DamageStatistics(); await DamageStatistics();
@ -25,7 +26,8 @@ public class Beat_ZanTing:BaseUI
RegisterButton(BTNs[1], async() => { RegisterButton(BTNs[1], async() => {
gameGlobal.GameRecovery(); gameGlobal.GameRecovery();
await ButtonClickAnimationAsync(BTNs[1].gameObject); await ButtonClickAnimationAsync(BTNs[1].gameObject);
SceneManager.LoadScene(1); //SceneManager.LoadScene(1);
Instantiate(LoadPrefab, GameObject.Find("Canvas").transform).GetComponent<loadingPanel>().SceneIndex = 1;
}); });
RegisterButton(BTNs[2], async () => { RegisterButton(BTNs[2], async () => {

4
meng_yao/Assets/script/A_Fight/Challeng_Evictory/Challeng_Evictory.cs
View File

@ -8,7 +8,7 @@ public class Challeng_Evictory : Base
{ {
public GameObject Victory; public GameObject Victory;
public GameObject failur; public GameObject failur;
public GameObject LoadPrefab;
public Button retrunBTN; public Button retrunBTN;
private void Awake() private void Awake()
@ -17,7 +17,7 @@ public class Challeng_Evictory : Base
Victory.SetActive(false); Victory.SetActive(false);
failur.SetActive(false); failur.SetActive(false);
retrunBTN.onClick.AddListener(() => { retrunBTN.onClick.AddListener(() => {
SceneManager.LoadScene(1); Instantiate(LoadPrefab, GameObject.Find("Canvas").transform).GetComponent<loadingPanel>().SceneIndex = 1;
}); });
} }