少年修仙传客户端代码仓库
client_Zxw
2018-12-27 ddd6f31300cc5e121512ed1b37370ffa0e5a257c
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
6个文件已修改
28 ■■■■ 已修改文件
Fight/Actor/HeroBehaviour.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeWinModel.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneHonorShopCell.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GatheringSoul/GatherSoulDungeonHintWin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowJump/WindowJumpMgr.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/HeroBehaviour.cs
@@ -229,8 +229,19 @@
        }
    }
    public void StopHandupAI()
    public void StopHandupAI(bool force = false)
    {
        if (!force)
        {
            if (StageManager.Instance.StageType == Stage.E_StageType.Dungeon)
            {
                if (DungeonStage.CurrentMapType != MapType.OpenCountry)
                {
                    return;
                }
            }
        }
        if (PreFightMission.Instance.IsFinished() == false)
        {
            return;
@@ -809,8 +820,8 @@
                        HurtHP = _serverHurtList[i].HurtHP
                    };
                }
                if(!GameNetSystem.Instance.crossServerSocketConnected)
                if (!GameNetSystem.Instance.crossServerSocketConnected)
                {
                    GameNetSystem.Instance.SendInfo(_b405);
                }
System/Compose/New/ComposeWin.cs
@@ -254,7 +254,6 @@
        private void OnClickWingsCompose()
        {
            CloseSubWindows();
            if (windowState == WindowState.Opened)
            {
@@ -270,6 +269,7 @@
        private void GatherSoulCompose()
        {
            ComposeModel.SetCurComposeModel(null);
            CloseSubWindows();
            if (windowState == WindowState.Opened)
            {
System/Compose/New/ComposeWinModel.cs
@@ -1290,6 +1290,7 @@
    Equip = 4,
    Item = 5,
    MountDogz = 6,
    GatherSoul = 7,
}
public enum NeedMatType
System/CrossServerOneVsOne/CrossServerOneVsOneHonorShopCell.cs
@@ -86,6 +86,7 @@
                }
                else
                {
                    stateImg.gameObject.SetActive(false);
                    sellImg.gameObject.SetActive(true);
                    itemCell.countText.text = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Red, remainNum.ToString()),
                        "/" + canBuyCnt.ToString());
System/GatheringSoul/GatherSoulDungeonHintWin.cs
@@ -16,6 +16,7 @@
    public class GatherSoulDungeonHintWin : Window
    {
        [SerializeField] Text m_HelpRemind;
        [SerializeField] Image m_HeadIcon;
        [SerializeField] RectTransform m_ContainerReady;
        [SerializeField] RectTransform m_ContainerTarget;
@@ -78,11 +79,14 @@
            if (mission.step <= 1)
            {
                m_HelpRemind.text = UIHelper.ReplaceNewLine(Language.Get("GatherSoulHelpRemind_0"));
                m_HeadIcon.SetSprite("XT_JH_11");
            }
            else
            {
                m_HelpRemind.text = UIHelper.ReplaceNewLine(Language.Get("GatherSoulHelpRemind_1"));
                m_HeadIcon.SetSprite("XT_JH_10");
            }
            m_HeadIcon.SetNativeSize();
        }
        void DisplayMissionTarget()
System/WindowJump/WindowJumpMgr.cs
@@ -175,7 +175,10 @@
            case JumpUIType.ComposeFunc5:
            case JumpUIType.TicketCompose1:
            case JumpUIType.TicketCompose2:
                SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.GatherSoul271:
                composeModel.SetCurComposeModel(null);
                SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.EquipCompose1: