8375 【主干】【后端】秘境探索修改

hch

2020-02-12 cce9cc81b14667f80415e4958585669f8cf98bf4

8375 【主干】【后端】秘境探索修改

 Core/NetworkPackage/ClientPack/ClientToMapServer/CB0_Event/CB029_tagCMActivityPlaceQuery.cs

New file
@@ -0,0 +1,16 @@
using UnityEngine;

using System.Collections;



// B0 29 活跃放置明细查询 #tagCMActivityPlaceQuery



public class CB029_tagCMActivityPlaceQuery : GameNetPackBasic {



    public CB029_tagCMActivityPlaceQuery () {

        combineCmd = (ushort)0x03FE;

        _cmd = (ushort)0xB029;

    }



    public override void WriteToBytes () {

    }



}


 Core/NetworkPackage/ClientPack/ClientToMapServer/CB0_Event/CB029_tagCMActivityPlaceQuery.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 0841c02b3d4076044bb3aef093c3c950
timeCreated: 1581428418
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Core/NetworkPackage/ServerPack/HB0_Event/HB027_tagMCActivityPlaceInfo.cs

@@ -9,6 +9,10 @@
    public byte RewardCount;    // 累计未领取探索奖励次数


    public byte RewardLen;


    public string RewardInfo;    //累计未领取探索奖励 [[itemID, count], ...]


    public uint TodayExp;

    public uint TodayExpPoint;

    public uint YestordayExp;

    public uint YestordayExpPoint;




    public HB027_tagMCActivityPlaceInfo () {


        _cmd = (ushort)0xB027;


@@ -20,6 +24,10 @@
        TransBytes (out RewardCount, vBytes, NetDataType.BYTE);


        TransBytes (out RewardLen, vBytes, NetDataType.BYTE);


        TransBytes (out RewardInfo, vBytes, NetDataType.Chars, RewardLen);


        TransBytes (out TodayExp, vBytes, NetDataType.DWORD);

        TransBytes (out TodayExpPoint, vBytes, NetDataType.DWORD);

        TransBytes (out YestordayExp, vBytes, NetDataType.DWORD);

        TransBytes (out YestordayExpPoint, vBytes, NetDataType.DWORD);

    }





}



 System/DailyQuest/ActivityPlaceWin.cs

@@ -20,23 +20,27 @@
        [SerializeField] Text m_DownTime;
        [SerializeField] Button FinishNow;
        [SerializeField] RawImage m_RawRole;
        [SerializeField] RawImage m_NPC;
        [SerializeField] ScrollerController m_Scroller;
        [SerializeField] Button m_Button;
        [SerializeField] Text m_ButtonText;
        [SerializeField] Text FindCountSys;
        [SerializeField] Text NoItem;
        [SerializeField] Text allUseActivity;
        [SerializeField] Text ExpYesterday;
        [SerializeField] Text ExpToday;
        [SerializeField] Text ExpMinute;

        int m_itemID = 0;
        int m_Money = 0;
        int OneTimes = 0;
        int maxCnt = 0;
        int useActivity = 0;
        int ButtonModel = 0; //三个状态 0. 开始探索，1.继续探索  2. 领取X次奖励
        int ButtonModel = 0; //三个状态 0. 开始修炼，1.继续修炼  2. 领取X次奖励
        DailyQuestModel dailyModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
        PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }

        int ExpTime = 1;
        string ExpFormula;
        #region Built-in
        protected override void BindController()
        {
@@ -47,22 +51,29 @@
            var _jsonDataC = LitJson.JsonMapper.ToObject(configNum1);
            m_itemID = int.Parse(_jsonDataC[0].ToString());
            m_Money = int.Parse(_jsonDataC[1].ToString());

            var cfg = FuncConfigConfig.Get("ActivityPlaceExp");
            if (cfg != null)
            {
                ExpTime = int.Parse(cfg.Numerical1);
                ExpFormula = cfg.Numerical2;
            }
        }

        protected override void AddListeners()
        {
            m_Close.SetListener(CloseClick);
            FinishNow.SetListener(()=> {
                if (playerPack.GetItemCountByID(PackType.Item, m_itemID) == 0 && PlayerDatas.Instance.baseData.bindDiamond < m_Money)
                {
                    SysNotifyMgr.Instance.ShowTip("GoldPaperErr");
                }
                else
                {
                    WindowCenter.Instance.Open<FastFinishWin>();
                }
            });
            
            //FinishNow.SetListener(()=> {
            //    if (playerPack.GetItemCountByID(PackType.Item, m_itemID) == 0 && PlayerDatas.Instance.baseData.bindDiamond < m_Money)
            //    {
            //        SysNotifyMgr.Instance.ShowTip("GoldPaperErr");
            //    }
            //    else
            //    {
            //        WindowCenter.Instance.Open<FastFinishWin>();
            //    }
            //});

        }

        protected override void OnPreOpen()
@@ -70,7 +81,9 @@
            dailyModel.ActivityPlaceInfoEvent += Display;
            m_Scroller.OnRefreshCell += OnRefreshItemCell;
            dailyModel.usableActivePointUpdateEvent += ShowFindCountSys;
            PlayerMainDate.Event_Experience += OnExperience;
            Display();
            QueryExp();
        }


@@ -109,12 +122,41 @@
        //        yield return new WaitForSeconds(1);
        //    }
        //}
        private void QueryExp()
        {
            var send = new CB029_tagCMActivityPlaceQuery();
            GameNetSystem.Instance.SendInfo(send);
        }

        private void OnExperience(int source, int expPoint, int exp)
        {
            if (source == 9)
                QueryExp();
        }

        private void Display()
        {
            var npcConfig = NPCConfig.Get(20103003);
            UI3DModelExhibition.Instance.ShowNPC(20103003, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawRole);
            UI3DModelExhibition.Instance.ShowNPC(20103003, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_NPC);
            ExpYesterday.text = Language.Get("ActivityPlaceExp1", UIHelper.ReplaceLargeNum((ulong)(dailyModel.ActivityPlaceInfo.YestordayExp + 
                dailyModel.ActivityPlaceInfo.YestordayExpPoint * Constants.ExpPointValue)));
            ExpToday.text = Language.Get("ActivityPlaceExp2", UIHelper.ReplaceLargeNum((ulong)(dailyModel.ActivityPlaceInfo.TodayExp + 
                dailyModel.ActivityPlaceInfo.TodayExpPoint * Constants.ExpPointValue)));

            
            Equation.Instance.Clear();
            PlayerLVConfig cfg = PlayerLVConfig.Get(PlayerDatas.Instance.baseData.LV);
            if (cfg != null)
            {
                Equation.Instance.AddKeyValue("reExp", cfg.ReExp);
            }

            ExpMinute.text = Language.Get("ActivityPlaceExp3", UIHelper.ReplaceLargeNum(60/ ExpTime*Equation.Instance.Eval<int>(ExpFormula)));

            //var npcConfig = NPCConfig.Get(20103003);
            //UI3DModelExhibition.Instance.ShowNPC(20103003, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawRole);
            //UI3DModelExhibition.Instance.ShowNPC(20103003, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_NPC);

            

            var remindCount = dailyModel.ActivityPlaceInfo.PlaceCount;
            if (remindCount == 0)
            {
@@ -276,6 +318,7 @@

        protected override void OnAfterOpen()
        {
            UI3DModelExhibition.Instance.ShowSitDownPlayer(m_RawRole, PlayerDatas.Instance.baseData.Job);
        }

        protected override void OnPreClose()
@@ -283,6 +326,7 @@
            dailyModel.ActivityPlaceInfoEvent -= Display;
            m_Scroller.OnRefreshCell -= OnRefreshItemCell;
            dailyModel.usableActivePointUpdateEvent -= ShowFindCountSys;
            PlayerMainDate.Event_Experience -= OnExperience;
            UI3DModelExhibition.Instance.StopShow();
        }


 UI/Common/UI3DShowHero.cs

@@ -268,6 +268,7 @@
                var animator = clothesModel.GetComponent<Animator>();

                if (animator)

                {

                    animator.Play(GAStaticDefine.State_IdleHash);

                    animator.SetInteger(GAStaticDefine.Param_Action, GAStaticDefine.Act_Idle);

                }

            }

@@ -284,7 +285,7 @@
                }

            }



            if (weaponModel)

            if (weaponModel != null)

            {

                GameObject prefab = InstanceResourcesLoader.LoadModelRes(weaponId, true);

                if (prefab)