|
|
@@ -21,9 +21,8 @@ public class PKMatchView : JCUnityLib.ViewBase, MenuBackInterface
|
|
|
PersistenHandler.ins?.menuBackCtr.views.Add(this);
|
|
|
TopBarView.NeedShowIt(this);
|
|
|
|
|
|
- Sprite avatar = RoleMgr.GetAvatar(LoginMgr.myUserInfo.avatarID);
|
|
|
string nickname = LoginMgr.myUserInfo.nickname;
|
|
|
- RenderPlayerInfo(1, avatar, nickname, true);
|
|
|
+ RenderPlayerInfo(1, LoginMgr.myUserInfo.avatarID, LoginMgr.myUserInfo.avatarUrl, nickname, true);
|
|
|
SetBtnTabSelected(btnTabs[0]);
|
|
|
}
|
|
|
|
|
|
@@ -114,24 +113,27 @@ public class PKMatchView : JCUnityLib.ViewBase, MenuBackInterface
|
|
|
|
|
|
void RefreshOtherPlayerInfoRender() {
|
|
|
if (curBtnTabIndex == 0) {
|
|
|
- RenderPlayerInfo(2, null, "", false);
|
|
|
+ RenderPlayerInfo(2, RoleMgr.NullAvatarID, "", "", false);
|
|
|
} else if (curBtnTabIndex == 1) {
|
|
|
if (selectedFriendInfo != null) {
|
|
|
- RenderPlayerInfo(2, RoleMgr.GetAvatar(selectedFriendInfo.avatarID), selectedFriendInfo.nickname, true);
|
|
|
+ RenderPlayerInfo(2, selectedFriendInfo.avatarID, selectedFriendInfo.avatarUrl, selectedFriendInfo.nickname, true);
|
|
|
} else {
|
|
|
- RenderPlayerInfo(2, null, "", false);
|
|
|
+ RenderPlayerInfo(2, RoleMgr.NullAvatarID, "", "", false);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- void RenderPlayerInfo(int playerID, Sprite avatar, string nickname, bool active) {
|
|
|
+ void RenderPlayerInfo(int playerID, int avatarID, string avatarUrl, string nickname, bool active) {
|
|
|
this.transform.Find($"BoxRight/Player{playerID}/NameBox")
|
|
|
.GetComponentInChildren<Text>().text = active
|
|
|
? nickname
|
|
|
: TextAutoLanguage2.GetTextByKey("pk-match_wait-to-join");
|
|
|
Transform avatarT = this.transform.Find($"BoxRight/Player{playerID}/MatchHeadBG/Avatar");
|
|
|
avatarT.gameObject.SetActive(active);
|
|
|
- avatarT.Find("Sprite").GetComponent<Image>().sprite = avatar;
|
|
|
+ RoleMgr.SetAvatarToImage(
|
|
|
+ avatarT.Find("Sprite").GetComponent<Image>(),
|
|
|
+ avatarID, avatarUrl
|
|
|
+ );
|
|
|
}
|
|
|
|
|
|
public void Back() {
|
|
|
@@ -164,13 +166,17 @@ public class PKMatchView : JCUnityLib.ViewBase, MenuBackInterface
|
|
|
foreach (var itemInfo in list) {
|
|
|
int friendID = itemInfo.Value<int>("friendID");
|
|
|
int avatarID = itemInfo.Value<int>("avatarID");
|
|
|
+ string avatarUrl = itemInfo.Value<string>("avatarUrl");
|
|
|
string nickname = itemInfo.Value<string>("nickname");
|
|
|
bool online = itemInfo.Value<bool>("online");
|
|
|
long offlineTime = itemInfo.Value<long>("offlineTime");
|
|
|
GameObject o = GameObject.Instantiate(GetFriendSelectItemPrefab(), GetFriendSelectItemParent());
|
|
|
o.SetActive(true);
|
|
|
o.name = friendID.ToString();
|
|
|
- o.transform.Find("Avatar/Sprite").GetComponent<Image>().sprite = RoleMgr.GetAvatar(avatarID);
|
|
|
+ RoleMgr.SetAvatarToImage(
|
|
|
+ o.transform.Find("Avatar/Sprite").GetComponent<Image>(),
|
|
|
+ avatarID, avatarUrl
|
|
|
+ );
|
|
|
o.transform.Find("Name").GetComponent<Text>().text = nickname;
|
|
|
o.transform.Find("Point").GetComponent<Image>().color = online ? Color.green : Color.red;
|
|
|
Text onlineTip = o.transform.Find("OnlineTip").GetComponent<Text>();
|
|
|
@@ -180,7 +186,7 @@ public class PKMatchView : JCUnityLib.ViewBase, MenuBackInterface
|
|
|
btnPK.onClick.RemoveAllListeners();
|
|
|
btnPK.onClick.AddListener(delegate() {
|
|
|
btnEvent_CloseFriendSelectView();
|
|
|
- selectedFriendInfo = new MatchPlayerInfo(friendID, avatarID, nickname);
|
|
|
+ selectedFriendInfo = new MatchPlayerInfo(friendID, avatarID, avatarUrl, nickname);
|
|
|
RefreshBtnMatch();
|
|
|
RefreshOtherPlayerInfoRender();
|
|
|
});
|