Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-09-11 82fe51656d4293aa52cab7d370596d8c9c6bff64

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/Player/Character/PlayerExtersionData.cs

@@ -54,4 +54,5 @@
    public int pkState;//是否在pk中 175 1--进入状态 2--退出状态

    public int bossState;//Boss状态  176 1--进入状态 2--退出状态

    public int OnlyFinalHurt;

    public int NpcHurtAddPer;//对怪物伤害加成 188

}

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -728,6 +728,9 @@
            case PlayerDataRefresh.OnlyFinalHurt:

                extersion.OnlyFinalHurt = (int)value;

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_NPCHurtAddPer:

                extersion.NpcHurtAddPer = (int)value;

                break;

        }

    }




 System/DogzDungeon/DogzDungeonWin.cs

@@ -15,7 +15,6 @@

    public class DogzDungeonWin : Window
    {

        [SerializeField] CyclicScroll m_Bosses;
        [SerializeField] DogzBoxBehaviour m_BoxBehaviour;
        [SerializeField] DogzEliteMonsterBehaviour m_EliteMonsterBehaviour;
@@ -83,7 +82,7 @@
            m_Bosses.Init(bosses);
            m_Bosses.MoveToCenter(bosses.IndexOf(model.selectedBoss));

            // DisplayItemDropTip(model.selectedBoss);
            DisplayItemDropTip(model.selectedBoss);
            DisplayBossBaseInfo(model.selectedBoss);
            DisplayWearyValue(model.selectedBoss);
        }
@@ -140,7 +139,7 @@

        private void OnBossSelected(int _bossId)
        {
            //DisplayItemDropTip(_bossId);
            DisplayItemDropTip(_bossId);
            DisplayBossBaseInfo(_bossId);
            DisplayWearyValue(_bossId);
        }
@@ -225,30 +224,6 @@
                    break;
            }
        }

        private void EnterDogzDungeon()
        {
            var error = 0;
            if (TestEnterDungeon(out error))
            {
                MapTransferUtility.Instance.MoveToNPC(model.selectedBoss);
            }
            else
            {
                ProcessEnterDungeonError(error);
            }
        }

        private bool TestEnterDungeon(out int _error)
        {
            _error = 0;
            return true;
        }

        private void ProcessEnterDungeonError(int _error)
        {
        }


    }


 System/Login/LoginWin.cs

@@ -26,6 +26,7 @@
        [SerializeField] RectTransform m_ContainerEnterGame;

        [SerializeField] RectTransform m_ContainerAccount;

        [SerializeField] Image m_ServerState;

        [SerializeField] Text m_ServerStateDescription;

        [SerializeField] Text m_ServerName;

        [SerializeField] protected InputField m_Account;

        [SerializeField] Button m_EnterGame;

@@ -129,15 +130,19 @@
                case ServerState.Maintain:

                case ServerState.Predicted:

                    m_ServerState.SetSprite("XT_FWQ_TB4");

                    m_ServerStateDescription.text = Language.Get("ServerStatus4");

                    break;

                case ServerState.Normal:

                    m_ServerState.SetSprite("XT_FWQ_TB2");

                    m_ServerStateDescription.text = Language.Get("ServerStatus3");

                    break;

                case ServerState.Busy:

                    m_ServerState.SetSprite("XT_FWQ_TB3");

                    m_ServerStateDescription.text = Language.Get("ServerStatus2");

                    break;

                case ServerState.Hot:

                    m_ServerState.SetSprite("XT_FWQ_TB1");

                    m_ServerStateDescription.text = Language.Get("ServerStatus1");

                    break;

            }

        }


 System/TaiChi/TaiChilDungeonEntranceWin.cs

@@ -96,7 +96,7 @@
                }

                else

                {

                    MessageWin.Inst.ShowFixedTip(Language.Get("L1020"));

                    SysNotifyMgr.Instance.ShowTip("Join_Space_Lost");

                }

              

            }


 System/TaiChi/WytjGameWin.cs

@@ -207,21 +207,27 @@
                        npcDesText.text = Language.Get("Wytj0");

                        break;

                    case 1:

                        SoundPlayer.Instance.PlayUIAudio(733);

                        npcDesText.text = Language.Get("Wytj1");

                        break;

                    case 2:

                        SoundPlayer.Instance.PlayUIAudio(734);

                        npcDesText.text = Language.Get("Wytj2");

                        break;

                    case 3:

                        SoundPlayer.Instance.PlayUIAudio(735);

                        npcDesText.text = Language.Get("Wytj3");

                        break;

                    case 4:

                        SoundPlayer.Instance.PlayUIAudio(736);

                        npcDesText.text = Language.Get("Wytj4");

                        break;

                    case 5:

                        SoundPlayer.Instance.PlayUIAudio(737);

                        npcDesText.text = Language.Get("Wytj5");

                        break;

                    case 6:

                        SoundPlayer.Instance.PlayUIAudio(738);

                        npcDesText.text = Language.Get("Wytj6");

                        break;

                }

@@ -274,10 +280,12 @@
                case Stand_1_Key:

                    break;

                case Star1_Key:

                    SoundPlayer.Instance.PlayUIAudio(57);

                    break;

                case Star3_Key:   

                    StartPlayDiceAni();

                    taiChiModel.SendQuest(1);

                    SoundPlayer.Instance.PlayUIAudio(57);

                    break;

                case Rock_Key:

                    break;


 Utility/EnumHelper.cs

@@ -551,6 +551,7 @@
    CDBPlayerRefresh_FuncDef = 185,  // 功能层防御  185

    CDBPlayerRefresh_TreasureScore = 186, //寻宝商店积分

    CDBPlayerRefresh_Danjing = 187,              // 丹精 187

    CDBPlayerRefresh_NPCHurtAddPer,//对怪物伤害加成 188

};



/** 物品加成类型 */

@@ -938,7 +939,7 @@
    StoneBasePer = 83, //宝石基础属性

    RealmBasePer = 84, //境界基础属性

    PetSkillAtkRate = 85, //宠物技能伤害



    NpcHurtAddPer = 89,//对怪物伤害加成

}

//UI图标类型

public enum SpriteFileType


 Utility/LanguageVerify.cs

@@ -94,7 +94,7 @@


        var account = ModelCenter.Instance.GetModel<LoginModel>().sdkLoginResult.account;

        var playerId = PlayerDatas.Instance.baseData.PlayerID;

        var playerName = PlayerDatas.Instance.baseData.PlayerName;

        var playerName = UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName);



        var tables = new Dictionary<string, string>();

        tables["game_code"] = "snxxz";

@@ -113,7 +113,7 @@


        tables["edit_uid"] = account;

        tables["edit_rid"] = playerId.ToString();

        tables["edit_name"] = UIHelper.ServerStringTrim(playerName);

        tables["edit_name"] = playerName;



        tables["notice"] = op_type == 2 ? string.Empty : verifyContent;

        var ts = System.DateTime.UtcNow - new System.DateTime(1970, 1, 1, 0, 0, 0, 0);


 Utility/OperationLogCollect.cs

@@ -148,7 +148,7 @@
        tables["AccountID"] = ModelCenter.Instance.GetModel<LoginModel>().sdkLoginResult.account;

        tables["RoleID"] = StringUtility.Contact(isFairy ? UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.FamilyName) : string.Empty,

           isFairy ? "-" : string.Empty, UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName));

        tables["ToRoleID"] = toPlayer;

        tables["ToRoleID"] = UIHelper.ServerStringTrim(toPlayer);

        tables["Level"] = PlayerDatas.Instance.baseData.LV.ToString();

        tables["VIPLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();

        tables["Content"] = WWW.EscapeURL(UIHelper.TrimContentToServer(content));


 Utility/UIHelper.cs

@@ -229,6 +229,8 @@
                return PlayerDatas.Instance.extersion.ComboDamPer;

            case AttrEnum.SkillHurtPrecent:

                return PlayerDatas.Instance.extersion.skillAtkRateReduce;

            case AttrEnum.NpcHurtAddPer:

                return PlayerDatas.Instance.extersion.NpcHurtAddPer;

        }

        return 0;

    }