From b3b82915705dfee86db127d45eea6dd2442d6d92 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 21 十一月 2025 17:25:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
/dev/null | 11 -----
Main/Core/GameEngine/Launch/LaunchInHot.cs | 14 -------
Main/System/Message/RichTableEvent.cs | 44 ++++++++++++++++++++--
Main/System/Main/FightPowerManager.cs | 2 +
Main/System/Main/FightPowerFormula.cs | 11 +++--
Main/Main.cs | 15 +++++++
6 files changed, 64 insertions(+), 33 deletions(-)
diff --git a/Main/Config/Configs/DienstgradConfig.cs b/Main/Config/Configs/DienstgradConfig.cs
deleted file mode 100644
index 5bdde41..0000000
--- a/Main/Config/Configs/DienstgradConfig.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: YYL
-// [ Date ]: 2025骞�8鏈�5鏃�
-//--------------------------------------------------------
-
-using System.Collections.Generic;
-using System;
-using UnityEngine;
-using LitJson;
-
-public partial class DienstgradConfig : ConfigBase<int, DienstgradConfig>
-{
- static DienstgradConfig()
- {
- // 璁块棶杩囬潤鎬佹瀯閫犲嚱鏁�
- visit = true;
- }
-
- public int ID;
- public string Name;
- public int Type;
- public int Prescription;
- public string OutTimeDesc;
- public int[] LightType;
- public int[] LightAttribute;
- public string Image;
- public string Content;
- public int[] Skills;
- public int gotoId;
- public int missionId;
- public int order;
-
- public override int LoadKey(string _key)
- {
- int key = GetKey(_key);
- return key;
- }
-
- public override void LoadConfig(string input)
- {
- try {
- string[] tables = input.Split('\t');
- int.TryParse(tables[0],out ID);
-
- Name = tables[1];
-
- int.TryParse(tables[2],out Type);
-
- int.TryParse(tables[3],out Prescription);
-
- OutTimeDesc = tables[4];
-
- if (tables[5].Contains("["))
- {
- LightType = JsonMapper.ToObject<int[]>(tables[5]);
- }
- else
- {
- string[] LightTypeStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- LightType = new int[LightTypeStringArray.Length];
- for (int i=0;i<LightTypeStringArray.Length;i++)
- {
- int.TryParse(LightTypeStringArray[i],out LightType[i]);
- }
- }
-
- if (tables[6].Contains("["))
- {
- LightAttribute = JsonMapper.ToObject<int[]>(tables[6]);
- }
- else
- {
- string[] LightAttributeStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- LightAttribute = new int[LightAttributeStringArray.Length];
- for (int i=0;i<LightAttributeStringArray.Length;i++)
- {
- int.TryParse(LightAttributeStringArray[i],out LightAttribute[i]);
- }
- }
-
- Image = tables[7];
-
- Content = tables[8];
-
- if (tables[9].Contains("["))
- {
- Skills = JsonMapper.ToObject<int[]>(tables[9]);
- }
- else
- {
- string[] SkillsStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- Skills = new int[SkillsStringArray.Length];
- for (int i=0;i<SkillsStringArray.Length;i++)
- {
- int.TryParse(SkillsStringArray[i],out Skills[i]);
- }
- }
-
- int.TryParse(tables[10],out gotoId);
-
- int.TryParse(tables[11],out missionId);
-
- int.TryParse(tables[12],out order);
- }
- catch (Exception exception)
- {
- Debug.LogError(exception);
- }
- }
-}
diff --git a/Main/Config/Configs/DienstgradConfig.cs.meta b/Main/Config/Configs/DienstgradConfig.cs.meta
deleted file mode 100644
index a9986c2..0000000
--- a/Main/Config/Configs/DienstgradConfig.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4c0b5c57b88fe5a4fa3002f245a2a257
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Main/Core/GameEngine/Launch/LaunchInHot.cs b/Main/Core/GameEngine/Launch/LaunchInHot.cs
index c6c9e25..740a69b 100644
--- a/Main/Core/GameEngine/Launch/LaunchInHot.cs
+++ b/Main/Core/GameEngine/Launch/LaunchInHot.cs
@@ -22,20 +22,6 @@
void Start()
{
-
-#if !UNITY_EDITOR
- if (File.Exists(Directory.GetParent(Application.persistentDataPath) + "/Debug") ||
- LocalSave.GetString("#@#BrancH") != string.Empty)
- {
- Debug.unityLogger.logEnabled = true;
- }
- else
- {
- Debug.unityLogger.logEnabled = false;
- }
-
-#endif
-
System.Net.ServicePointManager.DefaultConnectionLimit = 100;//璁剧疆http鏈�澶ц繛鎺ユ暟
Application.backgroundLoadingPriority = ThreadPriority.High;
Screen.sleepTimeout = SleepTimeout.NeverSleep;
diff --git a/Main/Main.cs b/Main/Main.cs
index 1d52dd8..ac56272 100644
--- a/Main/Main.cs
+++ b/Main/Main.cs
@@ -120,6 +120,21 @@
ClearGameData();
//閿�姣佹墍鏈夋垬鍦�
BattleManager.Instance.DestroyAllBattleField();
+
+ //娓告垙鍐呮棩蹇楀叧闂�
+#if !UNITY_EDITOR
+ if (File.Exists(Directory.GetParent(Application.persistentDataPath) + "/Debug") ||
+ LocalSave.GetString("#@#BrancH") != string.Empty)
+ {
+ Debug.unityLogger.logEnabled = true;
+ }
+ else
+ {
+ Debug.unityLogger.logEnabled = false;
+ }
+
+#endif
+
}
private static void ReleaseMgrs()
diff --git a/Main/System/Main/FightPowerFormula.cs b/Main/System/Main/FightPowerFormula.cs
index b36e474..bb7656e 100644
--- a/Main/System/Main/FightPowerFormula.cs
+++ b/Main/System/Main/FightPowerFormula.cs
@@ -3,9 +3,9 @@
public class FightPowerFormula
{
// 鍩虹灞炴�у叕寮�
- // (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue)*(1+lineupHaloPer+bookPer+realmPer+gubaoPer+hjgPer+horsePer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue
+ // (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)*(1+lineupHaloPer+bookPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue
// 鎴樻枟灞炴�у叕寮�
- // (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue
+ // (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue
// 鎴樻枟鍔涘叕寮�
// long(Atk*AtkRatio+MaxHP*MaxHPRatio+Def*DefRatio+(StunRate*StunRateRatio+SuperHitRate*SuperHitRateRatio+ComboRate*ComboRateRatio+MissRate*MissRateRatio+ParryRate*ParryRateRatio+SuckHPPer*SuckHPPerRatio+StunRateDef*StunRateDefRatio+SuperHitRateDef*SuperHitRateDefRatio+ComboRateDef*ComboRateDefRatio+MissRateDef*MissRateDefRatio+ParryRateDef*ParryRateDefRatio+SuckHPPerDef*SuckHPPerDefRatio+FinalDamPer*FinalDamPerRatio+FinalDamPerDef*FinalDamPerDefRatio+PhyDamPer*PhyDamPerRatio+PhyDamPerDef*PhyDamPerDefRatio+MagDamPer*MagDamPerRatio+MagDamPerDef*MagDamPerDefRatio+NormalSkillPer*NormalSkillPerRatio+NormalSkillPerDef*NormalSkillPerDefRatio+AngerSkillPer*AngerSkillPerRatio+AngerSkillPerDef*AngerSkillPerDefRatio+SuperDamPer*SuperDamPerRatio+SuperDamPerDef*SuperDamPerDefRatio+CurePer*CurePerRatio+CurePerDef*CurePerDefRatio+ShieldPer*ShieldPerRatio+ShieldPerDef*ShieldPerDefRatio+DOTPer*DOTPerRatio+DOTPerDef*DOTPerDefRatio+WeiFinalDamPer*WeiFinalDamPerRatio+WeiFinalDamPerDef*WeiFinalDamPerDefRatio+ShuFinalDamPer*ShuFinalDamPerRatio+ShuFinalDamPerDef*ShuFinalDamPerDefRatio+WuFinalDamPer*WuFinalDamPerRatio+WuFinalDamPerDef*WuFinalDamPerDefRatio+QunFinalDamPer*QunFinalDamPerRatio+QunFinalDamPerDef*QunFinalDamPerDefRatio+PVPDamPer*PVPDamPerRatio+PVPDamPerDef*PVPDamPerDefRatio)/100.0-55000)
// 鎶�鑳芥垬鏂楀姏鍏紡
@@ -20,12 +20,14 @@
double gubaoValue = variables["gubaoValue"];
double hjgValue = variables["hjgValue"];
double horseValue = variables["horseValue"];
+ double beautyValue = variables["beautyValue"];
double lineupHaloPer = variables["lineupHaloPer"];
double bookPer = variables["bookPer"];
double realmPer = variables["realmPer"];
double gubaoPer = variables["gubaoPer"];
double hjgPer = variables["hjgPer"];
double horsePer = variables["horsePer"];
+ double beautyPer = variables["beautyPer"];
double lineupInitAddPer = variables["lineupInitAddPer"];
double lineupLVAddPer = variables["lineupLVAddPer"];
double lineupBreakLVAddPer = variables["lineupBreakLVAddPer"];
@@ -37,7 +39,7 @@
double awakeTalentPer = variables["awakeTalentPer"];
double heroSelfValue = variables["heroSelfValue"];
- return (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue)*(1+lineupHaloPer+bookPer+realmPer+gubaoPer+hjgPer+horsePer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue;
+ return (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)*(1+lineupHaloPer+bookPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue;
}
public static double GetFightAttr(Dictionary<string, double> variables)
@@ -49,6 +51,7 @@
double gubaoValue = variables["gubaoValue"];
double hjgValue = variables["hjgValue"];
double horseValue = variables["horseValue"];
+ double beautyValue = variables["beautyValue"];
double heroSelfValue = variables["heroSelfValue"];
double lineupHaloValue = variables["lineupHaloValue"];
double starTalentValue = variables["starTalentValue"];
@@ -56,7 +59,7 @@
double awakeTalentValue = variables["awakeTalentValue"];
double fetterValue = variables["fetterValue"];
- return (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue;
+ return (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue;
}
public static double GetFightPower(Dictionary<string, double> variables)
diff --git a/Main/System/Main/FightPowerManager.cs b/Main/System/Main/FightPowerManager.cs
index 20fc8eb..53f3e7f 100644
--- a/Main/System/Main/FightPowerManager.cs
+++ b/Main/System/Main/FightPowerManager.cs
@@ -285,6 +285,8 @@
propertyVariables["hjgPer"] = PhantasmPavilionManager.Instance.GetAttrPer(attrType) / 10000.0f;
propertyVariables["horseValue"] = HorseManager.Instance.GetAttrValue(attrType);
propertyVariables["horsePer"] = HorseManager.Instance.GetAttrPer(attrType) / 10000.0f;
+ propertyVariables["beautyValue"] = 0;
+ propertyVariables["beautyPer"] = 0;
//锛侊紒锛佸崟姝﹀皢鎴樺姏棰勮鐨勮瘽闇�瑕佹帓闄ら槦浼嶅奖鍝嶆垬鍔涳紝鍙畻姝﹀皢鑷韩鐨勪笂闃靛睘鎬�
propertyVariables["lineupInitAddPer"] = GetLineUpPer(attrType, "lineupInitAddPer") / 10000.0f;
diff --git a/Main/System/Message/RichTableEvent.cs b/Main/System/Message/RichTableEvent.cs
index b43baf6..ad823cb 100644
--- a/Main/System/Message/RichTableEvent.cs
+++ b/Main/System/Message/RichTableEvent.cs
@@ -28,7 +28,7 @@
return false;
}
-
+
public override string GetDisplay(RichTextEventEnum type, Dictionary<string, string> _dict)
{
switch (type)
@@ -137,7 +137,7 @@
// }
// }
return "map";
- }
+ }
break;
case "skill":
{
@@ -252,7 +252,7 @@
return "treasureprivilege";
}
break;
-
+
// case "skytowerfloor":
// {
// var _id = 0;
@@ -300,7 +300,43 @@
var _id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
{
- return UIHelper.AppendColor(TextColType.Green, DienstgradConfig.Get(_id).Name, true);
+ return UIHelper.AppendColor(TextColType.Green, TitleConfig.Get(_id).Name, true);
+ }
+ }
+ break;
+ case "face":
+ {
+ var _id = 0;
+ if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
+ {
+ return UIHelper.AppendColor(TextColType.Green, PlayerFaceConfig.Get(_id).Name, true);
+ }
+ }
+ break;
+ case "facepic":
+ {
+ var _id = 0;
+ if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
+ {
+ return UIHelper.AppendColor(TextColType.Green, PlayerFacePicConfig.Get(_id).Name, true);
+ }
+ }
+ break;
+ case "chatbox":
+ {
+ var _id = 0;
+ if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
+ {
+ return UIHelper.AppendColor(TextColType.Green, ChatBubbleBoxConfig.Get(_id).Name, true);
+ }
+ }
+ break;
+ case "model":
+ {
+ var _id = 0;
+ if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
+ {
+ return UIHelper.AppendColor(TextColType.Green, ModelConfig.Get(_id).Name, true);
}
}
break;
--
Gitblit v1.8.0