From 1fad3650b3eebcd9fcd8caa668b7e770d15f16b9 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 13 十月 2018 11:47:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/PreFightMission.cs | 10 ++++++++--
System/Vip/VipInvest/RotatePointer.cs | 10 ++++++++--
System/Vip/VipInvest/WheelOfFortuneModel.cs | 2 +-
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/Fight/PreFightMission.cs b/Fight/PreFightMission.cs
index cf89836..26eb575 100644
--- a/Fight/PreFightMission.cs
+++ b/Fight/PreFightMission.cs
@@ -951,11 +951,17 @@
yield return WaitingForSecondConst.WaitMS500;
+ string _path = "BaseCanvas/MainInterfaceWin/TaskAndTeamTip/TaskListTip/Parent/TaskScroll View/Content/Main_1000";
+ if(!WindowCenter.Instance.uiRoot.transform.Find(_path))
+ {
+ _path = "BaseCanvas/MainInterfaceWin/TaskAndTeamTip/TaskListTip/Parent/TaskScroll View/Content/Main_1001";
+ }
+
// 鎵撳紑寮曞鐣岄潰
NewGuideModel _model2 = ModelCenter.Instance.GetModel<NewGuideModel>();
_model2.showMask = true;
_model2.content = "鐐瑰嚮寮�濮�<color=#00ff00>璇曠偧</color>";
- _model2.componentPath = "BaseCanvas/MainInterfaceWin/TaskAndTeamTip/TaskListTip/Parent/TaskScroll View/Content/Main_1001";
+ _model2.componentPath = _path;
_model2.size = new Vector2(276, 72);
_model2.direction = 3;
_model2.clickClosed = true;
@@ -964,7 +970,7 @@
{
GA_Hero.s_MapSwitching = false;
- _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/TaskAndTeamTip/TaskListTip/Parent/TaskScroll View/Content/Main_1001");
+ _temp = WindowCenter.Instance.uiRoot.transform.Find(_path);
var _btn = _temp.GetComponent<UnityEngine.UI.Button>();
if (_btn)
{
diff --git a/System/Vip/VipInvest/RotatePointer.cs b/System/Vip/VipInvest/RotatePointer.cs
index 23f1911..6727112 100644
--- a/System/Vip/VipInvest/RotatePointer.cs
+++ b/System/Vip/VipInvest/RotatePointer.cs
@@ -43,20 +43,25 @@
{
}
+ private Sequence sequence;
void Update()
{
if (!_isRotate)
{
- if (Math.Abs((360 - Angle) - transform.eulerAngles.z) > 2 && Angle- transform.eulerAngles.z!=0)
+ if (Math.Abs((360 - Angle) - transform.eulerAngles.z) > 0.2 && Angle - transform.eulerAngles.z != 0)
{
+ transform.DOPause();
+ sequence.Kill();
transform.localRotation = Quaternion.Euler(0, 0, -Angle);
m_CheckDisplay.ShowSelected(wheelOfFortuneModel.Lattice);
if (IsButtonShow != null)
{
IsButtonShow(true);
}
+ _time = 0;
IsRotateBool = false;
+ _isRotate = false;
}
return; //涓嶆棆杞粨鏉�
}
@@ -91,7 +96,8 @@
{
//缁撴潫锛屼娇鐢―oTween鏃嬭浆鍒扮粨鏉熻搴︼紝鑰楁椂1绉�
//杩欓噷鏈変釜360锛屼娇鐢ㄦ潵闃叉鎸囬拡鍥炶浆鐨勶紝濡傛灉涓嶅姞杩欎釜360锛屼綘浼氱湅鍒版寚閽堝�掗��
- Sequence sequence = DOTween.Sequence();
+ sequence = DOTween.Sequence();
+ sequence.SetAutoKill(false);
sequence.Append(transform.DORotate(new Vector3(0, 0, -(360 + Angle)), 2f, RotateMode.FastBeyond360));
sequence.AppendCallback(() =>
{
diff --git a/System/Vip/VipInvest/WheelOfFortuneModel.cs b/System/Vip/VipInvest/WheelOfFortuneModel.cs
index 20e6be1..9c9e149 100644
--- a/System/Vip/VipInvest/WheelOfFortuneModel.cs
+++ b/System/Vip/VipInvest/WheelOfFortuneModel.cs
@@ -89,7 +89,7 @@
{
Lattice = Info.Index;
Number = Info.Cnt;
- if (IsOk)
+ if (IsOk && Info.Index!=0)
{
if (AngleDic.ContainsKey(Lattice))
{
--
Gitblit v1.8.0