diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_1.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_1.png
index ce96f710..2360b4d9 100644
Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_1.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_1.png differ
diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_10.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_10.png
index 56fae103..5dccdbe2 100644
Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_10.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_10.png differ
diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_2.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_2.png
index 73f6ed19..eaeb0bf0 100644
Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_2.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_2.png differ
diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_3.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_3.png
index c4b8a85c..553bc164 100644
Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_3.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_3.png differ
diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_4.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_4.png
index 76855b51..726a036c 100644
Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_4.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_4.png differ
diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_5.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_5.png
index da89e1f5..89a8736b 100644
Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_5.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_5.png differ
diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_6.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_6.png
index fe9c53ff..554295fa 100644
Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_6.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_6.png differ
diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_7.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_7.png
index 7d691b76..1559c29a 100644
Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_7.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_7.png differ
diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_8.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_8.png
index e0b2e4c2..5115cce5 100644
Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_8.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_8.png differ
diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_9.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_9.png
index cb399322..b674877e 100644
Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_9.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_jdt_9.png differ
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
index 4b96e62e..796b0e94 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
@@ -89,32 +89,30 @@ namespace GameLogic
///
/// 计算百分比大小值
///
- public void UpdateScale(long value)
+ public void UpdateScale()
{
- // 避免除0
- if (value == 0)
+
+ if (DataGameSceneManager.Instance.m_TeamSortList.Count <= 0)
{
return;
}
- // 基于当前总值,计算自己scale大小
- var results = this.m_AllPush / (float)value;
+ // 获取当前第一名的值
+ long oneNum = DataGameSceneManager.Instance.m_TeamSortList[0].GetAllPower();
- Log.Debug(results);
-
- // 求出实际值
- var s = EventConts.MaxActorScale * results;
- //var s = results * EventConts.actorScaleConst + sclaeAdd;
-
- if (s < EventConts.MinActorScale)
+ if (oneNum == 0)
{
- s = EventConts.MinActorScale;
- }
- else if (s >= EventConts.MaxActorScale)
- {
- s = EventConts.MaxActorScale;
+ m_imgValue.fillAmount = 0.1f;
+ return;
}
+ // 计算自己的百分比
+ float percent = (float)m_AllPush / oneNum;
+ if (percent > 1)
+ {
+ percent = 1;
+ }
+ m_imgValue.fillAmount = percent;
}
}
}
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
index b4cb6dad..6eb0816f 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
@@ -237,38 +237,8 @@ namespace GameLogic
foreach (var item in m_TeamSortList)
{
// 执行内部更新
- item.UpdateScale(allValue);
+ item.UpdateScale();
}
-
-
- // // Determine the scale for the top team
- // float topTeamScale = 25.0f;
-
- // // Calculate the scale for each team based on their score relative to the top team
- // foreach (var item in m_TeamLists)
- // {
- // float teamScore = item.Value.GetPush();
- // float scale = 0;
- // float powerFactor = 1.5f; // 调整这个值以增加或减少悬殊比
- // scale = Mathf.Pow((teamScore / allValue), powerFactor) * topTeamScale;
-
- // if (isNoAdd)
- // {
- // scale = 10;
- // }
- // else
- // {
- // // 限制scale最大最小值
- // float minScale = 5.0f;
- // float maxScale = 25.0f;
- // scale = Mathf.Clamp(scale, minScale, maxScale);
- // }
-
-
- // item.Value.UpdateScale(scale);
- // }
-
- GameEvent.Send(EventConts.UpdateHItem, allValue);
}
///
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
index 07b2d3b8..43e1c44e 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
@@ -106,6 +106,19 @@ namespace GameLogic
float speed = distance / 0.2f; // Calculate speed to ensure movement completes in 1 second
rectTransform.localPosition = Vector2.MoveTowards(rectTransform.localPosition, targetPosition, speed * Time.deltaTime);
}
+
+ DataGameSceneManager.Instance.m_TeamSortList.Sort((a, b) =>
+ {
+ if (a.GetAllPower() > b.GetAllPower())
+ {
+ return -1;
+ }
+ else
+ {
+ return 1;
+ }
+ });
+
}
protected override void RegisterEvent()
@@ -237,7 +250,7 @@ namespace GameLogic
{
if (i < DataGameSceneManager.Instance.m_TeamSortList.Count)
{
- var hItemActor = DataGameSceneManager.Instance.m_TeamSortList[i];
+ var hItemActor = DataGameSceneManager.Instance.m_DicTeamList[(i + 1).ToString()];
long score = hItemActor.GetAllPower(); // Assume GetScore() returns the score of the actor
hItemActors.Add((hItemActor, score));
}
diff --git a/UnityProject/UserSettings/EditorUserSettings.asset b/UnityProject/UserSettings/EditorUserSettings.asset
index 7fcdc3fb..5116aaf3 100644
--- a/UnityProject/UserSettings/EditorUserSettings.asset
+++ b/UnityProject/UserSettings/EditorUserSettings.asset
@@ -6,9 +6,33 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedSceneGuid-0:
- value: 5754500456065b0b550d087413710644401549292f7d2063297a1c6be3b5366a
+ value: 51080d54530d0b0b5858592312765d4415161a79747e7260757c4f31b2e33560
flags: 0
RecentlyUsedSceneGuid-1:
+ value: 500257505d040f590b0f0a7a167b0c4445154f2b7e7c2360287c4d67bbb8363b
+ flags: 0
+ RecentlyUsedSceneGuid-2:
+ value: 0153065303055e0c590f557447775b444115192c7a2c72312c7e1c31b6e23661
+ flags: 0
+ RecentlyUsedSceneGuid-3:
+ value: 55520c5e50535c0c5c5b5c2349745a44151649287c7c71342e704930e1b1306d
+ flags: 0
+ RecentlyUsedSceneGuid-4:
+ value: 075401035d535c0b5a0d5a7745775d44464e40737f2d75662b2c1c67e1b8306a
+ flags: 0
+ RecentlyUsedSceneGuid-5:
+ value: 5a05015552505b030b5e5976487706444e161a7b2f2c24632e284e30e1b56c60
+ flags: 0
+ RecentlyUsedSceneGuid-6:
+ value: 5305055304565c0c5b0f0f7516210b4410161d2f282e74677d791960b5e4376c
+ flags: 0
+ RecentlyUsedSceneGuid-7:
+ value: 5a040503530058085a58087149215e4410164f2f792d24342c7a4831e6e1363c
+ flags: 0
+ RecentlyUsedSceneGuid-8:
+ value: 5a54550354500d0c0f0a5d7541265e44424f1b7829717167792b1961bbe1626e
+ flags: 0
+ RecentlyUsedSceneGuid-9:
value: 02500105010d500359565b7616225a44474e4c7d7b2c27337b7f4d31b1b8666f
flags: 0
UnityEditor.ShaderGraph.Blackboard: