liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
liwei1dao 2023-09-20 17:32:24 +08:00
commit 4b8b7e274c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/json/game_skillpassive.json
View File

@ -8838,6 +8838,7 @@
"Callback": [ "Callback": [
934002311 934002311
] ]
<<<<<<< HEAD
}, },
{ {
"Id": 481300223, "Id": 481300223,
@ -8898,5 +8899,7 @@
"Callback": [ "Callback": [
814003214 814003214
] ]
=======
>>>>>>> 61db84522abaac01acc58fffb57e5601d35ad929
} }
] ]