少年修仙传客户端代码仓库
client_Zxw
2018-09-04 657f7368ea332b7105c3c695fdb56ffd30e72059
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
2个文件已修改
38 ■■■■■ 已修改文件
Fight/GameActor/GActorInfo.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/UnionTaskModel.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActorInfo.cs
@@ -138,7 +138,7 @@
    {
        get
        {
            return HpEx * FullHp + Hp;
            return (ulong)HpEx * FullHp + Hp;
        }
    }
@@ -146,7 +146,7 @@
    {
        get
        {
            return MaxHpEx * FullHp + MaxHp;
            return (ulong)MaxHpEx * FullHp + MaxHp;
        }
    }
@@ -185,10 +185,10 @@
    {
        ushort _multiple = (ushort)(value / FullHp);
        //if (sid != PlayerDatas.Instance.PlayerId)
        //{
        //    Debug.LogFormat("<color=red>伤血量: {0}, 当前hp: {1}, hpEx: {2}</color>", value, Hp, HpEx);
        //}
        // if (sid != PlayerDatas.Instance.PlayerId)
        // {
        //     Debug.LogFormat("<color=red>伤血量: {0}, 当前hp: {1}, hpEx: {2}</color>", value, Hp, HpEx);
        // }
        if (_multiple > HpEx)
        {
@@ -218,20 +218,20 @@
            Hp -= value;
        }
        //if (sid != PlayerDatas.Instance.PlayerId)
        //{
        //    if (HpEx != SyncServerHpEx)
        //    {
        //        Debug.LogFormat("<color=red>---- 计算后, hp: {0}, hpEx: {1}</color>", Hp, HpEx);
        //    }
        //}
        if (HpEx * FullHp + Hp < SyncServerHpEx * FullHp + SyncServerHp)
        {
            Hp = SyncServerHp;
            HpEx = SyncServerHpEx;
        }
        // if (sid != PlayerDatas.Instance.PlayerId)
        // {
        //     if (HpEx != SyncServerHpEx)
        //     {
        //         Debug.LogFormat("<color=red>---- 计算后, hp: {0}, hpEx: {1}</color>", Hp, HpEx);
        //     }
        // }
        if (OnHpChange != null)
        {
            OnHpChange(Hp);
System/FairyAu/UnionTaskModel.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
using TableConfig;
public class UnionTaskModel : Model
public class UnionTaskModel : Model,IBeforePlayerDataInitialize
{
    private FuncConfigConfig _tagFuncModel;
    public Action RefreshLivenScoreEvent;
@@ -13,6 +13,14 @@
        SetUnionLivenReward();
        SetUnionLivenScore();
    }
    public void OnBeforePlayerDataInitialize()
    {
        taskInfoDict.Clear();
        curLivenScore = 0;
    }
    public override void UnInit()
    {