Skip to content

Commit f2494ba

Browse files
KassoutKassout
committed
Correcting issues on fight and turn states process
1 parent 7bea7e8 commit f2494ba

File tree

74 files changed

+1245
-2752
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1245
-2752
lines changed

‎RogueTactics/Assets/Resources/Abilities/Battle Tech/First Aid.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ MonoBehaviour:
198198
m_Script: {fileID: 11500000, guid: 2721623b1003f934ab6d8d607d1cc019, type: 3}
199199
m_Name:
200200
m_EditorClassIdentifier:
201-
level: 12
201+
might: 3
202202
--- !u!114 &3918370063176530907
203203
MonoBehaviour:
204204
m_ObjectHideFlags: 0

‎RogueTactics/Assets/Resources/Abilities/Fighter Tech/Air Blast.prefab‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ GameObject:
1010
m_Component:
1111
- component: {fileID: 5159795097924061635}
1212
- component: {fileID: 3681601486414748230}
13-
- component: {fileID: 6974210082255494081}
13+
- component: {fileID: 393793343259178223}
1414
- component: {fileID: 7149706877760009613}
1515
- component: {fileID: 7176171673742654205}
1616
m_Layer: 0
@@ -47,7 +47,7 @@ MonoBehaviour:
4747
m_Script: {fileID: 11500000, guid: 23e4bf9e3d434fc48add92ce7408cc60, type: 3}
4848
m_Name:
4949
m_EditorClassIdentifier:
50-
--- !u!114 &6974210082255494081
50+
--- !u!114 &393793343259178223
5151
MonoBehaviour:
5252
m_ObjectHideFlags: 0
5353
m_CorrespondingSourceObject: {fileID: 0}
@@ -56,10 +56,10 @@ MonoBehaviour:
5656
m_GameObject: {fileID: 6063027361884631690}
5757
m_Enabled: 1
5858
m_EditorHideFlags: 0
59-
m_Script: {fileID: 11500000, guid: 969614e6eda1a454da4e83c0aa44903c, type: 3}
59+
m_Script: {fileID: 11500000, guid: 2721623b1003f934ab6d8d607d1cc019, type: 3}
6060
m_Name:
6161
m_EditorClassIdentifier:
62-
level: 0
62+
might: 5
6363
--- !u!114 &7149706877760009613
6464
MonoBehaviour:
6565
m_ObjectHideFlags: 0
@@ -72,7 +72,7 @@ MonoBehaviour:
7272
m_Script: {fileID: 11500000, guid: 8e81189e4304a0c409f59e96248dd658, type: 3}
7373
m_Name:
7474
m_EditorClassIdentifier:
75-
horizontal: 4
75+
range: 2
7676
--- !u!114 &7176171673742654205
7777
MonoBehaviour:
7878
m_ObjectHideFlags: 0
@@ -96,7 +96,7 @@ GameObject:
9696
- component: {fileID: 1661448743730190234}
9797
- component: {fileID: 2597300484018085596}
9898
- component: {fileID: 2987459244695012473}
99-
- component: {fileID: 3083877851382933226}
99+
- component: {fileID: 444677267404912963}
100100
m_Layer: 0
101101
m_Name: Damage
102102
m_TagString: Untagged
@@ -142,7 +142,7 @@ MonoBehaviour:
142142
m_Script: {fileID: 11500000, guid: 2a5fcf76e8efb21478d94b82c5938565, type: 3}
143143
m_Name:
144144
m_EditorClassIdentifier:
145-
--- !u!114 &3083877851382933226
145+
--- !u!114 &444677267404912963
146146
MonoBehaviour:
147147
m_ObjectHideFlags: 0
148148
m_CorrespondingSourceObject: {fileID: 0}
@@ -151,6 +151,6 @@ MonoBehaviour:
151151
m_GameObject: {fileID: 7016487289335067320}
152152
m_Enabled: 1
153153
m_EditorHideFlags: 0
154-
m_Script: {fileID: 11500000, guid: 8a0eb4d71241fcb479f1a70fa66aa534, type: 3}
154+
m_Script: {fileID: 11500000, guid: b53e8be653bb4065b7b7a206399ce505, type: 3}
155155
m_Name:
156156
m_EditorClassIdentifier:

‎RogueTactics/Assets/Resources/Abilities/Monk Tech/Earth Render.prefab‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ MonoBehaviour:
5959
m_Script: {fileID: 11500000, guid: 969614e6eda1a454da4e83c0aa44903c, type: 3}
6060
m_Name:
6161
m_EditorClassIdentifier:
62-
level: 15
62+
might: 5
6363
--- !u!114 &3477985171097929676
6464
MonoBehaviour:
6565
m_ObjectHideFlags: 0
@@ -72,7 +72,7 @@ MonoBehaviour:
7272
m_Script: {fileID: 11500000, guid: 8e81189e4304a0c409f59e96248dd658, type: 3}
7373
m_Name:
7474
m_EditorClassIdentifier:
75-
horizontal: 2
75+
range: 3
7676
--- !u!114 &6108274385932743820
7777
MonoBehaviour:
7878
m_ObjectHideFlags: 0

‎RogueTactics/Assets/Resources/Abilities/Phantasm Skill/Prominence.prefab‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ MonoBehaviour:
6060
m_Script: {fileID: 11500000, guid: 2721623b1003f934ab6d8d607d1cc019, type: 3}
6161
m_Name:
6262
m_EditorClassIdentifier:
63-
level: 20
63+
might: 3
6464
--- !u!114 &9035554013788074784
6565
MonoBehaviour:
6666
m_ObjectHideFlags: 0
@@ -110,7 +110,7 @@ GameObject:
110110
- component: {fileID: 2923452640236227110}
111111
- component: {fileID: 2640451148038133609}
112112
- component: {fileID: 2412172071519115744}
113-
- component: {fileID: 434381105958918758}
113+
- component: {fileID: 2592088432958680921}
114114
m_Layer: 0
115115
m_Name: Damage
116116
m_TagString: Untagged
@@ -156,7 +156,7 @@ MonoBehaviour:
156156
m_Script: {fileID: 11500000, guid: 731f17c4e8cd98e42952a5e8fc3e3187, type: 3}
157157
m_Name:
158158
m_EditorClassIdentifier:
159-
--- !u!114 &434381105958918758
159+
--- !u!114 &2592088432958680921
160160
MonoBehaviour:
161161
m_ObjectHideFlags: 0
162162
m_CorrespondingSourceObject: {fileID: 0}
@@ -165,6 +165,6 @@ MonoBehaviour:
165165
m_GameObject: {fileID: 5966320100627870636}
166166
m_Enabled: 1
167167
m_EditorHideFlags: 0
168-
m_Script: {fileID: 11500000, guid: 8a0eb4d71241fcb479f1a70fa66aa534, type: 3}
168+
m_Script: {fileID: 11500000, guid: b53e8be653bb4065b7b7a206399ce505, type: 3}
169169
m_Name:
170170
m_EditorClassIdentifier:

‎RogueTactics/Assets/Resources/Abilities/Sagacity Skill/Drain.prefab‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ MonoBehaviour:
200200
m_Script: {fileID: 11500000, guid: 8e81189e4304a0c409f59e96248dd658, type: 3}
201201
m_Name:
202202
m_EditorClassIdentifier:
203-
horizontal: 1
203+
range: 2
204204
--- !u!114 &2748684797723580127
205205
MonoBehaviour:
206206
m_ObjectHideFlags: 0
@@ -226,7 +226,7 @@ MonoBehaviour:
226226
m_Script: {fileID: 11500000, guid: 969614e6eda1a454da4e83c0aa44903c, type: 3}
227227
m_Name:
228228
m_EditorClassIdentifier:
229-
level: 3
229+
might: 3
230230
--- !u!114 &4037723926495032622
231231
MonoBehaviour:
232232
m_ObjectHideFlags: 0

‎RogueTactics/Assets/Resources/Abilities/Sagacity Skill/Water.prefab‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ GameObject:
1010
m_Component:
1111
- component: {fileID: 8686509469424105682}
1212
- component: {fileID: 9036189452315640235}
13-
- component: {fileID: 7511682309484439984}
1413
- component: {fileID: 7602641528542243516}
14+
- component: {fileID: 5237710817257915466}
1515
m_Layer: 0
1616
m_Name: Damage
1717
m_TagString: Untagged
@@ -45,7 +45,7 @@ MonoBehaviour:
4545
m_Script: {fileID: 11500000, guid: f137cf3a93d265a4b91afe5ca7366256, type: 3}
4646
m_Name:
4747
m_EditorClassIdentifier:
48-
--- !u!114 &7511682309484439984
48+
--- !u!114 &7602641528542243516
4949
MonoBehaviour:
5050
m_ObjectHideFlags: 0
5151
m_CorrespondingSourceObject: {fileID: 0}
@@ -54,10 +54,10 @@ MonoBehaviour:
5454
m_GameObject: {fileID: 3108641111060280523}
5555
m_Enabled: 1
5656
m_EditorHideFlags: 0
57-
m_Script: {fileID: 11500000, guid: 8a0eb4d71241fcb479f1a70fa66aa534, type: 3}
57+
m_Script: {fileID: 11500000, guid: 2a5fcf76e8efb21478d94b82c5938565, type: 3}
5858
m_Name:
5959
m_EditorClassIdentifier:
60-
--- !u!114 &7602641528542243516
60+
--- !u!114 &5237710817257915466
6161
MonoBehaviour:
6262
m_ObjectHideFlags: 0
6363
m_CorrespondingSourceObject: {fileID: 0}
@@ -66,7 +66,7 @@ MonoBehaviour:
6666
m_GameObject: {fileID: 3108641111060280523}
6767
m_Enabled: 1
6868
m_EditorHideFlags: 0
69-
m_Script: {fileID: 11500000, guid: 2a5fcf76e8efb21478d94b82c5938565, type: 3}
69+
m_Script: {fileID: 11500000, guid: b53e8be653bb4065b7b7a206399ce505, type: 3}
7070
m_Name:
7171
m_EditorClassIdentifier:
7272
--- !u!1 &5821167678915048948
@@ -129,7 +129,7 @@ MonoBehaviour:
129129
m_Script: {fileID: 11500000, guid: 2721623b1003f934ab6d8d607d1cc019, type: 3}
130130
m_Name:
131131
m_EditorClassIdentifier:
132-
level: 5
132+
might: 5
133133
--- !u!114 &88392110736429137
134134
MonoBehaviour:
135135
m_ObjectHideFlags: 0
@@ -142,7 +142,7 @@ MonoBehaviour:
142142
m_Script: {fileID: 11500000, guid: 8e81189e4304a0c409f59e96248dd658, type: 3}
143143
m_Name:
144144
m_EditorClassIdentifier:
145-
horizontal: 2
145+
range: 2
146146
--- !u!114 &8664343020669147410
147147
MonoBehaviour:
148148
m_ObjectHideFlags: 0

‎RogueTactics/Assets/Resources/Abilities/White Magic/Cure.prefab‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ MonoBehaviour:
131131
m_Script: {fileID: 11500000, guid: 2721623b1003f934ab6d8d607d1cc019, type: 3}
132132
m_Name:
133133
m_EditorClassIdentifier:
134-
level: 5
134+
might: 2
135135
--- !u!114 &8422548861839052667
136136
MonoBehaviour:
137137
m_ObjectHideFlags: 0
@@ -144,7 +144,7 @@ MonoBehaviour:
144144
m_Script: {fileID: 11500000, guid: 8e81189e4304a0c409f59e96248dd658, type: 3}
145145
m_Name:
146146
m_EditorClassIdentifier:
147-
horizontal: 4
147+
range: 2
148148
--- !u!114 &8253906157464948917
149149
MonoBehaviour:
150150
m_ObjectHideFlags: 0

‎RogueTactics/Assets/Resources/Abilities/White Magic/Esuna.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ MonoBehaviour:
128128
m_Script: {fileID: 11500000, guid: 8e81189e4304a0c409f59e96248dd658, type: 3}
129129
m_Name:
130130
m_EditorClassIdentifier:
131-
horizontal: 3
131+
range: 4
132132
--- !u!114 &9005730110760895821
133133
MonoBehaviour:
134134
m_ObjectHideFlags: 0

‎RogueTactics/Assets/Resources/Abilities/White Magic/Holy.prefab‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ GameObject:
1010
m_Component:
1111
- component: {fileID: 562708343994082522}
1212
- component: {fileID: 3578287953249770723}
13-
- component: {fileID: 5622478313518709369}
1413
- component: {fileID: 9058944643131375471}
14+
- component: {fileID: 9138575282860161127}
1515
m_Layer: 0
1616
m_Name: Damage
1717
m_TagString: Untagged
@@ -45,7 +45,7 @@ MonoBehaviour:
4545
m_Script: {fileID: 11500000, guid: f137cf3a93d265a4b91afe5ca7366256, type: 3}
4646
m_Name:
4747
m_EditorClassIdentifier:
48-
--- !u!114 &5622478313518709369
48+
--- !u!114 &9058944643131375471
4949
MonoBehaviour:
5050
m_ObjectHideFlags: 0
5151
m_CorrespondingSourceObject: {fileID: 0}
@@ -54,10 +54,10 @@ MonoBehaviour:
5454
m_GameObject: {fileID: 161214000054757483}
5555
m_Enabled: 1
5656
m_EditorHideFlags: 0
57-
m_Script: {fileID: 11500000, guid: 8a0eb4d71241fcb479f1a70fa66aa534, type: 3}
57+
m_Script: {fileID: 11500000, guid: 2a5fcf76e8efb21478d94b82c5938565, type: 3}
5858
m_Name:
5959
m_EditorClassIdentifier:
60-
--- !u!114 &9058944643131375471
60+
--- !u!114 &9138575282860161127
6161
MonoBehaviour:
6262
m_ObjectHideFlags: 0
6363
m_CorrespondingSourceObject: {fileID: 0}
@@ -66,7 +66,7 @@ MonoBehaviour:
6666
m_GameObject: {fileID: 161214000054757483}
6767
m_Enabled: 1
6868
m_EditorHideFlags: 0
69-
m_Script: {fileID: 11500000, guid: 2a5fcf76e8efb21478d94b82c5938565, type: 3}
69+
m_Script: {fileID: 11500000, guid: b53e8be653bb4065b7b7a206399ce505, type: 3}
7070
m_Name:
7171
m_EditorClassIdentifier:
7272
--- !u!1 &4481719309272800436
@@ -129,7 +129,7 @@ MonoBehaviour:
129129
m_Script: {fileID: 11500000, guid: 2721623b1003f934ab6d8d607d1cc019, type: 3}
130130
m_Name:
131131
m_EditorClassIdentifier:
132-
level: 5
132+
might: 6
133133
--- !u!114 &7622103785449241457
134134
MonoBehaviour:
135135
m_ObjectHideFlags: 0
@@ -142,7 +142,7 @@ MonoBehaviour:
142142
m_Script: {fileID: 11500000, guid: 8e81189e4304a0c409f59e96248dd658, type: 3}
143143
m_Name:
144144
m_EditorClassIdentifier:
145-
horizontal: 3
145+
range: 2
146146
--- !u!114 &7719062264641321592
147147
MonoBehaviour:
148148
m_ObjectHideFlags: 0

‎RogueTactics/Assets/Resources/Weapons/Default/Fist (Unarmed).prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ MonoBehaviour:
148148
m_Script: {fileID: 11500000, guid: 0fe97bfd3f354429a244e7ccd85aa2d8, type: 3}
149149
m_Name:
150150
m_EditorClassIdentifier:
151-
horizontal: 1
151+
range: 1
152152
--- !u!114 &5859030930261726391
153153
MonoBehaviour:
154154
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)