From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/GeneralConfig/GeneralDefine.cs | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/Main/System/GeneralConfig/GeneralDefine.cs b/Main/System/GeneralConfig/GeneralDefine.cs
index d8cf231..9795b71 100644
--- a/Main/System/GeneralConfig/GeneralDefine.cs
+++ b/Main/System/GeneralConfig/GeneralDefine.cs
@@ -44,6 +44,12 @@
public static int lvExpFullTipLimit { get; private set; }
public static Dictionary<string, string> commonAwardTipDict { get; private set; }
+ public static int[][] review_Awards;
+ public static Dictionary<string, string> review_UrlDict;
+ public static int review_MainLevel;
+ public static int review_CD;
+ public static string[] noAdsChannels;
+ public static int[] heroSkinGiftList;
public static void Init()
{
try
@@ -100,6 +106,17 @@
config = FuncConfigConfig.Get("AwardEventTip");
commonAwardTipDict = JsonMapper.ToObject<Dictionary<string, string>>(config.Numerical1);
+
+ config = FuncConfigConfig.Get("GoodGameReward");
+ review_Awards = JsonMapper.ToObject<int[][]>(config.Numerical1);
+ config = FuncConfigConfig.Get("Review");
+ review_UrlDict = JsonMapper.ToObject<Dictionary<string, string>>(config.Numerical2);
+ review_MainLevel = int.Parse(config.Numerical3);
+ review_CD = int.Parse(config.Numerical4);
+ noAdsChannels = JsonMapper.ToObject<string[]>(config.Numerical5);
+
+ config = FuncConfigConfig.Get("HeroSkinGift");
+ heroSkinGiftList = JsonMapper.ToObject<int[]>(config.Numerical1);
}
catch (Exception ex)
{
@@ -298,6 +315,12 @@
public static long GetFactValue(uint value, uint valueEx)
{
- return (long)valueEx * (long)Constants.ExpPointValue +(long)value;
+ return (long)valueEx * (long)Constants.ExpPointValue + (long)value;
+ }
+
+ //绾﹀畾锛歱layerID<1000000涓烘満鍣ㄤ汉 瀹為檯璇峰弬鑰冩満鍣ㄤ汉琛�
+ public static bool IsRobot(int playerID)
+ {
+ return playerID < 1000000;
}
}
--
Gitblit v1.8.0