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

client_Zxw

2018-12-27 daec525d92e4ce2d72dfd3f114f6e839af256fe0

 System/Treasure/KingThreeDimensionsBehaviour.cs

@@ -78,19 +78,24 @@
                }

            }



            DisplayWear();



            model.treasureWearRefresh -= TreasureWearRefresh;

            model.treasureWearRefresh += TreasureWearRefresh;

        }



        void DisplayWear()

        {

            Treasure treasure;

            if(treasureModel.TryGetTreasure(treasureId, out treasure))

            if (treasureModel.TryGetTreasure(displayTreasureId, out treasure))

            {

                m_ContainerWearToggle.gameObject.SetActive(treasure.state == TreasureState.Collected);

                m_WearCheck.gameObject.SetActive(model.IsWear(treasureId));

                m_WearCheck.gameObject.SetActive(model.IsWear(displayTreasureId));

            }

            else

            {

                m_ContainerWearToggle.gameObject.SetActive(false);

            }



            model.treasureWearRefresh -= TreasureWearRefresh;

            model.treasureWearRefresh += TreasureWearRefresh;

        }



        public void OnWear()

@@ -101,12 +106,9 @@
            }

        }



        private void TreasureWearRefresh(int id)

        private void TreasureWearRefresh()

        {

            if (id == displayTreasureId)

            {

                Display(id);

            }

            DisplayWear();

        }



        public void Dispose()