少年修仙传客户端代码仓库
Client_PangDeRong
2018-08-22 7bfaf6ee7ead545cfb7c885da84680f405b75109
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
9个文件已修改
59 ■■■■ 已修改文件
System/Chat/ChatCenter.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Chat/VoiceHttpRequest.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/ClientVersion/VersionUtility.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Debug/DebugUtility.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Login/ServerListCenter.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/FairyTreasureCollectPanelPattern5.cs 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/TreasureSoulModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/UI3DShowHero.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Utility/OperationLogCollect.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Chat/ChatCenter.cs
@@ -293,7 +293,7 @@
            }
        }
        const string downloadUrl = "http://{0}.voice.secondworld.net.cn:53001/voice/download";
        const string downloadUrl = "http://{0}.voice.2460web.com:53001/voice/download";
        private void SendSpeech(byte[] encode, long _tick)
        {
            VoiceHttpRequest.Instance.Enqueue(encode, _tick, (int)PlayerDatas.Instance.PlayerId);
System/Chat/VoiceHttpRequest.cs
@@ -6,8 +6,8 @@
public class VoiceHttpRequest : SingletonMonobehaviour<VoiceHttpRequest>
{
    const string uploadUrl = "http://{0}.voice.secondworld.net.cn:53001/voice/upload";
    const string downloadUrl = "http://{0}.voice.secondworld.net.cn:53001/voice/download";
    const string uploadUrl = "http://{0}.voice.2460web.com:53001/voice/upload";
    const string downloadUrl = "http://{0}.voice.2460web.com:53001/voice/download";
    public Queue<VoiceHttp> speechs = new Queue<VoiceHttp>();
System/ClientVersion/VersionUtility.cs
@@ -13,7 +13,7 @@
public class VersionUtility : Singleton<VersionUtility>
{
    public static readonly string[] VERSION_URL = new string[] { "http://pub.game.secondworld.net.cn:11000/appversion/?" ,
    public static readonly string[] VERSION_URL = new string[] { "http://pub.game.2460web.com:11000/appversion/?" ,
    "http://111.230.234.252:11000/appversion/?"};
    const string VERSION_URL_PURE = "http://111.230.234.252:11000/purge/appversion/?";
System/Debug/DebugUtility.cs
@@ -7,7 +7,7 @@
public class DebugUtility : Singleton<DebugUtility>
{
    const string url = "http://pub.game.secondworld.net.cn:11000/dbg_player/?";
    const string url = "http://pub.game.2460web.com:11000/dbg_player/?";
    GameObject debugRoot;
System/Login/ServerListCenter.cs
@@ -8,7 +8,7 @@
public class ServerListCenter : Singleton<ServerListCenter>
{
    public static readonly string[] JUMP_URL = new string[] { "http://pub.game.secondworld.net.cn:11000/server_list/?"
    public static readonly string[] JUMP_URL = new string[] { "http://pub.game.2460web.com:11000/server_list/?"
        ,"http://111.230.234.252:11000/server_list/?"};
    public static string SERVERLIST_URL_COMMON = "";
System/Treasure/FairyTreasureCollectPanelPattern5.cs
@@ -13,6 +13,7 @@
        [SerializeField] ScrollRect m_AchievementScroller;
        [SerializeField] FurnacesAchievement[] m_FurnacesAchievements;
        [SerializeField] Button m_AchievementGetBtn;
        [SerializeField] Button m_ActiveBtn;
        [SerializeField] RectTransform m_ContainerHoles;
        [SerializeField] Image[] m_FurnacesIcons;
        [SerializeField] RectTransform m_ContainerFunc;
@@ -56,10 +57,12 @@
        {
            m_AchievementGetBtn.onClick.AddListener(OnAchievementGet);
            m_GotoStove.onClick.AddListener(GotoStove);
            m_ActiveBtn.onClick.AddListener(Active);
        }
        public override void Display(int _treasureId, bool _tween = false)
        {
            base.Display(_treasureId);
            m_GotoGet.onClick.RemoveAllListeners();
            m_GotoGet.onClick.AddListener(GotoGet);
@@ -77,7 +80,11 @@
            DisplayFurnacesHole();
            DisplayFurnace();
            DisplayFunc();
            achievementModel.achievementCompletedEvent -= AchievementCompletedEvent;
            achievementModel.achievementCompletedEvent += AchievementCompletedEvent;
            model.treasureStageUpEvent -= TreasureStageUpEvent;
            model.treasureStageUpEvent += TreasureStageUpEvent;
            completedAchivement = 0;
@@ -112,9 +119,18 @@
        {
            m_GotoGet.onClick.RemoveAllListeners();
            achievementModel.achievementCompletedEvent -= AchievementCompletedEvent;
            model.treasureStageUpEvent -= TreasureStageUpEvent;
            for (int i = 0; i < m_FurnacesAchievements.Length; i++)
            {
                m_FurnacesAchievements[i].Dispose();
            }
        }
        private void TreasureStageUpEvent(int _id)
        {
            if (_id == treasureId && model.serverInited)
            {
                TreasureActiveEffect();
            }
        }
@@ -190,10 +206,10 @@
                                {
                                    _effect.OnComplete = null;
                                    m_FurnacesIcons[_index].gameObject.SetActive(true);
                                    if (_index == m_FurnacesIcons.Length - 1)
                                    {
                                        TreasureActiveEffect();
                                    }
                                    //if (_index == m_FurnacesIcons.Length - 1)
                                    //{
                                    //    TreasureActiveEffect();
                                    //}
                                };
                            }
                            continue;
@@ -281,6 +297,7 @@
                var unlockTreasureConfig = Config.Instance.Get<TreasureConfig>(unlocktreasureId);
                m_AchievementGetBtn.gameObject.SetActive(false);
                m_ActiveBtn.gameObject.SetActive(false);
                m_GotoGet.gameObject.SetActive(false);
                m_ContainerLocked.gameObject.SetActive(true);
                m_LockedDescription.text = Language.Get("BlastFurnaceGet", unlockTreasureConfig == null ? string.Empty : unlockTreasureConfig.Name);
@@ -291,10 +308,12 @@
                m_AchievementGetBtn.gameObject.SetActive(false);
                m_GotoGet.gameObject.SetActive(false);
                m_ContainerLocked.gameObject.SetActive(false);
                m_ActiveBtn.gameObject.SetActive(currentAchievement == null && treasure.stage == 0);
            }
            else
            {
                m_ContainerLocked.gameObject.SetActive(false);
                m_ActiveBtn.gameObject.SetActive(false);
                var _isReach = Achievement.IsReach(currentAchievement.id, currentAchievement.progress);
                m_AchievementGetBtn.gameObject.SetActive(_isReach);
                var _list = model.GetFurnacesAchievements();
@@ -413,6 +432,13 @@
            WindowCenter.Instance.Open<BlastFurnaceWin>();
        }
        private void Active()
        {
            CA515_tagCMMagicWeaponUp _pak = new CA515_tagCMMagicWeaponUp();
            _pak.MWID = (uint)treasureId;
            GameNetSystem.Instance.SendInfo(_pak);
        }
        private void GetCurrentAchievement()
        {
System/Treasure/TreasureSoulModel.cs
@@ -228,7 +228,7 @@
            {
                if (soulAchievements[soulId].Contains(_id))
                {
                    UpdateAchievementRedpoint(_id);
                    UpdateAchievementRedpoint(soulId);
                }
            }
        }
UI/Common/UI3DShowHero.cs
@@ -544,7 +544,12 @@
        {
            if (_go != null)
            {
                LayerUtility.SetLayer(_go, LayerUtility.Player, true);
                var skinMeshRender = _go.GetComponentInChildren<SkinnedMeshRenderer>();
                if (skinMeshRender != null)
                {
                    skinMeshRender.gameObject.layer = LayerUtility.Player;
                }
                LayerUtility.SetLayer(_go, LayerUtility.Player, false);
            }
        }
    }
Utility/OperationLogCollect.cs
@@ -7,7 +7,7 @@
public class OperationLogCollect : Singleton<OperationLogCollect>
{
    const string url = "http://pub.game.secondworld.net.cn:11000/event_receiver?";
    const string url = "http://pub.game.2460web.com:11000/event_receiver?";
    public void RecordLauchEvent(int _step)
    {
@@ -100,7 +100,7 @@
    }
    const string bugReportUrl = "http://pub.game.secondworld.net.cn:11000/event_receiver?";
    const string bugReportUrl = "http://pub.game.2460web.com:11000/event_receiver?";
    public void BugReport(string _title, string _content)
    {