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-28 14:05:24 +08:00
commit a90addfc75
13 changed files with 188 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meng_yao/Assets/Epic Toon FX/Materials/Portals/portal_stripes4.mat
View File

@ -21,12 +21,12 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: bd829ee52edc2694b85ab6044fde8c9d, type: 3}
m_Texture: {fileID: 2800000, guid: e71fa25a8c3ac2e4ea9a94aff3a9f051, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _InvFade: 1
m_Colors:
- _TintColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 0.46666667}
- _TintColor: {r: 0.5377358, g: 0.5377358, b: 0.5377358, a: 0.46666667}
m_BuildTextureStacks: []

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

@ -176,6 +176,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3512060526186750275}
- {fileID: 7546179636844705041}
m_Father: {fileID: 1707126933630821580}
m_RootOrder: 0
@ -538,7 +539,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 935702017527693725}
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_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -546,7 +547,7 @@ RectTransform:
- {fileID: 5758552040785847597}
- {fileID: 7966322793119509022}
- {fileID: 4803481026598559427}
m_Father: {fileID: 6446013415379295601}
m_Father: {fileID: 3625690827309570785}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
@ -2258,10 +2259,10 @@ RectTransform:
m_Father: {fileID: 3512060526186750275}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 142.5, y: -42.5}
m_SizeDelta: {x: 285, y: 85}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7861842416264946970
MonoBehaviour:
@ -2671,7 +2672,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1707126933630821580
RectTransform:
m_ObjectHideFlags: 0
@ -2688,10 +2689,10 @@ RectTransform:
m_Father: {fileID: 722927743372136565}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: -1830}
m_SizeDelta: {x: 1080, y: 820}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6761047138766209849
MonoBehaviour:
@ -3036,12 +3037,12 @@ RectTransform:
m_Children:
- {fileID: 6446013415379295601}
m_Father: {fileID: 3625690827309570785}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 90.6514}
m_AnchoredPosition: {x: 0, y: -105}
m_SizeDelta: {x: 0, y: -14.349}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1586661877493179757
CanvasRenderer:
@ -3203,10 +3204,10 @@ RectTransform:
m_Father: {fileID: 3512060526186750275}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 427.5, y: -42.5}
m_SizeDelta: {x: 285, y: 85}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6624685875267375879
MonoBehaviour:
@ -3474,7 +3475,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &889330758509780454
RectTransform:
m_ObjectHideFlags: 0
@ -3491,10 +3492,10 @@ RectTransform:
m_Father: {fileID: 722927743372136565}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: -1010}
m_SizeDelta: {x: 1080, y: 820}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4859758159910522684
MonoBehaviour:
@ -3834,15 +3835,14 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3512060526186750275}
m_Children: []
m_Father: {fileID: 7546179636844705041}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 300}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &8501014200156297217
MonoBehaviour:
@ -4075,10 +4075,10 @@ RectTransform:
m_Father: {fileID: 3512060526186750275}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 712.5, y: -42.5}
m_SizeDelta: {x: 285, y: 85}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7925441625529160058
MonoBehaviour:

2
meng_yao/Assets/Prefabs/ui/info_enemy.prefab
View File

@ -136,7 +136,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
retbutton: {fileID: 0}
ClosureObj: {fileID: 0}
ClosureObj: {fileID: 103310189314411435}
_panel: {fileID: 8513957311761855226}
closeBtn: {fileID: 103310189314411445}
_closePanel: {fileID: 103310189314411435}

2
meng_yao/Assets/Prefabs/ui/info_mengyao.prefab
View File

@ -136,7 +136,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
retbutton: {fileID: 0}
ClosureObj: {fileID: 0}
ClosureObj: {fileID: 8782491854383104488}
_panel: {fileID: 7805053268599849540}
closeBtn: {fileID: 8782491854383104500}
_closePanel: {fileID: 8782491854383104488}

BIN
meng_yao/Assets/Resources/animation/A_fightin/Ftest/图层 1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 405 KiB

135
meng_yao/Assets/Resources/animation/A_fightin/Ftest/图层 1.png.meta Normal file
View File

@ -0,0 +1,135 @@
fileFormatVersion: 2
guid: e71fa25a8c3ac2e4ea9a94aff3a9f051
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

4
meng_yao/Assets/Scenes/New/Scene_map_1.unity
View File

@ -4605,6 +4605,10 @@ PrefabInstance:
propertyPath: ColorModule.gradient.maxGradient.key1.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8124682705109234402, guid: 2e76b707cea1c574fac26c5426bdd47c, type: 3}
propertyPath: ColorModule.enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8124682705109234402, guid: 2e76b707cea1c574fac26c5426bdd47c, type: 3}
propertyPath: ColorBySpeedModule.enabled
value: 0

2
meng_yao/Assets/common

@ -1 +1 @@
Subproject commit c04f3f2ed9571f522b41ec9f27928529d7c9f352
Subproject commit 53e24b624e206126bddcc2e0d8399a442d741901

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

@ -2,17 +2,23 @@ using UnityEngine;
using UnityEngine.UI;
using DG.Tweening;
using System.Threading.Tasks;
using UnityEngine.SceneManagement;
public class Challeng_Evictory : Base
{
public GameObject Victory;
public GameObject failur;
public Button retrunBTN;
private void Awake()
{
Victory.SetActive(false);
failur.SetActive(false);
retrunBTN.onClick.AddListener(() => {
SceneManager.LoadScene(1);
});
}

8
meng_yao/Assets/script/A_Fight/CharacterClick.cs
View File

@ -2,6 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
using UnityEngine.EventSystems;
public class CharacterClick : MonoBehaviour
{
@ -31,6 +32,12 @@ public class CharacterClick : MonoBehaviour
private void OnMouseDown()
{
// 检查鼠标是否点击在UI元素上
if (EventSystem.current.IsPointerOverGameObject())
{
return; // 如果点击的是UI，直接返回，避免穿透到2D对象
}
// 确保父节点的碰撞体是 Trigger 类型
Collider2D parentCollider = GetComponent<Collider2D>();
if (parentCollider != null && parentCollider.isTrigger)
@ -71,6 +78,7 @@ public class CharacterClick : MonoBehaviour
Destroy(instantiatedPanel.GetComponent<charainfoPanel>()._closePanel);
HideAttackRange(UIContorl.instance.NowAttackRange);
Debug.Log("关闭攻击范围");
});
RectTransform panelRect = instantiatedPanel.GetComponent<RectTransform>();
// 确保生成的面板不会挡住父物体

15
meng_yao/Assets/script/A_Fight/enemy.cs
View File

@ -52,21 +52,6 @@ public class enemy : Role
Navigation.MoveToNextWaypoint(this.gameObject, moveSpeed);
}
public override void die()
{
base.die();
if (Application.isPlaying)
{
// 将当前敌人对象放入死亡池
if (SpawnPool.intance != null)
{
SkillBox.instance.AddExperience(6, this.gameObject.transform);
}
// UIContorl.instance.Killnumber += 1;
}
}
private void OnTriggerEnter2D(Collider2D collision)
{
// ½øÈ뷶Χ¼ì²â

22
meng_yao/Assets/script/scene_Main/ui/BTN.cs
View File

@ -1,22 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class BTN : MonoBehaviour
{
public Button btn;
public int shuxing;
// Start is called before the first frame update
void Start()
{
btn.onClick.AddListener(() => { });
}
// Update is called once per frame
void Update()
{
}
}

11
meng_yao/Assets/script/scene_Main/ui/BTN.cs.meta
View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: a239e3f38bf08354688a0bc0445d3622
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: