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-30 12:49:41 +08:00
commit aadcf6c959
11 changed files with 1401 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meng_yao/Assets/Prefabs/charatar/enemy/wood_min.prefab
View File

@ -330,7 +330,7 @@ MonoBehaviour:
id: 0
Name:
camp: 1
hp: 25
hp: 20
dieIndex: 1
Hpfiil: {fileID: 1566038940701374259}
HpfiilYello: {fileID: 605146830908541898}
@ -349,7 +349,7 @@ MonoBehaviour:
CritRate: 0
CriticalHitRateBonus: 0
killNum: 0
gold: 10
gold: 3
MaxAttack: 10
MinAttack: 10
physicalArmor: 10
@ -449,8 +449,6 @@ MonoBehaviour:
DefensePerLevel: 5
elementType: 0
defenseType: 1
unitType: 0
size: 0
--- !u!210 &6468108308622956862
SortingGroup:
m_ObjectHideFlags: 0
@ -635,7 +633,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: cebb0d54c57db444d8b1f48aab88bb48, type: 3}
m_Sprite: {fileID: 21300000, guid: 0b98f7c80a18aa544a59829d0d8e8cb5, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0

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

@ -850,8 +850,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 462.18054, y: -1101.9258}
m_SizeDelta: {x: 725.2872, y: 0}
m_AnchoredPosition: {x: 462.18054, y: -1051.9258}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5361498673185763723
MonoBehaviour:

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

@ -4685,7 +4685,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_AnchorMin.x
@ -4693,15 +4693,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 166
objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: 166
objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_LocalPosition.x
@ -4733,11 +4733,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 208
objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -116
objectReference: {fileID: 0}
- target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

1114
meng_yao/Assets/Prefabs/ui/scene_main/Battle_Selection.prefab
View File

File diff suppressed because it is too large Load Diff

88
meng_yao/Assets/Prefabs/ui/scene_main/card_huhuhu.prefab
View File

@ -32,7 +32,7 @@ RectTransform:
m_Children:
- {fileID: 1126466393375563246}
m_Father: {fileID: 1126466392997513753}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -108,11 +108,11 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1126466392997513753}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -8, y: 116}
m_AnchoredPosition: {x: -3, y: 100.9}
m_SizeDelta: {x: 677.064, y: 601.6876}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1126466391919116221
@ -359,6 +359,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mengyaoid: M_H_001
shuxing: 0
--- !u!1 &1126466392997513758
GameObject:
m_ObjectHideFlags: 0
@ -390,6 +391,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5774639467184261221}
- {fileID: 1126466391919116211}
- {fileID: 1126466391911852755}
m_Father: {fileID: 1126466392417920612}
@ -607,3 +609,83 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u864E\u864E\u864E"
--- !u!1 &3881961472319517656
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5774639467184261221}
- component: {fileID: 5553627947663953144}
- component: {fileID: 7385831070857935280}
m_Layer: 5
m_Name: Text (Legacy)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5774639467184261221
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3881961472319517656}
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
m_Children: []
m_Father: {fileID: 1126466392997513753}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -71.5, y: 85.5}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5553627947663953144
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3881961472319517656}
m_CullTransparentMesh: 1
--- !u!114 &7385831070857935280
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3881961472319517656}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 5
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u706B"

86
meng_yao/Assets/Prefabs/ui/scene_main/card_mkl.prefab
View File

@ -1,5 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1871164226867223590
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5721631870110834662}
- component: {fileID: 3890802252661470589}
- component: {fileID: 2644016702316718577}
m_Layer: 5
m_Name: Text (Legacy)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5721631870110834662
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1871164226867223590}
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
m_Children: []
m_Father: {fileID: 6655435213110775789}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -65, y: 66.5}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3890802252661470589
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1871164226867223590}
m_CullTransparentMesh: 1
--- !u!114 &2644016702316718577
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1871164226867223590}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.3220304, g: 0.9056604, b: 0.03844783, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 5
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6728"
--- !u!1 &6655435211825999802
GameObject:
m_ObjectHideFlags: 0
@ -451,6 +531,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mengyaoid: M_M_001
shuxing: 0
--- !u!1 &6655435213110775788
GameObject:
m_ObjectHideFlags: 0
@ -480,13 +561,14 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 5721631870110834662}
m_Father: {fileID: 6655435212774856918}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1, y: 50.13}
m_AnchoredPosition: {x: -4, y: 20.6}
m_SizeDelta: {x: 421.2176, y: 390.2604}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6655435213110775795

86
meng_yao/Assets/Prefabs/ui/scene_main/card_qie.prefab
View File

@ -1,5 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1249462056720541488
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2194295987282284619}
- component: {fileID: 3471738330433828620}
- component: {fileID: 1281642295953657946}
m_Layer: 5
m_Name: Text (Legacy)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2194295987282284619
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1249462056720541488}
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
m_Children: []
m_Father: {fileID: 5508436328917121100}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -62.6, y: 34}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3471738330433828620
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1249462056720541488}
m_CullTransparentMesh: 1
--- !u!114 &1281642295953657946
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1249462056720541488}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.1273585, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u51B0"
--- !u!1 &5508436327076020825
GameObject:
m_ObjectHideFlags: 0
@ -286,6 +366,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mengyaoid: M_S_001
shuxing: 0
--- !u!1 &5508436328304430213
GameObject:
m_ObjectHideFlags: 0
@ -560,13 +641,14 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 2194295987282284619}
m_Father: {fileID: 5508436328304430210}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -8, y: 62}
m_AnchoredPosition: {x: -8, y: 59.6}
m_SizeDelta: {x: 555.6077, y: 493.7528}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5508436328917121098

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

@ -100,7 +100,7 @@ public class CharacterClick : MonoBehaviour
if (role.camp == Camp.Enemy)
{
//string eveText,string name,string def,string speed,string shanghai,string info,int hp,int maxHp
panelRect.GetComponent<charainfoPanel>().UpDateShow("1", "Enemy_002", "0", "3", "1", "测试文档一", role.hp, 100f);
panelRect.GetComponent<charainfoPanel>().UpDateShow("1", "Enemy_001", "0", "3", "1", "测试文档一", role.hp, role.maxHp);
}
else

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

@ -92,12 +92,7 @@ public class SpawnPool : Base
void Start()
{
//this.StartSpawning();
Base.GlobalObj.GetComponent<gameGlobal>().OnGamePlay += this.StartSpawning;
//currentWave = MengyaoInfo.Instance.m_WaveData[0].AffiliatedWaveNumber;
//GenerateQuantity = MengyaoInfo.Instance.m_WaveData[0].EnemyStatistics[0].EnemyAttributes.Count;
////GenerationIntervalOfOne = MengyaoInfo.Instance.m_WaveData[0].EnemyStatistics[0].
}
public void UpdateNodeList()
{
@ -234,15 +229,7 @@ public class SpawnPool : Base
}
// 当池子中敌人死亡或者被回收时，将其回收到池中
public void ReturnEnemyToPool(GameObject enemy)
{
//enemy.GetComponent<Role>().mycollider.enabled = false;
enemy.SetActive(false); // 禁用敌人对象
EnemyPool.Return(enemy); // 将敌人回收到池中
Enemys.Remove(enemy);
}
private void OnDisable()
{

3
meng_yao/Assets/script/A_Fight/UIContorl.cs
View File

@ -37,8 +37,9 @@ public class UIContorl : Base
{
killnumber = value;
this.KIllNumberText.text = killnumber + "/" + maxEnemynumber;
if (killnumber==maxEnemynumber)
if (killnumber>=maxEnemynumber)
{
killnumber = maxEnemynumber;
gameGlobal.GameVictory();
}
}

20
meng_yao/Assets/script/A_Fight/charainfoPanel.cs
View File

@ -45,6 +45,15 @@ public class charainfoPanel : Base
}
/// <summary>
///
/// </summary>
/// <param name="LeveText">等级</param>
/// <param name="NameText">名字</param>
/// <param name="InfoText">信息</param>
/// <param name="AttackText">攻击力</param>
/// <param name="AttackFanweiText">攻击范围</param>
/// <param name="AttackCD">攻击cd</param>
public void UpDateShow(string LeveText, string NameText, string InfoText, string AttackText, string AttackFanweiText,string AttackCD)
{
this.LeveText.text= "Lv."+LeveText;
@ -55,6 +64,17 @@ public class charainfoPanel : Base
this.AttackCD.text= "<color=#00FF00>"+ AttackCD+"</color>";
}
/// <summary>
///
/// </summary>
/// <param name="eveText">等级</param>
/// <param name="name">名字</param>
/// <param name="def">防御力</param>
/// <param name="speed">速度</param>
/// <param name="shanghai">伤害</param>
/// <param name="info">信息</param>
/// <param name="hp">血量</param>
/// <param name="maxHp">最大血量</param>
public void UpDateShow(string eveText,string name,string def,string speed,string shanghai,string info,float hp,float maxHp)
{
textList[0].text = "lv." + eveText;