修复部分Bug,补全历史事件失败默认测试流程
This commit is contained in:
parent
8fabb1c4f5
commit
b08c2f71c2
Binary file not shown.
Binary file not shown.
@ -31,6 +31,7 @@ namespace GameLogic
|
|||||||
public static int GmActorId = 1;
|
public static int GmActorId = 1;
|
||||||
|
|
||||||
public static int HuangJinShiDaiEnd = 5; // 黄金时代结束时间
|
public static int HuangJinShiDaiEnd = 5; // 黄金时代结束时间
|
||||||
|
public static int LiShiShiJianEnd = 5; // 历史事件结束时间
|
||||||
|
|
||||||
|
|
||||||
// 测试玩家头像Url
|
// 测试玩家头像Url
|
||||||
|
@ -204,10 +204,13 @@ namespace GameLogic
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
var config = ConfigSystem.Instance.Tables.TbTeamConfig.Get(
|
||||||
|
DataGameSceneManager.Instance.m_TeamId);
|
||||||
|
|
||||||
// 设置用户信息
|
// 设置用户信息
|
||||||
m_textHuangJinInfo.text = string.Format(
|
m_textHuangJinInfo.text = string.Format(
|
||||||
ConfigSystem.Instance.Tables.TbTeamConfig.Get(
|
config.TextInfo,
|
||||||
DataGameSceneManager.Instance.m_TeamId).TextInfo,
|
|
||||||
DataGameSceneManager.Instance.sjDatas[0] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[0].name,
|
DataGameSceneManager.Instance.sjDatas[0] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[0].name,
|
||||||
DataGameSceneManager.Instance.sjDatas[1] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[1].name,
|
DataGameSceneManager.Instance.sjDatas[1] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[1].name,
|
||||||
DataGameSceneManager.Instance.sjDatas[2] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[2].name
|
DataGameSceneManager.Instance.sjDatas[2] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[2].name
|
||||||
@ -215,8 +218,7 @@ namespace GameLogic
|
|||||||
|
|
||||||
|
|
||||||
// 设置图片从透明到不透明
|
// 设置图片从透明到不透明
|
||||||
m_img_HuangJinShiDai.color = new Color(1, 1, 1, 0);
|
m_img_HuangJinShiDai.sprite = GameModule.Resource.LoadAsset<Sprite>(config.ImgName);
|
||||||
m_img_HuangJinShiDai.CrossFadeAlpha(1, 1f, false);
|
|
||||||
|
|
||||||
|
|
||||||
DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据
|
DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据
|
||||||
@ -224,8 +226,9 @@ namespace GameLogic
|
|||||||
// 等待五秒钟后关闭
|
// 等待五秒钟后关闭
|
||||||
UniTask.Delay(5000).ContinueWith(() =>
|
UniTask.Delay(5000).ContinueWith(() =>
|
||||||
{
|
{
|
||||||
m_img_HuangJinShiDai.CrossFadeAlpha(0, 1f, false);
|
|
||||||
m_img_HuangJinShiDai.gameObject.SetActive(false);
|
m_img_HuangJinShiDai.gameObject.SetActive(false);
|
||||||
|
m_rect_ShiJian.gameObject.SetActive(false);
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -313,12 +316,15 @@ namespace GameLogic
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
m_img_HuangJinShiDai.gameObject.SetActive(true);
|
||||||
|
var config = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId);
|
||||||
|
|
||||||
// 设置用户信息
|
// 设置用户信息
|
||||||
m_textHuangJinInfo.text = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId).LoswerInfo;
|
m_textHuangJinInfo.text = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId).LoswerInfo;
|
||||||
|
|
||||||
// 设置图片从透明到不透明
|
// 设置图片从透明到不透明
|
||||||
m_img_HuangJinShiDai.color = new Color(1, 1, 1, 0);
|
m_img_HuangJinShiDai.sprite = GameModule.Resource.LoadAsset<Sprite>(config.ImgName);
|
||||||
m_img_HuangJinShiDai.CrossFadeAlpha(1, 1f, false);
|
|
||||||
|
|
||||||
|
|
||||||
DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据
|
DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据
|
||||||
@ -326,12 +332,12 @@ namespace GameLogic
|
|||||||
// 等待五秒钟后关闭
|
// 等待五秒钟后关闭
|
||||||
UniTask.Delay(5000).ContinueWith(() =>
|
UniTask.Delay(5000).ContinueWith(() =>
|
||||||
{
|
{
|
||||||
m_img_HuangJinShiDai.CrossFadeAlpha(0, 1f, false);
|
|
||||||
m_img_HuangJinShiDai.gameObject.SetActive(false);
|
m_img_HuangJinShiDai.gameObject.SetActive(false);
|
||||||
|
m_rect_ShiJian.gameObject.SetActive(false);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
}, 30);
|
}, EventConts.LiShiShiJianEnd);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,6 +23,7 @@ public sealed partial class TeamConfig : Luban.BeanBase
|
|||||||
ScoreTargetValue = _buf.ReadInt();
|
ScoreTargetValue = _buf.ReadInt();
|
||||||
OneScoreTargetValue = _buf.ReadInt();
|
OneScoreTargetValue = _buf.ReadInt();
|
||||||
VideoName = _buf.ReadString();
|
VideoName = _buf.ReadString();
|
||||||
|
ImgName = _buf.ReadString();
|
||||||
LoswerInfo = _buf.ReadString();
|
LoswerInfo = _buf.ReadString();
|
||||||
TextInfo = _buf.ReadString();
|
TextInfo = _buf.ReadString();
|
||||||
}
|
}
|
||||||
@ -61,6 +62,10 @@ public sealed partial class TeamConfig : Luban.BeanBase
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public readonly string VideoName;
|
public readonly string VideoName;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// 图片名称
|
||||||
|
/// </summary>
|
||||||
|
public readonly string ImgName;
|
||||||
|
/// <summary>
|
||||||
/// 描述文字
|
/// 描述文字
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public readonly string LoswerInfo;
|
public readonly string LoswerInfo;
|
||||||
@ -86,6 +91,7 @@ public sealed partial class TeamConfig : Luban.BeanBase
|
|||||||
+ "ScoreTargetValue:" + ScoreTargetValue + ","
|
+ "ScoreTargetValue:" + ScoreTargetValue + ","
|
||||||
+ "OneScoreTargetValue:" + OneScoreTargetValue + ","
|
+ "OneScoreTargetValue:" + OneScoreTargetValue + ","
|
||||||
+ "VideoName:" + VideoName + ","
|
+ "VideoName:" + VideoName + ","
|
||||||
|
+ "ImgName:" + ImgName + ","
|
||||||
+ "LoswerInfo:" + LoswerInfo + ","
|
+ "LoswerInfo:" + LoswerInfo + ","
|
||||||
+ "TextInfo:" + TextInfo + ","
|
+ "TextInfo:" + TextInfo + ","
|
||||||
+ "}";
|
+ "}";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user