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

Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks

Browse Source
This commit is contained in:
舒荣森 2024-10-30 06:22:17 +08:00
commit 66be58bbeb
5 changed files with 88 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
meng_yao/Assets/Scenes/develop_the_main_interface_slices.unity
View File

@ -230,6 +230,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 65205169}
- component: {fileID: 65205171}
- component: {fileID: 65205170}
m_Layer: 0
m_Name: deisland02
m_TagString: Untagged
@ -254,6 +256,44 @@ Transform:
m_Father: {fileID: 1077006413}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &65205170
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 65205168}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4828810cd0a388e438708b3693fe42b5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!61 &65205171
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 65205168}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.123535156, y: -0.13806939}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3.3689752, y: 2.70043}
m_EdgeRadius: 0
--- !u!1 &84930141
GameObject:
m_ObjectHideFlags: 0
@ -2351,6 +2391,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1086280132}
- component: {fileID: 1086280134}
- component: {fileID: 1086280133}
m_Layer: 0
m_Name: deisland01
m_TagString: Untagged
@ -2375,6 +2417,44 @@ Transform:
m_Father: {fileID: 1077006413}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1086280133
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1086280131}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8f20a8b8005e5ce46b9a3b97c4792820, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!61 &1086280134
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1086280131}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.14308095, y: -0.25754526}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 2.6025047, y: 1.6581719}
m_EdgeRadius: 0
--- !u!1 &1095284821
GameObject:
m_ObjectHideFlags: 3

6
meng_yao/Assets/Scenes/main_scene.unity
View File

@ -384,7 +384,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
dissolveMaterial: {fileID: 2100000, guid: 55e741d1aba3d0c44917e893f6a834b6, type: 2}
targetImage: {fileID: 304400298}
transitionSpeed: 1
transitionSpeed: 2.5
isTransitioning: 1
--- !u!1 &445174285
GameObject:
@ -1115,6 +1115,10 @@ PrefabInstance:
propertyPath: m_Name
value: pop
objectReference: {fileID: 0}
- target: {fileID: 1125018133084166437, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
--- !u!224 &2002424411 stripped

2
meng_yao/Assets/script/JumpScene/JinBidaoBtn.cs
View File

@ -32,6 +32,6 @@ public class JinBidaoBtn : MonoBehaviour
void JUmpScem()
{
// SceneGuodu.instance.SlideInAndLoadScene(JumpScene.cultivation_Jinsha_mine_slices);
SceneGuodu.instance.SlideInAndLoadScene(JumpScene.cultivation_gold_coin_Island);
}
}

2
meng_yao/Assets/script/JumpScene/SceneGuodu.cs
View File

@ -33,7 +33,7 @@ public class SceneGuodu : MonoBehaviour
{
this.sceneName = sceneName;
mask.transform.GetComponent<CircleDissolveEffect>().isTransitioning = false;
await Task.Delay(1100);
await Task.Delay(1000);
SceneManager.LoadScene(sceneName);
}

2
meng_yao/Assets/script/JumpScene/ZuanshiBtn.cs
View File

@ -32,6 +32,6 @@ public class ZuanshiBtn : MonoBehaviour
void JUmpScem()
{
// SceneGuodu.instance.SlideInAndLoadScene(JumpScene.cultivation_Jinsha_mine_slices);
SceneGuodu.instance.SlideInAndLoadScene(JumpScene.cultivation_gem_island_slices);
}
}