From 12bd4418f3bf340c81c202eede008414984be0ce Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 23 十月 2025 16:09:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Guild/GuildEmblemSelectCell.cs | 2 +-
Main/System/Guild/GuildHallWin.cs | 2 +-
Main/System/Guild/GuildViewListCell.cs | 2 +-
Main/System/HeroUI/HeroPosWin.cs | 14 +-------------
Main/System/HeroUI/HeroUIManager.OnTeam.cs | 2 +-
Main/System/Guild/GuildOPWin.cs | 2 +-
Main/System/Guild/GuildPreviewWin.cs | 2 +-
Main/System/Guild/GuildCreateWin.cs | 2 +-
Main/System/Guild/GuildEmblemWin.cs | 4 ++--
Main/System/NewBieGuidance/NewBieCenter.cs | 3 ++-
Main/System/Guild/GuildBaseWin.cs | 2 +-
Main/System/HeroUI/HeroUIManager.cs | 2 +-
12 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/Main/System/Guild/GuildBaseWin.cs b/Main/System/Guild/GuildBaseWin.cs
index 2d16c81..e42e6ef 100644
--- a/Main/System/Guild/GuildBaseWin.cs
+++ b/Main/System/Guild/GuildBaseWin.cs
@@ -54,7 +54,7 @@
void ShowGuildInfo()
{
- emblemCell.Display(PlayerDatas.Instance.fairyData.fairy.EmblemID, PlayerDatas.Instance.fairyData.fairy.EmblemWord);
+ emblemCell.Display(PlayerDatas.Instance.fairyData.fairy.EmblemID, PlayerDatas.Instance.fairyData.fairy.EmblemWord, 0.5f);
guildNameText.text = PlayerDatas.Instance.fairyData.fairy.FamilyName;
var config = FamilyConfig.Get(PlayerDatas.Instance.fairyData.fairy.FamilyLV);
guildMemberCountText.text = PlayerDatas.Instance.fairyData.fairy.MemberCount + "/" + config.MemberMax;
diff --git a/Main/System/Guild/GuildCreateWin.cs b/Main/System/Guild/GuildCreateWin.cs
index 25bf65b..c63f925 100644
--- a/Main/System/Guild/GuildCreateWin.cs
+++ b/Main/System/Guild/GuildCreateWin.cs
@@ -43,7 +43,7 @@
void Display()
{
- emblemCell.Display(GuildEmblemModel.Instance.createSelectEmblemId, GuildEmblemModel.Instance.createEmblemWord, 1.5f);
+ emblemCell.Display(GuildEmblemModel.Instance.createSelectEmblemId, GuildEmblemModel.Instance.createEmblemWord, 0.8f);
moneyIcon.SetIconWithMoneyType(GuildManager.Instance.createMoneyType);
moneyText.text = UIHelper.ShowUseMoney(GuildManager.Instance.createMoneyType, GuildManager.Instance.createFairyCost);
}
diff --git a/Main/System/Guild/GuildEmblemSelectCell.cs b/Main/System/Guild/GuildEmblemSelectCell.cs
index fc2e58b..b325ac1 100644
--- a/Main/System/Guild/GuildEmblemSelectCell.cs
+++ b/Main/System/Guild/GuildEmblemSelectCell.cs
@@ -16,7 +16,7 @@
public void Display(int index)
{
var id = GuildEmblemModel.Instance.showList[index];
- emblemIcon.Display(id, "");
+ emblemIcon.Display(id, "", 0.5f);
if (PlayerDatas.Instance.fairyData.fairy == null)
{
useImg.SetActive(false);
diff --git a/Main/System/Guild/GuildEmblemWin.cs b/Main/System/Guild/GuildEmblemWin.cs
index 97ae72e..b1433eb 100644
--- a/Main/System/Guild/GuildEmblemWin.cs
+++ b/Main/System/Guild/GuildEmblemWin.cs
@@ -76,7 +76,7 @@
void Display()
{
- guildEmblem.Display(GuildEmblemModel.Instance.nowChooseEmblemId, emblemWord, 2f);
+ guildEmblem.Display(GuildEmblemModel.Instance.nowChooseEmblemId, emblemWord);
emblemScroller.m_Scorller.RefreshActiveCellViews();
var config = FamilyEmblemConfig.Get(GuildEmblemModel.Instance.nowChooseEmblemId);
emblemInfoText.text = config.Descriptive;
@@ -125,7 +125,7 @@
void OnFlagNameChange(string value)
{
emblemWord = value;
- guildEmblem.Display(GuildEmblemModel.Instance.nowChooseEmblemId, emblemWord, 2f);
+ guildEmblem.Display(GuildEmblemModel.Instance.nowChooseEmblemId, emblemWord);
}
void ChooseEmblemEvent()
diff --git a/Main/System/Guild/GuildHallWin.cs b/Main/System/Guild/GuildHallWin.cs
index 725789d..dde0d4e 100644
--- a/Main/System/Guild/GuildHallWin.cs
+++ b/Main/System/Guild/GuildHallWin.cs
@@ -91,7 +91,7 @@
CreateMemberScroller();
var config = FamilyConfig.Get(guildInfo.FamilyLV);
- guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 1.3f);
+ guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.7f);
guildMemberCountText.text = guildInfo.MemberCount + "/" + config.MemberMax;
totalFightPowerText.text = UIHelper.ReplaceLargeArtNum(guildInfo.totalFightPower);
guildLevelText.text = Language.Get("L1094") + guildInfo.FamilyLV;
diff --git a/Main/System/Guild/GuildOPWin.cs b/Main/System/Guild/GuildOPWin.cs
index 4f8b758..8845c09 100644
--- a/Main/System/Guild/GuildOPWin.cs
+++ b/Main/System/Guild/GuildOPWin.cs
@@ -68,7 +68,7 @@
if (guildInfo == null) return;
- guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 1.4f);
+ guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.7f);
guildNameText.text = guildInfo.FamilyName;
diff --git a/Main/System/Guild/GuildPreviewWin.cs b/Main/System/Guild/GuildPreviewWin.cs
index 4bfd87f..6106d13 100644
--- a/Main/System/Guild/GuildPreviewWin.cs
+++ b/Main/System/Guild/GuildPreviewWin.cs
@@ -74,7 +74,7 @@
OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, (int)ViewPlayerType.viewGuildLeader);
var config = FamilyConfig.Get(guildInfo.FamilyLV);
- guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 1.3f);
+ guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.7f);
guildMemberCountText.text = guildInfo.MemberCount + "/" + config.MemberMax;
totalFightPowerText.text = UIHelper.ReplaceLargeArtNum(guildInfo.totalFightPower);
guildLevelText.text = Language.Get("L1094") + guildInfo.FamilyLV;
diff --git a/Main/System/Guild/GuildViewListCell.cs b/Main/System/Guild/GuildViewListCell.cs
index 663f07c..50d99e2 100644
--- a/Main/System/Guild/GuildViewListCell.cs
+++ b/Main/System/Guild/GuildViewListCell.cs
@@ -37,7 +37,7 @@
rankTextTf.SetActive(true);
rankText.text = guildInfo.Rank.ToString();
}
- guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord);
+ guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.5f);
guildLevelText.text = Language.Get("L1094") + guildInfo.FamilyLV;
guildNameText.text = guildInfo.FamilyName;
leaderNameText.text = guildInfo.LeaderName;
diff --git a/Main/System/HeroUI/HeroPosWin.cs b/Main/System/HeroUI/HeroPosWin.cs
index ab8a8f2..00bdc64 100644
--- a/Main/System/HeroUI/HeroPosWin.cs
+++ b/Main/System/HeroUI/HeroPosWin.cs
@@ -474,21 +474,9 @@
team.RemoveAllHeroes();
if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == HeroUIManager.Instance.onekeyGuideID)
{
- //绗簩涓己鍒舵帓鍦�5鍙蜂綅
- if (guidList.Count > 1)
- {
- team.AddHero(HeroManager.Instance.GetHero(guidList[1]), 4, true);
- guidList.RemoveAt(1);
- }
-
for (int i = 0; i < guidList.Count; i++)
{
- int index = i;
- if (i >= 4)
- {
- index = i + 1;
- }
- team.AddHero(HeroManager.Instance.GetHero(guidList[i]), index, true);
+ team.AddHero(HeroManager.Instance.GetHero(guidList[i]), HeroUIManager.Instance.onekeyGuidePosList[i] - 1, true);
}
}
diff --git a/Main/System/HeroUI/HeroUIManager.OnTeam.cs b/Main/System/HeroUI/HeroUIManager.OnTeam.cs
index e3a740c..73d39ac 100644
--- a/Main/System/HeroUI/HeroUIManager.OnTeam.cs
+++ b/Main/System/HeroUI/HeroUIManager.OnTeam.cs
@@ -384,7 +384,7 @@
public int[] teamSortByJob;
public int onekeyGuideID;
- public int onekeyGuideFirstPos; //涓�閿笂闃靛湪寮曞涓嬬殑鏈�浼樺厛鎺ㄨ崘浣嶇疆
+ public int[] onekeyGuidePosList; //涓�閿笂闃靛湪寮曞涓嬬殑椤哄簭
public Action OnUnLockHeroCountEvent;
public int lockState
diff --git a/Main/System/HeroUI/HeroUIManager.cs b/Main/System/HeroUI/HeroUIManager.cs
index 9bcc3ee..2e556e0 100644
--- a/Main/System/HeroUI/HeroUIManager.cs
+++ b/Main/System/HeroUI/HeroUIManager.cs
@@ -71,7 +71,7 @@
lockHeroCountLimit = JsonMapper.ToObject<int[][]>(config.Numerical1);
teamSortByJob = JsonMapper.ToObject<int[]>(config.Numerical2);
onekeyGuideID = int.Parse(config.Numerical3);
- onekeyGuideFirstPos = int.Parse(config.Numerical4);
+ onekeyGuidePosList = JsonMapper.ToObject<int[]>(config.Numerical4);
}
diff --git a/Main/System/NewBieGuidance/NewBieCenter.cs b/Main/System/NewBieGuidance/NewBieCenter.cs
index 9611412..6dae9d9 100644
--- a/Main/System/NewBieGuidance/NewBieCenter.cs
+++ b/Main/System/NewBieGuidance/NewBieCenter.cs
@@ -24,7 +24,8 @@
public bool inGuiding
{
- get { return currentGuide != 0; }
+ // 褰撳墠鏈夊紩瀵硷紝骞朵笖涓嶆槸鏆傚仠鐘舵�侊紝鍒欏湪寮曞涓�
+ get { return currentGuide != 0 && IsPauseStoryBattleState(); }
}
List<int> allGuides = new List<int>();
--
Gitblit v1.8.0