Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts in...

client_Zxw

2018-12-24 336c229f0b32edc4d1dfd3579eb70c5bae142286

 System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs

File was renamed from System/CrossServerOneVsOne/DungeonWaitPlayerCoolDownWin.cs
@@ -12,7 +12,7 @@
namespace Snxxz.UI
{

    public class DungeonWaitPlayerCoolDownWin : Window
    public class CrossServerOneVsOneWaitPlayerCoolDownWin : Window
    {
        [SerializeField]
        Transform m_CoolDownContainer;