待优化:1:接口的验证码调整,2:敌人点击信息调整,3:敌人波次信息调整,4:波次调整

2024年12月13日,08点47分——wlx——ll
This commit is contained in:
wulongxiao 2024-12-13 08:48:10 +08:00
parent a9fdee5432
commit 8ac9c95887
15 changed files with 288 additions and 118 deletions

View File

@ -116,9 +116,9 @@ RectTransform:
m_Father: {fileID: 5361498674124843495} m_Father: {fileID: 5361498674124843495}
m_RootOrder: 4 m_RootOrder: 4
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 427.415, y: -922.7216} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 854.83, y: 188.6848} m_SizeDelta: {x: 854.83, y: 188.6848}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5361498673207345219 --- !u!222 &5361498673207345219
@ -1330,6 +1330,7 @@ MonoBehaviour:
- {fileID: 5361498673403610161} - {fileID: 5361498673403610161}
- {fileID: 5361498673754352580} - {fileID: 5361498673754352580}
panel: {fileID: 5361498673865314947} panel: {fileID: 5361498673865314947}
sBtn: {fileID: 0}
--- !u!1 &5361498673881270029 --- !u!1 &5361498673881270029
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1530,9 +1531,9 @@ RectTransform:
m_Father: {fileID: 5361498674124843495} m_Father: {fileID: 5361498674124843495}
m_RootOrder: 3 m_RootOrder: 3
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 427.415, y: -718.12683} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 854.83, y: 188.6848} m_SizeDelta: {x: 854.83, y: 188.6848}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5361498673906891575 --- !u!222 &5361498673906891575
@ -2142,9 +2143,9 @@ RectTransform:
m_Father: {fileID: 5361498674124843495} m_Father: {fileID: 5361498674124843495}
m_RootOrder: 2 m_RootOrder: 2
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 427.415, y: -513.532} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 854.83, y: 188.6848} m_SizeDelta: {x: 854.83, y: 188.6848}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5361498674189050916 --- !u!222 &5361498674189050916
@ -2609,9 +2610,9 @@ RectTransform:
m_Father: {fileID: 5361498674124843495} m_Father: {fileID: 5361498674124843495}
m_RootOrder: 1 m_RootOrder: 1
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 427.415, y: -308.9372} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 854.83, y: 188.6848} m_SizeDelta: {x: 854.83, y: 188.6848}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5361498674285022893 --- !u!222 &5361498674285022893
@ -3206,9 +3207,9 @@ RectTransform:
m_Father: {fileID: 5361498674124843495} m_Father: {fileID: 5361498674124843495}
m_RootOrder: 0 m_RootOrder: 0
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 427.415, y: -104.3424} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 854.83, y: 188.6848} m_SizeDelta: {x: 854.83, y: 188.6848}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5361498674635734889 --- !u!222 &5361498674635734889

View File

@ -114,10 +114,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 7 m_RootOrder: 7
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 428, y: -264} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7169675744543659887 --- !u!222 &7169675744543659887
CanvasRenderer: CanvasRenderer:
@ -191,10 +191,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 5 m_RootOrder: 5
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 94, y: -264} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1222994963310700788 --- !u!222 &1222994963310700788
CanvasRenderer: CanvasRenderer:
@ -444,10 +444,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 11 m_RootOrder: 11
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 261, y: -432} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3595654838853167592 --- !u!222 &3595654838853167592
CanvasRenderer: CanvasRenderer:
@ -857,10 +857,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 2 m_RootOrder: 2
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 428, y: -96} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6520056904374541902 --- !u!222 &6520056904374541902
CanvasRenderer: CanvasRenderer:
@ -2002,10 +2002,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 0 m_RootOrder: 0
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 94, y: -96} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1531406980022054069 --- !u!222 &1531406980022054069
CanvasRenderer: CanvasRenderer:
@ -3217,10 +3217,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 4 m_RootOrder: 4
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 762, y: -96} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5543094969063421589 --- !u!222 &5543094969063421589
CanvasRenderer: CanvasRenderer:
@ -4395,10 +4395,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 3 m_RootOrder: 3
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 595, y: -96} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8755847497824060499 --- !u!222 &8755847497824060499
CanvasRenderer: CanvasRenderer:
@ -4675,10 +4675,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 12 m_RootOrder: 12
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 428, y: -432} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7328179528871867790 --- !u!222 &7328179528871867790
CanvasRenderer: CanvasRenderer:
@ -4911,10 +4911,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 6 m_RootOrder: 6
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 261, y: -264} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8457049888439665516 --- !u!222 &8457049888439665516
CanvasRenderer: CanvasRenderer:
@ -5455,10 +5455,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 13 m_RootOrder: 13
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 595, y: -432} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5966107342385659878 --- !u!222 &5966107342385659878
CanvasRenderer: CanvasRenderer:
@ -6417,10 +6417,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 14 m_RootOrder: 14
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 762, y: -432} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5490044534119089758 --- !u!222 &5490044534119089758
CanvasRenderer: CanvasRenderer:
@ -6570,10 +6570,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 10 m_RootOrder: 10
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 94, y: -432} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4225354732664056973 --- !u!222 &4225354732664056973
CanvasRenderer: CanvasRenderer:
@ -6647,10 +6647,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 1 m_RootOrder: 1
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 261, y: -96} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6068072483895883514 --- !u!222 &6068072483895883514
CanvasRenderer: CanvasRenderer:
@ -7589,10 +7589,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 8 m_RootOrder: 8
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 595, y: -264} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7184195710096514313 --- !u!222 &7184195710096514313
CanvasRenderer: CanvasRenderer:
@ -7842,10 +7842,10 @@ RectTransform:
m_Father: {fileID: 1531406979042994363} m_Father: {fileID: 1531406979042994363}
m_RootOrder: 9 m_RootOrder: 9
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 762, y: -264} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 166, y: 166} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6251739403718387388 --- !u!222 &6251739403718387388
CanvasRenderer: CanvasRenderer:

View File

@ -249,6 +249,7 @@ GameObject:
- component: {fileID: 3068602581546727684} - component: {fileID: 3068602581546727684}
- component: {fileID: 3068602581546727686} - component: {fileID: 3068602581546727686}
- component: {fileID: 3068602581546727687} - component: {fileID: 3068602581546727687}
- component: {fileID: 8858890326001648055}
m_Layer: 5 m_Layer: 5
m_Name: EnemyTipsTextInfo m_Name: EnemyTipsTextInfo
m_TagString: Untagged m_TagString: Untagged
@ -358,6 +359,18 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_HorizontalFit: 0 m_HorizontalFit: 0
m_VerticalFit: 2 m_VerticalFit: 2
--- !u!114 &8858890326001648055
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3068602581546727690}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ce2367f30c332d34697ee6035092c2c3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &3068602581867276443 --- !u!1 &3068602581867276443
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -140,6 +140,12 @@ MonoBehaviour:
_panel: {fileID: 7805053268599849540} _panel: {fileID: 7805053268599849540}
closeBtn: {fileID: 8782491854383104500} closeBtn: {fileID: 8782491854383104500}
_closePanel: {fileID: 8782491854383104488} _closePanel: {fileID: 8782491854383104488}
LeveText: {fileID: 7805053268693853369}
NameText: {fileID: 7805053269411725253}
InfoText: {fileID: 7805053267615995500}
AttackText: {fileID: 7805053267802664886}
AttackFanweiText: {fileID: 7805053267816179159}
AttackCD: {fileID: 7805053267580272315}
--- !u!1001 &8782491853943243843 --- !u!1001 &8782491853943243843
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -285,6 +291,50 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3}
--- !u!114 &7805053267580272315 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1562946257848318712, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3}
m_PrefabInstance: {fileID: 8782491853943243843}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7805053267615995500 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1562946257751396911, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3}
m_PrefabInstance: {fileID: 8782491853943243843}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7805053267802664886 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1562946257569033205, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3}
m_PrefabInstance: {fileID: 8782491853943243843}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7805053267816179159 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1562946257547420052, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3}
m_PrefabInstance: {fileID: 8782491853943243843}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7805053268599849540 stripped --- !u!1 &7805053268599849540 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 1562946259003229703, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3} m_CorrespondingSourceObject: {fileID: 1562946259003229703, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3}
@ -295,3 +345,25 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 1562946259003229700, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3} m_CorrespondingSourceObject: {fileID: 1562946259003229700, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3}
m_PrefabInstance: {fileID: 8782491853943243843} m_PrefabInstance: {fileID: 8782491853943243843}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!114 &7805053268693853369 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1562946258827682042, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3}
m_PrefabInstance: {fileID: 8782491853943243843}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7805053269411725253 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1562946258103303046, guid: 60d99ddd21f6df84195814f4d3ab7d07, type: 3}
m_PrefabInstance: {fileID: 8782491853943243843}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:

View File

@ -339,9 +339,9 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.13207549, g: 0.12646851, b: 0.12646851, a: 0.53333336} m_Color: {r: 0.13207549, g: 0.12646851, b: 0.12646851, a: 0.53333336}
m_RaycastTarget: 1 m_RaycastTarget: 0
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: 0
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -451,6 +451,7 @@ MonoBehaviour:
musk: {fileID: 2105540892441329861} musk: {fileID: 2105540892441329861}
UpgradeBtn: {fileID: 2105540892435701413} UpgradeBtn: {fileID: 2105540892435701413}
SkillID: 0 SkillID: 0
skillNumber: 0
infobox_skill_up: {fileID: 0} infobox_skill_up: {fileID: 0}
levelNumber: 0 levelNumber: 0
Maxlevel: 5 Maxlevel: 5

View File

@ -2863,7 +2863,7 @@ 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: 411.78506, y: -53.8071} m_AnchoredPosition: {x: 358.96, y: -53.8071}
m_SizeDelta: {x: 717.92, y: 0} m_SizeDelta: {x: 717.92, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1269639529 --- !u!114 &1269639529
@ -3104,8 +3104,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: 411.78506, y: -1974.132} m_AnchoredPosition: {x: 358.96, y: -1974.132}
m_SizeDelta: {x: 823.5701, y: 429.8071} m_SizeDelta: {x: 717.92, y: 429.8071}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1309263786 --- !u!114 &1309263786
MonoBehaviour: MonoBehaviour:
@ -3278,8 +3278,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: 411.78506, y: -1534.3248} m_AnchoredPosition: {x: 358.96, y: -1534.3248}
m_SizeDelta: {x: 823.5701, y: 429.8071} m_SizeDelta: {x: 717.92, y: 429.8071}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1323663686 --- !u!114 &1323663686
MonoBehaviour: MonoBehaviour:
@ -3653,8 +3653,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: 411.78506, y: -1094.5177} m_AnchoredPosition: {x: 358.96, y: -1094.5177}
m_SizeDelta: {x: 823.5701, y: 429.8071} m_SizeDelta: {x: 717.92, y: 429.8071}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1370749647 --- !u!114 &1370749647
MonoBehaviour: MonoBehaviour:
@ -4626,7 +4626,7 @@ 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: 411.78506, y: -53.8071} m_AnchoredPosition: {x: 358.96, y: -53.8071}
m_SizeDelta: {x: 717.92, y: 0} m_SizeDelta: {x: 717.92, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1691635001 --- !u!114 &1691635001
@ -5815,7 +5815,7 @@ 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: 411.78506, y: -53.8071} m_AnchoredPosition: {x: 358.96, y: -53.8071}
m_SizeDelta: {x: 717.92, y: 0} m_SizeDelta: {x: 717.92, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &2034190255 --- !u!114 &2034190255
@ -7209,8 +7209,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: 411.78506, y: -214.90355} m_AnchoredPosition: {x: 358.96, y: -214.90355}
m_SizeDelta: {x: 823.5701, y: 429.8071} m_SizeDelta: {x: 717.92, y: 429.8071}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &772119012549100890 --- !u!114 &772119012549100890
MonoBehaviour: MonoBehaviour:
@ -7667,7 +7667,7 @@ 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: 411.78506, y: -53.8071} m_AnchoredPosition: {x: 358.96, y: -53.8071}
m_SizeDelta: {x: 717.92, y: 0} m_SizeDelta: {x: 717.92, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &772119012782483039 --- !u!114 &772119012782483039
@ -9058,8 +9058,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: 411.78506, y: -654.71063} m_AnchoredPosition: {x: 358.96, y: -654.71063}
m_SizeDelta: {x: 823.5701, y: 429.8071} m_SizeDelta: {x: 717.92, y: 429.8071}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5017250697351840267 --- !u!114 &5017250697351840267
MonoBehaviour: MonoBehaviour:
@ -9625,7 +9625,7 @@ 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: 411.78506, y: -53.8071} m_AnchoredPosition: {x: 358.96, y: -53.8071}
m_SizeDelta: {x: 717.92, y: 0} m_SizeDelta: {x: 717.92, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &8187013512807648716 --- !u!114 &8187013512807648716

View File

@ -6,7 +6,14 @@ public class CharacterClick : MonoBehaviour
{ {
public Role role; public Role role;
public Character MyCharacter=null;
[Header("点击出现的详情")] public GameObject panelPrefab; [Header("点击出现的详情")] public GameObject panelPrefab;
void Start()
{
IdForInfo(transform.GetComponent<enemy>().Id);
}
private void OnMouseDown() private void OnMouseDown()
{ {
// 确保父节点的碰撞体是 Trigger 类型 // 确保父节点的碰撞体是 Trigger 类型
@ -26,9 +33,24 @@ public class CharacterClick : MonoBehaviour
RectTransform panelRect = instantiatedPanel.GetComponent<RectTransform>(); RectTransform panelRect = instantiatedPanel.GetComponent<RectTransform>();
// 确保生成的面板不会挡住父物体 // 确保生成的面板不会挡住父物体
panelRect.SetAsLastSibling(); // 将面板放到 Canvas 层级的最上层 panelRect.SetAsLastSibling(); // 将面板放到 Canvas 层级的最上层
panelRect.GetComponent<charainfoPanel>().UpDateShow("1", MyCharacter.Name, MyCharacter.Info, MyCharacter.MaxAttack+"~"+MyCharacter.MinAttack,MyCharacter.AttackRange,MyCharacter.AttackCD);
}
}
}
void IdForInfo(string id)
{
List<Character> mY = MengyaoInfo.Instance.m_Mengyao;
foreach (Character temp in mY)
{
if (temp.Id==id)
{
MyCharacter=temp;
break;
} }
} }
} }
} }

View File

@ -0,0 +1,19 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class EnemyTipsinfo : MonoBehaviour
{
public EnemyStatistics EnemyStatistics =new EnemyStatistics();
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View File

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

View File

@ -43,10 +43,9 @@ public class cardContorl : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndD
// 拖拽开始 // 拖拽开始
public void OnBeginDrag(PointerEventData eventData) public void OnBeginDrag(PointerEventData eventData)
{ {
mY = Instantiate(mengyaoPrefab); mY = Instantiate(mengyaoPrefab);
mY.GetComponent<enemy>().Id = transform.GetComponent<CardInfo>().mengyaoid;
Vector3 mousePosition = Input.mousePosition; Vector3 mousePosition = Input.mousePosition;
// 将鼠标屏幕坐标转换为世界坐标 // 将鼠标屏幕坐标转换为世界坐标

View File

@ -14,6 +14,13 @@ public class charainfoPanel : Base
[Header("关闭按钮")] public Button closeBtn; [Header("关闭按钮")] public Button closeBtn;
[Header("关闭的面板")] public GameObject _closePanel; [Header("关闭的面板")] public GameObject _closePanel;
public Text LeveText;
public Text NameText;
public Text InfoText;
public Text AttackText;
public Text AttackFanweiText;
public Text AttackCD;
public virtual void Start() public virtual void Start()
{ {
@ -31,4 +38,15 @@ public class charainfoPanel : Base
_panel.transform.DOScale(1f, 0.5f); _panel.transform.DOScale(1f, 0.5f);
} }
public void UpDateShow(string LeveText, string NameText, string InfoText, string AttackText, string AttackFanweiText,string AttackCD)
{
this.LeveText.text= LeveText;
this.NameText.text= NameText;
this.InfoText.text= InfoText;
this.AttackText.text = AttackText;
this.AttackFanweiText.text= AttackFanweiText;
this.AttackCD.text= AttackCD;
}
} }

View File

@ -4,6 +4,7 @@ using UnityEngine;
public class enemy : Role public class enemy : Role
{ {
public string Id;
public override void Start() public override void Start()
{ {
base.Start(); base.Start();

View File

@ -34,9 +34,9 @@ public class infobox_skill_up : MonoBehaviour
SkillBox.instance.UpdataExp(-Skillspend.spendNumber); SkillBox.instance.UpdataExp(-Skillspend.spendNumber);
Debug.Log(LevelText.text); Debug.Log(LevelText.text);
Skillspend.levelNumber++; Skillspend.levelNumber++;
UpgradeBtn.GetComponent<Image>().sprite = minLevelimg; /*UpgradeBtn.GetComponent<Image>().sprite = minLevelimg;
UpgradeBtn.transform.Find("UpgradText").GetComponent<Text>().text = "Éý¼¶"; UpgradeBtn.transform.Find("UpgradText").GetComponent<Text>().text = "Éý¼¶";
UpgradeBtn.enabled = true; UpgradeBtn.enabled = true;*/
SwitchLevel(Skillspend.levelNumber); SwitchLevel(Skillspend.levelNumber);
Debug.Log(Skillspend.levelNumber); Debug.Log(Skillspend.levelNumber);
} }
@ -44,22 +44,33 @@ public class infobox_skill_up : MonoBehaviour
{ {
Debug.Log("Õ½»ê²»×ã"); Debug.Log("Õ½»ê²»×ã");
} }
if(Skillspend.levelNumber >= Skillspend.Maxlevel) /*if(Skillspend.levelNumber >= Skillspend.Maxlevel)
{ {
Skillspend.levelNumber = Skillspend.Maxlevel; Skillspend.levelNumber = Skillspend.Maxlevel;
UpgradeBtn.GetComponent<Image>().sprite = maxlevelimg; UpgradeBtn.GetComponent<Image>().sprite = maxlevelimg;
UpgradeBtn.transform.Find("UpgradText").GetComponent<Text>().text = "µÈ¼¶ÒÑÂú"; UpgradeBtn.transform.Find("UpgradText").GetComponent<Text>().text = "µÈ¼¶ÒÑÂú";
SwitchLevel(Skillspend.levelNumber); SwitchLevel(Skillspend.levelNumber);
return; return;
} }*/
} }
void BtnUpdata() void BtnUpdata()
{ {
UpgradeBtn.GetComponent<Image>().sprite = minLevelimg; if (Skillspend.levelNumber >= Skillspend.Maxlevel)
UpgradeBtn.transform.Find("UpgradText").GetComponent<Text>().text = "Éý¼¶"; {
UpgradeBtn.enabled = true; UpgradeBtn.GetComponent<Image>().sprite = maxlevelimg;
UpgradeBtn.transform.Find("UpgradText").GetComponent<Text>().text = "µÈ¼¶ÒÑÂú";
UpgradeBtn.enabled = true;
}
else
{
UpgradeBtn.GetComponent<Image>().sprite = minLevelimg;
UpgradeBtn.transform.Find("UpgradText").GetComponent<Text>().text = "Éý¼¶";
UpgradeBtn.enabled = true;
}
} }
@ -85,11 +96,14 @@ public class infobox_skill_up : MonoBehaviour
ShowPanelMessage(Skillspend.MySkill.name, (Skillspend.levelNumber + 1).ToString(), Skillspend.MySkill.positioning, Skillspend.MySkill.effects.level_4); ShowPanelMessage(Skillspend.MySkill.name, (Skillspend.levelNumber + 1).ToString(), Skillspend.MySkill.positioning, Skillspend.MySkill.effects.level_4);
break; break;
case 4: case 4:
BtnUpdata();
ShowPanelMessage(Skillspend.MySkill.name, (Skillspend.levelNumber + 1).ToString(), Skillspend.MySkill.positioning, Skillspend.MySkill.effects.level_5); ShowPanelMessage(Skillspend.MySkill.name, (Skillspend.levelNumber + 1).ToString(), Skillspend.MySkill.positioning, Skillspend.MySkill.effects.level_5);
break; break;
case 5: case 5:
ShowPanelMessage(Skillspend.MySkill.name, Skillspend.levelNumber.ToString(), Skillspend.MySkill.positioning, Skillspend.MySkill.effects.level_5); BtnUpdata();
ShowPanelMessage(Skillspend.MySkill.name, (Skillspend.levelNumber).ToString(), Skillspend.MySkill.positioning, Skillspend.MySkill.effects.level_5);
break; break;
} }
} }
@ -102,11 +116,4 @@ public class infobox_skill_up : MonoBehaviour
infpText.text = infptext; infpText.text = infptext;
Improvement_Effect.text =improvement_effect; Improvement_Effect.text =improvement_effect;
} }
// Update is called once per frame
void Update()
{
}
} }

View File

@ -11,7 +11,7 @@ public class MengyaoInfo :JsonReadBase
public TextAsset LevelAsset; public TextAsset LevelAsset;
public TextAsset SkillAsset; public TextAsset SkillAsset;
public List<Character> m_Name; public List<Character> m_Mengyao;
public List<Level> m_Level; public List<Level> m_Level;
public List<WaveData> m_WaveData; public List<WaveData> m_WaveData;
public List<Monster> m_SkillData; public List<Monster> m_SkillData;
@ -21,18 +21,18 @@ public class MengyaoInfo :JsonReadBase
{ {
Instance = this; Instance = this;
m_Name = base.LoadJson<Character>(NameAsset); m_Mengyao = base.LoadJson<Character>(NameAsset);
base.DisplayData<Character>(m_Name); //base.DisplayData<Character>(m_Name);
m_Level = base.LoadJson<Level>(LevelAsset); m_Level = base.LoadJson<Level>(LevelAsset);
base.DisplayData<Level>(m_Level); // base.DisplayData<Level>(m_Level);
m_WaveData = base.LoadJson<WaveData>(m_Asset); m_WaveData = base.LoadJson<WaveData>(m_Asset);
base.DisplayData<WaveData>(m_WaveData); // base.DisplayData<WaveData>(m_WaveData);
m_SkillData = base.LoadJson<Monster>(SkillAsset); m_SkillData = base.LoadJson<Monster>(SkillAsset);
// Debug.Log(m_SkillData); // Debug.Log(m_SkillData);
base.DisplayData<Monster>(m_SkillData); //base.DisplayData<Monster>(m_SkillData);
} }
// Update is called once per frame // Update is called once per frame
@ -44,7 +44,7 @@ public class MengyaoInfo :JsonReadBase
public class Character public class Character
{ {
public int Id { get; set; } public string Id { get; set; }
public string Name { get; set; } public string Name { get; set; }
public string Quality { get; set; } public string Quality { get; set; }
public string Elements { get; set; } public string Elements { get; set; }

View File

@ -56,6 +56,12 @@ public class Battle_Selection : BaseUI
tiaoScene.onClick.AddListener(async() => { tiaoScene.onClick.AddListener(async() => {
await ButtonClickAnimationAsync(tiaoScene.gameObject); await ButtonClickAnimationAsync(tiaoScene.gameObject);
if (CarryCard.Count<=0)
{
Promptmgr.Instance.PromptBubble("请带上你的萌妖伙伴");
return;
}
Debug.LogError("++++Ìø++++ת++++³¡++++¾°++++"); Debug.LogError("++++Ìø++++ת++++³¡++++¾°++++");
foreach (Button go in CarryCard) foreach (Button go in CarryCard)
{ {