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

client_Zxw

2018-08-23 7291dd3b0c574e25e859fbbf9472a9f1d2291fa3

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

 Core/SDK/SDKUtility.cs

@@ -254,18 +254,17 @@
        var _code = (int)_json["code"];

        switch (_code)

        {

            case CodeA2U.DeviceInfo:

            case CodeA2U.DeviceInfo:



                Device = new DeviceInfo

                {

                    imei = _json["imei"].ToString(),

                    uniqueID = _json["unique_id"].ToString(),

                    macAddress = _json["mac"].ToString(),

                    androidID = _json["android_id"].ToString(),

                    userAgent = _json["userAgent"].ToString(),

                    totalMemory = (int)_json["memoryTotal"]

                };



                Device = new DeviceInfo ();

                Device.uniqueID = _json ["unique_id"].ToString ();

                Device.androidID = _json ["android_id"].ToString ();// ios平台下为idfa

                Device.userAgent = _json ["userAgent"].ToString ();

#if UNITY_ANDROID

                Device.macAddress = _json ["mac"].ToString ();

                Device.imei = _json ["imei"].ToString ();

                Device.totalMemory = (int)_json ["memoryTotal"];

#endif

                if (OnDeviceInfoChanged != null)

                {

                    OnDeviceInfoChanged(Device);

@@ -491,7 +490,7 @@


    #endregion



    public struct DeviceInfo

    public class DeviceInfo

    {

        public string imei;

        public string macAddress;


 System/Dungeon/DungeonModel.cs

@@ -464,6 +464,10 @@
                            {

                                CheckGroupEnterDungeon(_dungeon);

                            }

                            else

                            {

                                GroupCancelEnterDungeon(_dungeon.mapId);

                            }

                        });

                    }

                    else if (teamModel.myTeam.memberCount - teamModel.myTeam.GetOnlineMemberCnt() > 0)

@@ -488,6 +492,21 @@
            }

        }



        private void GroupCancelEnterDungeon(int _mapId)

        {

            switch (_mapId)

            {

                case RealmModel.REALM_DUNGEON_ID:

                    if (!WindowCenter.Instance.CheckOpen<TeamFrameWin>())

                    {

                        var teamModel = ModelCenter.Instance.GetModel<TeamModel>();

                        teamModel.missionBuf = teamModel.currentMission = new TeamMission(31110, 1);

                        WindowCenter.Instance.Open<TeamFrameWin>(false, teamModel.myTeam.inTeam ? 1 : 0);

                    }

                    break;

            }

        }



        private string GroupChallengeOnlyOneTip(int _mapId)

        {

            switch (_mapId)


 System/FindPrecious/FindPreciousBossRebornBehaviour.cs

@@ -176,14 +176,14 @@
                            {

                                if (_ok)

                                {

                                    EnterBossHome(config.FloorNum);

                                    EnterBossHome(config.FloorNum, _bossId);

                                }

                            }

                            );

                    }

                    else

                    {

                        EnterBossHome(config.FloorNum);

                        EnterBossHome(config.FloorNum, _bossId);

                    }

                }

            }

@@ -194,7 +194,7 @@


                if (mapConfig.MapFBType == (int)MapType.OpenCountry)

                {

                    EnterBossHome(config.FloorNum);

                    EnterBossHome(config.FloorNum,_bossId);

                }

                else

                {

@@ -244,12 +244,13 @@


        }



        private void EnterBossHome(int _floor)

        private void EnterBossHome(int _floor,int _bossId)

        {

            var error = 0;

            if (TestEnterBossHomeDungeon(_floor, out error))

            {

                bossHomeModel.selectedFloor = _floor;

                bossHomeModel.selectedBoss = _bossId;

                dungeonModel.SingleChallengeDungeon(BossHomeModel.BOSSHOME_MAPID, bossHomeModel.selectedFloor - 1);

            }

            else


 System/FindPrecious/FindPreciousModel.cs

@@ -452,14 +452,9 @@
            foreach (var boss in bossInfos.Values)

            {

                var bossId = boss.bossId;



                if (!IsBossAlive(bossId))

                if (Config.Instance.ContainKey<DemonJarConfig>(bossId))

                {

                    RemoveOneBossRebornNotify(bossId);

                }

                else

                {

                    if (Config.Instance.ContainKey<DemonJarConfig>(bossId))

                    if (IsBossAlive(bossId))

                    {

                        var config = Config.Instance.Get<DemonJarConfig>(bossId);

                        var grade = dungeonModel.GetDungeonGrade(new Dungeon(DemonJarModel.DEMONJAR_MAPID, config.LineID));

@@ -470,16 +465,21 @@
                    }

                    else

                    {

                        if ((bossInfos[bossId].refreshTime - DateTime.Now).TotalSeconds < PREPOSE_SECONDS)

                        {

                            AddOneBossRebornNotify(bossId);

                        }

                        else

                        {

                            FindPreciousTimer.Instance.AddClock(bossId, bossInfos[bossId].refreshTime);

                        }

                        RemoveOneBossRebornNotify(bossId);

                    }

                }

                else

                {

                    if (IsBossAlive(bossId) || (bossInfos[bossId].refreshTime - DateTime.Now).TotalSeconds < PREPOSE_SECONDS)

                    {

                        AddOneBossRebornNotify(bossId);

                    }

                    else

                    {

                        FindPreciousTimer.Instance.AddClock(bossId, bossInfos[bossId].refreshTime);

                    }

                }



            }

        }




 System/HappyXB/BestXBWin.cs

@@ -18,9 +18,11 @@
        [SerializeField] Button xbBtn;

        [SerializeField] Text xbBtnText;

        [SerializeField] Text xbBtnMoneyText;

        [SerializeField] Text xbOneDesText;

        [SerializeField] Button xbManyBtn;

        [SerializeField] Text xbManyBtnText;

        [SerializeField] Text xbManyMoneyText;

        [SerializeField] Text xbManyDesText;

        [SerializeField] Button freeXbBtn;

        [SerializeField] Text luckText;

        [SerializeField] GameObject luckDesObj;

@@ -182,6 +184,8 @@
                xbManyMoneyText.text = funcSet.xbPrices[1].ToString();

                xbOneMoney = funcSet.xbPrices[0];

                xbManyMoney = funcSet.xbPrices[1];

                xbOneDesText.text = Language.Get("HappyXB106", funcSet.costToolNums[0]);

                xbManyDesText.text = Language.Get("HappyXB106", funcSet.costToolNums[1]);

                ItemConfig itemConfig1 = Config.Instance.Get<ItemConfig>(funcSet.costToolIds[0]);

                ItemConfig itemConfig2 = Config.Instance.Get<ItemConfig>(funcSet.costToolIds[1]);

                if(itemConfig1 != null)


 System/HappyXB/HappyXBModel.cs

@@ -838,6 +838,7 @@
            {

                bestXBOneRed.state = RedPointState.None;

                bestXBManyRed.state = RedPointState.None;

                bestXBRed.state = RedPointState.None;

            }



            if (IsHaveFreeXB(2))

@@ -860,6 +861,7 @@
            {

                runeXBOneRed.state = RedPointState.None;

                runeXBManyRed.state = RedPointState.None;

                runeXBRed.state = RedPointState.None;

            }

        }




 System/HappyXB/RuneXBWin.cs

@@ -17,10 +17,12 @@
        [SerializeField] Transform verRightContent;

        [SerializeField] Button xbBtn;

        [SerializeField] Text xbBtnText;

        [SerializeField] Text xbOneDesText;

        [SerializeField] Text xbBtnMoneyText;

        [SerializeField] Button xbManyBtn;

        [SerializeField] Text xbManyBtnText;

        [SerializeField] Text xbManyMoneyText;

        [SerializeField] Text xbManyDesText;

        [SerializeField] Button freeXbBtn;

        [SerializeField] GameObject luckDesObj;

        [SerializeField] Text luckText;

@@ -193,6 +195,8 @@
                xbManyMoneyText.text = funcSet.xbPrices[1].ToString();

                xbOneMoney = funcSet.xbPrices[0];

                xbManyMoney = funcSet.xbPrices[1];

                xbOneDesText.text = Language.Get("HappyXB106", funcSet.costToolNums[0]);

                xbManyDesText.text = Language.Get("HappyXB106", funcSet.costToolNums[1]);

                ItemConfig itemConfig1 = Config.Instance.Get<ItemConfig>(funcSet.costToolIds[0]);

                ItemConfig itemConfig2 = Config.Instance.Get<ItemConfig>(funcSet.costToolIds[1]);

                if (itemConfig1 != null)


 System/KnapSack/Logic/PackModelInterface.cs

@@ -1173,7 +1173,8 @@
                        for (i = 0; i < itemlist.Count; i++)

                        {

                            bool isOverdue = IsOverdue(itemlist[i].itemInfo.ItemGUID, itemlist[i].itemInfo.ItemID, itemlist[i].useDataDict);

                            if (itemlist[i].equipScore > putOnDic[key].equipScore && !isOverdue)

                            bool isRealm = PlayerDatas.Instance.baseData.realmLevel >= itemlist[i].chinItemModel.RealmLimit ? true : false;

                            if (itemlist[i].equipScore > putOnDic[key].equipScore && !isOverdue && isRealm)

                            {

                                return true;

                            }


 System/MainInterfacePanel/TopRightTip.cs

@@ -51,6 +51,10 @@
            {

                ModelCenter.Instance.GetModel<DailyQuestModel>().currentDailyQuest = (int)DailyQuestType.Trial;

            }

            if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 29)//仙界秘境功能开启引导

            {

                ModelCenter.Instance.GetModel<DailyQuestModel>().currentDailyQuest = (int)DailyQuestType.FairyLand;

            }

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<DailyQuestWin>();

        }