Skip to content

Commit aa7b32d

Browse files
jcs090218jcs090218
committed
style: Remove awkward naming
1 parent 49d8b0e commit aa7b32d

File tree

5 files changed

+87
-77
lines changed

5 files changed

+87
-77
lines changed

‎Assets/JCSUnity/Scripts/Effects/JCS_ButtonSoundEffect.cs‎

Lines changed: 63 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -156,61 +156,71 @@ private void Start()
156156
* player.
157157
*/
158158
if (mSoundPlayer == null)
159-
mSoundPlayer = JCS_SoundManager.FirstInstance().GlobalSoundPlayer();
159+
{
160+
var sm = JCS_SoundManager.FirstInstance();
161+
162+
mSoundPlayer = sm.GlobalSoundPlayer();
163+
}
160164

161165
if (mAutoAddEvent)
162166
{
163-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, EventTriggerType.PointerEnter, JCS_OnMouseOver);
164-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, EventTriggerType.PointerEnter, JCS_OnMouseDoubleClick);
165-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, EventTriggerType.PointerExit, JCS_OnMouseExit);
166-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, EventTriggerType.PointerDown, JCS_OnMouseDown);
167-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, EventTriggerType.PointerUp, JCS_OnMouseUp);
168-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, EventTriggerType.PointerClick, JCS_OnMouseClick);
167+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, EventTriggerType.PointerEnter, ItOnMouseOver);
168+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, EventTriggerType.PointerEnter, ItOnMouseDoubleClick);
169+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, EventTriggerType.PointerExit, ItOnMouseExit);
170+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, EventTriggerType.PointerDown, ItOnMouseDown);
171+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, EventTriggerType.PointerUp, ItOnMouseUp);
172+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, EventTriggerType.PointerClick, ItOnMouseClick);
169173
}
170174
}
171175

172176
private void Update()
177+
{
178+
HandleDoubleClick();
179+
}
180+
181+
private void HandleDoubleClick()
173182
{
174183
// IMPORTANT(JenChieh): only double click need update
175-
if (mIsOver)
184+
if (!mIsOver)
185+
return;
186+
187+
if (mBtn == null)
188+
return;
189+
190+
if (JCS_Input.OnMouseDoubleClick(0))
176191
{
177-
if (JCS_Input.OnMouseDoubleClick(0))
192+
// either time is out or double click,
193+
// both are all over the "double click event".
194+
mIsOver = false;
195+
196+
if (!mBtn.interactable)
178197
{
179-
// either time is out or double click,
180-
// both are all over the "double click event".
181-
mIsOver = false;
182-
183-
if (mBtn != null)
184-
{
185-
if (!mBtn.interactable)
186-
{
187-
// play not ineractable sound
188-
mSoundPlayer.PlayOneShotByMethod(
189-
mOnMouseDoubleClickRefuseSound,
190-
mOnMouseDoubleClickRefuseSoundMethod);
191-
return;
192-
}
193-
else
194-
{
195-
// play normal double click sound
196-
mSoundPlayer.PlayOneShotByMethod(
197-
mOnMouseDoubleClickSound,
198-
mOnMouseDoubleClickSoundMethod);
199-
}
200-
}
201-
}
198+
// play not ineractable sound
199+
mSoundPlayer.PlayOneShotByMethod(
200+
mOnMouseDoubleClickRefuseSound,
201+
mOnMouseDoubleClickRefuseSoundMethod);
202202

203-
// check if the mouse still over or not
204-
if (!JCS_UIUtil.MouseOverGUI(mRectTransform))
205-
mIsOver = false;
203+
return;
204+
}
205+
else
206+
{
207+
// play normal double click sound
208+
mSoundPlayer.PlayOneShotByMethod(
209+
mOnMouseDoubleClickSound,
210+
mOnMouseDoubleClickSoundMethod);
211+
}
206212
}
213+
214+
// check if the mouse still over or not
215+
if (!JCS_UIUtil.MouseOverGUI(mRectTransform))
216+
mIsOver = false;
207217
}
208218

209-
public void JCS_OnMouseOver(PointerEventData data)
219+
public void ItOnMouseOver()
210220
{
211-
JCS_OnMouseOver();
221+
ItOnMouseOver(null);
212222
}
213-
public void JCS_OnMouseOver()
223+
public void ItOnMouseOver(PointerEventData data)
214224
{
215225
if (mBtn != null)
216226
{
@@ -229,11 +239,11 @@ public void JCS_OnMouseOver()
229239
mOnMouseOverSoundMethod);
230240
}
231241

232-
public void JCS_OnMouseExit(PointerEventData data)
242+
public void ItOnMouseExit()
233243
{
234-
JCS_OnMouseExit();
244+
ItOnMouseExit(null);
235245
}
236-
public void JCS_OnMouseExit()
246+
public void ItOnMouseExit(PointerEventData data)
237247
{
238248
if (mBtn == null)
239249
return;
@@ -253,11 +263,11 @@ public void JCS_OnMouseExit()
253263
}
254264
}
255265

256-
public void JCS_OnMouseDown(PointerEventData data)
266+
public void ItOnMouseDown()
257267
{
258-
JCS_OnMouseDown();
268+
ItOnMouseDown(null);
259269
}
260-
public void JCS_OnMouseDown()
270+
public void ItOnMouseDown(PointerEventData data)
261271
{
262272
if (mBtn == null)
263273
return;
@@ -278,11 +288,11 @@ public void JCS_OnMouseDown()
278288
}
279289
}
280290

281-
public void JCS_OnMouseUp(PointerEventData data)
291+
public void ItOnMouseUp()
282292
{
283-
JCS_OnMouseUp();
293+
ItOnMouseUp(null);
284294
}
285-
public void JCS_OnMouseUp()
295+
public void ItOnMouseUp(PointerEventData data)
286296
{
287297
if (mBtn == null)
288298
return;
@@ -302,11 +312,11 @@ public void JCS_OnMouseUp()
302312
}
303313
}
304314

305-
public void JCS_OnMouseClick(PointerEventData data)
315+
public void ItOnMouseClick()
306316
{
307-
JCS_OnMouseClick();
317+
ItOnMouseClick(null);
308318
}
309-
public void JCS_OnMouseClick()
319+
public void ItOnMouseClick(PointerEventData data)
310320
{
311321
if (mBtn == null)
312322
return;
@@ -327,11 +337,11 @@ public void JCS_OnMouseClick()
327337
}
328338

329339
// plz put this in Pointer Enter event
330-
public void JCS_OnMouseDoubleClick(PointerEventData data)
340+
public void ItOnMouseDoubleClick()
331341
{
332-
JCS_OnMouseDoubleClick();
342+
ItOnMouseDoubleClick(null);
333343
}
334-
public void JCS_OnMouseDoubleClick()
344+
public void ItOnMouseDoubleClick(PointerEventData data)
335345
{
336346
mIsOver = true;
337347
}

‎Assets/JCSUnity/Scripts/Effects/JCS_DragDropObject.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private enum DragDrop
3939
/// <summary>
4040
/// Call when on drag.
4141
/// </summary>
42-
public void JCS_OnDrag()
42+
public void OnDrag()
4343
{
4444
switch (mDragDropType)
4545
{
@@ -50,7 +50,7 @@ public void JCS_OnDrag()
5050
case JCS_DragDropType.Inventory:
5151
break;
5252

53-
// TODO(JenChieh):
53+
// TODO(JenChieh):
5454
case JCS_DragDropType.GameObject_2D:
5555
break;
5656

@@ -65,7 +65,7 @@ public void JCS_OnDrag()
6565
/// <summary>
6666
/// Call when on drop.
6767
/// </summary>
68-
public void JCS_OnDrop()
68+
public void OnDrop()
6969
{
7070
// empty..
7171
}

‎Assets/JCSUnity/Scripts/Effects/JCS_ScaleEffect.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ private void Start()
109109

110110
foreach (EventTriggerType evt in mActiveEventTriggerType)
111111
{
112-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, JCS_OnMouseOver);
112+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, ItOnMouseOver);
113113
}
114114

115115
foreach (EventTriggerType evt in mDeactiveEventTriggerType)
116116
{
117-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, JCS_OnMouseExit);
117+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, ItOnMouseExit);
118118
}
119119
}
120120
}
@@ -138,11 +138,11 @@ private void Update()
138138
///
139139
/// Use in inspector for Event Trigger System. (Active)
140140
/// </summary>
141-
public void JCS_OnMouseOver(PointerEventData data)
141+
public void ItOnMouseOver()
142142
{
143-
JCS_OnMouseOver();
143+
ItOnMouseOver(null);
144144
}
145-
public void JCS_OnMouseOver()
145+
public void ItOnMouseOver(PointerEventData data)
146146
{
147147
Active();
148148
}
@@ -153,11 +153,11 @@ public void JCS_OnMouseOver()
153153
/// Use in inspector for Event Trigger System. (Deactive)
154154
/// </summary>
155155
/// <returns></returns>
156-
public void JCS_OnMouseExit(PointerEventData data)
156+
public void ItOnMouseExit()
157157
{
158-
JCS_OnMouseExit();
158+
ItOnMouseExit(null);
159159
}
160-
public void JCS_OnMouseExit()
160+
public void ItOnMouseExit(PointerEventData data)
161161
{
162162
Deactive();
163163
}

‎Assets/JCSUnity/Scripts/Effects/JCS_SlideEffect.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ protected override void Awake()
179179

180180
// set the call back function if there is button assigned.
181181
if (mActiveButton != null)
182-
mActiveButton.SetSystemCallback(JCS_OnMouseOver);
182+
mActiveButton.SetSystemCallback(ItOnMouseOver);
183183
}
184184

185185
private void Start()
@@ -200,12 +200,12 @@ private void Start()
200200

201201
foreach (EventTriggerType evt in mActiveEventTriggerType)
202202
{
203-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, JCS_OnMouseOver);
203+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, ItOnMouseOver);
204204
}
205205

206206
foreach (EventTriggerType evt in mDeactiveEventTriggerType)
207207
{
208-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, JCS_OnMouseExit);
208+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, ItOnMouseExit);
209209
}
210210
}
211211
}
@@ -275,11 +275,11 @@ private void Test()
275275
///
276276
/// Use in inspector for Event Trigger System. (Active)
277277
/// </summary>
278-
public void JCS_OnMouseOver(PointerEventData data)
278+
public void ItOnMouseOver()
279279
{
280-
JCS_OnMouseOver();
280+
ItOnMouseOver(null);
281281
}
282-
public void JCS_OnMouseOver()
282+
public void ItOnMouseOver(PointerEventData data)
283283
{
284284
Active();
285285
}
@@ -291,11 +291,11 @@ public void JCS_OnMouseOver()
291291
/// Use in inspector for Event Trigger System. (Deactive)
292292
/// </summary>
293293
/// <returns></returns>
294-
public void JCS_OnMouseExit(PointerEventData data)
294+
public void ItOnMouseExit()
295295
{
296-
JCS_OnMouseExit();
296+
ItOnMouseExit();
297297
}
298-
public void JCS_OnMouseExit()
298+
public void ItOnMouseExit(PointerEventData data)
299299
{
300300
Deactive();
301301
}

‎Assets/JCSUnity/Scripts/UI/GameWindow/JCS_GameWindow.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void Awake()
5050
/// <summary>
5151
/// On pointer down event.
5252
/// </summary>
53-
public void JCS_PointerDown()
53+
public void ItPointerDown()
5454
{
5555
var uim = JCS_UIManager.FirstInstance();
5656

@@ -62,15 +62,15 @@ public void JCS_PointerDown()
6262
/// <summary>
6363
/// On click event.
6464
/// </summary>
65-
public void JCS_Click()
65+
public void ItClick()
6666
{
6767
// default.
6868
}
6969

7070
/// <summary>
7171
/// On drag event.
7272
/// </summary>
73-
public void JCS_OnDrag()
73+
public void ItOnDrag()
7474
{
7575
switch (mType)
7676
{
@@ -86,7 +86,7 @@ public void JCS_OnDrag()
8686
/// <summary>
8787
/// On drop event.
8888
/// </summary>
89-
public void JCS_OnDrop()
89+
public void ItOnDrop()
9090
{
9191
// empty..
9292
}

0 commit comments

Comments
 (0)