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

client_Wu Xijin

2019-05-07 6056a0f9aaa7076927d845a7e5dd1ad86a2cf6c8

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

 System/FashionDress/FashionDetailsWin.cs

@@ -15,7 +15,7 @@
        [SerializeField] Text nameText;

        [SerializeField] Text fashionPartText;

        [SerializeField] Text jobText;

        [SerializeField] CommonItemBaisc itemBaisc;

        [SerializeField] ItemBehaviour itemBaisc;

        [Header("中间UI")]

        [SerializeField] GameObject midPartObj;

        [SerializeField] FashionAttrBeh currentFashionAttr;

@@ -99,8 +99,7 @@
            nameText.text = itemConfig.ItemName;

            nameText.color = UIHelper.GetUIColor(itemConfig.ItemColor);

            fashionPartText.text = itemConfig.ItemTypeName;

            ItemCellModel cellModel = new ItemCellModel(itemConfig.ID);

            itemBaisc.Init(cellModel);

            itemBaisc.SetItem(itemConfig.ID, 1);

        }



        private void SetMidUI()


 System/HazyRegion/HazyRegionIncidentPanel.cs

@@ -59,6 +59,16 @@
            if (incidents.Count > 0)

            {

                model.selectIncident = incidents[0];



                var error = 0;

                foreach (var id in incidents)

                {

                    if (model.TryGotoIncident(id, false, out error))

                    {

                        model.selectIncident = id;

                        break;

                    }

                }

            }



            m_CyclicScroll.Init(incidents);