Merge branch 'sdk' into online

Merge branch 'main' into sdk
Export AllLanguage.xlsx at 2026-05-19T11:57:47+08:00
2026-05-20 14:27:49 +08:00 · 2026-05-19 14:25:50 +08:00 · 2026-05-19 11:57:47 +08:00 · 2026-05-19 11:57:24 +08:00 · 2026-05-19 11:35:22 +08:00 · 2026-05-19 11:22:20 +08:00
17 changed files with 3572 additions and 2 deletions
--- a/config/AllLanguage.xlsx
+++ b/config/AllLanguage.xlsx
--- a/config/BagItemConfig.xlsx
+++ b/config/BagItemConfig.xlsx
--- a/config/Card.xlsx
+++ b/config/Card.xlsx
--- a/config/Constant.xlsx
+++ b/config/Constant.xlsx
--- a/config/DecorateCost.xlsx
+++ b/config/DecorateCost.xlsx
--- a/config/Guide.xlsx
+++ b/config/Guide.xlsx
--- a/config/Item.xlsx
+++ b/config/Item.xlsx
--- a/config/LevelData.xlsx
+++ b/config/LevelData.xlsx
--- a/config/MergeData.xlsx
+++ b/config/MergeData.xlsx
--- a/config/Pet.xlsx
+++ b/config/Pet.xlsx
--- a/config/Playroom.xlsx
+++ b/config/Playroom.xlsx
--- a/config/UIForm.xlsx
+++ b/config/UIForm.xlsx
--- a/config/UserData.xlsx
+++ b/config/UserData.xlsx
--- a/config/配置表审核规则.md
+++ b/config/配置表审核规则.md
@ -0,0 +1,58 @@
+# 配置表审核规则
+
+## 通用规则
+
+- key-value常量配置value列不能为空
+- 符合json字符串格式(`{}`,`[{}]`)的值判断json字符串合法性
+- 如果是[{"Id":x,"Num":y}]这种道具列表的形式，需判断Id在Item.xlsx / sheet Item中有对应配置
+- 判断奖励道具列表中IType=100(即棋子类道具)的数量小于10，如果有则提示warning
+- Id列确保值唯一
+
+## 各个配置表特定规则
+
+### Activity.xlsx / sheet Activity 弃用
+
+### Activity.xlsx / sheet Gift
+
+- [error]Items列为json字符串
+- [error]ChargeId为充值Id，不为0的值必须在Charge.xlsx / sheet Charge中的Id列有对应配置
+
+### Charge.xlsx / sheet EnergyShop
+
+- [error]ChargeId为充值Id，不为0的值必须在Charge.xlsx / sheet Charge中的Id列有对应配置
+
+### Charge.xlsx / sheet SpecialShop
+
+- [error]ChargeId为充值Id，不为0的值必须在Charge.xlsx / sheet Charge中的Id列有对应配置
+
+### Charge.xlsx / sheet Gift
+
+- [error]ChargeId为充值Id，不为0的值必须在Charge.xlsx / sheet Charge中的Id列有对应配置
+
+### Charge.xlsx / sheet PetCoin
+
+- [error]ChargeId为充值Id，不为0的值必须在Charge.xlsx / sheet Charge中的Id列有对应配置
+
+### Charge.xlsx / sheet AD
+
+- [error]ChargeId为充值Id，不为0的值必须在Charge.xlsx / sheet Charge中的Id列有对应配置
+
+### Endless.xlsx / sheet Endless
+
+- [error]ChargeId为充值Id，不为0的值必须在Charge.xlsx / sheet Charge中的Id列有对应配置
+
+### Handbook.xlsx / sheet Handbook
+
+- [error]Type列与MergeData.xlsx / sheet Emit中的Type列一一对应
+
+### IndoorProgress.xlsx / sheet IndoorProgress
+
+- [warning]当Part列有值时，Item列也需要对应的值
+
+### MergeData.xlsx / sheet MergeData
+
+- [error]Emit_Product列中的值必须是Type=Product的Color
+
+### MergeData.xlsx / sheet Emit
+
+- [error]Retire列的值不能为空或0
--- a/config/配置表知识库.md
+++ b/config/配置表知识库.md
--- a/proto/Gameapi.proto
+++ b/proto/Gameapi.proto
@ -3248,6 +3248,7 @@ message ResUserDetailInfo {
    int32                         AdWatch          = 21;
    repeated UserDetailFriendInfo FriendList       = 22;
    repeated UserDetailOrderInfo  Order            = 23;
+	map<int32, int32> ChessBuffer = 24; //棋子缓存
 }

 message ResServerInfo{
--- a/tool/cfg/cfg_txt.json
+++ b/tool/cfg/cfg_txt.json
@ -511,15 +511,16 @@
         "in_file": "LevelData.xlsx",
         "out_file": "LevelData.txt",
         "sheet_name": "LevelData",
-         "coloum_type": [
+        "coloum_type": [
            "int",
            "int",
            "int",
            "int",
            "string",
            "string",
+            "string",
            "string"
-         ]
+        ]
      },
      {
         "in_file": "LimitedTimeEvent.xlsx",