|
|
@@ -20,7 +20,7 @@ namespace GFGGame
|
|
|
private const int _range = 100;//圆圈随机范围
|
|
|
private float _time = 0;// 登峰造极按住的时间
|
|
|
|
|
|
- private float _playTime = 1.25f;
|
|
|
+ private float _playTime = 2f;
|
|
|
|
|
|
private GameObject _gameObject0;
|
|
|
private GameObject _gameObject1;
|
|
|
@@ -28,6 +28,10 @@ namespace GFGGame
|
|
|
private GameObject _gameObject3;
|
|
|
private GameObject _gameObject4;
|
|
|
private GameObject _gameObject5;
|
|
|
+ private GameObject _gameObject6;
|
|
|
+ private GameObject _gameObject7;
|
|
|
+ private GoWrapper _wrapper6;
|
|
|
+ private GoWrapper _wrapper7;
|
|
|
|
|
|
protected override void OnInit()
|
|
|
{
|
|
|
@@ -51,7 +55,7 @@ namespace GFGGame
|
|
|
SceneController.UpdateRole(EquipDataCache.cacher.equipDatas, _sceneObject);
|
|
|
EventAgent.AddEventListener(ConstMessage.CARD_SKILL, CircleScoreStart);
|
|
|
|
|
|
- _ui.m_comClickCircle.m_loaCircle.onClick.Add(CircleScoreEnd);
|
|
|
+ _ui.m_comClickCircle.target.onClick.Add(CircleScoreEnd);
|
|
|
_ui.m_comAllCircle.target.onTouchBegin.Add(OnComAllCircleClickBegin);
|
|
|
_ui.m_comAllCircle.target.onTouchEnd.Add(AllCircleScoreStart);
|
|
|
_ui.m_comAllCircle.target.visible = false;
|
|
|
@@ -115,33 +119,49 @@ namespace GFGGame
|
|
|
_ui.m_comClickCircle.target.SetXY(x, y);
|
|
|
_ui.m_comClickCircle.target.visible = true;
|
|
|
|
|
|
-
|
|
|
+ // string resPath6 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_sf");
|
|
|
if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
|
|
|
{
|
|
|
_ui.m_comClickCircle.m_loaCircle.touchable = false;
|
|
|
- _ui.m_comClickCircle.m_t0.Play(1, 0, 0, _playTime / 2, () =>
|
|
|
+
|
|
|
+ GTween.To(100, 50, _playTime / 2).SetTarget(_gameObject7).OnUpdate((GTweener t) =>
|
|
|
{
|
|
|
- _ui.m_comClickCircle.m_loaCircle.touchable = true;
|
|
|
+
|
|
|
+ _gameObject7.transform.localScale = new Vector3(t.value.x, t.value.x, t.value.x);
|
|
|
+
|
|
|
});
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- _ui.m_comClickCircle.m_t0.ignoreEngineTimeScale = false;
|
|
|
- _ui.m_comClickCircle.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;// (1 / _speed);
|
|
|
- _ui.m_comClickCircle.m_t0.Play(CircleScoreEnd);
|
|
|
+
|
|
|
+ _ui.m_comClickCircle.m_grpCircle.visible = true;
|
|
|
+ _ui.m_comClickCircle.m_c1.selectedIndex = 0;
|
|
|
+ GTween.To(100, 0, _playTime / EquipDataCache.cacher.fightSpeed).SetTarget(_gameObject7).OnUpdate((GTweener t) =>
|
|
|
+ {
|
|
|
+ if (t.value.x <= 60 && _ui.m_comClickCircle.m_c1.selectedIndex == 0)
|
|
|
+ {
|
|
|
+ _ui.m_comClickCircle.m_c1.selectedIndex = 1;
|
|
|
+ }
|
|
|
+ _gameObject7.transform.localScale = new Vector3(t.value.x, t.value.x, t.value.x);
|
|
|
+
|
|
|
+ }).OnComplete(CircleScoreEnd);
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
private void CircleScoreEnd()
|
|
|
{
|
|
|
- _ui.m_comClickCircle.m_loaCircle.onClick.Remove(CircleScoreEnd);
|
|
|
|
|
|
int clickState = GetClickState();
|
|
|
- _ui.m_comClickCircle.m_t0.Stop(true, false);
|
|
|
+ GTweener twener = GTween.GetTween(_gameObject7);
|
|
|
+ if (twener != null)
|
|
|
+ {
|
|
|
+ twener.Kill();
|
|
|
+ }
|
|
|
+ // _ui.m_comClickCircle.m_t0.Stop(true, false);
|
|
|
_ui.m_comClickCircle.m_grpCircle.visible = false;
|
|
|
- _ui.m_comClickCircle.m_ComScoreResult.target.visible = true;
|
|
|
_ui.m_comClickCircle.m_ComScoreResult.m_c1.selectedIndex = clickState;
|
|
|
+ _ui.m_comClickCircle.m_ComScoreResult.target.visible = true;
|
|
|
_ui.m_comClickCircle.m_ComScoreResult.m_t0.ignoreEngineTimeScale = false;
|
|
|
_ui.m_comClickCircle.m_ComScoreResult.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
_ui.m_comClickCircle.m_ComScoreResult.m_t0.Play(() =>
|
|
|
@@ -286,8 +306,8 @@ namespace GFGGame
|
|
|
Timers.inst.Remove(Skip);
|
|
|
_ui.m_comAllCircle.target.visible = false;
|
|
|
_ui.m_comClickCircle.target.visible = false;
|
|
|
- _ui.m_comClickCircle.m_t0.Stop(true, false);
|
|
|
- _ui.m_comClickCircle.m_t1.Stop(true, false);
|
|
|
+ // _ui.m_comClickCircle.m_t0.Stop(true, false);
|
|
|
+ // _ui.m_comClickCircle.m_t1.Stop(true, false);
|
|
|
_ui.m_proScore.target.value = 0;
|
|
|
_ui.m_proScore.m_txtCount.text = "总分：0";
|
|
|
}
|
|
|
@@ -319,6 +339,10 @@ namespace GFGGame
|
|
|
SceneController.AddObjectToView(_gameObject4, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder2, resPath3_2, out _gameObject4, out GoWrapper _wrapper4, 59);
|
|
|
string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
|
|
|
SceneController.AddObjectToView(_gameObject5, null, _ui.m_proScore.m_comBar.m_holder1, resPath4, out _gameObject5, out GoWrapper _wrapper5);
|
|
|
+ string resPath5 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_cz");
|
|
|
+ SceneController.AddObjectToView(_gameObject6, _wrapper6, _ui.m_comClickCircle.m_holder, resPath5, out _gameObject6, out _wrapper6);
|
|
|
+ string resPath6 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_sf");
|
|
|
+ SceneController.AddObjectToView(_gameObject7, _wrapper7, _ui.m_comClickCircle.m_holder1, resPath6, out _gameObject7, out _wrapper7);
|
|
|
}
|
|
|
protected override void OnHide()
|
|
|
{
|
|
|
@@ -344,6 +368,8 @@ namespace GFGGame
|
|
|
SceneController.DestroyObjectFromView(_gameObject3);
|
|
|
SceneController.DestroyObjectFromView(_gameObject4);
|
|
|
SceneController.DestroyObjectFromView(_gameObject5);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject6);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject7);
|
|
|
|
|
|
base.Dispose();
|
|
|
|
|
|
@@ -353,18 +379,18 @@ namespace GFGGame
|
|
|
|
|
|
private int GetClickState()
|
|
|
{
|
|
|
- float scaleX = _ui.m_comClickCircle.m_imgCircle.scaleX;
|
|
|
+ float scaleX = _gameObject7.transform.localScale.x;// _ui.m_comClickCircle.m_imgCircle.scaleX;
|
|
|
int clickState = ScoreSystemData.MISS_CLICK;
|
|
|
if (EquipDataCache.cacher.autoPlay == true)
|
|
|
{
|
|
|
return ScoreSystemData.PREFACT_CLICK;
|
|
|
}
|
|
|
- if (scaleX < 0.6f && scaleX > 0.4f)
|
|
|
+ if (scaleX < 60f && scaleX > 40f)
|
|
|
{
|
|
|
clickState = ScoreSystemData.PREFACT_CLICK;
|
|
|
_prefectCount++;
|
|
|
}
|
|
|
- else if (scaleX <= 0.2f)
|
|
|
+ else if (scaleX <= 20f)
|
|
|
{
|
|
|
clickState = ScoreSystemData.MISS_CLICK;
|
|
|
}
|
|
|
@@ -380,7 +406,7 @@ namespace GFGGame
|
|
|
|
|
|
if (!ViewManager.CheckIsTopView(this.viewCom)) return;
|
|
|
|
|
|
- float scaleX = _ui.m_comClickCircle.m_imgCircle.scaleX;
|
|
|
+ float scaleX = _gameObject7.transform.localScale.x;
|
|
|
if (scaleX == 0.5)
|
|
|
{
|
|
|
GuideController.TryGuide(_ui.m_comClickCircle.m_loaCircle, ConstGuideId.SINGLE_FIGHT, 6, "服饰比较繁琐，适当的整理会更加分，点击为各部位修整吧");
|
zhaoyang
