Commit 2da04a6e authored by Ever's avatar Ever

更新代码

parent 0faf3ff1
...@@ -22,5 +22,8 @@ public class GameMgr : MonoBehaviour ...@@ -22,5 +22,8 @@ public class GameMgr : MonoBehaviour
md.Init(_png, _jpg, _json); md.Init(_png, _jpg, _json);
} }
public void ChooseGroup(int id)
{
}
} }
...@@ -84,8 +84,8 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -84,8 +84,8 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
onEvent(EventName.Event.Event_GroupIsLoadOver, onGroupIsLoadOver); //组的成员加载完成,就是组列表下的item onEvent(EventName.Event.Event_GroupIsLoadOver, onGroupIsLoadOver); //组的成员加载完成,就是组列表下的item
transform.Find("ingameLoad/loadImg").gameObject.SetActive(false); transform.Find("ingameLoad/loadImg").gameObject.SetActive(false);
//gameScenUser //gameScenUser
var gridViewList = areaGroupList.GetComponent<gameSceneAreaGroupHandler>(); //var gridViewList = areaGroupList.GetComponent<gameSceneAreaGroupHandler>();
gridViewList.gameObject.SetActive(false); //gridViewList.gameObject.SetActive(false);
transform.Find("areaGroupList/groupListBg").gameObject.SetActive(false); transform.Find("areaGroupList/groupListBg").gameObject.SetActive(false);
transform.Find("areaGroupList/gameProgress/gameProgressText").gameObject.SetActive(false); transform.Find("areaGroupList/gameProgress/gameProgressText").gameObject.SetActive(false);
transform.Find("areaGroupList/gameProgress").gameObject.SetActive(false); transform.Find("areaGroupList/gameProgress").gameObject.SetActive(false);
......
...@@ -8,12 +8,18 @@ using System.Linq; ...@@ -8,12 +8,18 @@ using System.Linq;
public class GroupListManager : MonoBehaviour public class GroupListManager : MonoBehaviour
{ {
private static GroupListManager instance;
public static GroupListManager Instance=>instance;
public ScrollRect scrollview; //列表 public ScrollRect scrollview; //列表
public GameObject GroupItem_Obj; //要实例化的预制体 public GameObject GroupItem_Obj; //要实例化的预制体
public GridLayoutGroup Content; public GridLayoutGroup Content;
private List<colorItem> AllItem = new List<colorItem>(); private List<colorItem> AllItem = new List<colorItem>();
private void Awake()
{
instance = this;
}
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
...@@ -44,6 +50,7 @@ public class GroupListManager : MonoBehaviour ...@@ -44,6 +50,7 @@ public class GroupListManager : MonoBehaviour
int AllGroupNum = roomGroupsData.Count; //总的组个数 int AllGroupNum = roomGroupsData.Count; //总的组个数
float NowJindu = 0.4f; //现在的进度 float NowJindu = 0.4f; //现在的进度
Transform tran; Transform tran;
int index = 0;
foreach (var item in roomGroupsData) foreach (var item in roomGroupsData)
{ {
...@@ -53,12 +60,42 @@ public class GroupListManager : MonoBehaviour ...@@ -53,12 +60,42 @@ public class GroupListManager : MonoBehaviour
tran.localRotation = Quaternion.Euler(0, 0, 0); tran.localRotation = Quaternion.Euler(0, 0, 0);
tran.localScale = Vector3.one; tran.localScale = Vector3.one;
NowJindu=(float)item.curCount/item.roomIds.Count;
var coloritem = tran.GetComponent<colorItem>(); var coloritem = tran.GetComponent<colorItem>();
coloritem.Init(new Color(item.R, item.G, item.B), NowJindu,item.id); coloritem.Init(new Color(item.R, item.G, item.B)/255f, NowJindu,item.id);
coloritem.index = index;
index++;
AllItem.Add(coloritem); AllItem.Add(coloritem);
} }
EventDispatcher.Dispatch(EventName.Event.Event_LoadingPanelCLose);
StartCoroutine(Delay());
}
IEnumerator Delay()
{
yield return new WaitForSeconds(0.1f);
foreach (var item in AllItem)
{
item.SetLocalRootPos();
item.PlayInitAni();
}
}
public void ClickItem(int Gid,int clickindex)
{
foreach (var item in AllItem)
{
item.IsSelect = item.GID == Gid;
if (item.GID == Gid)
continue;
item.ChangeLocalPos_Select(item.index < clickindex, clickindex, item.transform.localPosition.x);
item.switchPlayAnimation();
}
} }
} }
...@@ -80,6 +80,7 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler ...@@ -80,6 +80,7 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
NowProgress = Jindu; NowProgress = Jindu;
UseColor = color; UseColor = color;
GID = groupid; GID = groupid;
IdName = groupid.ToString();
} }
public void ChangeProgress(float jindu) public void ChangeProgress(float jindu)
...@@ -243,11 +244,15 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler ...@@ -243,11 +244,15 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
{ {
return; return;
} }
//if (isSelect == false && isFinish() == false) ////if (isSelect == false && isFinish() == false)
{ //{
if (utilsTools.getGDataByKey<bool>(EventName.DataName.Data_autoFillColor, false)) return; // if (utilsTools.getGDataByKey<bool>(EventName.DataName.Data_autoFillColor, false)) return;
utilsTools.sendEventObjectParams(EventName.Event.Event_switchGameAreaGroupId, index); // utilsTools.sendEventObjectParams(EventName.Event.Event_switchGameAreaGroupId, index);
} //}
GameMgr.Ins.ChooseGroup(GID);
GroupListManager.Instance.ClickItem(GID, index);
} }
public void SetLocalRootPos() //保存一下第一个的原始坐标 public void SetLocalRootPos() //保存一下第一个的原始坐标
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment