From 06da72770c641fabf980816ed466a2280dac2be7 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 05 八月 2025 19:25:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/GeneralConfig/GeneralDefine.cs | 268 +++++++----------------------------------------------
1 files changed, 35 insertions(+), 233 deletions(-)
diff --git a/Main/System/GeneralConfig/GeneralDefine.cs b/Main/System/GeneralConfig/GeneralDefine.cs
index 302a4e9..d3d89bf 100644
--- a/Main/System/GeneralConfig/GeneralDefine.cs
+++ b/Main/System/GeneralConfig/GeneralDefine.cs
@@ -8,245 +8,45 @@
public class GeneralDefine
{
- public const int CrossBattleFieldMapID = 32060;
- public const int CrossFamilyBattleMapID = 32090;
- public static int initDepotGridCount { get; private set; }
- public static int maxDepotGridCount { get; private set; }
- public static int maxBagGridCount { get; private set; }
- public static int maxXBGridCount { get; private set; }
+ public static Dictionary<int, int> MoneyDisplayModel { get; private set; }
public static int playerMaxLevel { get; private set; }
- public static int[] kylinHomeCollectItems;
- public static List<int> dailyQuestOpenTime;
- public static int flyBootItemId { get; private set; }
- public static int flyBootItemMoney { get; private set; }
- public static int teamReadyTime { get; private set; }
- public static int elderGodAreaAngerTotal { get; private set; }
- public static float petRandomSpeak { get; private set; }
- public static int[] openJobs { get; private set; }
- public static int playerNameLength { get; private set; }
- public static int guardDungeonCageNPCID { get; private set; }
- public static float guardBubbleInterval { get; private set; }
- public static List<int> autoOnHookMap { get; private set; }
- public static float autoRideHorse { get; private set; }
+
public static Dictionary<int, string> equipPlaceNameDict { get; private set; }
public static Dictionary<int, int> moneyDisplayIds { get; private set; }
public static int expDisplayId { get; private set; }
- public static float xpGuideDelay { get; private set; }
- public static float xpGuideDuration { get; private set; }
- public static Dictionary<int, string> trailBossHeadIcons { get; private set; }
- public static Dictionary<int, string> godWeaponMobs { get; private set; }
- public static float ResetComAtkTime { get; private set; }
- public static int RotateSpeed { get; private set; }
- public static float CloseNpcDist { get; private set; }
- public static float FarawayNpcDist { get; private set; }
- public static List<int> SpecialNpcIDs { get; private set; }
- public static Dictionary<int, int> wingEquipLimits { get; private set; }
- public static float PetDanceInterval { get; private set; }
- public static float FuncNpcDanceInterval { get; private set; }
- public static float audioScaleWhenFullScreenOn { get; private set; }
- public static int ruinsTranscriptMapId { get; private set; }
- public static List<int> GuardianPickUpID { get; private set; }
- public static List<int> EarlierGetTreasure { get; private set; }
- public static int BossSound { get; private set; }
- public static Dictionary<int, int> iceCrystalMonsterScores { get; private set; }
- public static float PlayBossHurtInterval { get; private set; }
- public static List<int> NoXpDungeons { get; private set; }
- public static List<int> RandomJobs { get; private set; }
- public static int elderGodTalkingTime { get; private set; }
- public static int elderGodBigBoss { get; private set; }
- public static List<int> PassiveSkillShow { get; private set; }
- public static List<int> bossShuntMaps { get; private set; }
- public static int bossShuntDays { get; private set; }
- public static Dictionary<int, int[]> itemDropEffect = new Dictionary<int, int[]>();
- public static Dictionary<int, int[]> xllyDropEffect = new Dictionary<int, int[]>();
- public static Dictionary<int, int[]> xqryDropEffect = new Dictionary<int, int[]>();
- public static Dictionary<int, List<int[]>> customDropEffect = new Dictionary<int, List<int[]>>();
- public static Dictionary<int, int> dropEffectQuality = new Dictionary<int, int>();
- public static Dictionary<int, int> BuffToHitEffect = new Dictionary<int, int>();
+
//鍙傛暟int锛宨nt 锛宻tring 鍒嗗埆琛ㄧず鑱屼笟锛岃浆鐢熺瓑绾э紝icon
static Dictionary<int, Dictionary<int, string>> jobHeadPortrait = new Dictionary<int, Dictionary<int, string>>();
static Dictionary<int, Dictionary<int, string>> otherjobHeadPortrait = new Dictionary<int, Dictionary<int, string>>();
- public static Dictionary<int, int> bossWearyValues = new Dictionary<int, int>();
- public static Dictionary<int, Vector3> NpcPosOffset = new Dictionary<int, Vector3>();
- public static Dictionary<int, string> propertyIconDict = new Dictionary<int, string>();
-
- public static int demonJarHintLevelLimit { get; private set; }
- public static int demonJarHintLineId { get; private set; }
- public static int skillPanelUnLock { get; private set; }
- public static int dailyQuestRedpointLevelLimit { get; private set; }
- public static int lowHpRemind { get; private set; }
- public static int munekadolockLimit { get; private set; }
- public static int maxItemDropEffectCount { get; private set; }
-
- public static int[] autoBuyItemIds;
- public static int[] autoBuyItemPrices;
-
- public static List<int> neutralMaps = new List<int>();
- public static List<int> neutralBossMaps = new List<int>();
-
- public static int demonJarRedPoint { get; private set; }
- public static string LoadLV { get; private set; }
- public static int MasteryLoadingLevelLimit1 { get; private set; }
- public static int MasteryLoadingLevelLimit2 { get; private set; }
-
- public static float mainWinSkillResetTime { get; private set; }
- public static Vector3 heroDialogueOffset { get; private set; }
- public static Vector3 heroDialogueRotation { get; private set; }
- public static float heroDialogueScale { get; private set; }
-
- public static List<int> ancientGrandTotalAchievements { get; private set; }
- public static List<int> ancientContinueKillAchievements { get; private set; }
-
- public static int trialDungeonGroupChallengeTipLv { get; private set; }
- public static int prayerRedpointLimitLv { get; private set; }
-
- public static int demonJarLevelLimit { get; private set; }
-
- public static int fairyLandGuideId = 82;
-
- public static int specialGuide41Mission { get; private set; }
- public static int specialGuide41Achievement { get; private set; }
-
- public static int supremeRechargeVipLv { get; private set; }
+
public static int rechargeRedpointLv { get; private set; }
public static int rechargeRedpointMinLv { get; private set; }
- public static int runeTowerSweepBuyTimes { get; private set; }
- public static int runeTowerSweepBuyPrice { get; private set; }
-
- public static int teamMatchingTimeOut { get; private set; }
+
public static List<int> inGameDownLoadLevelCheckPoints = null;
public static List<int> inGameDownLoadTaskCheckPoints = null;
public static int inGameDownLoadHighLevel { get; private set; }
- public static List<int> worldBossNoRebornRemindMaps = null;
- public static List<int> bossHomeNoRebornRemindMaps = null;
- public static List<int> elderGodNoRebornRemindMaps = null;
- public static List<int> demonJarNoRebornRemindMaps = null;
- public static List<int> dogzNoRebornRemindMaps = null;
-
- public static string[][] ModeDefaultConfig { get; private set; }
- public static int[][] PreloadSkillEffect { get; private set; }
- public static int[] RealmGroup { get; private set; }
- public static float PrefightAtkRange { get; private set; }
-
- public static Dictionary<int, string> multipleRealmImgDict { get; private set; }
- public static int[] ImportantItemType { get; private set; }
- public static int[] ImportantItemID { get; private set; }
-
- public static int inGameDownLoadHighestLevelPoint { get; private set; }
-
- public static List<int> dungeonCanUseMoneyIds { get; private set; }
- public static int dogzBoxLimit { get; private set; }
-
- public static Dictionary<int, int> dungeonRebornClientTimes { get; private set; }
+
public static int[] CompareEquipPlaces { get; private set; }
- public static Dictionary<int, int> fairyGrabBossMapLines { get; private set; }
-
- public static Dictionary<int, List<int>> DropItemEffectMapID { get; private set; }
public static Dictionary<int, List<int>> itemPutInPackDict { get; private set; }
- public static List<int> RebornAutoFightMapID { get; private set; }
-
- public static string teamWorldCall;
- public static int teamWorldCallInviteCount;
-
- // public static List<Item> ancientKingAwards = new List<Item>();
-
- public static int lowQualityEffectCount { get; private set; }
- public static int medQualityEffectCount { get; private set; }
- public static int highQualityEffectCount { get; private set; }
- public static int lowQualityPetCount { get; private set; }
- public static int medQualityPetCount { get; private set; }
- public static int highQualityPetCount { get; private set; }
- public static int lowQualityGuardCount { get; private set; }
- public static int medQualityGuardCount { get; private set; }
- public static int highQualityGuardCount { get; private set; }
- public static int lowQualityPetEffectCount { get; private set; }
- public static int medQualityPetEffectCount { get; private set; }
- public static int highQualityPetEffectCount { get; private set; }
- public static int lowQualityHorseEffectCount { get; private set; }
- public static int medQualityHorseEffectCount { get; private set; }
- public static int highQualityHorseEffectCount { get; private set; }
-
- public static int GatherSoulDZ { get; private set; }
-
- public static int fairyLandBuffCondition { get; private set; }
- public static int fairyLandBuffId { get; private set; }
- public static int achievementEarlierStageLevel { get; private set; }
- public static int demonJarAutoTime { get; private set; }
- // public static Dictionary<int, Dictionary<int, GA_NpcFightSgzcZZ.EquipRandomInfo>> SgzzRobotEquipDict { get; private set; }
- public static Dictionary<int, int> SgzcRealm { get; private set; }
-
- public static int crossServerOneVsOneOpenDay { get; set; }
- public static int crossServerBattleFieldOpenDay { get; private set; }
+ public static Dictionary<int, int> itemMoneyCountDict { get; private set; } //鑳屽寘涓敤浜庡睍绀鸿揣甯佹暟閲忕殑鐗╁搧
+
public static int UISpringDecorate { get; private set; }
public static Dictionary<int, List<int>> skillAttrIDDict { get; private set; }
- public static int mixServerCustomDays { get; private set; }
- public static float ClientPvpAttributePer { get; private set; }
- public static int openServerCustomDays { get; private set; }
-
- public static int mysteryShopRefreshItem { get; private set; }
- public static Dictionary<int, int> mysteryShopRefreshItemCount { get; private set; }
- public static int mysteryShopRefreshItemValue { get; private set; }
- public static int mysteryShopRefreshInterval { get; private set; }
- public static Dictionary<int, Dictionary<int, int>> equipStarLimit { get; private set; }
- public static int equipTrainMustItemId { get; private set; }
- public static int acutionItemHour { get; private set; }
-
- public static int mainWinTopCloseTime { get; private set; }
- public static List<int> equipDecomposeScreen = new List<int>();
- public static Dictionary<int, float> AtkTypeIncreasePushDis = new Dictionary<int, float>();
- // public static Dictionary<int, CameraController.LookAtData> NpcDieSetCamera = new Dictionary<int, CameraController.LookAtData>();
- public static int BlueEquipJumpLevel { get; private set; }
- public static int[] defenseGetWays { get; private set; }
- public static Dictionary<int, int> skillYinjis { get; private set; }
- public static List<int> onlyUsedAtBackpackItems { get; private set; }
- public static List<int> signInPromoteSkills = new List<int>();
- public static List<int> chestDisplayItems = new List<int>();
-
- public static int equipStarUpAmendFactor { get; private set; }
- public static int equipStarDownAmendFactor { get; private set; }
-
- public static int normalEquipStarUpgradeRateCeiling { get; private set; }
- public static int normalEquipStarUpgradeRateFloor { get; private set; }
-
- public static int suitEquipStarUpgradeRateCeiling { get; private set; }
- public static int suitEquipStarUpgradeRateFloor { get; private set; }
-
- public static Dictionary<int, List<int>> BossAssistAward { get; private set; }
- public static Dictionary<int, List<int>> FBAssistAward { get; private set; }
-
- //妫�娴嬫槸鍚﹀湪systemsetwin prefab鏄剧ず鍒囨崲鍖烘湇鍜屽垏鎹㈣处鍙�
- public static List<string> checkShowSwitchAccount = new List<string>();
- //绔炴妧鍦� 鍒濆绉垎|鏈�楂樼Н鍒�
- public static List<int> ArenaSetList { get; private set; }
- //鍩瑰吇瀵瑰簲鐗╁搧鍒楄〃 1.鍩瑰吇涓�2.鍏荤鐭�3.鐗规畩鍩瑰吇
- public static int[] HorseTrainIDList { get; private set; }
- public static int[] PetTrainIDList { get; private set; }
- public static Dictionary<int, List<int>> LingQiTrainIDList { get; private set; }
-
- //鏁板��1锛氬彲瀵规晫鏂逛娇鐢ㄧ殑闄勫姞鎶�鑳藉垪琛�
- //鏁板��2锛氬彲瀵硅嚜宸变娇鐢ㄧ殑闄勫姞鎶�鑳藉垪琛�
- //鏁板��3锛氫笉鍙噴鏀剧殑鎶�鑳�
- public static int[] WorkForEnemySkills { get; private set; }
- public static int[] WorkForMeSkills { get; private set; }
- public static int[] WorkNotSkills { get; private set; }
- public static Dictionary<int, List<int>> ZhanLingCtgIdDict { get; private set; }
- public static Dictionary<int, List<int>> ZhanLingCtgIdHDict { get; private set; }
- public static Dictionary<int, int> OldZhanLingCtgIdDict { get; private set; }
-
- public static float fightPowerMore; //鎴樺姏瓒呰繃姣斾緥鎵嶅彲蹇�熸寫鎴�
- public static int[] flashOpenArr; //寮�鍚浄璇涘眰 [澶╂槦濉旓紝澧冪晫濉旓紝绗﹀嵃濉旓紙鎸夌鍑犱釜濉旂畻锛塢
- public static int[] flashCntMoreArr; //闆疯瘺鏇村娆℃暟灞傞渶姹� [澶╂槦濉旓紝澧冪晫濉旓紝绗﹀嵃濉旓紙鎸夌鍑犱釜濉旂畻锛塢
- public static int flashKillMaxCount; //闆疯瘺鏈�澶ф鏁�
- public static readonly int HundredMillion = 100000000;//1浜�
+ public static int mysteryShopRefreshInterval { get; private set; }
+
+ public static int acutionItemHour { get; private set; }
+ public static int maxXBGridCount { get; private set; }
+
public static void Init()
{
try
{
+ MoneyDisplayModel = ConfigParse.ParseIntDict(GetInputString("MoneyDisplayModel", 1));
// equipStarUpAmendFactor = GetIntArray("EquipStarRate")[0];
// equipStarDownAmendFactor = GetIntArray("EquipStarRate")[1];
@@ -458,24 +258,26 @@
// checkShowSwitchAccount.Add(item.ToString());
// }
- // var putInItemPack = FuncConfigConfig.Get("PutInItemPack");
- // LitJson.JsonData itemPutInData = LitJson.JsonMapper.ToObject(putInItemPack.Numerical1);
- // itemPutInPackDict = new Dictionary<int, List<int>>();
- // foreach (var _key in itemPutInData.Keys)
- // {
- // var itemTypeData = itemPutInData[_key];
- // int packType = int.Parse(_key);
- // List<int> itemTypes = new List<int>();
- // itemPutInPackDict.Add(packType, itemTypes);
- // if (itemTypeData.IsArray)
- // {
- // for (i = 0; i < itemTypeData.Count; i++)
- // {
- // int itemType = int.Parse(itemTypeData[i].ToString());
- // itemTypes.Add(itemType);
- // }
- // }
- // }
+ var putInItemPack = FuncConfigConfig.Get("PutInItemPack");
+ LitJson.JsonData itemPutInData = LitJson.JsonMapper.ToObject(putInItemPack.Numerical1);
+ itemPutInPackDict = new Dictionary<int, List<int>>();
+ foreach (var _key in itemPutInData.Keys)
+ {
+ var itemTypeData = itemPutInData[_key];
+ int packType = int.Parse(_key);
+ List<int> itemTypes = new List<int>();
+ itemPutInPackDict.Add(packType, itemTypes);
+ if (itemTypeData.IsArray)
+ {
+ for (int i = 0; i < itemTypeData.Count; i++)
+ {
+ int itemType = int.Parse(itemTypeData[i].ToString());
+ itemTypes.Add(itemType);
+ }
+ }
+ }
+
+ itemMoneyCountDict = ConfigParse.ParseIntDict(putInItemPack.Numerical2);
// //鎷惧彇璐甸噸鐗╁搧
// FuncConfigConfig importantItemType = FuncConfigConfig.Get("AutoBuyDrug");
@@ -1166,6 +968,6 @@
public static long GetFactValue(uint value, uint valueEx)
{
- return (long)valueEx * HundredMillion +(long)value;
+ return (long)valueEx * (long)Constants.ExpPointValue +(long)value;
}
}
--
Gitblit v1.8.0