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

client_Wu Xijin

2019-01-23 1a3ae1a93876d7e58fd93c897ad0b8d223f9efca

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

 Fight/Stage/Dungeon/DungeonStage.cs

@@ -261,43 +261,41 @@


    private void HandleMapData()

    {

        mapData = H2Engine.MapData.LoadFormFile(PlayerDatas.Instance.baseData.MapID);

        if (mapData == null)

        {

            Debug.LogFormat("------------------ 数据是空的");

            return;

        }

        // 目前版本只处理刷场景物件

        foreach (var _trigger in mapData.triggers)

        {

            if (_trigger.triggerType != H2Engine.MapTrigger.E_TriggerType.EnterStage)

            {

                Debug.Log("_trigger.triggerType: " + _trigger.triggerType);

                continue;

            }

        // mapData = H2Engine.MapData.LoadFormFile(PlayerDatas.Instance.baseData.MapID);

        // if (mapData == null)

        // {

        //     return;

        // }

        // // 目前版本只处理刷场景物件

        // foreach (var _trigger in mapData.triggers)

        // {

        //     if (_trigger.triggerType != H2Engine.MapTrigger.E_TriggerType.EnterStage)

        //     {

        //         continue;

        //     }



            foreach (var _id in _trigger.evevntIDs)

            {

                var _event = mapData.eventDict[_id];

                if (_event.type == H2Engine.Evt.E_EventType.SceneObject)

                {

                    var _refreshSceneObject = _event as H2Engine.Evt_RefreshSceneObject;

                    if (_refreshSceneObject != null)

                    {

                        foreach (var _sceneObjData in _refreshSceneObject.sceneObjects)

                        {

                            var _prefab = InstanceResourcesLoader.LoadModelPrefab(InstanceResourcesLoader.raceSuffix, _sceneObjData.resName, false);

                            if (_prefab)

                            {

                                var _go = GameObject.Instantiate(_prefab);

                                _go.transform.position = _sceneObjData.position;

                                _go.transform.eulerAngles = _sceneObjData.eulerAngles;

                            }

                        }

                    }

                }

            }

        }

        //     foreach (var _id in _trigger.evevntIDs)

        //     {

        //         var _event = mapData.eventDict[_id];

        //         if (_event.type == H2Engine.Evt.E_EventType.SceneObject)

        //         {

        //             var _refreshSceneObject = _event as H2Engine.Evt_RefreshSceneObject;

        //             if (_refreshSceneObject != null)

        //             {

        //                 foreach (var _sceneObjData in _refreshSceneObject.sceneObjects)

        //                 {

        //                     var _prefab = InstanceResourcesLoader.LoadModelPrefab(InstanceResourcesLoader.raceSuffix, _sceneObjData.resName, false);

        //                     if (_prefab)

        //                     {

        //                         var _go = GameObject.Instantiate(_prefab);

        //                         _go.transform.position = _sceneObjData.position;

        //                         _go.transform.eulerAngles = _sceneObjData.eulerAngles;

        //                     }

        //                 }

        //             }

        //         }

        //     }

        // }

    }



    private void HandleAutoFight()

@@ -475,6 +473,35 @@
            }

        }



        var _func = Config.Instance.Get<FuncConfigConfig>("MapObjectConfig");

        if (_func != null)

        {

            var _json = LitJson.JsonMapper.ToObject(_func.Numerical1);

            var _mapID = PlayerDatas.Instance.baseData.MapID.ToString();

            if ((_json as IDictionary).Contains(_mapID))

            {

                _json = _json[_mapID];

                bool _isShow = (bool)_json["show"];

                if (_isShow)

                {

                    string _effectName = _json["obj"].ToString();

                    string _parent = _json["parent"].ToString();



                    var _prefab = InstanceResourcesLoader.LoadModelPrefab(InstanceResourcesLoader.raceSuffix, _effectName, false);

                    if (_prefab)

                    {

                        var _go = GameObject.Instantiate(_prefab);



                        var _parentNode = GameObject.Find(_parent);

                        _go.transform.SetParent(_parentNode.transform);

                        _go.transform.localPosition = Vector3.zero;

                        _go.transform.localRotation = Quaternion.identity;

                        _go.transform.localScale = Vector3.one;

                    }

                }

            }

        }



    }






 System/OpenServerActivity/OpenServiceAchievementModel.cs

@@ -120,6 +120,7 @@
    {

        GlobalTimeEvent.Instance.secondEvent -= secondEvent;

        GlobalTimeEvent.Instance.secondEvent += secondEvent;

        GetDayNow();//获取当前天数

        SetRedPoint();



    }

@@ -206,6 +207,8 @@


    public void WeekPartyInfo(HAA0A_tagMCWeekPartyInfo info)

    {

        WeekPartyDayDic.Clear();

        WeekPartyActionDic.Clear();

        ResetType = info.ResetType;

        string[] dateArray = info.StartDate.Split('-');

        if (dateArray != null && dateArray.Length == 3)