diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json
index 66d76ec65..62735ce9c 100644
--- a/bin/json/game_coin.json
+++ b/bin/json/game_coin.json
@@ -12,7 +12,7 @@
"intr": "基础货币，能买好多东西"
},
{
- "key": "diamonds",
+ "key": "diamond",
"name": "钻石",
"color": 2,
"effects": "",
diff --git a/bin/json/game_extservers.json b/bin/json/game_extservers.json
index dd804adc8..775d87b8b 100644
--- a/bin/json/game_extservers.json
+++ b/bin/json/game_extservers.json
@@ -1,10 +1,10 @@
[
{
- "name": "本地测试服1",
- "ips": "10.0.1.11:9999"
+ "name": "本地测试服",
+ "ips": "10.0.0.9:7891"
},
{
- "name": "本地测试服2",
- "ips": "homm20.legu.cc:6352"
+ "name": "外网测试服",
+ "ips": "119.3.89.14:7891"
}
]
\ No newline at end of file
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
deleted file mode 100644
index be706aa3f..000000000
--- a/bin/json/game_hero.json
+++ /dev/null
@@ -1,813 +0,0 @@
-[
- {
- "id": "11001",
- "name": {
- "key": "11001",
- "text": "阿宝"
- },
- "star": 4,
- "color": 3,
- "race": 1,
- "job": 1,
- "type": 1,
- "prefab": "Person/11001.prefab",
- "icon": 11001,
- "sound": 121323,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11001.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 110011,
- "skill2": 110012,
- "skill3": 110013,
- "enteranivalue": 100,
- "camerainterval": 0.5
- },
- {
- "id": "11002",
- "name": {
- "key": "11002",
- "text": "原始人"
- },
- "star": 5,
- "color": 4,
- "race": 1,
- "job": 1,
- "type": 1,
- "prefab": "Person/11002.prefab",
- "icon": 11002,
- "sound": 11002,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11002.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 110021,
- "skill2": 110022,
- "skill3": 110023,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11003",
- "name": {
- "key": "11003",
- "text": "波比"
- },
- "star": 5,
- "color": 4,
- "race": 2,
- "job": 1,
- "type": 1,
- "prefab": "Person/11003.prefab",
- "icon": 11003,
- "sound": 11003,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11003.asset",
- "cite": "",
- "effectstay": [
- "this,Skill/Role/11003/effect_11003_wuqitexiao"
- ],
- "hpspace": {
- "x": 0,
- "y": -0.69,
- "z": 0
- },
- "skill1": 110031,
- "skill2": 110032,
- "skill3": 110033,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11004",
- "name": {
- "key": "11004",
- "text": "布兰"
- },
- "star": 5,
- "color": 4,
- "race": 1,
- "job": 1,
- "type": 1,
- "prefab": "11004",
- "icon": 11004,
- "sound": 11004,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "hero_2011",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 110041,
- "skill2": 110042,
- "skill3": 110043,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11005",
- "name": {
- "key": "11005",
- "text": "无牙仔"
- },
- "star": 4,
- "color": 3,
- "race": 1,
- "job": 1,
- "type": 1,
- "prefab": "Person/11001.prefab",
- "icon": 11005,
- "sound": 121323,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11001.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 110051,
- "skill2": 110052,
- "skill3": 110053,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11006",
- "name": {
- "key": "11006",
- "text": "亚丝翠"
- },
- "star": 5,
- "color": 4,
- "race": 1,
- "job": 1,
- "type": 1,
- "prefab": "11006",
- "icon": 11006,
- "sound": 11006,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "hero_2011",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 110061,
- "skill2": 110062,
- "skill3": 110063,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11009",
- "name": {
- "key": "11009",
- "text": "希卡普"
- },
- "star": 4,
- "color": 3,
- "race": 3,
- "job": 2,
- "type": 1,
- "prefab": "11009",
- "icon": 11009,
- "sound": 11009,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11009.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": -0.1,
- "z": 0
- },
- "skill1": 110091,
- "skill2": 110092,
- "skill3": 110093,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "22002",
- "name": {
- "key": "22002",
- "text": "沈王爷青春版"
- },
- "star": 5,
- "color": 4,
- "race": 2,
- "job": 2,
- "type": 1,
- "prefab": "22002",
- "icon": 22002,
- "sound": 22002,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "hero_2011",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 220021,
- "skill2": 220022,
- "skill3": 220023,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "90001",
- "name": {
- "key": "90001",
- "text": "邪恶阿宝"
- },
- "star": 4,
- "color": 3,
- "race": 1,
- "job": 1,
- "type": 1,
- "prefab": "Person/90001.prefab",
- "icon": 90001,
- "sound": 90001,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "hero_90001",
- "cite": "11001",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 900011,
- "skill2": 900012,
- "skill3": 900013,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11011",
- "name": {
- "key": "11011",
- "text": "浣熊"
- },
- "star": 4,
- "color": 3,
- "race": 2,
- "job": 2,
- "type": 1,
- "prefab": "11011",
- "icon": 11011,
- "sound": 11011,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11011.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 110111,
- "skill2": 110112,
- "skill3": 110113,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11008",
- "name": {
- "key": "11008",
- "text": "悍娇虎"
- },
- "star": 5,
- "color": 4,
- "race": 2,
- "job": 2,
- "type": 1,
- "prefab": "Person/11008.prefab",
- "icon": 11008,
- "sound": 11008,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11008.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 110081,
- "skill2": 110082,
- "skill3": 110083,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11017",
- "name": {
- "key": "11017",
- "text": "冰霜杰克"
- },
- "star": 5,
- "color": 4,
- "race": 4,
- "job": 2,
- "type": 1,
- "prefab": "11017",
- "icon": 11017,
- "sound": 11017,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11017.asset",
- "cite": "",
- "effectstay": [
- "Bone001/Dummy001,Skill/Role/11017/effect_11017_weapon1"
- ],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 110171,
- "skill2": 110172,
- "skill3": 110173,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11018",
- "name": {
- "key": "11018",
- "text": "睡神"
- },
- "star": 5,
- "color": 4,
- "race": 4,
- "job": 2,
- "type": 1,
- "prefab": "11018",
- "icon": 11018,
- "sound": 11018,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11018.asset",
- "cite": "",
- "effectstay": [
- "Bip001,Skill/Role/11018/effect_11018_sleep",
- "Bip001,Skill/Role/11018/effect_11018_fengsha"
- ],
- "hpspace": {
- "x": 0,
- "y": -0.31,
- "z": 0
- },
- "skill1": 110181,
- "skill2": 110182,
- "skill3": 110183,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11019",
- "name": {
- "key": "11019",
- "text": "莫甘娜"
- },
- "star": 5,
- "color": 4,
- "race": 2,
- "job": 2,
- "type": 1,
- "prefab": "11019",
- "icon": 11019,
- "sound": 11019,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11019.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 110191,
- "skill2": 110192,
- "skill3": 110193,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11020",
- "name": {
- "key": "11020",
- "text": "莫甘娜二阶段"
- },
- "star": 5,
- "color": 4,
- "race": 2,
- "job": 2,
- "type": 1,
- "prefab": "11020",
- "icon": 11020,
- "sound": 11020,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11020.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 110201,
- "skill2": 110202,
- "skill3": 110203,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11021",
- "name": {
- "key": "11021",
- "text": "莫甘娜巨怪"
- },
- "star": 5,
- "color": 4,
- "race": 2,
- "job": 2,
- "type": 1,
- "prefab": "11021",
- "icon": 11021,
- "sound": 11021,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11021.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 110211,
- "skill2": 110212,
- "skill3": 110213,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "11099",
- "name": {
- "key": "11099",
- "text": "触手"
- },
- "star": 5,
- "color": 4,
- "race": 2,
- "job": 2,
- "type": 1,
- "prefab": "11099",
- "icon": 11099,
- "sound": 11099,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11099.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 110991,
- "skill2": 110992,
- "skill3": 110993,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "12001",
- "name": {
- "key": "12001",
- "text": "黑化阿宝"
- },
- "star": 5,
- "color": 4,
- "race": 2,
- "job": 2,
- "type": 1,
- "prefab": "Person/12001.prefab",
- "icon": 12001,
- "sound": 121323,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_12001.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 120011,
- "skill2": 120012,
- "skill3": 120013,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "12003",
- "name": {
- "key": "12003",
- "text": "黑化包比"
- },
- "star": 5,
- "color": 4,
- "race": 2,
- "job": 2,
- "type": 1,
- "prefab": "Person/11003.prefab",
- "icon": 12003,
- "sound": 12003,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11003.asset",
- "cite": "",
- "effectstay": [
- "this,Skill/Role/12003/effect_12003_wuqitexiao"
- ],
- "hpspace": {
- "x": 0,
- "y": 0.154,
- "z": 0
- },
- "skill1": 120031,
- "skill2": 120032,
- "skill3": 120033,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "12009",
- "name": {
- "key": "12009",
- "text": "黑化希卡普"
- },
- "star": 5,
- "color": 4,
- "race": 2,
- "job": 2,
- "type": 1,
- "prefab": "12009",
- "icon": 11009,
- "sound": 11009,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11009.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 120091,
- "skill2": 120092,
- "skill3": 120093,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "12017",
- "name": {
- "key": "12017",
- "text": "黑化杰克"
- },
- "star": 5,
- "color": 4,
- "race": 2,
- "job": 2,
- "type": 1,
- "prefab": "12017",
- "icon": 12017,
- "sound": 12017,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11017.asset",
- "cite": "",
- "effectstay": [
- "Bone001/Dummy001,Skill/Role/12017/effect_12017_weapon1_bad"
- ],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 120171,
- "skill2": 120172,
- "skill3": 120173,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "12018",
- "name": {
- "key": "12018",
- "text": "黑化睡神"
- },
- "star": 5,
- "color": 4,
- "race": 2,
- "job": 2,
- "type": 1,
- "prefab": "12018",
- "icon": 12018,
- "sound": 12018,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_11018.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0.26,
- "z": 0
- },
- "skill1": 120181,
- "skill2": 120182,
- "skill3": 120183,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "44005",
- "name": {
- "key": "44005",
- "text": "小伊"
- },
- "star": 4,
- "color": 4,
- "race": 4,
- "job": 3,
- "type": 1,
- "prefab": "Person/44005.prefab",
- "icon": 44005,
- "sound": 44005,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_44005.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 440051,
- "skill2": 440052,
- "skill3": 440053,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "15005",
- "name": {
- "key": "15005",
- "text": "亚力克斯"
- },
- "star": 5,
- "color": 5,
- "race": 1,
- "job": 3,
- "type": 1,
- "prefab": "Person/15005.prefab",
- "icon": 15005,
- "sound": 15005,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_15005.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 150051,
- "skill2": 150052,
- "skill3": 150053,
- "enteranivalue": 0,
- "camerainterval": 0.6
- },
- {
- "id": "35001",
- "name": {
- "key": "35001",
- "text": "浣熊"
- },
- "star": 4,
- "color": 4,
- "race": 4,
- "job": 3,
- "type": 1,
- "prefab": "Person/35001.prefab",
- "icon": 35001,
- "sound": 35001,
- "tujing": [
- 1
- ],
- "intr": "",
- "events": "EventDataSet/Hero_35001.asset",
- "cite": "",
- "effectstay": [],
- "hpspace": {
- "x": 0,
- "y": 0,
- "z": 0
- },
- "skill1": 350011,
- "skill2": 350012,
- "skill3": 350013,
- "enteranivalue": 0,
- "camerainterval": 0.6
- }
-]
\ No newline at end of file
diff --git a/bin/json/game_language.json b/bin/json/game_language.json
deleted file mode 100644
index d82389253..000000000
--- a/bin/json/game_language.json
+++ /dev/null
@@ -1,366 +0,0 @@
-[
- {
- "id": "ChineseSimplified",
- "maps": [
- [
- "ChineseSimplified",
- "简体中文"
- ],
- [
- "ChineseTraditional",
- "簡體中文"
- ]
- ]
- },
- {
- "id": "ChineseTraditional",
- "maps": [
- [
- "ChineseSimplified",
- "繁体中文"
- ],
- [
- "ChineseTraditional",
- "繁體中文"
- ]
- ]
- },
- {
- "id": "English",
- "maps": [
- [
- "ChineseSimplified",
- "英文"
- ],
- [
- "ChineseTraditional",
- "英文"
- ]
- ]
- },
- {
- "id": "1",
- "maps": [
- [
- "ChineseSimplified",
- "一"
- ],
- [
- "ChineseTraditional",
- "一"
- ],
- [
- "English",
- "one"
- ]
- ]
- },
- {
- "id": "2",
- "maps": [
- [
- "ChineseSimplified",
- "二"
- ],
- [
- "ChineseTraditional",
- "二"
- ],
- [
- "English",
- "two"
- ]
- ]
- },
- {
- "id": "3",
- "maps": [
- [
- "ChineseSimplified",
- "三"
- ],
- [
- "ChineseTraditional",
- "三"
- ],
- [
- "English",
- "three"
- ]
- ]
- },
- {
- "id": "4",
- "maps": [
- [
- "ChineseSimplified",
- "四"
- ],
- [
- "ChineseTraditional",
- "四"
- ],
- [
- "English",
- "four"
- ]
- ]
- },
- {
- "id": "5",
- "maps": [
- [
- "ChineseSimplified",
- "五"
- ],
- [
- "ChineseTraditional",
- "五"
- ],
- [
- "English",
- "five"
- ]
- ]
- },
- {
- "id": "6",
- "maps": [
- [
- "ChineseSimplified",
- "六"
- ],
- [
- "ChineseTraditional",
- "六"
- ],
- [
- "English",
- "six"
- ]
- ]
- },
- {
- "id": "7",
- "maps": [
- [
- "ChineseSimplified",
- "七"
- ],
- [
- "ChineseTraditional",
- "七"
- ],
- [
- "English",
- "seven"
- ]
- ]
- },
- {
- "id": "8",
- "maps": [
- [
- "ChineseSimplified",
- "八"
- ],
- [
- "ChineseTraditional",
- "八"
- ],
- [
- "English",
- "eight"
- ]
- ]
- },
- {
- "id": "9",
- "maps": [
- [
- "ChineseSimplified",
- "九"
- ],
- [
- "ChineseTraditional",
- "九"
- ],
- [
- "English",
- "nine"
- ]
- ]
- },
- {
- "id": "10",
- "maps": [
- [
- "ChineseSimplified",
- "十"
- ],
- [
- "ChineseTraditional",
- "十"
- ],
- [
- "English",
- "ten"
- ]
- ]
- },
- {
- "id": "Login",
- "maps": [
- [
- "ChineseSimplified",
- "登录"
- ],
- [
- "ChineseTraditional",
- "登錄"
- ],
- [
- "English",
- "Login"
- ]
- ]
- },
- {
- "id": "MomentDay1",
- "maps": [
- [
- "ChineseSimplified",
- "{0}天前"
- ],
- [
- "ChineseTraditional",
- "{0}天前"
- ]
- ]
- },
- {
- "id": "MomentDay2",
- "maps": [
- [
- "ChineseSimplified",
- "还有{0}天"
- ],
- [
- "ChineseTraditional",
- "還有{0}天"
- ]
- ]
- },
- {
- "id": "MomentHour1",
- "maps": [
- [
- "ChineseSimplified",
- "{0}小时前"
- ],
- [
- "ChineseTraditional",
- "{0}小時前"
- ]
- ]
- },
- {
- "id": "MomentHour2",
- "maps": [
- [
- "ChineseSimplified",
- "还有{0}小时"
- ],
- [
- "ChineseTraditional",
- "還有{0}小時"
- ]
- ]
- },
- {
- "id": "MomentMinutes1",
- "maps": [
- [
- "ChineseSimplified",
- "{0}分钟前"
- ],
- [
- "ChineseTraditional",
- "{0}分鐘前"
- ]
- ]
- },
- {
- "id": "MomentMinutes2",
- "maps": [
- [
- "ChineseSimplified",
- "还有{0}分钟"
- ],
- [
- "ChineseTraditional",
- "還有{0}分鐘"
- ]
- ]
- },
- {
- "id": "MomentSeconds1",
- "maps": [
- [
- "ChineseSimplified",
- "刚刚"
- ],
- [
- "ChineseTraditional",
- "剛剛"
- ]
- ]
- },
- {
- "id": "MomentSeconds2",
- "maps": [
- [
- "ChineseSimplified",
- "1分以内"
- ],
- [
- "ChineseTraditional",
- "1分以內"
- ]
- ]
- },
- {
- "id": "Tuijian",
- "maps": [
- [
- "ChineseSimplified",
- "推荐"
- ],
- [
- "ChineseTraditional",
- "推薦"
- ],
- [
- "English",
- "Hot"
- ]
- ]
- },
- {
- "id": "Juese",
- "maps": [
- [
- "ChineseSimplified",
- "角色"
- ],
- [
- "ChineseTraditional",
- "角色"
- ],
- [
- "English",
- "Role"
- ]
- ]
- }
-]
\ No newline at end of file
diff --git a/bin/json/game_mainlinechapter.json b/bin/json/game_mainlinechapter.json
index b5c7552d1..b281aa11a 100644
--- a/bin/json/game_mainlinechapter.json
+++ b/bin/json/game_mainlinechapter.json
@@ -30,9 +30,7 @@
107,
108,
109,
- 110,
- 111,
- 112
+ 110
],
"award": [
{
@@ -78,9 +76,7 @@
207,
208,
209,
- 210,
- 211,
- 212
+ 210
],
"award": [
{
@@ -126,9 +122,7 @@
307,
308,
309,
- 310,
- 311,
- 312
+ 310
],
"award": [
{
@@ -174,9 +168,7 @@
407,
408,
409,
- 410,
- 411,
- 412
+ 410
],
"award": [
{
@@ -222,9 +214,7 @@
507,
508,
509,
- 510,
- 511,
- 512
+ 510
],
"award": [
{
@@ -270,9 +260,7 @@
607,
608,
609,
- 610,
- 611,
- 612
+ 610
],
"award": [
{
@@ -318,9 +306,7 @@
707,
708,
709,
- 710,
- 711,
- 712
+ 710
],
"award": [
{
@@ -366,9 +352,7 @@
807,
808,
809,
- 810,
- 811,
- 812
+ 810
],
"award": [
{
@@ -414,9 +398,7 @@
907,
908,
909,
- 910,
- 911,
- 912
+ 910
],
"award": [
{
@@ -462,9 +444,7 @@
1007,
1008,
1009,
- 1010,
- 1011,
- 1012
+ 1010
],
"award": [
{
diff --git a/bin/json/game_mainlineeasy.json b/bin/json/game_mainlineeasy.json
index 4068786d7..5384ebe8e 100644
--- a/bin/json/game_mainlineeasy.json
+++ b/bin/json/game_mainlineeasy.json
@@ -576,138 +576,16 @@
}
},
{
- "id": 111,
+ "id": 201,
"previoustage": 110,
"order": 11,
- "linearnum": 11,
- "chapter": 1,
- "route": 1,
- "Episodetype": 1,
- "Episodelocation": [
- 474,
- 601
- ],
- "model": "",
- "effect": "",
- "enemywave": 1,
- "enemy1lv": 11,
- "enemy1hppro": 1,
- "enemy1atkpro": 1,
- "enemy1defpro": 0.5,
- "enemy2lv": 11,
- "enemy2hppro": 1,
- "enemy2atkpro": 1,
- "enemy2defpro": 0.5,
- "wave1enemyid": [
- 250011,
- 340061,
- 440051,
- 240031,
- 350021
- ],
- "wave2enemyid": [
- 250017,
- 340061,
- 440051,
- 240031,
- 350021
- ],
- "enemyid": "zx_42271",
- "battlescene": "bg_zhandoulmboss",
- "sceneeffect": "",
- "award": [
- {
- "a": "item",
- "t": "1",
- "n": 1
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 40010
- }
- ],
- "title": {
- "key": "mainline_title_10011",
- "text": "第7关：太狼来袭"
- },
- "desc": {
- "key": "mainline_name_10071",
- "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
- }
- },
- {
- "id": 112,
- "previoustage": 111,
- "order": 12,
- "linearnum": 12,
- "chapter": 1,
- "route": 1,
- "Episodetype": 1,
- "Episodelocation": [
- 815,
- 387
- ],
- "model": "",
- "effect": "",
- "enemywave": 1,
- "enemy1lv": 12,
- "enemy1hppro": 1,
- "enemy1atkpro": 1.1,
- "enemy1defpro": 0.8,
- "enemy2lv": 12,
- "enemy2hppro": 1,
- "enemy2atkpro": 1.1,
- "enemy2defpro": 0.8,
- "wave1enemyid": [
- 250011,
- 340061,
- 440051,
- 240031,
- 350021
- ],
- "wave2enemyid": [
- 250018,
- 340061,
- 440051,
- 240031,
- 350021
- ],
- "enemyid": "zx_42271",
- "battlescene": "bg_zhandoulmboss",
- "sceneeffect": "",
- "award": [
- {
- "a": "item",
- "t": "1",
- "n": 1
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 40011
- }
- ],
- "title": {
- "key": "mainline_title_10012",
- "text": "第8关：乌龟大师"
- },
- "desc": {
- "key": "mainline_name_10071",
- "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
- }
- },
- {
- "id": 201,
- "previoustage": 112,
- "order": 13,
"linearnum": 1,
"chapter": 2,
"route": 1,
"Episodetype": 1,
"Episodelocation": [
- 838,
- 836
+ 474,
+ 601
],
"model": "",
"effect": "",
@@ -761,14 +639,14 @@
{
"id": 202,
"previoustage": 201,
- "order": 14,
+ "order": 12,
"linearnum": 2,
"chapter": 2,
"route": 1,
"Episodetype": 1,
"Episodelocation": [
- 1570,
- 895
+ 815,
+ 387
],
"model": "",
"effect": "",
@@ -822,14 +700,14 @@
{
"id": 203,
"previoustage": 202,
- "order": 15,
+ "order": 13,
"linearnum": 3,
"chapter": 2,
"route": 1,
"Episodetype": 1,
"Episodelocation": [
- 2164,
- 1329
+ 838,
+ 836
],
"model": "",
"effect": "",
@@ -883,14 +761,14 @@
{
"id": 204,
"previoustage": 203,
- "order": 16,
+ "order": 14,
"linearnum": 4,
"chapter": 2,
"route": 2,
"Episodetype": 1,
"Episodelocation": [
- 2687,
- 759
+ 1570,
+ 895
],
"model": "",
"effect": "",
@@ -944,14 +822,14 @@
{
"id": 205,
"previoustage": 204,
- "order": 17,
+ "order": 15,
"linearnum": 5,
"chapter": 2,
"route": 2,
"Episodetype": 1,
"Episodelocation": [
- 2064,
- 346
+ 2164,
+ 1329
],
"model": "",
"effect": "",
@@ -1005,14 +883,14 @@
{
"id": 206,
"previoustage": 205,
- "order": 18,
+ "order": 16,
"linearnum": 6,
"chapter": 2,
"route": 2,
"Episodetype": 1,
"Episodelocation": [
- 1369,
- 380
+ 2687,
+ 759
],
"model": "",
"effect": "",
@@ -1066,14 +944,14 @@
{
"id": 207,
"previoustage": 206,
- "order": 19,
+ "order": 17,
"linearnum": 7,
"chapter": 2,
"route": 2,
"Episodetype": 1,
"Episodelocation": [
- 1424,
- 651
+ 2064,
+ 346
],
"model": "",
"effect": "",
@@ -1127,14 +1005,14 @@
{
"id": 208,
"previoustage": 207,
- "order": 20,
+ "order": 18,
"linearnum": 8,
"chapter": 2,
"route": 2,
"Episodetype": 1,
"Episodelocation": [
- 2000,
- 752
+ 1369,
+ 380
],
"model": "",
"effect": "",
@@ -1188,14 +1066,14 @@
{
"id": 209,
"previoustage": 208,
- "order": 21,
+ "order": 19,
"linearnum": 9,
"chapter": 2,
"route": 3,
"Episodetype": 1,
"Episodelocation": [
- 2000,
- 752
+ 1424,
+ 651
],
"model": "",
"effect": "",
@@ -1249,14 +1127,14 @@
{
"id": 210,
"previoustage": 209,
- "order": 22,
+ "order": 20,
"linearnum": 10,
"chapter": 2,
"route": 3,
"Episodetype": 1,
"Episodelocation": [
- 200,
- 53
+ 2000,
+ 752
],
"model": "",
"effect": "",
@@ -1308,138 +1186,16 @@
}
},
{
- "id": 211,
+ "id": 301,
"previoustage": 210,
"order": 23,
- "linearnum": 11,
- "chapter": 2,
- "route": 3,
- "Episodetype": 1,
- "Episodelocation": [
- 474,
- 601
- ],
- "model": "",
- "effect": "",
- "enemywave": 1,
- "enemy1lv": 24,
- "enemy1hppro": 0.7,
- "enemy1atkpro": 1,
- "enemy1defpro": 0.8,
- "enemy2lv": 24,
- "enemy2hppro": 0.7,
- "enemy2atkpro": 1,
- "enemy2defpro": 0.8,
- "wave1enemyid": [
- 250011,
- 340061,
- 440051,
- 240031,
- 350021
- ],
- "wave2enemyid": [
- 250029,
- 340061,
- 440051,
- 240031,
- 350021
- ],
- "enemyid": "zx_42271",
- "battlescene": "bg_zhandoulmboss",
- "sceneeffect": "",
- "award": [
- {
- "a": "item",
- "t": "1",
- "n": 1
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 40022
- }
- ],
- "title": {
- "key": "mainline_title_10023",
- "text": "第13关：太狼来袭"
- },
- "desc": {
- "key": "mainline_name_10071",
- "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
- }
- },
- {
- "id": 212,
- "previoustage": 211,
- "order": 24,
- "linearnum": 12,
- "chapter": 2,
- "route": 3,
- "Episodetype": 1,
- "Episodelocation": [
- 815,
- 387
- ],
- "model": "",
- "effect": "",
- "enemywave": 1,
- "enemy1lv": 25,
- "enemy1hppro": 0.8,
- "enemy1atkpro": 1.1,
- "enemy1defpro": 1,
- "enemy2lv": 25,
- "enemy2hppro": 0.8,
- "enemy2atkpro": 1.1,
- "enemy2defpro": 1,
- "wave1enemyid": [
- 250011,
- 340061,
- 440051,
- 240031,
- 350021
- ],
- "wave2enemyid": [
- 250030,
- 340061,
- 440051,
- 240031,
- 350021
- ],
- "enemyid": "zx_42271",
- "battlescene": "bg_zhandoulmboss",
- "sceneeffect": "",
- "award": [
- {
- "a": "item",
- "t": "1",
- "n": 1
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 40023
- }
- ],
- "title": {
- "key": "mainline_title_10024",
- "text": "第14关：乌龟大师"
- },
- "desc": {
- "key": "mainline_name_10071",
- "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
- }
- },
- {
- "id": 301,
- "previoustage": 212,
- "order": 25,
"linearnum": 1,
"chapter": 3,
"route": 3,
"Episodetype": 1,
"Episodelocation": [
- 838,
- 836
+ 474,
+ 601
],
"model": "",
"effect": "",
@@ -1493,14 +1249,14 @@
{
"id": 302,
"previoustage": 301,
- "order": 26,
+ "order": 24,
"linearnum": 2,
"chapter": 3,
"route": 4,
"Episodetype": 1,
"Episodelocation": [
- 1570,
- 895
+ 815,
+ 387
],
"model": "",
"effect": "",
@@ -1554,14 +1310,14 @@
{
"id": 303,
"previoustage": 302,
- "order": 27,
+ "order": 25,
"linearnum": 3,
"chapter": 3,
"route": 4,
"Episodetype": 1,
"Episodelocation": [
- 2164,
- 1329
+ 838,
+ 836
],
"model": "",
"effect": "",
@@ -1615,14 +1371,14 @@
{
"id": 304,
"previoustage": 303,
- "order": 28,
+ "order": 26,
"linearnum": 4,
"chapter": 3,
"route": 4,
"Episodetype": 1,
"Episodelocation": [
- 2687,
- 759
+ 1570,
+ 895
],
"model": "",
"effect": "",
@@ -1676,14 +1432,14 @@
{
"id": 305,
"previoustage": 304,
- "order": 29,
+ "order": 27,
"linearnum": 5,
"chapter": 3,
"route": 4,
"Episodetype": 1,
"Episodelocation": [
- 2064,
- 346
+ 2164,
+ 1329
],
"model": "",
"effect": "",
@@ -1737,14 +1493,14 @@
{
"id": 306,
"previoustage": 305,
- "order": 30,
+ "order": 28,
"linearnum": 6,
"chapter": 3,
"route": 4,
"Episodetype": 1,
"Episodelocation": [
- 1369,
- 380
+ 2687,
+ 759
],
"model": "",
"effect": "",
@@ -1798,14 +1554,14 @@
{
"id": 307,
"previoustage": 306,
- "order": 31,
+ "order": 29,
"linearnum": 7,
"chapter": 3,
"route": 1,
"Episodetype": 1,
"Episodelocation": [
- 1424,
- 651
+ 2064,
+ 346
],
"model": "",
"effect": "",
@@ -1859,14 +1615,14 @@
{
"id": 308,
"previoustage": 307,
- "order": 32,
+ "order": 30,
"linearnum": 8,
"chapter": 3,
"route": 1,
"Episodetype": 1,
"Episodelocation": [
- 2000,
- 752
+ 1369,
+ 380
],
"model": "",
"effect": "",
@@ -1920,14 +1676,14 @@
{
"id": 309,
"previoustage": 308,
- "order": 33,
+ "order": 31,
"linearnum": 9,
"chapter": 3,
"route": 1,
"Episodetype": 1,
"Episodelocation": [
- 200,
- 53
+ 1424,
+ 651
],
"model": "",
"effect": "",
@@ -1981,14 +1737,14 @@
{
"id": 310,
"previoustage": 309,
- "order": 34,
+ "order": 32,
"linearnum": 10,
"chapter": 3,
"route": 1,
"Episodetype": 1,
"Episodelocation": [
- 474,
- 601
+ 2000,
+ 752
],
"model": "",
"effect": "",
@@ -2040,16 +1796,16 @@
}
},
{
- "id": 311,
+ "id": 401,
"previoustage": 310,
- "order": 35,
+ "order": 33,
"linearnum": 11,
- "chapter": 3,
+ "chapter": 4,
"route": 1,
"Episodetype": 1,
"Episodelocation": [
- 815,
- 387
+ 838,
+ 836
],
"model": "",
"effect": "",
@@ -2101,11 +1857,11 @@
}
},
{
- "id": 312,
- "previoustage": 311,
- "order": 36,
+ "id": 402,
+ "previoustage": 401,
+ "order": 34,
"linearnum": 12,
- "chapter": 3,
+ "chapter": 4,
"route": 2,
"Episodetype": 1,
"Episodelocation": [
@@ -2162,9 +1918,9 @@
}
},
{
- "id": 401,
- "previoustage": 312,
- "order": 37,
+ "id": 403,
+ "previoustage": 402,
+ "order": 35,
"linearnum": 1,
"chapter": 4,
"route": 2,
@@ -2223,9 +1979,9 @@
}
},
{
- "id": 402,
- "previoustage": 401,
- "order": 38,
+ "id": 404,
+ "previoustage": 403,
+ "order": 36,
"linearnum": 2,
"chapter": 4,
"route": 2,
@@ -2284,9 +2040,9 @@
}
},
{
- "id": 403,
- "previoustage": 402,
- "order": 39,
+ "id": 405,
+ "previoustage": 404,
+ "order": 37,
"linearnum": 3,
"chapter": 4,
"route": 2,
@@ -2345,9 +2101,9 @@
}
},
{
- "id": 404,
- "previoustage": 403,
- "order": 40,
+ "id": 406,
+ "previoustage": 405,
+ "order": 38,
"linearnum": 4,
"chapter": 4,
"route": 2,
@@ -2406,9 +2162,9 @@
}
},
{
- "id": 405,
- "previoustage": 404,
- "order": 41,
+ "id": 407,
+ "previoustage": 406,
+ "order": 39,
"linearnum": 5,
"chapter": 4,
"route": 3,
@@ -2467,9 +2223,9 @@
}
},
{
- "id": 406,
- "previoustage": 405,
- "order": 42,
+ "id": 408,
+ "previoustage": 407,
+ "order": 40,
"linearnum": 6,
"chapter": 4,
"route": 3,
@@ -2528,9 +2284,9 @@
}
},
{
- "id": 407,
- "previoustage": 406,
- "order": 43,
+ "id": 409,
+ "previoustage": 408,
+ "order": 41,
"linearnum": 7,
"chapter": 4,
"route": 3,
@@ -2589,9 +2345,9 @@
}
},
{
- "id": 408,
- "previoustage": 407,
- "order": 44,
+ "id": 410,
+ "previoustage": 409,
+ "order": 42,
"linearnum": 8,
"chapter": 4,
"route": 3,
@@ -2650,11 +2406,11 @@
}
},
{
- "id": 409,
- "previoustage": 408,
- "order": 45,
+ "id": 501,
+ "previoustage": 410,
+ "order": 43,
"linearnum": 9,
- "chapter": 4,
+ "chapter": 5,
"route": 3,
"Episodetype": 1,
"Episodelocation": [
@@ -2711,11 +2467,11 @@
}
},
{
- "id": 410,
- "previoustage": 409,
- "order": 46,
+ "id": 502,
+ "previoustage": 501,
+ "order": 44,
"linearnum": 10,
- "chapter": 4,
+ "chapter": 5,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -2769,11 +2525,11 @@
}
},
{
- "id": 411,
- "previoustage": 410,
- "order": 47,
+ "id": 503,
+ "previoustage": 502,
+ "order": 45,
"linearnum": 11,
- "chapter": 4,
+ "chapter": 5,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -2827,11 +2583,11 @@
}
},
{
- "id": 412,
- "previoustage": 411,
- "order": 48,
+ "id": 504,
+ "previoustage": 503,
+ "order": 46,
"linearnum": 12,
- "chapter": 4,
+ "chapter": 5,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -2885,9 +2641,9 @@
}
},
{
- "id": 501,
- "previoustage": 412,
- "order": 49,
+ "id": 505,
+ "previoustage": 504,
+ "order": 47,
"linearnum": 1,
"chapter": 5,
"route": 4,
@@ -2943,9 +2699,9 @@
}
},
{
- "id": 502,
- "previoustage": 501,
- "order": 50,
+ "id": 506,
+ "previoustage": 505,
+ "order": 48,
"linearnum": 2,
"chapter": 5,
"route": 4,
@@ -3004,9 +2760,9 @@
}
},
{
- "id": 503,
- "previoustage": 502,
- "order": 51,
+ "id": 507,
+ "previoustage": 506,
+ "order": 49,
"linearnum": 3,
"chapter": 5,
"route": 4,
@@ -3062,9 +2818,9 @@
}
},
{
- "id": 504,
- "previoustage": 503,
- "order": 52,
+ "id": 508,
+ "previoustage": 507,
+ "order": 50,
"linearnum": 4,
"chapter": 5,
"route": 4,
@@ -3120,9 +2876,9 @@
}
},
{
- "id": 505,
- "previoustage": 504,
- "order": 53,
+ "id": 509,
+ "previoustage": 508,
+ "order": 51,
"linearnum": 5,
"chapter": 5,
"route": 4,
@@ -3178,9 +2934,9 @@
}
},
{
- "id": 506,
- "previoustage": 505,
- "order": 54,
+ "id": 510,
+ "previoustage": 509,
+ "order": 52,
"linearnum": 6,
"chapter": 5,
"route": 4,
@@ -3236,11 +2992,11 @@
}
},
{
- "id": 507,
- "previoustage": 506,
- "order": 55,
+ "id": 601,
+ "previoustage": 510,
+ "order": 53,
"linearnum": 7,
- "chapter": 5,
+ "chapter": 6,
"route": 4,
"Episodetype": 1,
"Episodelocation": [
@@ -3297,11 +3053,11 @@
}
},
{
- "id": 508,
- "previoustage": 507,
- "order": 56,
+ "id": 602,
+ "previoustage": 601,
+ "order": 54,
"linearnum": 8,
- "chapter": 5,
+ "chapter": 6,
"route": 1,
"Episodetype": 1,
"Episodelocation": [
@@ -3358,11 +3114,11 @@
}
},
{
- "id": 509,
- "previoustage": 508,
- "order": 57,
+ "id": 603,
+ "previoustage": 602,
+ "order": 55,
"linearnum": 9,
- "chapter": 5,
+ "chapter": 6,
"route": 1,
"Episodetype": 1,
"Episodelocation": [],
@@ -3416,11 +3172,11 @@
}
},
{
- "id": 510,
- "previoustage": 509,
- "order": 58,
+ "id": 604,
+ "previoustage": 603,
+ "order": 56,
"linearnum": 10,
- "chapter": 5,
+ "chapter": 6,
"route": 1,
"Episodetype": 1,
"Episodelocation": [],
@@ -3474,11 +3230,11 @@
}
},
{
- "id": 511,
- "previoustage": 510,
- "order": 59,
+ "id": 605,
+ "previoustage": 604,
+ "order": 57,
"linearnum": 11,
- "chapter": 5,
+ "chapter": 6,
"route": 1,
"Episodetype": 1,
"Episodelocation": [],
@@ -3532,11 +3288,11 @@
}
},
{
- "id": 512,
- "previoustage": 511,
- "order": 60,
+ "id": 606,
+ "previoustage": 605,
+ "order": 58,
"linearnum": 12,
- "chapter": 5,
+ "chapter": 6,
"route": 1,
"Episodetype": 1,
"Episodelocation": [
@@ -3593,9 +3349,9 @@
}
},
{
- "id": 601,
- "previoustage": 512,
- "order": 61,
+ "id": 607,
+ "previoustage": 606,
+ "order": 59,
"linearnum": 1,
"chapter": 6,
"route": 2,
@@ -3651,9 +3407,9 @@
}
},
{
- "id": 602,
- "previoustage": 601,
- "order": 62,
+ "id": 608,
+ "previoustage": 607,
+ "order": 60,
"linearnum": 2,
"chapter": 6,
"route": 2,
@@ -3709,9 +3465,9 @@
}
},
{
- "id": 603,
- "previoustage": 602,
- "order": 63,
+ "id": 609,
+ "previoustage": 608,
+ "order": 61,
"linearnum": 3,
"chapter": 6,
"route": 2,
@@ -3767,9 +3523,9 @@
}
},
{
- "id": 604,
- "previoustage": 603,
- "order": 64,
+ "id": 610,
+ "previoustage": 609,
+ "order": 62,
"linearnum": 4,
"chapter": 6,
"route": 2,
@@ -3825,11 +3581,11 @@
}
},
{
- "id": 605,
- "previoustage": 604,
- "order": 65,
+ "id": 701,
+ "previoustage": 610,
+ "order": 63,
"linearnum": 5,
- "chapter": 6,
+ "chapter": 7,
"route": 2,
"Episodetype": 1,
"Episodelocation": [
@@ -3886,11 +3642,11 @@
}
},
{
- "id": 606,
- "previoustage": 605,
- "order": 66,
+ "id": 702,
+ "previoustage": 701,
+ "order": 64,
"linearnum": 6,
- "chapter": 6,
+ "chapter": 7,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -3944,11 +3700,11 @@
}
},
{
- "id": 607,
- "previoustage": 606,
- "order": 67,
+ "id": 703,
+ "previoustage": 702,
+ "order": 65,
"linearnum": 7,
- "chapter": 6,
+ "chapter": 7,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -4002,11 +3758,11 @@
}
},
{
- "id": 608,
- "previoustage": 607,
- "order": 68,
+ "id": 704,
+ "previoustage": 703,
+ "order": 66,
"linearnum": 8,
- "chapter": 6,
+ "chapter": 7,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -4060,11 +3816,11 @@
}
},
{
- "id": 609,
- "previoustage": 608,
- "order": 69,
+ "id": 705,
+ "previoustage": 704,
+ "order": 67,
"linearnum": 9,
- "chapter": 6,
+ "chapter": 7,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -4118,11 +3874,11 @@
}
},
{
- "id": 610,
- "previoustage": 609,
- "order": 70,
+ "id": 706,
+ "previoustage": 705,
+ "order": 68,
"linearnum": 10,
- "chapter": 6,
+ "chapter": 7,
"route": 3,
"Episodetype": 1,
"Episodelocation": [
@@ -4179,11 +3935,11 @@
}
},
{
- "id": 611,
- "previoustage": 610,
- "order": 71,
+ "id": 707,
+ "previoustage": 706,
+ "order": 69,
"linearnum": 11,
- "chapter": 6,
+ "chapter": 7,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -4237,11 +3993,11 @@
}
},
{
- "id": 612,
- "previoustage": 611,
- "order": 72,
+ "id": 708,
+ "previoustage": 707,
+ "order": 70,
"linearnum": 12,
- "chapter": 6,
+ "chapter": 7,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -4295,9 +4051,9 @@
}
},
{
- "id": 701,
- "previoustage": 612,
- "order": 73,
+ "id": 709,
+ "previoustage": 708,
+ "order": 71,
"linearnum": 1,
"chapter": 7,
"route": 3,
@@ -4353,9 +4109,9 @@
}
},
{
- "id": 702,
- "previoustage": 701,
- "order": 74,
+ "id": 710,
+ "previoustage": 709,
+ "order": 72,
"linearnum": 2,
"chapter": 7,
"route": 3,
@@ -4411,11 +4167,11 @@
}
},
{
- "id": 703,
- "previoustage": 702,
- "order": 75,
+ "id": 801,
+ "previoustage": 710,
+ "order": 73,
"linearnum": 3,
- "chapter": 7,
+ "chapter": 8,
"route": 3,
"Episodetype": 1,
"Episodelocation": [
@@ -4472,11 +4228,11 @@
}
},
{
- "id": 704,
- "previoustage": 703,
- "order": 76,
+ "id": 802,
+ "previoustage": 801,
+ "order": 74,
"linearnum": 4,
- "chapter": 7,
+ "chapter": 8,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -4530,11 +4286,11 @@
}
},
{
- "id": 705,
- "previoustage": 704,
- "order": 77,
+ "id": 803,
+ "previoustage": 802,
+ "order": 75,
"linearnum": 5,
- "chapter": 7,
+ "chapter": 8,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -4588,11 +4344,11 @@
}
},
{
- "id": 706,
- "previoustage": 705,
- "order": 78,
+ "id": 804,
+ "previoustage": 803,
+ "order": 76,
"linearnum": 6,
- "chapter": 7,
+ "chapter": 8,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -4646,11 +4402,11 @@
}
},
{
- "id": 707,
- "previoustage": 706,
- "order": 79,
+ "id": 805,
+ "previoustage": 804,
+ "order": 77,
"linearnum": 7,
- "chapter": 7,
+ "chapter": 8,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -4704,11 +4460,11 @@
}
},
{
- "id": 708,
- "previoustage": 707,
- "order": 80,
+ "id": 806,
+ "previoustage": 805,
+ "order": 78,
"linearnum": 8,
- "chapter": 7,
+ "chapter": 8,
"route": 4,
"Episodetype": 1,
"Episodelocation": [
@@ -4765,11 +4521,11 @@
}
},
{
- "id": 709,
- "previoustage": 708,
- "order": 81,
+ "id": 807,
+ "previoustage": 806,
+ "order": 79,
"linearnum": 9,
- "chapter": 7,
+ "chapter": 8,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -4823,11 +4579,11 @@
}
},
{
- "id": 710,
- "previoustage": 709,
- "order": 82,
+ "id": 808,
+ "previoustage": 807,
+ "order": 80,
"linearnum": 10,
- "chapter": 7,
+ "chapter": 8,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -4881,11 +4637,11 @@
}
},
{
- "id": 711,
- "previoustage": 710,
- "order": 83,
+ "id": 809,
+ "previoustage": 808,
+ "order": 81,
"linearnum": 11,
- "chapter": 7,
+ "chapter": 8,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -4939,11 +4695,11 @@
}
},
{
- "id": 712,
- "previoustage": 711,
- "order": 84,
+ "id": 810,
+ "previoustage": 809,
+ "order": 82,
"linearnum": 12,
- "chapter": 7,
+ "chapter": 8,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -4997,11 +4753,11 @@
}
},
{
- "id": 801,
- "previoustage": 712,
- "order": 85,
+ "id": 901,
+ "previoustage": 810,
+ "order": 83,
"linearnum": 1,
- "chapter": 8,
+ "chapter": 9,
"route": 4,
"Episodetype": 1,
"Episodelocation": [
@@ -5058,11 +4814,11 @@
}
},
{
- "id": 802,
- "previoustage": 801,
- "order": 86,
+ "id": 902,
+ "previoustage": 901,
+ "order": 84,
"linearnum": 2,
- "chapter": 8,
+ "chapter": 9,
"route": 1,
"Episodetype": 1,
"Episodelocation": [
@@ -5119,11 +4875,11 @@
}
},
{
- "id": 803,
- "previoustage": 802,
- "order": 87,
+ "id": 903,
+ "previoustage": 902,
+ "order": 85,
"linearnum": 3,
- "chapter": 8,
+ "chapter": 9,
"route": 1,
"Episodetype": 1,
"Episodelocation": [],
@@ -5177,11 +4933,11 @@
}
},
{
- "id": 804,
- "previoustage": 803,
- "order": 88,
+ "id": 904,
+ "previoustage": 903,
+ "order": 86,
"linearnum": 4,
- "chapter": 8,
+ "chapter": 9,
"route": 1,
"Episodetype": 1,
"Episodelocation": [],
@@ -5235,11 +4991,11 @@
}
},
{
- "id": 805,
- "previoustage": 804,
- "order": 89,
+ "id": 905,
+ "previoustage": 904,
+ "order": 87,
"linearnum": 5,
- "chapter": 8,
+ "chapter": 9,
"route": 1,
"Episodetype": 1,
"Episodelocation": [],
@@ -5293,11 +5049,11 @@
}
},
{
- "id": 806,
- "previoustage": 805,
- "order": 90,
+ "id": 906,
+ "previoustage": 905,
+ "order": 88,
"linearnum": 6,
- "chapter": 8,
+ "chapter": 9,
"route": 1,
"Episodetype": 1,
"Episodelocation": [
@@ -5354,11 +5110,11 @@
}
},
{
- "id": 807,
- "previoustage": 806,
- "order": 91,
+ "id": 907,
+ "previoustage": 906,
+ "order": 89,
"linearnum": 7,
- "chapter": 8,
+ "chapter": 9,
"route": 2,
"Episodetype": 1,
"Episodelocation": [],
@@ -5412,11 +5168,11 @@
}
},
{
- "id": 808,
- "previoustage": 807,
- "order": 92,
+ "id": 908,
+ "previoustage": 907,
+ "order": 90,
"linearnum": 8,
- "chapter": 8,
+ "chapter": 9,
"route": 2,
"Episodetype": 1,
"Episodelocation": [],
@@ -5470,11 +5226,11 @@
}
},
{
- "id": 809,
- "previoustage": 808,
- "order": 93,
+ "id": 909,
+ "previoustage": 908,
+ "order": 91,
"linearnum": 9,
- "chapter": 8,
+ "chapter": 9,
"route": 2,
"Episodetype": 1,
"Episodelocation": [],
@@ -5528,11 +5284,11 @@
}
},
{
- "id": 810,
- "previoustage": 809,
- "order": 94,
+ "id": 910,
+ "previoustage": 909,
+ "order": 92,
"linearnum": 10,
- "chapter": 8,
+ "chapter": 9,
"route": 2,
"Episodetype": 1,
"Episodelocation": [],
@@ -5586,11 +5342,11 @@
}
},
{
- "id": 811,
- "previoustage": 810,
- "order": 95,
+ "id": 1001,
+ "previoustage": 910,
+ "order": 93,
"linearnum": 11,
- "chapter": 8,
+ "chapter": 10,
"route": 2,
"Episodetype": 1,
"Episodelocation": [
@@ -5647,11 +5403,11 @@
}
},
{
- "id": 812,
- "previoustage": 811,
- "order": 96,
+ "id": 1002,
+ "previoustage": 1001,
+ "order": 94,
"linearnum": 12,
- "chapter": 8,
+ "chapter": 10,
"route": 2,
"Episodetype": 1,
"Episodelocation": [],
@@ -5705,11 +5461,11 @@
}
},
{
- "id": 901,
- "previoustage": 812,
- "order": 97,
+ "id": 1003,
+ "previoustage": 1002,
+ "order": 95,
"linearnum": 1,
- "chapter": 9,
+ "chapter": 10,
"route": 2,
"Episodetype": 1,
"Episodelocation": [],
@@ -5763,11 +5519,11 @@
}
},
{
- "id": 902,
- "previoustage": 901,
- "order": 98,
+ "id": 1004,
+ "previoustage": 1003,
+ "order": 96,
"linearnum": 2,
- "chapter": 9,
+ "chapter": 10,
"route": 2,
"Episodetype": 1,
"Episodelocation": [],
@@ -5821,11 +5577,11 @@
}
},
{
- "id": 903,
- "previoustage": 902,
- "order": 99,
+ "id": 1005,
+ "previoustage": 1004,
+ "order": 97,
"linearnum": 3,
- "chapter": 9,
+ "chapter": 10,
"route": 2,
"Episodetype": 1,
"Episodelocation": [],
@@ -5879,11 +5635,11 @@
}
},
{
- "id": 904,
- "previoustage": 903,
- "order": 100,
+ "id": 1006,
+ "previoustage": 1005,
+ "order": 98,
"linearnum": 4,
- "chapter": 9,
+ "chapter": 10,
"route": 2,
"Episodetype": 1,
"Episodelocation": [
@@ -5940,11 +5696,11 @@
}
},
{
- "id": 905,
- "previoustage": 904,
- "order": 101,
+ "id": 1007,
+ "previoustage": 1006,
+ "order": 99,
"linearnum": 5,
- "chapter": 9,
+ "chapter": 10,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -5998,11 +5754,11 @@
}
},
{
- "id": 906,
- "previoustage": 905,
- "order": 102,
+ "id": 1008,
+ "previoustage": 1007,
+ "order": 100,
"linearnum": 6,
- "chapter": 9,
+ "chapter": 10,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -6056,11 +5812,11 @@
}
},
{
- "id": 907,
- "previoustage": 906,
- "order": 103,
+ "id": 1009,
+ "previoustage": 1008,
+ "order": 101,
"linearnum": 7,
- "chapter": 9,
+ "chapter": 10,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -6114,11 +5870,11 @@
}
},
{
- "id": 908,
- "previoustage": 907,
- "order": 104,
+ "id": 1010,
+ "previoustage": 1009,
+ "order": 102,
"linearnum": 8,
- "chapter": 9,
+ "chapter": 10,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -6172,11 +5928,11 @@
}
},
{
- "id": 909,
- "previoustage": 908,
- "order": 105,
+ "id": 1101,
+ "previoustage": 1010,
+ "order": 103,
"linearnum": 9,
- "chapter": 9,
+ "chapter": 11,
"route": 3,
"Episodetype": 1,
"Episodelocation": [
@@ -6233,11 +5989,11 @@
}
},
{
- "id": 910,
- "previoustage": 909,
- "order": 106,
+ "id": 1102,
+ "previoustage": 1101,
+ "order": 104,
"linearnum": 10,
- "chapter": 9,
+ "chapter": 11,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -6291,11 +6047,11 @@
}
},
{
- "id": 911,
- "previoustage": 910,
- "order": 107,
+ "id": 1103,
+ "previoustage": 1102,
+ "order": 105,
"linearnum": 11,
- "chapter": 9,
+ "chapter": 11,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -6349,11 +6105,11 @@
}
},
{
- "id": 912,
- "previoustage": 911,
- "order": 108,
+ "id": 1104,
+ "previoustage": 1103,
+ "order": 106,
"linearnum": 12,
- "chapter": 9,
+ "chapter": 11,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -6407,11 +6163,11 @@
}
},
{
- "id": 1001,
- "previoustage": 912,
- "order": 109,
+ "id": 1105,
+ "previoustage": 1104,
+ "order": 107,
"linearnum": 1,
- "chapter": 10,
+ "chapter": 11,
"route": 3,
"Episodetype": 1,
"Episodelocation": [],
@@ -6465,11 +6221,11 @@
}
},
{
- "id": 1002,
- "previoustage": 1001,
- "order": 110,
+ "id": 1106,
+ "previoustage": 1105,
+ "order": 108,
"linearnum": 2,
- "chapter": 10,
+ "chapter": 11,
"route": 3,
"Episodetype": 1,
"Episodelocation": [
@@ -6526,11 +6282,11 @@
}
},
{
- "id": 1003,
- "previoustage": 1002,
- "order": 111,
+ "id": 1107,
+ "previoustage": 1106,
+ "order": 109,
"linearnum": 3,
- "chapter": 10,
+ "chapter": 11,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -6584,11 +6340,11 @@
}
},
{
- "id": 1004,
- "previoustage": 1003,
- "order": 112,
+ "id": 1108,
+ "previoustage": 1107,
+ "order": 110,
"linearnum": 4,
- "chapter": 10,
+ "chapter": 11,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -6642,11 +6398,11 @@
}
},
{
- "id": 1005,
- "previoustage": 1004,
- "order": 113,
+ "id": 1109,
+ "previoustage": 1108,
+ "order": 111,
"linearnum": 5,
- "chapter": 10,
+ "chapter": 11,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -6700,11 +6456,11 @@
}
},
{
- "id": 1006,
- "previoustage": 1005,
- "order": 114,
+ "id": 1110,
+ "previoustage": 1109,
+ "order": 112,
"linearnum": 6,
- "chapter": 10,
+ "chapter": 11,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -6758,11 +6514,11 @@
}
},
{
- "id": 1007,
- "previoustage": 1006,
- "order": 115,
+ "id": 1201,
+ "previoustage": 1110,
+ "order": 113,
"linearnum": 7,
- "chapter": 10,
+ "chapter": 12,
"route": 4,
"Episodetype": 1,
"Episodelocation": [
@@ -6819,11 +6575,11 @@
}
},
{
- "id": 1008,
- "previoustage": 1007,
- "order": 116,
+ "id": 1202,
+ "previoustage": 1201,
+ "order": 114,
"linearnum": 8,
- "chapter": 10,
+ "chapter": 12,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -6877,11 +6633,11 @@
}
},
{
- "id": 1009,
- "previoustage": 1008,
- "order": 117,
+ "id": 1203,
+ "previoustage": 1202,
+ "order": 115,
"linearnum": 9,
- "chapter": 10,
+ "chapter": 12,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -6935,11 +6691,11 @@
}
},
{
- "id": 1010,
- "previoustage": 1009,
- "order": 118,
+ "id": 1204,
+ "previoustage": 1203,
+ "order": 116,
"linearnum": 10,
- "chapter": 10,
+ "chapter": 12,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -6993,11 +6749,11 @@
}
},
{
- "id": 1011,
- "previoustage": 1010,
- "order": 119,
+ "id": 1205,
+ "previoustage": 1204,
+ "order": 117,
"linearnum": 11,
- "chapter": 10,
+ "chapter": 12,
"route": 4,
"Episodetype": 1,
"Episodelocation": [],
@@ -7051,11 +6807,11 @@
}
},
{
- "id": 1012,
- "previoustage": 1011,
- "order": 120,
+ "id": 1206,
+ "previoustage": 1205,
+ "order": 118,
"linearnum": 12,
- "chapter": 10,
+ "chapter": 12,
"route": 4,
"Episodetype": 1,
"Episodelocation": [
diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json
new file mode 100644
index 000000000..0637a088a
--- /dev/null
+++ b/bin/json/game_msgdistrib.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/bin/json/game_newhero.json b/bin/json/game_newhero.json
index a41930aad..bf14b1dd5 100644
--- a/bin/json/game_newhero.json
+++ b/bin/json/game_newhero.json
@@ -1287,7 +1287,7 @@
"job": 2,
"type": 1,
"handbook": 1,
- "prefab": 90002,
+ "prefab": 25001,
"icon": 25001,
"sound": {
"key": "25001",
@@ -1419,7 +1419,7 @@
"job": 3,
"type": 1,
"handbook": 1,
- "prefab": 90003,
+ "prefab": 25004,
"icon": 25004,
"sound": {
"key": "25004",
@@ -4542,8 +4542,8 @@
"race": 1,
"job": 1,
"type": 1,
- "handbook": 0,
- "prefab": 11001,
+ "handbook": -1,
+ "prefab": 25001,
"icon": 11001,
"sound": {
"key": "121323",
@@ -4556,7 +4556,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11001.asset",
+ "events": "Hero_11001",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -4564,7 +4564,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110011,
"skill2": 110012,
"skill3": 110013,
@@ -4579,15 +4579,15 @@
"hid": "11002",
"name": {
"key": "11002",
- "text": "原始人"
+ "text": "瓜哥"
},
"star": 5,
"color": 4,
"race": 1,
"job": 1,
"type": 1,
- "handbook": 0,
- "prefab": 11002,
+ "handbook": -1,
+ "prefab": 34004,
"icon": 11002,
"sound": {
"key": "11002",
@@ -4600,7 +4600,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11002.asset",
+ "events": "Hero_11002",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -4608,7 +4608,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110021,
"skill2": 110022,
"skill3": 110023,
@@ -4630,8 +4630,8 @@
"race": 2,
"job": 1,
"type": 1,
- "handbook": 0,
- "prefab": 11003,
+ "handbook": -1,
+ "prefab": 25004,
"icon": 11003,
"sound": {
"key": "11003",
@@ -4644,7 +4644,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11003.asset",
+ "events": "Hero_11003",
"cite": "",
"effectstay": [
"this,Skill/Role/11003/effect_11003_wuqitexiao"
@@ -4654,7 +4654,7 @@
"y": -0.69,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110031,
"skill2": 110032,
"skill3": 110033,
@@ -4669,15 +4669,15 @@
"hid": "11004",
"name": {
"key": "11004",
- "text": "布兰"
+ "text": "布兰奇"
},
"star": 5,
"color": 4,
"race": 1,
"job": 1,
"type": 1,
- "handbook": 0,
- "prefab": 11004,
+ "handbook": -1,
+ "prefab": 14006,
"icon": 11004,
"sound": {
"key": "11004",
@@ -4698,7 +4698,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110041,
"skill2": 110042,
"skill3": 110043,
@@ -4720,8 +4720,8 @@
"race": 1,
"job": 1,
"type": 1,
- "handbook": 0,
- "prefab": 11005,
+ "handbook": -1,
+ "prefab": 25003,
"icon": 11005,
"sound": {
"key": "121323",
@@ -4734,7 +4734,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11001.asset",
+ "events": "Hero_11001",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -4742,7 +4742,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110051,
"skill2": 110052,
"skill3": 110053,
@@ -4764,8 +4764,8 @@
"race": 1,
"job": 1,
"type": 1,
- "handbook": 0,
- "prefab": 11006,
+ "handbook": -1,
+ "prefab": 14003,
"icon": 11006,
"sound": {
"key": "11006",
@@ -4786,7 +4786,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110061,
"skill2": 110062,
"skill3": 110063,
@@ -4808,8 +4808,8 @@
"race": 3,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 11009,
+ "handbook": -1,
+ "prefab": 35002,
"icon": 11009,
"sound": {
"key": "11009",
@@ -4822,7 +4822,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11009.asset",
+ "events": "Hero_11009",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -4830,7 +4830,7 @@
"y": -0.1,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110091,
"skill2": 110092,
"skill3": 110093,
@@ -4845,15 +4845,15 @@
"hid": "22002",
"name": {
"key": "22002",
- "text": "沈王爷青春版"
+ "text": "贫嘴驴"
},
"star": 5,
"color": 4,
"race": 2,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 22002,
+ "handbook": -1,
+ "prefab": 34001,
"icon": 22002,
"sound": {
"key": "22002",
@@ -4874,7 +4874,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 220021,
"skill2": 220022,
"skill3": 220023,
@@ -4889,15 +4889,15 @@
"hid": "90001",
"name": {
"key": "90001",
- "text": "邪恶阿宝"
+ "text": "阿宝"
},
"star": 4,
"color": 3,
"race": 1,
"job": 1,
"type": 1,
- "handbook": 0,
- "prefab": 90001,
+ "handbook": -1,
+ "prefab": 25001,
"icon": 90001,
"sound": {
"key": "90001",
@@ -4918,7 +4918,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 900011,
"skill2": 900012,
"skill3": 900013,
@@ -4933,15 +4933,15 @@
"hid": "11011",
"name": {
"key": "11011",
- "text": "浣熊"
+ "text": "师父"
},
"star": 4,
"color": 3,
"race": 2,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 11011,
+ "handbook": -1,
+ "prefab": 35001,
"icon": 11011,
"sound": {
"key": "11011",
@@ -4954,7 +4954,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11011.asset",
+ "events": "Hero_11011",
"cite": "11011",
"effectstay": [],
"hpspace": {
@@ -4962,7 +4962,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110111,
"skill2": 110112,
"skill3": 110113,
@@ -4984,8 +4984,8 @@
"race": 2,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 11008,
+ "handbook": -1,
+ "prefab": 44006,
"icon": 11008,
"sound": {
"key": "11008",
@@ -4998,7 +4998,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11008.asset",
+ "events": "Hero_11008",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -5006,7 +5006,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110081,
"skill2": 110082,
"skill3": 110083,
@@ -5028,8 +5028,8 @@
"race": 4,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 11017,
+ "handbook": -1,
+ "prefab": 34006,
"icon": 11017,
"sound": {
"key": "11017",
@@ -5042,7 +5042,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11017.asset",
+ "events": "Hero_11017",
"cite": "",
"effectstay": [
"Bone001/Dummy001,Skill/Role/11017/effect_11017_weapon1"
@@ -5052,7 +5052,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110171,
"skill2": 110172,
"skill3": 110173,
@@ -5067,15 +5067,15 @@
"hid": "11018",
"name": {
"key": "11018",
- "text": "睡神"
+ "text": "睡神沙人"
},
"star": 5,
"color": 4,
"race": 4,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 11018,
+ "handbook": -1,
+ "prefab": 24003,
"icon": 11018,
"sound": {
"key": "11018",
@@ -5088,7 +5088,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11018.asset",
+ "events": "Hero_11018",
"cite": "",
"effectstay": [
"Bip001,Skill/Role/11018/effect_11018_sleep",
@@ -5099,7 +5099,7 @@
"y": -0.31,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110181,
"skill2": 110182,
"skill3": 110183,
@@ -5114,15 +5114,15 @@
"hid": "11019",
"name": {
"key": "11019",
- "text": "莫甘娜"
+ "text": "睡神沙人"
},
"star": 5,
"color": 4,
"race": 2,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 11019,
+ "handbook": -1,
+ "prefab": 24003,
"icon": 11019,
"sound": {
"key": "11019",
@@ -5135,7 +5135,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11019.asset",
+ "events": "Hero_11019",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -5143,7 +5143,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110191,
"skill2": 110192,
"skill3": 110193,
@@ -5158,15 +5158,15 @@
"hid": "11020",
"name": {
"key": "11020",
- "text": "莫甘娜二阶段"
+ "text": "睡神沙人"
},
"star": 5,
"color": 4,
"race": 2,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 11020,
+ "handbook": -1,
+ "prefab": 24003,
"icon": 11020,
"sound": {
"key": "11020",
@@ -5179,7 +5179,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11020.asset",
+ "events": "Hero_11020",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -5187,7 +5187,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110201,
"skill2": 110202,
"skill3": 110203,
@@ -5209,8 +5209,8 @@
"race": 2,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 11021,
+ "handbook": -1,
+ "prefab": 55007,
"icon": 11021,
"sound": {
"key": "11021",
@@ -5223,7 +5223,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11021.asset",
+ "events": "Hero_11021",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -5231,7 +5231,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110211,
"skill2": 110212,
"skill3": 110213,
@@ -5246,15 +5246,15 @@
"hid": "11099",
"name": {
"key": "11099",
- "text": "触手"
+ "text": "睡神沙人"
},
"star": 5,
"color": 4,
"race": 2,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 11099,
+ "handbook": -1,
+ "prefab": 24003,
"icon": 11099,
"sound": {
"key": "11099",
@@ -5267,7 +5267,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11099.asset",
+ "events": "Hero_11099",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -5275,7 +5275,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 110991,
"skill2": 110992,
"skill3": 110993,
@@ -5290,15 +5290,15 @@
"hid": "12001",
"name": {
"key": "12001",
- "text": "黑化阿宝"
+ "text": "睡神沙人"
},
"star": 5,
"color": 4,
"race": 2,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 12001,
+ "handbook": -1,
+ "prefab": 24003,
"icon": 12001,
"sound": {
"key": "121323",
@@ -5311,7 +5311,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_12001.asset",
+ "events": "Hero_12001",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -5319,7 +5319,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 120011,
"skill2": 120012,
"skill3": 120013,
@@ -5334,15 +5334,15 @@
"hid": "12003",
"name": {
"key": "12003",
- "text": "黑化包比"
+ "text": "睡神沙人"
},
"star": 5,
"color": 4,
"race": 2,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 12003,
+ "handbook": -1,
+ "prefab": 24003,
"icon": 12003,
"sound": {
"key": "12003",
@@ -5355,7 +5355,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11003.asset",
+ "events": "Hero_11003",
"cite": "",
"effectstay": [
"this,Skill/Role/12003/effect_12003_wuqitexiao"
@@ -5365,7 +5365,7 @@
"y": 0.154,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 120031,
"skill2": 120032,
"skill3": 120033,
@@ -5380,15 +5380,15 @@
"hid": "12009",
"name": {
"key": "12009",
- "text": "黑化希卡普"
+ "text": "睡神沙人"
},
"star": 5,
"color": 4,
"race": 2,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 12009,
+ "handbook": -1,
+ "prefab": 24003,
"icon": 11009,
"sound": {
"key": "11009",
@@ -5401,7 +5401,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11009.asset",
+ "events": "Hero_11009",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -5409,7 +5409,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 120091,
"skill2": 120092,
"skill3": 120093,
@@ -5424,15 +5424,15 @@
"hid": "12017",
"name": {
"key": "12017",
- "text": "黑化杰克"
+ "text": "睡神沙人"
},
"star": 5,
"color": 4,
"race": 2,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 12017,
+ "handbook": -1,
+ "prefab": 24003,
"icon": 12017,
"sound": {
"key": "12017",
@@ -5445,7 +5445,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11017.asset",
+ "events": "Hero_11017",
"cite": "",
"effectstay": [
"Bone001/Dummy001,Skill/Role/12017/effect_12017_weapon1_bad"
@@ -5455,7 +5455,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 120171,
"skill2": 120172,
"skill3": 120173,
@@ -5470,15 +5470,15 @@
"hid": "12018",
"name": {
"key": "12018",
- "text": "黑化睡神"
+ "text": "睡神沙人"
},
"star": 5,
"color": 4,
"race": 2,
"job": 2,
"type": 1,
- "handbook": 0,
- "prefab": 12018,
+ "handbook": -1,
+ "prefab": 24003,
"icon": 12018,
"sound": {
"key": "12018",
@@ -5491,7 +5491,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_11018.asset",
+ "events": "Hero_11018",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -5499,7 +5499,7 @@
"y": 0.26,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 120181,
"skill2": 120182,
"skill3": 120183,
@@ -5521,7 +5521,7 @@
"race": 4,
"job": 3,
"type": 1,
- "handbook": 0,
+ "handbook": -1,
"prefab": 44005,
"icon": 44005,
"sound": {
@@ -5535,7 +5535,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_44005.asset",
+ "events": "Hero_44005",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -5543,7 +5543,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 440051,
"skill2": 440052,
"skill3": 440053,
@@ -5565,7 +5565,7 @@
"race": 1,
"job": 3,
"type": 1,
- "handbook": 0,
+ "handbook": -1,
"prefab": 15005,
"icon": 15005,
"sound": {
@@ -5579,7 +5579,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_15005.asset",
+ "events": "Hero_15005",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -5587,7 +5587,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 150051,
"skill2": 150052,
"skill3": 150053,
@@ -5602,14 +5602,14 @@
"hid": "35001",
"name": {
"key": "35001",
- "text": "浣熊"
+ "text": "师父"
},
"star": 4,
"color": 4,
"race": 4,
"job": 3,
"type": 1,
- "handbook": 0,
+ "handbook": -1,
"prefab": 35001,
"icon": 35001,
"sound": {
@@ -5623,7 +5623,7 @@
"key": "",
"text": ""
},
- "events": "EventDataSet/Hero_35001.asset",
+ "events": "Hero_35001",
"cite": "",
"effectstay": [],
"hpspace": {
@@ -5631,7 +5631,7 @@
"y": 0,
"z": 0
},
- "skill": -1,
+ "skill": 190011000,
"skill1": 350011,
"skill2": 350012,
"skill3": 350013,
diff --git a/bin/json/game_newskill.json b/bin/json/game_newskill.json
index a1dd30317..04abe585e 100644
--- a/bin/json/game_newskill.json
+++ b/bin/json/game_newskill.json
@@ -5019,7 +5019,7 @@
"Id": 110013,
"Name": "太极零式",
"ico": "skillicon_003",
- "act": "SkillWithCam_3",
+ "act": "Skill_3",
"Type": 0,
"MaxLV": 6,
"CD": [
@@ -6069,7 +6069,7 @@
"Id": 110083,
"Name": "霸·猎杀时刻",
"ico": "skillicon_009",
- "act": "SkillWithCam_3",
+ "act": "Skill_3",
"Type": 0,
"MaxLV": 6,
"CD": [
@@ -6219,7 +6219,7 @@
"Id": 150053,
"Name": "这是我的主场！",
"ico": "skillicon_015",
- "act": "Skill_30",
+ "act": "Skill_3",
"Type": 1,
"MaxLV": 6,
"CD": [
diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json
index 8ddefda4a..6a73ac733 100644
--- a/bin/json/game_shop.json
+++ b/bin/json/game_shop.json
@@ -12,7 +12,7 @@
},
{
"a": "attr",
- "t": "money",
+ "t": "gold",
"n": 1
}
],
@@ -22,7 +22,7 @@
"rneed": [
{
"a": "attr",
- "t": "money",
+ "t": "gold",
"n": 20
}
],
@@ -45,7 +45,7 @@
},
{
"a": "attr",
- "t": "money",
+ "t": "gold",
"n": 1
}
],
@@ -70,7 +70,7 @@
},
{
"a": "attr",
- "t": "money",
+ "t": "gold",
"n": 1
}
],
@@ -95,7 +95,7 @@
},
{
"a": "attr",
- "t": "money",
+ "t": "gold",
"n": 1
}
],
@@ -120,7 +120,7 @@
},
{
"a": "attr",
- "t": "money",
+ "t": "gold",
"n": 1
}
],
diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json
index bf38c163c..6d0942f17 100644
--- a/bin/json/game_shopitem.json
+++ b/bin/json/game_shopitem.json
@@ -173,7 +173,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10002",
"n": 5
}
],
@@ -243,7 +243,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10003",
+ "t": "10002",
"n": 5
}
],
@@ -278,7 +278,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10003",
"n": 5
}
],
@@ -306,7 +306,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10003",
"n": 10
}
],
@@ -334,7 +334,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10003",
"n": 15
}
],
@@ -362,7 +362,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10003",
"n": 20
}
],
@@ -390,7 +390,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10003",
"n": 25
}
],
@@ -418,7 +418,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10003",
"n": 30
}
],
@@ -446,7 +446,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10004",
"n": 5
}
],
@@ -481,7 +481,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10002",
+ "t": "10004",
"n": 5
}
],
@@ -516,7 +516,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10003",
+ "t": "10004",
"n": 5
}
],
@@ -551,7 +551,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10005",
"n": 5
}
],
@@ -579,7 +579,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10005",
"n": 10
}
],
@@ -607,7 +607,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10005",
"n": 15
}
],
@@ -635,7 +635,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10005",
"n": 20
}
],
@@ -663,7 +663,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10005",
"n": 25
}
],
@@ -691,7 +691,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10005",
"n": 30
}
],
@@ -719,7 +719,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10006",
"n": 5
}
],
@@ -754,7 +754,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10002",
+ "t": "10006",
"n": 5
}
],
@@ -789,7 +789,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10003",
+ "t": "10006",
"n": 5
}
],
@@ -824,7 +824,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10007",
"n": 5
}
],
@@ -852,7 +852,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10007",
"n": 10
}
],
@@ -880,7 +880,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10007",
"n": 15
}
],
@@ -908,7 +908,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10007",
"n": 20
}
],
@@ -936,7 +936,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10007",
"n": 25
}
],
@@ -964,7 +964,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10007",
"n": 30
}
],
@@ -992,7 +992,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10001",
+ "t": "10008",
"n": 5
}
],
@@ -1027,7 +1027,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10002",
+ "t": "10008",
"n": 5
}
],
@@ -1062,7 +1062,7 @@
"iteminfo": [
{
"a": "item",
- "t": "10003",
+ "t": "10008",
"n": 5
}
],
diff --git a/bin/json/game_skill.json b/bin/json/game_skill.json
deleted file mode 100644
index d642894b1..000000000
--- a/bin/json/game_skill.json
+++ /dev/null
@@ -1,245 +0,0 @@
-[
- {
- "sameid": 110011,
- "act": "Skill_1",
- "type": 0,
- "triggerchannce": 5000,
- "tubiao": "skillicon_001",
- "name": "熊猫拳",
- "describe": ""
- },
- {
- "sameid": 110012,
- "act": "Skill_2",
- "type": 0,
- "triggerchannce": 0,
- "tubiao": "skillicon_002",
- "name": "太极一式",
- "describe": ""
- },
- {
- "sameid": 110013,
- "act": "Skill_3",
- "type": 0,
- "triggerchannce": 0,
- "tubiao": "skillicon_003",
- "name": "太极零式",
- "describe": ""
- },
- {
- "sameid": 110031,
- "act": "Skill_1",
- "type": 1,
- "triggerchannce": 0,
- "tubiao": "skillicon_004",
- "name": "和谐音律",
- "describe": ""
- },
- {
- "sameid": 110032,
- "act": "Skill_2",
- "type": 1,
- "triggerchannce": 0,
- "tubiao": "skillicon_005",
- "name": "欢悦之舞",
- "describe": ""
- },
- {
- "sameid": 110033,
- "act": "Skill_3",
- "type": 1,
- "triggerchannce": 0,
- "tubiao": "skillicon_006",
- "name": "彩虹音符",
- "describe": ""
- },
- {
- "sameid": 110171,
- "act": "Skill_1",
- "type": 1,
- "triggerchannce": 0,
- "tubiao": "skillicon_010",
- "name": "冰霜之语",
- "describe": ""
- },
- {
- "sameid": 110172,
- "act": "Skill_2",
- "type": 1,
- "triggerchannce": 2000,
- "tubiao": "skillicon_011",
- "name": "寒冰之力",
- "describe": ""
- },
- {
- "sameid": 110173,
- "act": "Skill_3",
- "type": 1,
- "triggerchannce": 0,
- "tubiao": "skillicon_012",
- "name": "极寒领域",
- "describe": ""
- },
- {
- "sameid": 110181,
- "act": "Skill_1",
- "type": 0,
- "triggerchannce": 0,
- "tubiao": "skillicon_013",
- "name": "梦·呓语",
- "describe": ""
- },
- {
- "sameid": 110182,
- "act": "Skill_2",
- "type": 1,
- "triggerchannce": 0,
- "tubiao": "skillicon_014",
- "name": "梦·愉悦",
- "describe": ""
- },
- {
- "sameid": 110183,
- "act": "Skill_3",
- "type": 1,
- "triggerchannce": 0,
- "tubiao": "skillicon_015",
- "name": "梦·创世",
- "describe": ""
- },
- {
- "sameid": 110091,
- "act": "Skill_1",
- "type": 1,
- "triggerchannce": 0,
- "tubiao": "skillicon_007",
- "name": "一往无前",
- "describe": ""
- },
- {
- "sameid": 110092,
- "act": "Skill_2",
- "type": 1,
- "triggerchannce": 0,
- "tubiao": "skillicon_008",
- "name": "无所畏惧",
- "describe": ""
- },
- {
- "sameid": 110093,
- "act": "Skill_3",
- "type": 1,
- "triggerchannce": 0,
- "tubiao": "skillicon_009",
- "name": "自由之往",
- "describe": ""
- },
- {
- "sameid": 110111,
- "act": "Skill_1",
- "type": 1,
- "triggerchannce": 0,
- "tubiao": "skillicon_001",
- "name": "点到为止",
- "describe": ""
- },
- {
- "sameid": 110112,
- "act": "Skill_2",
- "type": 0,
- "triggerchannce": 1,
- "tubiao": "skillicon_002",
- "name": "聚·心神",
- "describe": ""
- },
- {
- "sameid": 110113,
- "act": "Skill_3",
- "type": 0,
- "triggerchannce": 2,
- "tubiao": "skillicon_003",
- "name": "上·善若水",
- "describe": ""
- },
- {
- "sameid": 440051,
- "act": "Skill_1",
- "type": 1,
- "triggerchannce": 3,
- "tubiao": "skillicon_001",
- "name": "蛮之力",
- "describe": ""
- },
- {
- "sameid": 440052,
- "act": "Skill_2",
- "type": 1,
- "triggerchannce": 4,
- "tubiao": "skillicon_002",
- "name": "蛮力横扫",
- "describe": ""
- },
- {
- "sameid": 440053,
- "act": "Skill_3",
- "type": 1,
- "triggerchannce": 5,
- "tubiao": "skillicon_003",
- "name": "蛮力冲撞",
- "describe": ""
- },
- {
- "sameid": 110081,
- "act": "Skill_1",
- "type": 0,
- "triggerchannce": 2000,
- "tubiao": "skillicon_007",
- "name": "猛虎爪",
- "describe": ""
- },
- {
- "sameid": 110082,
- "act": "Skill_2",
- "type": 1,
- "triggerchannce": 2000,
- "tubiao": "skillicon_008",
- "name": "胜者为王",
- "describe": ""
- },
- {
- "sameid": 110083,
- "act": "Skill_3",
- "type": 0,
- "triggerchannce": 2000,
- "tubiao": "skillicon_009",
- "name": "霸·猎杀时刻",
- "describe": ""
- },
- {
- "sameid": 150051,
- "act": "Skill_1",
- "type": 0,
- "triggerchannce": 2000,
- "tubiao": "skillicon_013",
- "name": "狮子铁拳",
- "describe": ""
- },
- {
- "sameid": 150052,
- "act": "Skill_2",
- "type": 1,
- "triggerchannce": 2000,
- "tubiao": "skillicon_014",
- "name": "净化烟火",
- "describe": ""
- },
- {
- "sameid": 150053,
- "act": "Skill_3",
- "type": 1,
- "triggerchannce": 2000,
- "tubiao": "skillicon_015",
- "name": "这是我的主场！",
- "describe": ""
- }
-]
\ No newline at end of file
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index e20181b9b..21ce2ae68 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -3509,6 +3509,25 @@
"RelyTags": [],
"NoRelyTags": []
},
+ {
+ "Id": 290087004,
+ "Desc": "添加护盾",
+ "From": 3,
+ "Limit": 1,
+ "Where": [],
+ "Order": [],
+ "EmitPR": 1000,
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=300192115,Round=-1,Type=ProBuff,BufPro1=SufferDam,BufQuaType1=0,BufParNum1=1,BufVal1=150",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
{
"Id": 210011,
"Desc": "对敌方全体造成80%攻击力伤害",
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index a1dd30317..04abe585e 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -5019,7 +5019,7 @@
"Id": 110013,
"Name": "太极零式",
"ico": "skillicon_003",
- "act": "SkillWithCam_3",
+ "act": "Skill_3",
"Type": 0,
"MaxLV": 6,
"CD": [
@@ -6069,7 +6069,7 @@
"Id": 110083,
"Name": "霸·猎杀时刻",
"ico": "skillicon_009",
- "act": "SkillWithCam_3",
+ "act": "Skill_3",
"Type": 0,
"MaxLV": 6,
"CD": [
@@ -6219,7 +6219,7 @@
"Id": 150053,
"Name": "这是我的主场！",
"ico": "skillicon_015",
- "act": "Skill_30",
+ "act": "Skill_3",
"Type": 1,
"MaxLV": 6,
"CD": [
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index 109068517..510a2bd02 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -591,5 +591,21 @@
"buffico": "",
"buffeffect": "",
"buffpos": ""
+ },
+ {
+ "Id": 300192115,
+ "Type": "Type=ShieldBuff",
+ "Name": "护盾",
+ "Desc": "增加护盾",
+ "Tags": [
+ "102"
+ ],
+ "OverlayTimes": 0,
+ "SameID": false,
+ "RelyTags": [],
+ "NoRelyTags": [],
+ "buffico": "",
+ "buffeffect": "",
+ "buffpos": ""
}
]
\ No newline at end of file
diff --git a/bin/json/game_ui.json b/bin/json/game_ui.json
index 3e798c477..0c0d700f7 100644
--- a/bin/json/game_ui.json
+++ b/bin/json/game_ui.json
@@ -26,7 +26,7 @@
{
"id": "useragreement",
"file": "LoginUseragreementWindow",
- "unloadpkg": 0,
+ "unloadpkg": 3,
"loadtype": 1,
"full": 0,
"blur": 1,
@@ -38,7 +38,7 @@
{
"id": "serverlist",
"file": "ServerListWindow",
- "unloadpkg": 0,
+ "unloadpkg": 3,
"loadtype": 1,
"full": 0,
"blur": 1,
@@ -47,6 +47,42 @@
"comname": "serverlist",
"des": "服务器列表"
},
+ {
+ "id": "loginaccountpopup",
+ "file": "LoginAccountPopup",
+ "unloadpkg": 3,
+ "loadtype": 1,
+ "full": 0,
+ "blur": 1,
+ "package": "login/login",
+ "packagename": "login",
+ "comname": "loginaccountnumber",
+ "des": "账号登录"
+ },
+ {
+ "id": "mobilephonelogin",
+ "file": "MobilePhoneLoginPopup",
+ "unloadpkg": 3,
+ "loadtype": 1,
+ "full": 0,
+ "blur": 1,
+ "package": "login/login",
+ "packagename": "login",
+ "comname": "mobilephonelogin",
+ "des": "手机号登录"
+ },
+ {
+ "id": "gameadvice",
+ "file": "GameAdviceWindow",
+ "unloadpkg": 2,
+ "loadtype": 1,
+ "full": 1,
+ "blur": 0,
+ "package": "login/login",
+ "packagename": "login",
+ "comname": "gameadvice",
+ "des": "游戏logo"
+ },
{
"id": "tanxian",
"file": "TanXianWindow",
@@ -424,7 +460,7 @@
"file": "RoleDetailWindow",
"unloadpkg": 0,
"loadtype": 1,
- "full": 3,
+ "full": 2,
"blur": 0,
"package": "roledetails/roledetails",
"packagename": "roledetails",
@@ -508,7 +544,7 @@
"file": "HeroManualWindow",
"unloadpkg": 1,
"loadtype": 0,
- "full": 2,
+ "full": 1,
"blur": 0,
"package": "roledetails/roledetails",
"packagename": "roledetails",
@@ -568,7 +604,7 @@
"file": "MainInterFaceWindow",
"unloadpkg": 2,
"loadtype": 1,
- "full": 1,
+ "full": 2,
"blur": 0,
"package": "maininterface/maininterface",
"packagename": "maininterface",
@@ -598,5 +634,17 @@
"packagename": "tips",
"comname": "storetips",
"des": " 确认框"
+ },
+ {
+ "id": "taskrewardpreview",
+ "file": "TaskRewardPreviewPopup",
+ "unloadpkg": 3,
+ "loadtype": 1,
+ "full": 0,
+ "blur": 0,
+ "package": "task/task",
+ "packagename": "task",
+ "comname": "rewardPreview",
+ "des": "任务奖励预览"
}
]
\ No newline at end of file
diff --git a/modules/gateway/configure_comp.go b/modules/gateway/configure_comp.go
index 2136dd29e..6980d61b8 100644
--- a/modules/gateway/configure_comp.go
+++ b/modules/gateway/configure_comp.go
@@ -19,7 +19,7 @@ type configureComp struct {
// Init 组件初始化接口
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.ModuleCompBase.Init(service, module, comp, options)
- this.LoadConfigure(game_msgdistrib, cfg.NewGame_msgDistrib)
+ this.LoadConfigure(game_msgdistrib, cfg.NewGame_msgdistrib)
return
}
@@ -32,7 +32,7 @@ func (this *configureComp) GetMsgDistribute(mtype, stype string) (rule string, o
if v, err = this.GetConfigure(game_msgdistrib); err != nil {
return
} else {
- for _, v := range v.(*cfg.Game_msgDistrib).GetDataMap() {
+ for _, v := range v.(*cfg.Game_msgdistrib).GetDataMap() {
if v.Mtype == mtype && v.Stype == stype {
rule = v.Routrules
ok = true
diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go
index dd0dc41c9..1542efd7c 100644
--- a/modules/shop/api_getlist.go
+++ b/modules/shop/api_getlist.go
@@ -19,17 +19,18 @@ func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.ShopGetList
///获取用户商品列表
func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) (code pb.ErrorCode, data proto.Message) {
var (
- err error
- filed string
- shopconf *cfg.Game_shopData
- shopData *pb.DBShop
- udata *pb.DBUser
- sdata *pb.UserShopData
- items []*cfg.Game_shopitemData
- ushoputem map[int32]*pb.DBShopItem
- goods []*pb.ShopItem
- tdata time.Duration
- ltime time.Duration
+ err error
+ filed string
+ shopconf *cfg.Game_shopData
+ shopData *pb.DBShop
+ udata *pb.DBUser
+ sdata *pb.UserShopData
+ items []*cfg.Game_shopitemData
+ ushoputem map[int32]*pb.DBShopItem
+ goods []*pb.ShopItem
+ tdata time.Duration
+ ltime time.Duration
+ leftrefnum int32
)
if shopconf, err = this.module.configure.GetShopConfigure(int32(req.SType)); err != nil && err != mgo.MongodbNil {
@@ -73,6 +74,12 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
if sdata == nil {
sdata = &pb.UserShopData{}
}
+ if shopconf.Rnum > 0 {
+ leftrefnum = shopconf.Rnum - sdata.ManualRefreshNum
+ } else {
+ leftrefnum = shopconf.Rnum
+ }
+
tdata = time.Since(time.Unix(sdata.LastRefreshTime, 0))
switch shopconf.Rtype {
case 1:
@@ -90,6 +97,14 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
}
if req.IsManualRefresh && shopconf.Rtype == 1 { //可以手动刷新
+ //剩余刷新次数为零
+ if leftrefnum == 0 {
+ code = pb.ErrorCode_ShopNoSurplusRefreshNum
+ return
+ } else if leftrefnum > 0 {
+ leftrefnum--
+ }
+
if code = this.module.ConsumeRes(session, shopconf.Rneed, true); code != pb.ErrorCode_Success {
return
}
@@ -103,6 +118,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
}
goods = transGoods(req.SType, items, ushoputem)
sdata.LastRefreshTime = time.Now().Unix()
+ sdata.ManualRefreshNum++
sdata.Items = make([]int32, len(items))
for i, v := range items {
sdata.Items[i] = v.Key
@@ -136,6 +152,6 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
code = pb.ErrorCode_ReqParameterError
return
}
- session.SendMsg(string(this.module.GetType()), "getlist", &pb.ShopGetListResp{Goods: goods})
+ session.SendMsg(string(this.module.GetType()), "getlist", &pb.ShopGetListResp{SType: req.SType, Goods: goods, SurplusRefreshNum: leftrefnum})
return
}
diff --git a/pb/comm.pb.go b/pb/comm.pb.go
index c0942d60a..8506bd913 100644
--- a/pb/comm.pb.go
+++ b/pb/comm.pb.go
@@ -77,7 +77,7 @@ func (HeroAttributesType) EnumDescriptor() ([]byte, []int) {
return file_comm_proto_rawDescGZIP(), []int{0}
}
-//用户消息流结构
+//用户消息流结构1
type UserMessage struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 99d2f1a76..d10f11905 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -119,7 +119,8 @@ const (
ErrorCode_TaskNoFinished ErrorCode = 1607 //任务未完成
ErrorCode_TaskFinished ErrorCode = 1608 //已完成
// shop
- ErrorCode_ShopGoodsIsSoldOut ErrorCode = 1700 //商品已售罄
+ ErrorCode_ShopGoodsIsSoldOut ErrorCode = 1700 //商品已售罄
+ ErrorCode_ShopNoSurplusRefreshNum ErrorCode = 1701 //剩余刷新次数已用完
)
// Enum value maps for ErrorCode.
@@ -214,6 +215,7 @@ var (
1607: "TaskNoFinished",
1608: "TaskFinished",
1700: "ShopGoodsIsSoldOut",
+ 1701: "ShopNoSurplusRefreshNum",
}
ErrorCode_value = map[string]int32{
"Success": 0,
@@ -305,6 +307,7 @@ var (
"TaskNoFinished": 1607,
"TaskFinished": 1608,
"ShopGoodsIsSoldOut": 1700,
+ "ShopNoSurplusRefreshNum": 1701,
}
)
@@ -339,7 +342,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
var file_errorcode_proto_rawDesc = []byte{
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x2a, 0xdc, 0x0e, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+ 0x6f, 0x2a, 0xfa, 0x0e, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
@@ -457,7 +460,9 @@ var file_errorcode_proto_rawDesc = []byte{
0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69,
0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, 0x47,
0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, 0x53, 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d,
- 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75,
+ 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x42, 0x06,
+ 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/pb/shop_msg.pb.go b/pb/shop_msg.pb.go
index 20aac5fa2..ff378ce48 100644
--- a/pb/shop_msg.pb.go
+++ b/pb/shop_msg.pb.go
@@ -162,7 +162,9 @@ type ShopGetListResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Goods []*ShopItem `protobuf:"bytes,1,rep,name=Goods,proto3" json:"Goods"` //商品列表
+ SType ShopType `protobuf:"varint,1,opt,name=sType,proto3,enum=ShopType" json:"sType"` //商城类型
+ Goods []*ShopItem `protobuf:"bytes,2,rep,name=Goods,proto3" json:"Goods"` //商品列表
+ SurplusRefreshNum int32 `protobuf:"varint,3,opt,name=SurplusRefreshNum,proto3" json:"SurplusRefreshNum"` //剩余手动刷新次数
}
func (x *ShopGetListResp) Reset() {
@@ -197,6 +199,13 @@ func (*ShopGetListResp) Descriptor() ([]byte, []int) {
return file_shop_shop_msg_proto_rawDescGZIP(), []int{2}
}
+func (x *ShopGetListResp) GetSType() ShopType {
+ if x != nil {
+ return x.SType
+ }
+ return ShopType_Null
+}
+
func (x *ShopGetListResp) GetGoods() []*ShopItem {
if x != nil {
return x.Goods
@@ -204,6 +213,13 @@ func (x *ShopGetListResp) GetGoods() []*ShopItem {
return nil
}
+func (x *ShopGetListResp) GetSurplusRefreshNum() int32 {
+ if x != nil {
+ return x.SurplusRefreshNum
+ }
+ return 0
+}
+
//购买商品 请求
type ShopBuyReq struct {
state protoimpl.MessageState
@@ -330,10 +346,15 @@ var file_shop_shop_msg_proto_rawDesc = []byte{
0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a,
0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c,
- 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0x32, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x70, 0x47,
- 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x47, 0x6f,
- 0x6f, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70,
- 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x22, 0x4d, 0x0a, 0x0a, 0x53,
+ 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0x81, 0x01, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x70,
+ 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x73,
+ 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f,
+ 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05,
+ 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68,
+ 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x2c, 0x0a,
+ 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e,
+ 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75,
+ 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x22, 0x4d, 0x0a, 0x0a, 0x53,
0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x08, 0x53, 0x68, 0x6f,
0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68,
0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65,
@@ -371,13 +392,14 @@ var file_shop_shop_msg_proto_depIdxs = []int32{
5, // 0: ShopItem.Items:type_name -> UserAssets
5, // 1: ShopItem.Consume:type_name -> UserAssets
6, // 2: ShopGetListReq.sType:type_name -> ShopType
- 0, // 3: ShopGetListResp.Goods:type_name -> ShopItem
- 6, // 4: ShopBuyReq.ShopType:type_name -> ShopType
- 5, // [5:5] is the sub-list for method output_type
- 5, // [5:5] is the sub-list for method input_type
- 5, // [5:5] is the sub-list for extension type_name
- 5, // [5:5] is the sub-list for extension extendee
- 0, // [0:5] is the sub-list for field type_name
+ 6, // 3: ShopGetListResp.sType:type_name -> ShopType
+ 0, // 4: ShopGetListResp.Goods:type_name -> ShopItem
+ 6, // 5: ShopBuyReq.ShopType:type_name -> ShopType
+ 6, // [6:6] is the sub-list for method output_type
+ 6, // [6:6] is the sub-list for method input_type
+ 6, // [6:6] is the sub-list for extension type_name
+ 6, // [6:6] is the sub-list for extension extendee
+ 0, // [0:6] is the sub-list for field type_name
}
func init() { file_shop_shop_msg_proto_init() }
diff --git a/sys/configure/structs/game.gameComData.go b/sys/configure/structs/game.gameComData.go
deleted file mode 100644
index 37fc81057..000000000
--- a/sys/configure/structs/game.gameComData.go
+++ /dev/null
@@ -1,29 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-package cfg
-
-import "errors"
-
-type Game_gameComData struct {
- Index string
- Var string
- Intr string
-}
-
-func (Game_gameComData) GetTypeId() int {
- return -1518519171
-}
-
-func NewGame_gameComData(_buf map[string]interface{}) (_v *Game_gameComData, err error) {
- _v = &Game_gameComData{}
- { var _ok_ bool; if _v.Index, _ok_ = _buf["index"].(string); !_ok_ { err = errors.New("index error"); return } }
- { var _ok_ bool; if _v.Var, _ok_ = _buf["var"].(string); !_ok_ { err = errors.New("var error"); return } }
- { var _ok_ bool; if _v.Intr, _ok_ = _buf["intr"].(string); !_ok_ { err = errors.New("intr error"); return } }
- return
-}
diff --git a/sys/configure/structs/game.hero.go b/sys/configure/structs/game.hero.go
deleted file mode 100644
index c324154bb..000000000
--- a/sys/configure/structs/game.hero.go
+++ /dev/null
@@ -1,42 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-package cfg
-
-type Game_hero struct {
- _dataMap map[string]*Game_heroData
- _dataList []*Game_heroData
-}
-
-func NewGame_hero(_buf []map[string]interface{}) (*Game_hero, error) {
- _dataList := make([]*Game_heroData, 0, len(_buf))
- dataMap := make(map[string]*Game_heroData)
- for _, _ele_ := range _buf {
- if _v, err2 := NewGame_heroData(_ele_); err2 != nil {
- return nil, err2
- } else {
- _dataList = append(_dataList, _v)
- dataMap[_v.Id] = _v
- }
- }
- return &Game_hero{_dataList:_dataList, _dataMap:dataMap}, nil
-}
-
-func (table *Game_hero) GetDataMap() map[string]*Game_heroData {
- return table._dataMap
-}
-
-func (table *Game_hero) GetDataList() []*Game_heroData {
- return table._dataList
-}
-
-func (table *Game_hero) Get(key string) *Game_heroData {
- return table._dataMap[key]
-}
-
-
diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go
deleted file mode 100644
index ed740090a..000000000
--- a/sys/configure/structs/game.heroData.go
+++ /dev/null
@@ -1,99 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-package cfg
-
-import "errors"
-import "bright/math"
-
-type Game_heroData struct {
- Id string
- Name string
- Star int32
- Color int32
- Race int32
- Job int32
- Type int32
- Prefab string
- Icon int32
- Sound int32
- Tujing []int32
- Intr string
- Events string
- Cite string
- Effectstay []string
- Hpspace math.Vector3
- Skill1 int32
- Skill2 int32
- Skill3 int32
- Enteranivalue int32
- Camerainterval float32
-}
-
-func (Game_heroData) GetTypeId() int {
- return 650222912
-}
-
-func NewGame_heroData(_buf map[string]interface{}) (_v *Game_heroData, err error) {
- _v = &Game_heroData{}
- { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
- {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["job"].(float64); !_ok_ { err = errors.New("job error"); return }; _v.Job = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
- { var _ok_ bool; if _v.Prefab, _ok_ = _buf["prefab"].(string); !_ok_ { err = errors.New("prefab error"); return } }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["icon"].(float64); !_ok_ { err = errors.New("icon error"); return }; _v.Icon = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sound"].(float64); !_ok_ { err = errors.New("sound error"); return }; _v.Sound = int32(_tempNum_) }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["tujing"].([]interface{}); !_ok_ { err = errors.New("tujing error"); return }
-
- _v.Tujing = make([]int32, 0, len(_arr_))
-
- for _, _e_ := range _arr_ {
- var _list_v_ int32
- { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
- _v.Tujing = append(_v.Tujing, _list_v_)
- }
- }
-
- { var _ok_ bool; if _v.Intr, _ok_ = _buf["intr"].(string); !_ok_ { err = errors.New("intr error"); return } }
- { var _ok_ bool; if _v.Events, _ok_ = _buf["events"].(string); !_ok_ { err = errors.New("events error"); return } }
- { var _ok_ bool; if _v.Cite, _ok_ = _buf["cite"].(string); !_ok_ { err = errors.New("cite error"); return } }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["effectstay"].([]interface{}); !_ok_ { err = errors.New("effectstay error"); return }
-
- _v.Effectstay = make([]string, 0, len(_arr_))
-
- for _, _e_ := range _arr_ {
- var _list_v_ string
- { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
- _v.Effectstay = append(_v.Effectstay, _list_v_)
- }
- }
-
- { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["hpspace"].(map[string]interface{}); !_ok_ { err = errors.New("hpspace error"); return }
- var _x_, _y_, _z_ float32;
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
- _v.Hpspace = math.NewVector3(_x_, _y_, _z_)
- }
-
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill1"].(float64); !_ok_ { err = errors.New("skill1 error"); return }; _v.Skill1 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill2"].(float64); !_ok_ { err = errors.New("skill2 error"); return }; _v.Skill2 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill3"].(float64); !_ok_ { err = errors.New("skill3 error"); return }; _v.Skill3 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enteranivalue"].(float64); !_ok_ { err = errors.New("enteranivalue error"); return }; _v.Enteranivalue = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camerainterval"].(float64); !_ok_ { err = errors.New("camerainterval error"); return }; _v.Camerainterval = float32(_tempNum_) }
- return
-}
diff --git a/sys/configure/structs/game.language.go b/sys/configure/structs/game.language.go
deleted file mode 100644
index 0c4024d2e..000000000
--- a/sys/configure/structs/game.language.go
+++ /dev/null
@@ -1,42 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-package cfg
-
-type Game_language struct {
- _dataMap map[string]*Game_languageData
- _dataList []*Game_languageData
-}
-
-func NewGame_language(_buf []map[string]interface{}) (*Game_language, error) {
- _dataList := make([]*Game_languageData, 0, len(_buf))
- dataMap := make(map[string]*Game_languageData)
- for _, _ele_ := range _buf {
- if _v, err2 := NewGame_languageData(_ele_); err2 != nil {
- return nil, err2
- } else {
- _dataList = append(_dataList, _v)
- dataMap[_v.Id] = _v
- }
- }
- return &Game_language{_dataList:_dataList, _dataMap:dataMap}, nil
-}
-
-func (table *Game_language) GetDataMap() map[string]*Game_languageData {
- return table._dataMap
-}
-
-func (table *Game_language) GetDataList() []*Game_languageData {
- return table._dataList
-}
-
-func (table *Game_language) Get(key string) *Game_languageData {
- return table._dataMap[key]
-}
-
-
diff --git a/sys/configure/structs/game.languageData.go b/sys/configure/structs/game.languageData.go
deleted file mode 100644
index fd0a408e2..000000000
--- a/sys/configure/structs/game.languageData.go
+++ /dev/null
@@ -1,43 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-package cfg
-
-import "errors"
-
-type Game_languageData struct {
- Id string
- Maps map[string]string
-}
-
-func (Game_languageData) GetTypeId() int {
- return -1436621922
-}
-
-func NewGame_languageData(_buf map[string]interface{}) (_v *Game_languageData, err error) {
- _v = &Game_languageData{}
- { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["maps"].([]interface{}); !_ok_ { err = errors.New("maps error"); return }
-
- _v.Maps = make(map[string]string)
-
- for _, _e_ := range _arr_ {
- var _kv_ []interface{}
- if _kv_, _ok_ = _e_.([]interface{}); !_ok_ || len(_kv_) != 2 { err = errors.New("maps error"); return }
- var _key_ string
- { if _key_, _ok_ = _kv_[0].(string); !_ok_ { err = errors.New("_key_ error"); return } }
- var _value_ string
- { if _value_, _ok_ = _kv_[1].(string); !_ok_ { err = errors.New("_value_ error"); return } }
- _v.Maps[_key_] = _value_
- }
- }
- return
-}
diff --git a/sys/configure/structs/game.msgDistrib.go b/sys/configure/structs/game.msgDistrib.go
index d51bb8947..97041dd26 100644
--- a/sys/configure/structs/game.msgDistrib.go
+++ b/sys/configure/structs/game.msgDistrib.go
@@ -8,34 +8,34 @@
//------------------------------------------------------------------------------
package cfg
-type Game_msgDistrib struct {
- _dataMap map[string]*Game_msgDistribData
- _dataList []*Game_msgDistribData
+type Game_msgdistrib struct {
+ _dataMap map[string]*Game_msgdistribData
+ _dataList []*Game_msgdistribData
}
-func NewGame_msgDistrib(_buf []map[string]interface{}) (*Game_msgDistrib, error) {
- _dataList := make([]*Game_msgDistribData, 0, len(_buf))
- dataMap := make(map[string]*Game_msgDistribData)
+func NewGame_msgdistrib(_buf []map[string]interface{}) (*Game_msgdistrib, error) {
+ _dataList := make([]*Game_msgdistribData, 0, len(_buf))
+ dataMap := make(map[string]*Game_msgdistribData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_msgDistribData(_ele_); err2 != nil {
+ if _v, err2 := NewGame_msgdistribData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Mtype] = _v
}
}
- return &Game_msgDistrib{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Game_msgdistrib{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_msgDistrib) GetDataMap() map[string]*Game_msgDistribData {
+func (table *Game_msgdistrib) GetDataMap() map[string]*Game_msgdistribData {
return table._dataMap
}
-func (table *Game_msgDistrib) GetDataList() []*Game_msgDistribData {
+func (table *Game_msgdistrib) GetDataList() []*Game_msgdistribData {
return table._dataList
}
-func (table *Game_msgDistrib) Get(key string) *Game_msgDistribData {
+func (table *Game_msgdistrib) Get(key string) *Game_msgdistribData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.msgDistribData.go b/sys/configure/structs/game.msgDistribData.go
index 7d06bf250..c2bcfb5be 100644
--- a/sys/configure/structs/game.msgDistribData.go
+++ b/sys/configure/structs/game.msgDistribData.go
@@ -10,18 +10,18 @@ package cfg
import "errors"
-type Game_msgDistribData struct {
+type Game_msgdistribData struct {
Mtype string
Stype string
Routrules string
}
-func (Game_msgDistribData) GetTypeId() int {
- return -758961622
+func (Game_msgdistribData) GetTypeId() int {
+ return 1868137034
}
-func NewGame_msgDistribData(_buf map[string]interface{}) (_v *Game_msgDistribData, err error) {
- _v = &Game_msgDistribData{}
+func NewGame_msgdistribData(_buf map[string]interface{}) (_v *Game_msgdistribData, err error) {
+ _v = &Game_msgdistribData{}
{ var _ok_ bool; if _v.Mtype, _ok_ = _buf["mtype"].(string); !_ok_ { err = errors.New("mtype error"); return } }
{ var _ok_ bool; if _v.Stype, _ok_ = _buf["stype"].(string); !_ok_ { err = errors.New("stype error"); return } }
{ var _ok_ bool; if _v.Routrules, _ok_ = _buf["routrules"].(string); !_ok_ { err = errors.New("routrules error"); return } }
diff --git a/sys/configure/structs/game.skill.go b/sys/configure/structs/game.skill.go
deleted file mode 100644
index fdda767b1..000000000
--- a/sys/configure/structs/game.skill.go
+++ /dev/null
@@ -1,42 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-package cfg
-
-type Game_skill struct {
- _dataMap map[int32]*Game_skillData
- _dataList []*Game_skillData
-}
-
-func NewGame_skill(_buf []map[string]interface{}) (*Game_skill, error) {
- _dataList := make([]*Game_skillData, 0, len(_buf))
- dataMap := make(map[int32]*Game_skillData)
- for _, _ele_ := range _buf {
- if _v, err2 := NewGame_skillData(_ele_); err2 != nil {
- return nil, err2
- } else {
- _dataList = append(_dataList, _v)
- dataMap[_v.Sameid] = _v
- }
- }
- return &Game_skill{_dataList:_dataList, _dataMap:dataMap}, nil
-}
-
-func (table *Game_skill) GetDataMap() map[int32]*Game_skillData {
- return table._dataMap
-}
-
-func (table *Game_skill) GetDataList() []*Game_skillData {
- return table._dataList
-}
-
-func (table *Game_skill) Get(key int32) *Game_skillData {
- return table._dataMap[key]
-}
-
-
diff --git a/sys/configure/structs/game.skillData.go b/sys/configure/structs/game.skillData.go
deleted file mode 100644
index 5a29bf61e..000000000
--- a/sys/configure/structs/game.skillData.go
+++ /dev/null
@@ -1,37 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-package cfg
-
-import "errors"
-
-type Game_skillData struct {
- Sameid int32
- Act string
- Type int32
- Triggerchannce int32
- Tubiao string
- Name string
- Describe string
-}
-
-func (Game_skillData) GetTypeId() int {
- return -1600555361
-}
-
-func NewGame_skillData(_buf map[string]interface{}) (_v *Game_skillData, err error) {
- _v = &Game_skillData{}
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sameid"].(float64); !_ok_ { err = errors.New("sameid error"); return }; _v.Sameid = int32(_tempNum_) }
- { var _ok_ bool; if _v.Act, _ok_ = _buf["act"].(string); !_ok_ { err = errors.New("act error"); return } }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["triggerchannce"].(float64); !_ok_ { err = errors.New("triggerchannce error"); return }; _v.Triggerchannce = int32(_tempNum_) }
- { var _ok_ bool; if _v.Tubiao, _ok_ = _buf["tubiao"].(string); !_ok_ { err = errors.New("tubiao error"); return } }
- { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } }
- { var _ok_ bool; if _v.Describe, _ok_ = _buf["describe"].(string); !_ok_ { err = errors.New("describe error"); return } }
- return
-}
diff --git a/sys/configure/structs/game.taskReward.go b/sys/configure/structs/game.taskReward.go
deleted file mode 100644
index 0e442fc94..000000000
--- a/sys/configure/structs/game.taskReward.go
+++ /dev/null
@@ -1,42 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-package cfg
-
-type Game_taskReward struct {
- _dataMap map[int32]*Game_taskRewardData
- _dataList []*Game_taskRewardData
-}
-
-func NewGame_taskReward(_buf []map[string]interface{}) (*Game_taskReward, error) {
- _dataList := make([]*Game_taskRewardData, 0, len(_buf))
- dataMap := make(map[int32]*Game_taskRewardData)
- for _, _ele_ := range _buf {
- if _v, err2 := NewGame_taskRewardData(_ele_); err2 != nil {
- return nil, err2
- } else {
- _dataList = append(_dataList, _v)
- dataMap[_v.Key] = _v
- }
- }
- return &Game_taskReward{_dataList:_dataList, _dataMap:dataMap}, nil
-}
-
-func (table *Game_taskReward) GetDataMap() map[int32]*Game_taskRewardData {
- return table._dataMap
-}
-
-func (table *Game_taskReward) GetDataList() []*Game_taskRewardData {
- return table._dataList
-}
-
-func (table *Game_taskReward) Get(key int32) *Game_taskRewardData {
- return table._dataMap[key]
-}
-
-
diff --git a/sys/configure/structs/game.taskRewardData.go b/sys/configure/structs/game.taskRewardData.go
deleted file mode 100644
index fb54bae60..000000000
--- a/sys/configure/structs/game.taskRewardData.go
+++ /dev/null
@@ -1,44 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-package cfg
-
-import "errors"
-
-type Game_taskRewardData struct {
- Key int32
- IdTag int32
- Active int32
- Reword []*Game_atn
-}
-
-func (Game_taskRewardData) GetTypeId() int {
- return -79537062
-}
-
-func NewGame_taskRewardData(_buf map[string]interface{}) (_v *Game_taskRewardData, err error) {
- _v = &Game_taskRewardData{}
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_tag"].(float64); !_ok_ { err = errors.New("id_tag error"); return }; _v.IdTag = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["active"].(float64); !_ok_ { err = errors.New("active error"); return }; _v.Active = int32(_tempNum_) }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["reword"].([]interface{}); !_ok_ { err = errors.New("reword error"); return }
-
- _v.Reword = make([]*Game_atn, 0, len(_arr_))
-
- for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
- _v.Reword = append(_v.Reword, _list_v_)
- }
- }
-
- return
-}