Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

2023-09-20 17:32:24 +08:00 · 2023-09-20 17:32:24 +08:00 · 4b8b7e274c
commit 4b8b7e274c
parent 771d869e7e 61db84522a
1 changed files with 3 additions and 0 deletions
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@ -8838,6 +8838,7 @@
    "Callback": [
      934002311
    ]
+<<<<<<< HEAD
  },
  {
    "Id": 481300223,
@ -8898,5 +8899,7 @@
    "Callback": [
      814003214
    ]
+=======
+>>>>>>> 61db84522abaac01acc58fffb57e5601d35ad929
  }
 ]