Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

3 天以前 5a4e34c8a85737c0fa5b5775122da31155cbaef3

 Main/System/Guild/GuildPreviewWin.cs

@@ -29,6 +29,7 @@

    int guildID;
    int leaderID;
    int leaderServerID;
    protected override void InitComponent()
    {
        opearteBtn.AddListener(() =>
@@ -47,7 +48,7 @@

        leaderAvatar.AddListener(() =>
        {
            OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID);
            OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, leaderServerID);
        });
    }

@@ -67,10 +68,22 @@

    void Display()
    {
        var guildInfo = GuildManager.Instance.guildsDict[guildID];
        FairyData guildInfo = null;
        if (GuildManager.Instance.guildsDict.ContainsKey(guildID))
        {
            guildInfo = GuildManager.Instance.guildsDict[guildID];
        }
        else
        {
            if (GuildManager.Instance.viewGuildsDict.ContainsKey(guildID))
            {
                guildInfo = GuildManager.Instance.viewGuildsDict[guildID];
            }
        }
        if (guildInfo == null) return;
        leaderID = guildInfo.LeaderID;
        OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, (int)ViewPlayerType.viewGuildLeader);
        leaderServerID = guildInfo.ServerID;
        OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, leaderServerID, (int)ViewPlayerType.viewGuildLeader);

        var config = FamilyConfig.Get(guildInfo.FamilyLV);
        guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.7f);