Skip to content

Commit b711698

Browse files
jcs090218jcs090218
committed
update item droppable
1 parent b540984 commit b711698

File tree

4 files changed

+39
-20
lines changed

4 files changed

+39
-20
lines changed

‎Assets/JCSUnity/Scripts/Effects/Item/JCS_ItemDroppable.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,12 @@ public void DropItems()
213213
}
214214

215215
/// <summary>
216-
///
216+
/// Calculate possibility and drop the item.
217217
/// </summary>
218-
/// <param name="mustDropItem"></param>
219-
/// <param name="specIndex"></param>
218+
/// <param name="mustDropItem"> item must drop </param>
219+
/// <param name="specIndex"> specific drop item index </param>
220220
/// <param name="only"> only drop this item. </param>
221-
/// <param name="count"></param>
221+
/// <param name="count"> how many of this item u want to drop. </param>
222222
public void DropItems(JCS_Item mustDropItem, int specIndex = -1, bool only = false, int count = 1)
223223
{
224224
if (mustDropItem == null)
@@ -318,9 +318,9 @@ public void DropItems(JCS_Item mustDropItem, int specIndex = -1, bool only = fal
318318
/// <summary>
319319
/// Drop an item.
320320
/// </summary>
321-
/// <param name="item"></param>
322-
/// <param name="index"></param>
323-
/// <param name="isEven"></param>
321+
/// <param name="item"> item u want to spawn </param>
322+
/// <param name="index"> index to know the force this is pushing to. </param>
323+
/// <param name="isEven"> is the index even number? </param>
324324
private void DropAnItem(JCS_Item item, int index, bool isEven)
325325
{
326326
DropAnItem(

‎Assets/JCSUnity/Scripts/GUI/JCS_BlackSlideScreen.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@ public class JCS_BlackSlideScreen
2828
// Private Variables
2929
private JCS_SlideEffect mSlideEffect = null;
3030

31-
[SerializeField]
32-
private RectTransform mFadeScreenTop = null;
33-
34-
[SerializeField]
35-
private RectTransform mFadeScreenBottom = null;
36-
37-
[SerializeField]
38-
private RectTransform mFadeScreenRight = null;
39-
40-
[SerializeField]
41-
private RectTransform mFadeScreenLeft = null;
42-
4331
//----------------------
4432
// Protected Variables
4533

‎Assets/Resources/JCSUnity_Resources/JCS_InGameDialogue/Setting_Panel.prefab‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,12 @@ MonoBehaviour:
12891289
m_Script: {fileID: 11500000, guid: 7620b0665bb9f0e46b024c3ef9af1cc8, type: 3}
12901290
m_Name:
12911291
m_EditorClassIdentifier:
1292+
mButtonText: {fileID: 0}
1293+
mAutoListener: 1
12921294
mDialogueIndex: -1
1295+
mInteractable: 1
1296+
mInteractColor: {r: 1, g: 1, b: 1, a: 1}
1297+
mNotInteractColor: {r: 1, g: 1, b: 1, a: 0.5}
12931298
--- !u!114 &11498360
12941299
MonoBehaviour:
12951300
m_ObjectHideFlags: 1
@@ -1428,6 +1433,7 @@ RectTransform:
14281433
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
14291434
m_LocalPosition: {x: 0, y: 0, z: 0}
14301435
m_LocalScale: {x: 1, y: 1, z: 1}
1436+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
14311437
m_Children:
14321438
- {fileID: 22486242}
14331439
m_Father: {fileID: 22450510}
@@ -1446,6 +1452,7 @@ RectTransform:
14461452
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
14471453
m_LocalPosition: {x: 0, y: 0, z: 0}
14481454
m_LocalScale: {x: 1.801679, y: 1.8016795, z: 1.8016795}
1455+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
14491456
m_Children:
14501457
- {fileID: 22450510}
14511458
m_Father: {fileID: 22425816}
@@ -1464,6 +1471,7 @@ RectTransform:
14641471
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
14651472
m_LocalPosition: {x: 0, y: 0, z: 0}
14661473
m_LocalScale: {x: 0.76319087, y: 0.7631911, z: 0.7631911}
1474+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
14671475
m_Children:
14681476
- {fileID: 22434706}
14691477
- {fileID: 22414654}
@@ -1484,6 +1492,7 @@ RectTransform:
14841492
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
14851493
m_LocalPosition: {x: 0, y: 0, z: 0}
14861494
m_LocalScale: {x: 1, y: 1, z: 1}
1495+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
14871496
m_Children:
14881497
- {fileID: 22487156}
14891498
m_Father: {fileID: 22450510}
@@ -1502,6 +1511,7 @@ RectTransform:
15021511
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
15031512
m_LocalPosition: {x: 0, y: 0, z: 0}
15041513
m_LocalScale: {x: 1, y: 1, z: 1}
1514+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15051515
m_Children:
15061516
- {fileID: 22455554}
15071517
m_Father: {fileID: 22407750}
@@ -1520,6 +1530,7 @@ RectTransform:
15201530
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
15211531
m_LocalPosition: {x: 0, y: 0, z: 0}
15221532
m_LocalScale: {x: 1, y: 1, z: 1}
1533+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15231534
m_Children:
15241535
- {fileID: 22454844}
15251536
- {fileID: 22479562}
@@ -1543,6 +1554,7 @@ RectTransform:
15431554
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
15441555
m_LocalPosition: {x: 0, y: 0, z: 0}
15451556
m_LocalScale: {x: 1, y: 1, z: 1}
1557+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15461558
m_Children: []
15471559
m_Father: {fileID: 22487984}
15481560
m_RootOrder: 0
@@ -1560,6 +1572,7 @@ RectTransform:
15601572
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
15611573
m_LocalPosition: {x: 0, y: 0, z: 0}
15621574
m_LocalScale: {x: 1, y: 1, z: 1}
1575+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15631576
m_Children: []
15641577
m_Father: {fileID: 22436344}
15651578
m_RootOrder: 0
@@ -1577,6 +1590,7 @@ RectTransform:
15771590
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
15781591
m_LocalPosition: {x: 0, y: 0, z: 0}
15791592
m_LocalScale: {x: 1, y: 1, z: 1}
1593+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15801594
m_Children: []
15811595
m_Father: {fileID: 22407750}
15821596
m_RootOrder: 0
@@ -1594,6 +1608,7 @@ RectTransform:
15941608
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
15951609
m_LocalPosition: {x: 0, y: 0, z: 0}
15961610
m_LocalScale: {x: 0.76319087, y: 0.7631913, z: 0.7631913}
1611+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15971612
m_Children:
15981613
- {fileID: 22433122}
15991614
- {fileID: 22466840}
@@ -1614,6 +1629,7 @@ RectTransform:
16141629
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
16151630
m_LocalPosition: {x: 0, y: 0, z: 0}
16161631
m_LocalScale: {x: 1, y: 1, z: 1}
1632+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16171633
m_Children: []
16181634
m_Father: {fileID: 22449960}
16191635
m_RootOrder: 0
@@ -1631,6 +1647,7 @@ RectTransform:
16311647
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
16321648
m_LocalPosition: {x: 0, y: 0, z: 0}
16331649
m_LocalScale: {x: 1.8016788, y: 1.8016794, z: 1.8016794}
1650+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16341651
m_Children:
16351652
- {fileID: 22407750}
16361653
m_Father: {fileID: 22425816}
@@ -1649,6 +1666,7 @@ RectTransform:
16491666
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
16501667
m_LocalPosition: {x: 0, y: 0, z: 0}
16511668
m_LocalScale: {x: 0.9612185, y: 0.9612186, z: 0.9612186}
1669+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16521670
m_Children:
16531671
- {fileID: 22440502}
16541672
m_Father: {fileID: 22425816}
@@ -1667,6 +1685,7 @@ RectTransform:
16671685
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
16681686
m_LocalPosition: {x: 0, y: 0, z: 0}
16691687
m_LocalScale: {x: 0.76319087, y: 0.7631911, z: 0.7631911}
1688+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16701689
m_Children:
16711690
- {fileID: 22460736}
16721691
- {fileID: 22406060}
@@ -1687,6 +1706,7 @@ RectTransform:
16871706
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
16881707
m_LocalPosition: {x: 0, y: 0, z: 0}
16891708
m_LocalScale: {x: 1, y: 1, z: 1}
1709+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16901710
m_Children: []
16911711
m_Father: {fileID: 22466840}
16921712
m_RootOrder: 0
@@ -1704,6 +1724,7 @@ RectTransform:
17041724
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
17051725
m_LocalPosition: {x: 0, y: 0, z: 0}
17061726
m_LocalScale: {x: 1.1881999, y: 1.1882, z: 1.1882}
1727+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17071728
m_Children: []
17081729
m_Father: {fileID: 22425816}
17091730
m_RootOrder: 0
@@ -1721,6 +1742,7 @@ RectTransform:
17211742
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
17221743
m_LocalPosition: {x: 0, y: 0, z: 0}
17231744
m_LocalScale: {x: 1, y: 1, z: 1}
1745+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17241746
m_Children: []
17251747
m_Father: {fileID: 22414654}
17261748
m_RootOrder: 0
@@ -1738,6 +1760,7 @@ RectTransform:
17381760
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
17391761
m_LocalPosition: {x: 0, y: 0, z: 0}
17401762
m_LocalScale: {x: 1, y: 1, z: 1}
1763+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17411764
m_Children: []
17421765
m_Father: {fileID: 22450510}
17431766
m_RootOrder: 0
@@ -1755,6 +1778,7 @@ RectTransform:
17551778
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
17561779
m_LocalPosition: {x: 0, y: 0, z: 0}
17571780
m_LocalScale: {x: 1, y: 1, z: 1}
1781+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17581782
m_Children:
17591783
- {fileID: 22465676}
17601784
m_Father: {fileID: 22407750}
@@ -1773,6 +1797,7 @@ RectTransform:
17731797
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
17741798
m_LocalPosition: {x: 0, y: 0, z: 0}
17751799
m_LocalScale: {x: 1, y: 1, z: 1}
1800+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17761801
m_Children: []
17771802
m_Father: {fileID: 22463556}
17781803
m_RootOrder: 0
@@ -1790,6 +1815,7 @@ RectTransform:
17901815
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
17911816
m_LocalPosition: {x: 0, y: 0, z: 0}
17921817
m_LocalScale: {x: 1, y: 1, z: 1}
1818+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17931819
m_Children:
17941820
- {fileID: 22453662}
17951821
m_Father: {fileID: 22436344}
@@ -1808,6 +1834,7 @@ RectTransform:
18081834
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
18091835
m_LocalPosition: {x: 0, y: 0, z: 0}
18101836
m_LocalScale: {x: 1.8016788, y: 1.8016788, z: 1.8016788}
1837+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
18111838
m_Children:
18121839
- {fileID: 22436344}
18131840
m_Father: {fileID: 22425816}
@@ -1826,6 +1853,7 @@ RectTransform:
18261853
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
18271854
m_LocalPosition: {x: 0, y: 0, z: 0}
18281855
m_LocalScale: {x: 4.5892906, y: 4.58929, z: 4.58929}
1856+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
18291857
m_Children: []
18301858
m_Father: {fileID: 22425816}
18311859
m_RootOrder: 5
@@ -1843,6 +1871,7 @@ RectTransform:
18431871
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
18441872
m_LocalPosition: {x: 0, y: 0, z: 0}
18451873
m_LocalScale: {x: 1, y: 1, z: 1}
1874+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
18461875
m_Children: []
18471876
m_Father: {fileID: 22406060}
18481877
m_RootOrder: 0
@@ -1860,6 +1889,7 @@ RectTransform:
18601889
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
18611890
m_LocalPosition: {x: 0, y: 0, z: 0}
18621891
m_LocalScale: {x: 1, y: 1, z: 1}
1892+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
18631893
m_Children: []
18641894
m_Father: {fileID: 22410344}
18651895
m_RootOrder: 0
@@ -1877,6 +1907,7 @@ RectTransform:
18771907
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
18781908
m_LocalPosition: {x: 0, y: 0, z: 0}
18791909
m_LocalScale: {x: 1, y: 1, z: 1}
1910+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
18801911
m_Children:
18811912
- {fileID: 22427206}
18821913
m_Father: {fileID: 22436344}

‎Assets/StreamingAssets/build_info.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Build from DESKTOP-5QUO247 at 12/20/2016 9:39:32 PM
1+
Build from DESKTOP-5QUO247 at 12/20/2016 10:03:48 PM

0 commit comments

Comments
 (0)