浏览代码

Merge remote-tracking branch 'remotes/origin/guodong' into zhaoyang

zhaoyang 3 年之前
父节点
当前提交
f3d7ff7eed
共有 2 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      GameClient/Assets/Game/CSShare
  2. 二进制
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

+ 1 - 1
GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit f825e00494cc9aacb55aa00955f23d13a73f2ab6
+Subproject commit 3526f01fb4a402a5b9dfb0b54d30871adf2a6993

二进制
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes