From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/OpenServerActivity/OpenServerActivityCell.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityCell.cs b/System/OpenServerActivity/OpenServerActivityCell.cs
index 246d1a6..03ae9e6 100644
--- a/System/OpenServerActivity/OpenServerActivityCell.cs
+++ b/System/OpenServerActivity/OpenServerActivityCell.cs
@@ -37,8 +37,8 @@
[SerializeField] UIEffect m_TitleEffect;
public UIEffect titleEffect { get { return m_TitleEffect; } }
- private int m_Order = 0;
- public int order { get { return m_Order; } set { m_Order = value; } }
+ private int m_ActivityType = 0;
+ public int activityType { get { return m_ActivityType; } set { m_ActivityType = value; } }
public void ChangeState(TitleBtnState _state)
{
--
Gitblit v1.8.0