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

client_Hale

2019-05-22 a2acd8beb3484c2f6116ed8cc255bdec2e1d4a1f

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

 System/Treasure/FairyTreasureCollectPanelPattern3.cs

@@ -72,6 +72,10 @@
                    }

                    break;

                case 305:

                    m_GotoBtnText.text = Language.Get("FairyTreasureGot");

                    m_ContainerLocked.gameObject.SetActive(false);

                    m_AddedEffect.text = Language.Get("FairyTreasure_12", model.treasureAddReikiPoint.y);

                    break;

                case 306:

                case 307:

                case 308:

@@ -94,6 +98,9 @@
                            case 18:

                                m_AddedEffect.text = Language.Get("FairyTreasure_9", _property.Value / 100);

                                break;

                            case 37:

                                m_AddedEffect.text = Language.Get("FairyTreasure_11", _property.Value / 100);

                                break;

                        }

                    }

                    break;


 System/Treasure/TreasureModel.cs

@@ -148,6 +148,8 @@


        public int displayInductionId { get; private set; }



        public Int2 treasureAddReikiPoint { get; private set; }



        TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }



        VIPKillNPCTreasure m_VIPKillNPCTreasure;

@@ -306,6 +308,9 @@
            funcConfig = FuncConfigConfig.Get("OpenFabao");

            entranceOpenCondition = int.Parse(funcConfig.Numerical1);



            funcConfig = FuncConfigConfig.Get("FabaoAddPoint");

            treasureAddReikiPoint = new Int2(int.Parse(funcConfig.Numerical1), int.Parse(funcConfig.Numerical2));



            var treasureDungeonConfigs = TreasureDungeonConfig.GetValues();

            foreach (var config in treasureDungeonConfigs)

            {