Merge branch 'master' into leonard

client_Wu Xijin

2018-10-23 a974a2621a6dcb90b8fe52b23d075814873c0960

 System/Dungeon/DungenWHYJ.cs

@@ -95,7 +95,7 @@
                    m_Horizontal.GetChild(i).gameObject.SetActive(true);

                    ItemCell ItemCell = m_Horizontal.GetChild(i).GetComponent<ItemCell>();

                    float value = GetRating() * QuantityList[i];

                    ItemCellModel cellModel = new ItemCellModel(RewardList[i], true, (ulong)Math.Floor(value), 0);

                    ItemCellModel cellModel = new ItemCellModel(RewardList[i], true, (ulong)Math.Round(value,0), 0);

                    ItemCell.Init(cellModel);

                }

                else