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

解决冲突

Browse Source
This commit is contained in:
meixiongfeng 2023-06-26 11:42:54 +08:00
parent f64144f8f3
commit 29e3ddcfa7
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bin/json/game_opencond.json
View File

@ -1727,13 +1727,8 @@
}, },
"main": [ "main": [
{ {
<<<<<<< HEAD
"key": 2, "key": 2,
"param": 1100208 "param": 1100208
=======
"key": 1,
"param": 1
>>>>>>> a3bec23bf241b6dd679796965c80c09d855ce741
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1755,13 +1750,8 @@
}, },
"main": [ "main": [
{ {
<<<<<<< HEAD
"key": 2, "key": 2,
"param": 1100504 "param": 1100504
=======
"key": 1,
"param": 1
>>>>>>> a3bec23bf241b6dd679796965c80c09d855ce741
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1783,13 +1773,8 @@
}, },
"main": [ "main": [
{ {
<<<<<<< HEAD
"key": 2, "key": 2,
"param": 1100504 "param": 1100504
=======
"key": 1,
"param": 1
>>>>>>> a3bec23bf241b6dd679796965c80c09d855ce741
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1811,13 +1796,8 @@
}, },
"main": [ "main": [
{ {
<<<<<<< HEAD
"key": 2, "key": 2,
"param": 1100604 "param": 1100604
=======
"key": 1,
"param": 1
>>>>>>> a3bec23bf241b6dd679796965c80c09d855ce741
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1839,13 +1819,8 @@
}, },
"main": [ "main": [
{ {
<<<<<<< HEAD
"key": 2, "key": 2,
"param": 1100608 "param": 1100608
=======
"key": 1,
"param": 1
>>>>>>> a3bec23bf241b6dd679796965c80c09d855ce741
} }
], ],
"wkqbx": 0, "wkqbx": 0,