少年修仙传客户端代码仓库
client_Wu Xijin
2018-09-08 b1d01207f159d406d05563ae19705643831e5447
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
6个文件已修改
69 ■■■■ 已修改文件
Core/SDK/SDKUtility.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/AI/AI_BossDSX.cs 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/BlastFurnace/BlastFurnaceModel.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/BlastFurnace/DandrugCell.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskListTip.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskType.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/SDK/SDKUtility.cs
@@ -669,13 +669,12 @@
        _stringBuilder.Remove(0, _stringBuilder.Length);
        HttpRequest.Instance.RequestHttpGet(_stringBuilder.Append("http://recharge.game.173on.com:11000/api?").
        HttpRequest.Instance.RequestHttpGet(_stringBuilder.Append("http://recharge.game.2460web.com:11000/api?").
                                                           Append(HttpRequest.HashtablaToString(m_PaymentTable)).ToString(),
            HttpRequest.defaultHttpContentType, 1, (bool result, string message) =>
            {
                if (result)
                {
                    Debug.Log(" ------------------ : " + message);
                    JsonData _json = JsonMapper.ToObject(message);
                    int _callbackResult = (int)_json["result"];
Fight/Actor/AI/AI_BossDSX.cs
@@ -297,7 +297,6 @@
    private void OnCastSkill(int id)
    {
        Debug.LogFormat("DSX_AI: skillID: {0}", id);
        HeroBehaviour.OnUserClickSkill -= OnCastSkill;
        if (id == 190)
@@ -340,8 +339,6 @@
                _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/JoyStick");
                _temp.gameObject.SetActive(false);
                HeroBehaviour.OnUserClickSkill += OnCastSkill;
                m_Step = 12;
                m_TimeCount = 0;
            }
@@ -362,8 +359,29 @@
                _model.pressedClose = false;
                _model.clickClosed = true;
                _model.onClose = null;
                // () =>
                // {
                //     Time.timeScale = 1;
                //     GA_Hero.s_MapSwitching = false;
                //     if (PreFightMission.Instance.m_HuaShouEffect)
                //     {
                //         EffectMgr.Instance.RecyleUIEffect(1050, PreFightMission.Instance.m_HuaShouEffect.gameObject);
                //         PreFightMission.Instance.m_HuaShouEffect = null;
                //     }
                //     if (m_UIEffect)
                //     {
                //         EffectMgr.Instance.RecyleUIEffect(m_UIEffect.effect, m_UIEffect.gameObject);
                //         m_UIEffect = null;
                //     }
                //     Transform _temp1 = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/JoyStick");
                //     _temp1.gameObject.SetActive(true);
                // };
                WindowCenter.Instance.Open<NewGuideWin>();
                HeroBehaviour.OnUserClickSkill += OnCastSkill;
                Transform _temp = skillContainer.blinkSkill.transform.Find("Img_BackGround");
                PreFightMission.Instance.m_HuaShouEffect = EffectMgr.Instance.PlayUIEffect(1050, 4500, _temp, true);
System/BlastFurnace/BlastFurnaceModel.cs
@@ -900,13 +900,13 @@
            if(playerPack.CheckIsDrugById(previewlist[i]))
            {
                AttrFruitConfig fruitConfig = Config.Instance.Get<AttrFruitConfig>(previewlist[i]);
                if(playerPack.IsReachMaxUseDrug(fruitConfig))
                if(!playerPack.IsReachMaxUseDrug(fruitConfig))
                {
                    return true;
                    return false;
                }
            }
        }
        return false;
        return true;
    }
    public bool CheckNormalAlchemyIsReachMaxUse(AlchemyConfig alchemyConfig)
System/BlastFurnace/DandrugCell.cs
@@ -76,22 +76,7 @@
            unSelectImg.SetActive(true);
            selectImg.SetActive(false);
        }
        List<int> previewDanlist = FurnaceModel.GetPreviewMakeDruglist(alchemyModel).Keys.ToList();
        bool isReach = true;
        for(int i = 0; i < previewDanlist.Count; i++)
        {
            if(playerPack.CheckIsDrugById(previewDanlist[i]))
            {
                AttrFruitConfig fruitConfig = Config.Instance.Get<AttrFruitConfig>(previewDanlist[i]);
                if(!playerPack.IsReachMaxUseDrug(fruitConfig))
                {
                    isReach = false;
                    break;
                }
            }
        }
         bool isReach = FurnaceModel.IsHaveReachFull(alchemyModel);
        int alchemyLv = alchemyModel.AlchemyID % 10;
        if(isReach)
        {
System/MainInterfacePanel/TaskListTip.cs
@@ -221,6 +221,8 @@
            for (int i = 0; i < leng; i++)
            {
                GameObject childObj = Content.GetChild(i).gameObject;
                TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
                childObjTaskType.ClearTaskName();
                if (childObj.activeSelf)
                {
                    childObj.SetActive(!childObj.activeSelf);
@@ -279,7 +281,6 @@
            {
                GameObject childObj = Content.GetChild(i).gameObject;
                TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
            //    childObj.GetComponent<FlyingShoesTask>().ImgSelected.SetActive(false);
                if (i < _list.Count)
                {
                    if (!childObj.activeSelf)
@@ -293,6 +294,7 @@
                }
                else
                {
                    childObjTaskType.ClearTaskName();
                    if (childObj.activeSelf)
                    {
                        childObj.SetActive(false);
System/MainInterfacePanel/TaskType.cs
@@ -54,7 +54,6 @@
    public void IsGameObjectName(int TaskID)
    {
        if (taskmodel.allMissionDict.ContainsKey(TaskID))
        {
            switch (taskmodel.allMissionDict[TaskID].Type)
@@ -85,16 +84,12 @@
                case 12:
                    this.gameObject.name = "FairyAu_" + TaskID;
                    break;
            }
        }
    }
    public void  ClearTaskName()
    {
        this.gameObject.name = "Task_PoolObject";
    }
}