diff --git a/bin/json/game_asklibrary.json b/bin/json/game_asklibrary.json index 146cf2825..a13e0ecab 100644 --- a/bin/json/game_asklibrary.json +++ b/bin/json/game_asklibrary.json @@ -2,7 +2,7 @@ { "id": 1, "ExaminationGroup": 1001, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_01", "text": "菲奥娜父亲的真实身份是？" @@ -33,7 +33,7 @@ { "id": 2, "ExaminationGroup": 1001, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_02", "text": "诺斯是我们“守护联盟”的创始人之一，也是一位尊贵的守护神。那请问他成神之前是干什么的呢？" @@ -64,7 +64,7 @@ { "id": 3, "ExaminationGroup": 1001, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_03", "text": "匹诺曹的良心是什么？" @@ -95,7 +95,7 @@ { "id": 4, "ExaminationGroup": 1002, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_04", "text": "阿宝的亲生父亲是谁？" @@ -126,7 +126,7 @@ { "id": 5, "ExaminationGroup": 1002, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_05", "text": "希卡普的黑龙，和那条白龙，生的龙是什么品种？" @@ -157,7 +157,7 @@ { "id": 6, "ExaminationGroup": 1002, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_06", "text": "马达加斯加企鹅团最喜欢吃什么？" @@ -188,7 +188,7 @@ { "id": 7, "ExaminationGroup": 1003, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_07", "text": "博肯族女仆布里奇特告别王子逃走时，留在台阶上的鞋子是什么？" @@ -219,7 +219,7 @@ { "id": 8, "ExaminationGroup": 1003, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_08", "text": "史莱克向菲欧娜求婚时送她的戒指里刻着什么字？" @@ -250,7 +250,7 @@ { "id": 9, "ExaminationGroup": 1003, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_09", "text": "穿靴猫有一次冒险死于炮弹爆炸，那次冒险中他本来想偷什么？" @@ -281,7 +281,7 @@ { "id": 10, "ExaminationGroup": 1004, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_10", "text": "巴布女王的老爹，做的手势叫什么名字？" @@ -312,7 +312,7 @@ { "id": 11, "ExaminationGroup": 1004, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_11", "text": "瓜哥发明的腰带是用什么做的？" @@ -343,7 +343,7 @@ { "id": 12, "ExaminationGroup": 1004, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_12", "text": "悍娇虎最喜欢什么口味的食物？" @@ -374,7 +374,7 @@ { "id": 13, "ExaminationGroup": 1005, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_13", "text": "亲衣节时，戈伯的汤加进了什么意外的调料？" @@ -405,7 +405,7 @@ { "id": 14, "ExaminationGroup": 1005, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_14", "text": "雷霆狂花出阵时，众人涂在脸上的颜料是什么来源？" @@ -436,7 +436,7 @@ { "id": 15, "ExaminationGroup": 1005, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_15", "text": "骇客蛛的黑客知识在哪个网站上学的？" @@ -467,7 +467,7 @@ { "id": 16, "ExaminationGroup": 1006, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_16", "text": "希卡普的老妈瓦尔卡做的丸子，被戈伯评价像什么一样？" @@ -498,7 +498,7 @@ { "id": 17, "ExaminationGroup": 1006, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_17", "text": "什么植物能让龙轻轻一闻，就欲仙欲死，欲罢不能？" @@ -529,7 +529,7 @@ { "id": 18, "ExaminationGroup": 1006, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_18", "text": "以下哪个不是冰霜杰克的特征？" @@ -560,7 +560,7 @@ { "id": 19, "ExaminationGroup": 1007, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_19", "text": "哪种龙的蛋孵化时会发生强烈的爆炸？" @@ -591,7 +591,7 @@ { "id": 20, "ExaminationGroup": 1007, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_20", "text": "阿宝的乳名是什么？" @@ -622,7 +622,7 @@ { "id": 21, "ExaminationGroup": 1007, - "type": 0, + "type": 1, "topic": { "key": "ask_ask_library_topic_21", "text": "马达加斯加企鹅团的军师叫什么？" diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index be82d9e53..ddcc21513 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -9,8 +9,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -21,7 +21,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -31,7 +31,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -44,8 +44,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -56,7 +56,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -66,7 +66,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -79,8 +79,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -91,7 +91,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -101,7 +101,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -114,8 +114,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -126,7 +126,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -136,7 +136,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -149,8 +149,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -161,7 +161,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -171,7 +171,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -184,8 +184,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -196,7 +196,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -206,7 +206,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -219,8 +219,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -231,7 +231,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -241,7 +241,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -254,8 +254,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -266,7 +266,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -276,7 +276,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -289,8 +289,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -301,7 +301,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -311,7 +311,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -324,8 +324,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -336,7 +336,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -346,7 +346,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -359,8 +359,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -371,7 +371,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -381,7 +381,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -394,8 +394,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -406,7 +406,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -416,7 +416,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -429,8 +429,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -441,7 +441,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -451,7 +451,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 10 }, { @@ -464,8 +464,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -476,7 +476,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -486,7 +486,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -499,8 +499,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -511,7 +511,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -521,7 +521,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -534,8 +534,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -546,7 +546,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -556,7 +556,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -569,8 +569,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -581,7 +581,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -591,7 +591,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -606,8 +606,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -618,7 +618,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -628,7 +628,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 60 }, { @@ -641,8 +641,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -653,7 +653,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -663,7 +663,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -676,8 +676,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -688,7 +688,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -698,7 +698,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -711,8 +711,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -723,7 +723,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -733,7 +733,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -746,8 +746,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -758,7 +758,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -768,7 +768,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 100 }, { @@ -781,8 +781,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -793,7 +793,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -803,7 +803,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -816,8 +816,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -828,7 +828,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -838,7 +838,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -851,8 +851,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -863,7 +863,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -873,7 +873,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -886,8 +886,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -898,7 +898,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -908,7 +908,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -921,8 +921,8 @@ ], "BGMusic": "", "LoadingId": 1019, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -933,7 +933,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -943,7 +943,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -956,8 +956,8 @@ ], "BGMusic": "", "LoadingId": 1019, - "HideAlienSpace": 0, - "HideFightUI": 1, + "HideAlienSpace": false, + "HideFightUI": true, "RuleTips": { "key": "", "text": "" @@ -968,7 +968,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720014, @@ -978,7 +978,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -991,8 +991,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1003,7 +1003,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1013,7 +1013,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1026,8 +1026,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1038,7 +1038,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1048,7 +1048,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 100 }, { @@ -1061,8 +1061,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "battleready_battleready_RuleTips_1", "text": "只能上阵热情之火属性的守护者" @@ -1073,7 +1073,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [ 1 ], @@ -1085,7 +1085,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 100 }, { @@ -1098,8 +1098,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "battleready_battleready_RuleTips_2", "text": "只能上阵感观之林属性的守护者" @@ -1110,7 +1110,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [ 2 ], @@ -1122,7 +1122,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 100 }, { @@ -1135,8 +1135,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "battleready_battleready_RuleTips_3", "text": "只能上阵包容之水属性的守护者" @@ -1147,7 +1147,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [ 3 ], @@ -1159,7 +1159,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 100 }, { @@ -1172,8 +1172,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1184,7 +1184,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1194,7 +1194,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1207,8 +1207,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1219,7 +1219,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1229,7 +1229,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1242,8 +1242,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1256,7 +1256,7 @@ 14 ], "ScoreGroupID": 1, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1266,7 +1266,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 50 }, { @@ -1279,8 +1279,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 1, - "HideFightUI": 0, + "HideAlienSpace": true, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1291,7 +1291,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1301,7 +1301,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1314,8 +1314,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 1, - "HideFightUI": 0, + "HideAlienSpace": true, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1326,7 +1326,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1339,7 +1339,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1352,8 +1352,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 1, - "HideFightUI": 0, + "HideAlienSpace": true, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1364,7 +1364,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1374,7 +1374,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1387,8 +1387,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1399,7 +1399,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1409,7 +1409,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1422,8 +1422,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1434,7 +1434,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1444,7 +1444,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1457,8 +1457,8 @@ ], "BGMusic": "", "LoadingId": 1017, - "HideAlienSpace": 0, - "HideFightUI": 1, + "HideAlienSpace": false, + "HideFightUI": true, "RuleTips": { "key": "", "text": "" @@ -1471,7 +1471,7 @@ 109 ], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720014, @@ -1481,7 +1481,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1494,8 +1494,8 @@ ], "BGMusic": "", "LoadingId": 1017, - "HideAlienSpace": 0, - "HideFightUI": 1, + "HideAlienSpace": false, + "HideFightUI": true, "RuleTips": { "key": "", "text": "" @@ -1508,7 +1508,7 @@ 110 ], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720014, @@ -1518,7 +1518,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1531,8 +1531,8 @@ ], "BGMusic": "", "LoadingId": 1017, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1546,7 +1546,7 @@ 114 ], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1559,7 +1559,7 @@ ], "RedAssistTeam": 0, "BlueAssistTeam": 720016, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1572,8 +1572,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1586,7 +1586,7 @@ 112 ], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1596,7 +1596,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1609,8 +1609,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1621,7 +1621,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1631,7 +1631,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1644,8 +1644,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1656,7 +1656,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720017, @@ -1666,7 +1666,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1679,8 +1679,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1691,7 +1691,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1701,7 +1701,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1714,8 +1714,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1728,7 +1728,7 @@ 113 ], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720017, @@ -1738,7 +1738,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1751,8 +1751,8 @@ ], "BGMusic": "", "LoadingId": 1031, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1763,7 +1763,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1773,7 +1773,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -1786,8 +1786,8 @@ ], "BGMusic": "", "LoadingId": 1031, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1798,7 +1798,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720015, @@ -1808,7 +1808,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -1821,8 +1821,8 @@ ], "BGMusic": "", "LoadingId": 1031, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1833,7 +1833,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1845,7 +1845,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -1858,8 +1858,8 @@ ], "BGMusic": "", "LoadingId": 1031, - "HideAlienSpace": 0, - "HideFightUI": 1, + "HideAlienSpace": false, + "HideFightUI": true, "RuleTips": { "key": "", "text": "" @@ -1870,7 +1870,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [ 1, @@ -1885,7 +1885,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -1898,8 +1898,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1913,7 +1913,7 @@ 138 ], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -1927,7 +1927,7 @@ "HeroCheck": [], "RedAssistTeam": 720004, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1940,8 +1940,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1952,7 +1952,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720001, @@ -1962,7 +1962,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -1975,8 +1975,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -1989,7 +1989,7 @@ 137 ], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [ 1, @@ -2004,7 +2004,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2017,8 +2017,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2029,7 +2029,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2039,7 +2039,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2052,8 +2052,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2068,7 +2068,7 @@ 142 ], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720005, @@ -2080,7 +2080,7 @@ "HeroCheck": [], "RedAssistTeam": 720003, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2093,8 +2093,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2105,7 +2105,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2115,7 +2115,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -2128,8 +2128,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2140,7 +2140,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720006, @@ -2150,7 +2150,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2163,8 +2163,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2175,7 +2175,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720007, @@ -2189,7 +2189,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2202,8 +2202,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2214,7 +2214,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2224,7 +2224,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -2237,8 +2237,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2249,7 +2249,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2259,7 +2259,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -2272,8 +2272,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2284,7 +2284,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2294,7 +2294,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -2308,8 +2308,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2328,7 +2328,7 @@ 126 ], "ScoreGroupID": 0, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720021, @@ -2342,7 +2342,7 @@ "HeroCheck": [], "RedAssistTeam": 720019, "BlueAssistTeam": 720020, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2355,8 +2355,8 @@ ], "BGMusic": "", "LoadingId": 1019, - "HideAlienSpace": 0, - "HideFightUI": 1, + "HideAlienSpace": false, + "HideFightUI": true, "RuleTips": { "key": "", "text": "" @@ -2367,7 +2367,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720013, @@ -2377,7 +2377,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2390,8 +2390,8 @@ ], "BGMusic": "", "LoadingId": 1033, - "HideAlienSpace": 0, - "HideFightUI": 1, + "HideAlienSpace": false, + "HideFightUI": true, "RuleTips": { "key": "", "text": "" @@ -2406,7 +2406,7 @@ 132 ], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720014, @@ -2416,7 +2416,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2429,8 +2429,8 @@ ], "BGMusic": "", "LoadingId": 1019, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2441,7 +2441,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720018, @@ -2451,7 +2451,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2464,8 +2464,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2476,7 +2476,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2486,7 +2486,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2499,8 +2499,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2511,7 +2511,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2521,7 +2521,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -2534,8 +2534,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "battleready_battleready_RuleTips_1", "text": "只能上阵热情之火属性的守护者" @@ -2546,7 +2546,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [ 1 ], @@ -2558,7 +2558,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -2571,8 +2571,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "battleready_battleready_RuleTips_2", "text": "只能上阵感观之林属性的守护者" @@ -2583,7 +2583,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [ 2 ], @@ -2595,7 +2595,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -2608,8 +2608,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "battleready_battleready_RuleTips_3", "text": "只能上阵包容之水属性的守护者" @@ -2620,7 +2620,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [ 3 ], @@ -2632,7 +2632,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -2645,8 +2645,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2657,7 +2657,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2667,7 +2667,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -2680,8 +2680,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2692,7 +2692,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2702,7 +2702,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2715,8 +2715,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2727,7 +2727,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2737,7 +2737,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2750,8 +2750,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2762,7 +2762,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2772,7 +2772,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2785,8 +2785,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2797,7 +2797,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2807,7 +2807,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2820,8 +2820,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2832,7 +2832,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2842,7 +2842,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2855,8 +2855,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2867,7 +2867,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2877,7 +2877,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2890,8 +2890,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2902,7 +2902,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2912,7 +2912,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2925,8 +2925,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2939,7 +2939,7 @@ 136 ], "ScoreGroupID": 0, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2949,7 +2949,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2962,8 +2962,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -2974,7 +2974,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -2984,7 +2984,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -2997,8 +2997,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3009,7 +3009,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3019,7 +3019,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -3032,8 +3032,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3044,7 +3044,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3054,7 +3054,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -3067,8 +3067,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3079,7 +3079,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3089,7 +3089,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -3102,8 +3102,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3114,7 +3114,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3124,7 +3124,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -3137,8 +3137,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3149,7 +3149,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3159,7 +3159,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -3172,8 +3172,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3184,7 +3184,7 @@ }, "battleEvents": [], "ScoreGroupID": 1, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3194,7 +3194,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -3207,8 +3207,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3219,7 +3219,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3229,7 +3229,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -3242,8 +3242,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3254,7 +3254,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3264,7 +3264,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -3277,8 +3277,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3289,7 +3289,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3299,7 +3299,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -3312,8 +3312,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3324,7 +3324,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3334,7 +3334,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 60 }, { @@ -3347,8 +3347,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3359,7 +3359,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3369,7 +3369,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": true, "Numrounds": 0 }, { @@ -3382,8 +3382,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3394,7 +3394,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3404,7 +3404,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -3417,8 +3417,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3429,7 +3429,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3439,7 +3439,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -3452,8 +3452,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3464,7 +3464,7 @@ }, "battleEvents": [], "ScoreGroupID": 0, - "disableAiCamera": 0, + "disableAiCamera": false, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3474,7 +3474,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 0 }, { @@ -3487,8 +3487,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3499,7 +3499,7 @@ }, "battleEvents": [], "ScoreGroupID": 301, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3509,7 +3509,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 60 }, { @@ -3522,8 +3522,8 @@ ], "BGMusic": "", "LoadingId": 0, - "HideAlienSpace": 0, - "HideFightUI": 0, + "HideAlienSpace": false, + "HideFightUI": false, "RuleTips": { "key": "", "text": "" @@ -3534,7 +3534,7 @@ }, "battleEvents": [], "ScoreGroupID": 302, - "disableAiCamera": 1, + "disableAiCamera": true, "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 0, @@ -3544,7 +3544,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": false, "Numrounds": 60 } ] \ No newline at end of file diff --git a/bin/json/game_breakingbadtag.json b/bin/json/game_breakingbadtag.json index 25d36dfb4..9d6ebf624 100644 --- a/bin/json/game_breakingbadtag.json +++ b/bin/json/game_breakingbadtag.json @@ -2,42 +2,42 @@ { "Type": 1, "TagName": { - "key": "breakingbad_gourmet_TagName_1", + "key": "breakingbad_gourmettag_TagName_1", "text": "点心" } }, { "Type": 2, "TagName": { - "key": "breakingbad_gourmet_TagName_2", + "key": "breakingbad_gourmettag_TagName_2", "text": "凉菜" } }, { "Type": 3, "TagName": { - "key": "breakingbad_gourmet_TagName_3", + "key": "breakingbad_gourmettag_TagName_3", "text": "热菜" } }, { "Type": 4, "TagName": { - "key": "breakingbad_gourmet_TagName_4", + "key": "breakingbad_gourmettag_TagName_4", "text": "汤" } }, { "Type": 5, "TagName": { - "key": "breakingbad_gourmet_TagName_5", + "key": "breakingbad_gourmettag_TagName_5", "text": "饮料" } }, { "Type": 6, "TagName": { - "key": "breakingbad_gourmet_TagName_6", + "key": "breakingbad_gourmettag_TagName_6", "text": "主食" } } diff --git a/bin/json/game_bubblegroup.json b/bin/json/game_bubblegroup.json index 204b95f24..50111e35d 100644 --- a/bin/json/game_bubblegroup.json +++ b/bin/json/game_bubblegroup.json @@ -1442,7 +1442,7 @@ { "KeyId": 121, "GroupID": 20030234, - "Type": 0, + "Type": 1, "TaskIDMin": 0, "TaskIDMax": 0, "weight": 10, @@ -1454,7 +1454,7 @@ { "KeyId": 122, "GroupID": 20030235, - "Type": 0, + "Type": 1, "TaskIDMin": 0, "TaskIDMax": 0, "weight": 10, @@ -1478,7 +1478,7 @@ { "KeyId": 124, "GroupID": 15000001, - "Type": 0, + "Type": 1, "TaskIDMin": 0, "TaskIDMax": 0, "weight": 10, @@ -1490,7 +1490,7 @@ { "KeyId": 125, "GroupID": 15000002, - "Type": 0, + "Type": 1, "TaskIDMin": 0, "TaskIDMax": 0, "weight": 10, @@ -1502,7 +1502,7 @@ { "KeyId": 126, "GroupID": 15000003, - "Type": 0, + "Type": 1, "TaskIDMin": 0, "TaskIDMax": 0, "weight": 10, diff --git a/bin/json/game_caravanevent.json b/bin/json/game_caravanevent.json index 3afbf2460..ac4553715 100644 --- a/bin/json/game_caravanevent.json +++ b/bin/json/game_caravanevent.json @@ -4,7 +4,7 @@ "eventgroup": 1, "eventweight": 250, "eventtype": 1, - "mustdo": 2, + "mustdo": false, "citystory": 50020010, "citynormal": 50020030, "cityabnormal": 50020020, @@ -34,7 +34,7 @@ "eventgroup": 1, "eventweight": 250, "eventtype": 1, - "mustdo": 2, + "mustdo": false, "citystory": 50020010, "citynormal": 50020030, "cityabnormal": 50020020, @@ -64,7 +64,7 @@ "eventgroup": 1, "eventweight": 250, "eventtype": 1, - "mustdo": 2, + "mustdo": false, "citystory": 50020010, "citynormal": 50020030, "cityabnormal": 50020020, @@ -94,7 +94,7 @@ "eventgroup": 1, "eventweight": 250, "eventtype": 1, - "mustdo": 2, + "mustdo": false, "citystory": 50020010, "citynormal": 50020030, "cityabnormal": 50020020, diff --git a/bin/json/game_global.json b/bin/json/game_global.json index f36a8aa68..7dba54bad 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -678,9 +678,9 @@ }, "passlvmax": 50, "guildboss_roulette": { - "a": "attr", - "t": "arenacoin", - "n": 1000 + "a": "item", + "t": "22100001", + "n": 1 }, "guildboss_kill_Preview": [ { diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 3afa7d95f..95eb6c3df 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -23848,9 +23848,11 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], "scene_effect": [ - "senlinmiwu", + "senlinmiwu01", "miwu" ], "scene_effectfilter": "", @@ -23932,9 +23934,11 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], "scene_effect": [ - "senlinmiwu", + "senlinmiwu01", "miwu" ], "scene_effectfilter": "", @@ -24064,9 +24068,11 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], "scene_effect": [ - "senlinmiwu", + "senlinmiwu01", "miwu" ], "scene_effectfilter": "", @@ -24148,9 +24154,11 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], "scene_effect": [ - "senlinmiwu", + "senlinmiwu01", "miwu" ], "scene_effectfilter": "", @@ -24282,6 +24290,7 @@ "venturetype": 0, "ventureavatar": [], "scene_effect": [ + "senlinmiwu02", "miwu" ], "scene_effectfilter": "", @@ -24413,6 +24422,7 @@ "venturetype": 0, "ventureavatar": [], "scene_effect": [ + "senlinmiwu03", "miwu" ], "scene_effectfilter": "", @@ -24542,7 +24552,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [ "miwu" ], @@ -24673,7 +24686,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [ "miwu" ], @@ -24756,7 +24772,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [ "miwu" ], @@ -24839,7 +24858,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [ "miwu" ], @@ -24922,7 +24944,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [ "miwu" ], @@ -25005,7 +25030,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [ "miwu" ], @@ -25136,7 +25164,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [ "miwu" ], @@ -25219,7 +25250,9 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], "scene_effect": [ "miwu" ], @@ -25302,7 +25335,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/13004/13004_q.prefab" + ], "scene_effect": [ "miwu" ], @@ -25385,10 +25421,11 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], - "scene_effect": [ - "miwuxiaosan" + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/13004/13004_q.prefab" ], + "scene_effect": [], "scene_effectfilter": "", "is_near": 0, "openlevel": 1, @@ -25468,7 +25505,9 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -25597,7 +25636,9 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -25678,7 +25719,9 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -25807,7 +25850,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -25936,7 +25982,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -26323,7 +26372,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -26452,7 +26504,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -26662,7 +26717,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -26743,7 +26801,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -26872,7 +26933,9 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -26953,7 +27016,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, @@ -27082,7 +27148,10 @@ "text": "" }, "venturetype": 0, - "ventureavatar": [], + "ventureavatar": [ + "Person/24004/24004_q.prefab", + "Person/45004/45004_q.prefab" + ], "scene_effect": [], "scene_effectfilter": "", "is_near": 0, diff --git a/bin/json/game_playerskill.json b/bin/json/game_playerskill.json index 06edeba05..45be7b036 100644 --- a/bin/json/game_playerskill.json +++ b/bin/json/game_playerskill.json @@ -1,6 +1,6 @@ [ { - "key": 10001, + "key": "10001", "skillvalue": 0, "icon": "sx_img_cz", "name": { @@ -17,7 +17,7 @@ "jump": 103 }, { - "key": 10002, + "key": "10002", "skillvalue": 0, "icon": "sx_img_fj", "name": { @@ -34,7 +34,7 @@ "jump": 103 }, { - "key": 10003, + "key": "10003", "skillvalue": 0, "icon": "sx_img_pz", "name": { diff --git a/modules/caravan/api_gotocity.go b/modules/caravan/api_gotocity.go index 939c901c8..e3b03c206 100644 --- a/modules/caravan/api_gotocity.go +++ b/modules/caravan/api_gotocity.go @@ -56,7 +56,7 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity if list.Tasktime-configure.Now().Unix() > int64(event.Eventtime) { //TODO 任务超时 this.module.CheckCaravanTask(session, list) } - if event.Mustdo == 1 { // 需要完成强制任务 + if event.Mustdo { // 需要完成强制任务 errdata = &pb.ErrorData{ Code: pb.ErrorCode_TrollTask, Title: pb.ErrorCode_TrollTask.ToString(), diff --git a/modules/entertainment/api_match.go b/modules/entertainment/api_match.go index 5e36e338c..fcf531b87 100644 --- a/modules/entertainment/api_match.go +++ b/modules/entertainment/api_match.go @@ -78,7 +78,7 @@ func (this *apiComp) Match(session comm.IUserSession, req *pb.EntertainMatchReq) } } - mySkill := make(map[int32]int32, 0) + mySkill := make(map[string]int32, 0) for _, v := range req.Skillcard { mySkill[v] = 1 } diff --git a/modules/entertainment/configure.go b/modules/entertainment/configure.go index 01297326c..9b52d4dd8 100644 --- a/modules/entertainment/configure.go +++ b/modules/entertainment/configure.go @@ -278,7 +278,7 @@ func (this *configureComp) GetGameNormalElem() (rd int32) { rd = comm.GetRandW(szWeight) + 1 return } -func (this *configureComp) GetGamePlaySkill(skillid int32) (conf *cfg.GamePlayerSkillData, err error) { +func (this *configureComp) GetGamePlaySkill(skillid string) (conf *cfg.GamePlayerSkillData, err error) { var ( v interface{} ) @@ -341,7 +341,7 @@ func (this *configureComp) getPassCheckCfg() (data *cfg.GamePassCheck, err error return } -func (this *configureComp) GetInitGameConsumeSkill() (skill []int32) { +func (this *configureComp) GetInitGameConsumeSkill() (skill []string) { if v, err := this.GetConfigure(game_playerskill); err == nil { if configure, ok := v.(*cfg.GamePlayerSkill); ok { @@ -365,3 +365,20 @@ func (this *configureComp) GetConsumeTaskData() (conf []*cfg.GameConsumeTaskData return } +func (this *configureComp) GetGamePlaySkillByTouch(skilltouch int32) (conf *cfg.GamePlayerSkillData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_playerskill); err == nil { + if configure, ok := v.(*cfg.GamePlayerSkill); ok { + for _, v := range configure.GetDataList() { + if v.Skilltouch == skilltouch { + conf = v + return + } + } + } + } + err = comm.NewNotFoundConfErr(moduleName, game_playerskill, skilltouch) + return +} diff --git a/modules/entertainment/match.go b/modules/entertainment/match.go index 9d68a780b..980b9c458 100644 --- a/modules/entertainment/match.go +++ b/modules/entertainment/match.go @@ -68,7 +68,6 @@ func (this *matchComp) MatchNotic(players map[string]interface{}) (err error) { playerSlice = append(playerSlice, v.(*pb.DBXXLMatch)) } for pos, v := range playerSlice { - if pos == 0 { p1 = &pb.PlayerData{ Userinfo: v.Userinfo, diff --git a/modules/entertainment/model.go b/modules/entertainment/model.go index a26a8b1f5..ae0417fbd 100644 --- a/modules/entertainment/model.go +++ b/modules/entertainment/model.go @@ -44,7 +44,7 @@ func (this *modelComp) getEntertainmList(uid string) (result *pb.DBXXLData, err result = &pb.DBXXLData{ Reward: map[int32]int32{}, Card: map[string]int32{}, - Skill: map[int32]int32{}, + Skill: map[string]int32{}, } err = this.Get(uid, result) diff --git a/modules/entertainment/module.go b/modules/entertainment/module.go index fc9bc2799..dac8e8a4a 100644 --- a/modules/entertainment/module.go +++ b/modules/entertainment/module.go @@ -11,7 +11,6 @@ import ( "go_dreamfactory/modules" "go_dreamfactory/pb" "go_dreamfactory/sys/db" - "strconv" ) func NewModule() core.IModule { @@ -185,8 +184,8 @@ func (this *Entertainment) CreateRoom(sessions []comm.IUserSession, rulesStr str RoomType: 0, Card1: "", Card2: "", - Skill1: make(map[int32]int32), - Skill2: make(map[int32]int32), + Skill1: make(map[string]int32), + Skill2: make(map[string]int32), } red *pb.DBUser blue *pb.DBUser @@ -266,30 +265,11 @@ func (this *Entertainment) AddXxlSkillCard(session comm.IUserSession, skill map[ result *pb.DBXXLData err error ) - // for k := range skill { - // if _, err := this.model.module.configure.GetGameConsumeHero(k); err != nil { - // errdata = &pb.ErrorData{ - // Code: pb.ErrorCode_ReqParameterError, - // Title: pb.ErrorCode_ReqParameterError.ToString(), - // Message: err.Error(), - // } - // return - // } - // } if result, err = this.model.getEntertainmList(session.GetUserId()); err != nil { return } for k, v := range skill { - if iKey, err := strconv.Atoi(k); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ReqParameterError, - Title: pb.ErrorCode_ReqParameterError.ToString(), - Message: err.Error(), - } - return - } else { - result.Skill[int32(iKey)] += v - } + result.Skill[k] += v } this.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{ "skill": result.Skill, @@ -304,7 +284,7 @@ func (this *Entertainment) AddXxlSkillCard(session comm.IUserSession, skill map[ } // 消耗一张技能卡 -func (this *Entertainment) ConsumXxlSkillCard(session comm.IUserSession, skillCard int32) (errdata *pb.ErrorData) { +func (this *Entertainment) ConsumXxlSkillCard(session comm.IUserSession, skillCard string) (errdata *pb.ErrorData) { var ( result *pb.DBXXLData diff --git a/modules/entertainment/room.go b/modules/entertainment/room.go index b17ed982d..fa3d2b30d 100644 --- a/modules/entertainment/room.go +++ b/modules/entertainment/room.go @@ -155,17 +155,20 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr } return } else if req.Itype > 0 { //玩家卡牌技能 - if curPlayer.Skill[req.Itype] <= 0 { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_EntertainNoSkillCard, // 技能卡不足 - Title: pb.ErrorCode_EntertainNoSkillCard.ToString(), + if conf, err := this.module.configure.GetGamePlaySkillByTouch(req.Itype); err != nil { + if curPlayer.Skill[conf.Key] <= 0 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EntertainNoSkillCard, // 技能卡不足 + Title: pb.ErrorCode_EntertainNoSkillCard.ToString(), + } + return + } + curPlayer.Skill[conf.Key] -= 1 + if errdata = this.UserCardSkill(curPlayer, color, conf.Key, req.Curid); errdata != nil { + return } - return - } - curPlayer.Skill[req.Itype] -= 1 - if errdata = this.UserCardSkill(curPlayer, color, req.Itype, req.Curid); errdata != nil { - return } + return } if req.Itype == 0 && req.Curid == 0 && req.Targetid == 0 { @@ -934,7 +937,7 @@ func (this *Room) ChangePower() { } // 玩家释放技能 -func (this *Room) UserCardSkill(curPlayer *pb.PlayerData, color int32, skillid int32, curid int32) (errdata *pb.ErrorData) { +func (this *Room) UserCardSkill(curPlayer *pb.PlayerData, color int32, skillid string, curid int32) (errdata *pb.ErrorData) { var ( curScore int32 // 该次操作的得分 oid1 int32 // 唯一id @@ -1006,7 +1009,7 @@ func (this *Room) UserCardSkill(curPlayer *pb.PlayerData, color int32, skillid i Round: this.round, User1: this.player1, User2: this.player2, - Itype: skillid, + Itype: conf.Skilltouch, Curid: oid1, Targetid: oid2, }, this.szSession...); err != nil { diff --git a/pb/entertain_db.pb.go b/pb/entertain_db.pb.go index d4c5dc9e0..ece1ccff4 100644 --- a/pb/entertain_db.pb.go +++ b/pb/entertain_db.pb.go @@ -177,13 +177,13 @@ type PlayerData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"` - Score int32 `protobuf:"varint,2,opt,name=score,proto3" json:"score"` // 本局战斗得分 - Ps int32 `protobuf:"varint,3,opt,name=ps,proto3" json:"ps"` // 体力 - Cardid string `protobuf:"bytes,4,opt,name=cardid,proto3" json:"cardid"` // 出战的英雄卡 - Energy int32 `protobuf:"varint,5,opt,name=energy,proto3" json:"energy"` // 能量进度 - Consumeexp int32 `protobuf:"varint,6,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分 - Skill map[int32]int32 `protobuf:"bytes,7,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 出战的技能卡 key consume_playerskill表中cid value 数量 + Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"` + Score int32 `protobuf:"varint,2,opt,name=score,proto3" json:"score"` // 本局战斗得分 + Ps int32 `protobuf:"varint,3,opt,name=ps,proto3" json:"ps"` // 体力 + Cardid string `protobuf:"bytes,4,opt,name=cardid,proto3" json:"cardid"` // 出战的英雄卡 + Energy int32 `protobuf:"varint,5,opt,name=energy,proto3" json:"energy"` // 能量进度 + Consumeexp int32 `protobuf:"varint,6,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分 + Skill map[string]int32 `protobuf:"bytes,7,rep,name=skill,proto3" json:"skill" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 出战的技能卡 key consume_playerskill表中cid value 数量 } func (x *PlayerData) Reset() { @@ -260,7 +260,7 @@ func (x *PlayerData) GetConsumeexp() int32 { return 0 } -func (x *PlayerData) GetSkill() map[int32]int32 { +func (x *PlayerData) GetSkill() map[string]int32 { if x != nil { return x.Skill } @@ -273,10 +273,10 @@ type DBXXLMatch struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"` - Cardid string `protobuf:"bytes,2,opt,name=cardid,proto3" json:"cardid"` // 选择的卡片ID - Consumeexp int32 `protobuf:"varint,3,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分 - Skill map[int32]int32 `protobuf:"bytes,4,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // + Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"` + Cardid string `protobuf:"bytes,2,opt,name=cardid,proto3" json:"cardid"` // 选择的卡片ID + Consumeexp int32 `protobuf:"varint,3,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分 + Skill map[string]int32 `protobuf:"bytes,4,rep,name=skill,proto3" json:"skill" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // } func (x *DBXXLMatch) Reset() { @@ -332,7 +332,7 @@ func (x *DBXXLMatch) GetConsumeexp() int32 { return 0 } -func (x *DBXXLMatch) GetSkill() map[int32]int32 { +func (x *DBXXLMatch) GetSkill() map[string]int32 { if x != nil { return x.Skill } @@ -406,13 +406,13 @@ type DBXXLData struct { Rtime int64 `protobuf:"varint,5,opt,name=rtime,proto3" json:"rtime"` // 刷新时间 (客户端不用) Playtype []int32 `protobuf:"varint,6,rep,packed,name=playtype,proto3" json:"playtype"` // 每天随机玩法 Box []*BoxData `protobuf:"bytes,7,rep,name=box,proto3" json:"box"` - Roomid string `protobuf:"bytes,8,opt,name=roomid,proto3" json:"roomid"` // 房间id 重连用 - ServicePath string `protobuf:"bytes,9,opt,name=servicePath,proto3" json:"servicePath"` // 目标服务节点 重连RPC用 - Etime int64 `protobuf:"varint,10,opt,name=etime,proto3" json:"etime"` // 赛季结束时间 - Touxiang int32 `protobuf:"varint,11,opt,name=touxiang,proto3" json:"touxiang"` // 今天投降的次数 - Skill map[int32]int32 `protobuf:"bytes,12,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 技能id value 数量(可为0) - Liansheng int32 `protobuf:"varint,13,opt,name=liansheng,proto3" json:"liansheng"` // 连胜 - Freeprogress int32 `protobuf:"varint,14,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取进度 + Roomid string `protobuf:"bytes,8,opt,name=roomid,proto3" json:"roomid"` // 房间id 重连用 + ServicePath string `protobuf:"bytes,9,opt,name=servicePath,proto3" json:"servicePath"` // 目标服务节点 重连RPC用 + Etime int64 `protobuf:"varint,10,opt,name=etime,proto3" json:"etime"` // 赛季结束时间 + Touxiang int32 `protobuf:"varint,11,opt,name=touxiang,proto3" json:"touxiang"` // 今天投降的次数 + Skill map[string]int32 `protobuf:"bytes,12,rep,name=skill,proto3" json:"skill" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 技能id value 数量(可为0) + Liansheng int32 `protobuf:"varint,13,opt,name=liansheng,proto3" json:"liansheng"` // 连胜 + Freeprogress int32 `protobuf:"varint,14,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取进度 Payprogress int32 `protobuf:"varint,15,opt,name=payprogress,proto3" json:"payprogress"` Vip bool `protobuf:"varint,16,opt,name=vip,proto3" json:"vip"` // 是否购买 Maxconsumeexp int32 `protobuf:"varint,17,opt,name=maxconsumeexp,proto3" json:"maxconsumeexp"` // 最大赛季积分 @@ -531,7 +531,7 @@ func (x *DBXXLData) GetTouxiang() int32 { return 0 } -func (x *DBXXLData) GetSkill() map[int32]int32 { +func (x *DBXXLData) GetSkill() map[string]int32 { if x != nil { return x.Skill } @@ -607,11 +607,11 @@ type DBXxlRules struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RoomType int32 `protobuf:"varint,1,opt,name=RoomType,proto3" json:"RoomType"` // 房间类型 - Card1 string `protobuf:"bytes,2,opt,name=card1,proto3" json:"card1"` // player1 卡 - Card2 string `protobuf:"bytes,3,opt,name=card2,proto3" json:"card2"` // player2 卡 - Skill1 map[int32]int32 `protobuf:"bytes,4,rep,name=skill1,proto3" json:"skill1" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家1携带的技能 - Skill2 map[int32]int32 `protobuf:"bytes,5,rep,name=skill2,proto3" json:"skill2" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家2携带的技能 + RoomType int32 `protobuf:"varint,1,opt,name=RoomType,proto3" json:"RoomType"` // 房间类型 + Card1 string `protobuf:"bytes,2,opt,name=card1,proto3" json:"card1"` // player1 卡 + Card2 string `protobuf:"bytes,3,opt,name=card2,proto3" json:"card2"` // player2 卡 + Skill1 map[string]int32 `protobuf:"bytes,4,rep,name=skill1,proto3" json:"skill1" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家1携带的技能 + Skill2 map[string]int32 `protobuf:"bytes,5,rep,name=skill2,proto3" json:"skill2" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家2携带的技能 } func (x *DBXxlRules) Reset() { @@ -667,14 +667,14 @@ func (x *DBXxlRules) GetCard2() string { return "" } -func (x *DBXxlRules) GetSkill1() map[int32]int32 { +func (x *DBXxlRules) GetSkill1() map[string]int32 { if x != nil { return x.Skill1 } return nil } -func (x *DBXxlRules) GetSkill2() map[int32]int32 { +func (x *DBXxlRules) GetSkill2() map[string]int32 { if x != nil { return x.Skill2 } @@ -957,7 +957,7 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{ 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xd7, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x29, @@ -971,7 +971,7 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{ 0x32, 0x16, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3b, 0x0a, 0x07, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x01, 0x20, @@ -1027,7 +1027,7 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{ 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xac, 0x02, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x78, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x18, @@ -1042,11 +1042,11 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{ 0x42, 0x58, 0x78, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x1a, 0x39, 0x0a, 0x0b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x31, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa6, 0x01, 0x0a, 0x09, 0x58, 0x78, 0x6c, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, diff --git a/pb/entertain_msg.pb.go b/pb/entertain_msg.pb.go index d72444ad1..5bb9bda8f 100644 --- a/pb/entertain_msg.pb.go +++ b/pb/entertain_msg.pb.go @@ -26,8 +26,8 @@ type EntertainMatchReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Idcard string `protobuf:"bytes,1,opt,name=idcard,proto3" json:"idcard"` //出战的英雄卡 - Skillcard []int32 `protobuf:"varint,2,rep,packed,name=skillcard,proto3" json:"skillcard"` + Idcard string `protobuf:"bytes,1,opt,name=idcard,proto3" json:"idcard"` //出战的英雄卡 + Skillcard []string `protobuf:"bytes,2,rep,name=skillcard,proto3" json:"skillcard"` } func (x *EntertainMatchReq) Reset() { @@ -69,7 +69,7 @@ func (x *EntertainMatchReq) GetIdcard() string { return "" } -func (x *EntertainMatchReq) GetSkillcard() []int32 { +func (x *EntertainMatchReq) GetSkillcard() []string { if x != nil { return x.Skillcard } @@ -1313,8 +1313,8 @@ type EntertainChangePush struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Card map[string]int32 `protobuf:"bytes,1,rep,name=card,proto3" json:"card" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 卡id value 数量(可为0) - Skill map[int32]int32 `protobuf:"bytes,2,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // + Card map[string]int32 `protobuf:"bytes,1,rep,name=card,proto3" json:"card" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 卡id value 数量(可为0) + Skill map[string]int32 `protobuf:"bytes,2,rep,name=skill,proto3" json:"skill" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // } func (x *EntertainChangePush) Reset() { @@ -1356,7 +1356,7 @@ func (x *EntertainChangePush) GetCard() map[string]int32 { return nil } -func (x *EntertainChangePush) GetSkill() map[int32]int32 { +func (x *EntertainChangePush) GetSkill() map[string]int32 { if x != nil { return x.Skill } @@ -2641,7 +2641,7 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{ 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x63, - 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, + 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x63, 0x61, 0x72, 0x64, 0x22, 0x2a, 0x0a, 0x12, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x79, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x61, 0x79, 0x63, 0x68, @@ -2782,7 +2782,7 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x30, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69, diff --git a/sys/configure/structs/Game.BattlePlayType.go b/sys/configure/structs/Game.BattlePlayType.go new file mode 100644 index 000000000..470a52400 --- /dev/null +++ b/sys/configure/structs/Game.BattlePlayType.go @@ -0,0 +1,34 @@ +//------------------------------------------------------------------------------ +// +// 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 + +const ( + GameBattlePlayType_Null = 0 + GameBattlePlayType_Mainline = 1 + GameBattlePlayType_Pagoda = 2 + GameBattlePlayType_Rtask = 3 + GameBattlePlayType_Hunting = 4 + GameBattlePlayType_Viking = 5 + GameBattlePlayType_Moonfantasy = 6 + GameBattlePlayType_Arena = 7 + GameBattlePlayType_Academy = 8 + GameBattlePlayType_Heroteaching = 9 + GameBattlePlayType_Combat = 10 + GameBattlePlayType_Enchant = 11 + GameBattlePlayType_Sociaty = 12 + GameBattlePlayType_Friendsmeet = 13 + GameBattlePlayType_Practicenpc = 14 + GameBattlePlayType_Race = 15 + GameBattlePlayType_Cycle = 16 + GameBattlePlayType_Guildgve = 17 + GameBattlePlayType_Stone = 18 + GameBattlePlayType_Expboos = 19 + GameBattlePlayType_IsLand = 20 + GameBattlePlayType_Integral = 21 +) diff --git a/sys/configure/structs/Game.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go index 6d1f89b28..446773aa3 100644 --- a/sys/configure/structs/Game.BattleReadyData.go +++ b/sys/configure/structs/Game.BattleReadyData.go @@ -18,13 +18,13 @@ type GameBattleReadyData struct { BattleScenes []string BGMusic string LoadingId int32 - HideAlienSpace int32 - HideFightUI int32 + HideAlienSpace bool + HideFightUI bool RuleTips string BattleTips string BattleEvents []int32 ScoreGroupID int32 - DisableAiCamera int32 + DisableAiCamera bool ChoseCamp []int32 DisableCamp []int32 DefaultHero int32 @@ -34,7 +34,7 @@ type GameBattleReadyData struct { HeroCheck []string RedAssistTeam int32 BlueAssistTeam int32 - CanFriendHelp int32 + CanFriendHelp bool Numrounds int32 } @@ -65,8 +65,8 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; if _v.BGMusic, _ok_ = _buf["BGMusic"].(string); !_ok_ { err = errors.New("BGMusic error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["LoadingId"].(float64); !_ok_ { err = errors.New("LoadingId error"); return }; _v.LoadingId = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HideAlienSpace"].(float64); !_ok_ { err = errors.New("HideAlienSpace error"); return }; _v.HideAlienSpace = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HideFightUI"].(float64); !_ok_ { err = errors.New("HideFightUI error"); return }; _v.HideFightUI = int32(_tempNum_) } + { var _ok_ bool; if _v.HideAlienSpace, _ok_ = _buf["HideAlienSpace"].(bool); !_ok_ { err = errors.New("HideAlienSpace error"); return } } + { var _ok_ bool; if _v.HideFightUI, _ok_ = _buf["HideFightUI"].(bool); !_ok_ { err = errors.New("HideFightUI error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["RuleTips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RuleTips error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RuleTips, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["BattleTips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BattleTips error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BattleTips, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { @@ -84,7 +84,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ScoreGroupID"].(float64); !_ok_ { err = errors.New("ScoreGroupID error"); return }; _v.ScoreGroupID = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) } + { var _ok_ bool; if _v.DisableAiCamera, _ok_ = _buf["disableAiCamera"].(bool); !_ok_ { err = errors.New("disableAiCamera error"); return } } { var _arr_ []interface{} var _ok_ bool @@ -172,7 +172,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RedAssistTeam"].(float64); !_ok_ { err = errors.New("RedAssistTeam error"); return }; _v.RedAssistTeam = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BlueAssistTeam"].(float64); !_ok_ { err = errors.New("BlueAssistTeam error"); return }; _v.BlueAssistTeam = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CanFriendHelp"].(float64); !_ok_ { err = errors.New("CanFriendHelp error"); return }; _v.CanFriendHelp = int32(_tempNum_) } + { var _ok_ bool; if _v.CanFriendHelp, _ok_ = _buf["CanFriendHelp"].(bool); !_ok_ { err = errors.New("CanFriendHelp error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Numrounds"].(float64); !_ok_ { err = errors.New("Numrounds error"); return }; _v.Numrounds = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.BattleScoreType.go b/sys/configure/structs/Game.BattleScoreType.go new file mode 100644 index 000000000..85b1c03e6 --- /dev/null +++ b/sys/configure/structs/Game.BattleScoreType.go @@ -0,0 +1,14 @@ +//------------------------------------------------------------------------------ +// +// 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 + +const ( + GameBattleScoreType_Ordinary = 0 + GameBattleScoreType_Coefficient = 1 +) diff --git a/sys/configure/structs/Game.CaravanEventData.go b/sys/configure/structs/Game.CaravanEventData.go index 061273674..f1a673552 100644 --- a/sys/configure/structs/Game.CaravanEventData.go +++ b/sys/configure/structs/Game.CaravanEventData.go @@ -15,7 +15,7 @@ type GameCaravanEventData struct { Eventgroup int32 Eventweight int32 Eventtype int32 - Mustdo int32 + Mustdo bool Citystory int32 Citynormal int32 Cityabnormal int32 @@ -41,7 +41,7 @@ func (_v *GameCaravanEventData)Deserialize(_buf map[string]interface{}) (err err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventgroup"].(float64); !_ok_ { err = errors.New("eventgroup error"); return }; _v.Eventgroup = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventweight"].(float64); !_ok_ { err = errors.New("eventweight error"); return }; _v.Eventweight = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventtype"].(float64); !_ok_ { err = errors.New("eventtype error"); return }; _v.Eventtype = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mustdo"].(float64); !_ok_ { err = errors.New("mustdo error"); return }; _v.Mustdo = int32(_tempNum_) } + { var _ok_ bool; if _v.Mustdo, _ok_ = _buf["mustdo"].(bool); !_ok_ { err = errors.New("mustdo error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citystory"].(float64); !_ok_ { err = errors.New("citystory error"); return }; _v.Citystory = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citynormal"].(float64); !_ok_ { err = errors.New("citynormal error"); return }; _v.Citynormal = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityabnormal"].(float64); !_ok_ { err = errors.New("cityabnormal error"); return }; _v.Cityabnormal = int32(_tempNum_) } diff --git a/sys/configure/structs/Game.PlayerSkill.go b/sys/configure/structs/Game.PlayerSkill.go index 2a78ed400..294f3e9ab 100644 --- a/sys/configure/structs/Game.PlayerSkill.go +++ b/sys/configure/structs/Game.PlayerSkill.go @@ -9,13 +9,13 @@ package cfg type GamePlayerSkill struct { - _dataMap map[int32]*GamePlayerSkillData + _dataMap map[string]*GamePlayerSkillData _dataList []*GamePlayerSkillData } func NewGamePlayerSkill(_buf []map[string]interface{}) (*GamePlayerSkill, error) { _dataList := make([]*GamePlayerSkillData, 0, len(_buf)) - dataMap := make(map[int32]*GamePlayerSkillData) + dataMap := make(map[string]*GamePlayerSkillData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGamePlayerSkillData(_ele_); err2 != nil { return nil, err2 @@ -27,7 +27,7 @@ func NewGamePlayerSkill(_buf []map[string]interface{}) (*GamePlayerSkill, error) return &GamePlayerSkill{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamePlayerSkill) GetDataMap() map[int32]*GamePlayerSkillData { +func (table *GamePlayerSkill) GetDataMap() map[string]*GamePlayerSkillData { return table._dataMap } @@ -35,7 +35,7 @@ func (table *GamePlayerSkill) GetDataList() []*GamePlayerSkillData { return table._dataList } -func (table *GamePlayerSkill) Get(key int32) *GamePlayerSkillData { +func (table *GamePlayerSkill) Get(key string) *GamePlayerSkillData { return table._dataMap[key] } diff --git a/sys/configure/structs/Game.PlayerSkillData.go b/sys/configure/structs/Game.PlayerSkillData.go index 56876514a..9bbc7ac73 100644 --- a/sys/configure/structs/Game.PlayerSkillData.go +++ b/sys/configure/structs/Game.PlayerSkillData.go @@ -11,7 +11,7 @@ package cfg import "errors" type GamePlayerSkillData struct { - Key int32 + Key string Skillvalue int32 Icon string Name string @@ -29,7 +29,7 @@ func (*GamePlayerSkillData) GetTypeId() int32 { } func (_v *GamePlayerSkillData)Deserialize(_buf map[string]interface{}) (err error) { - { 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; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillvalue"].(float64); !_ok_ { err = errors.New("skillvalue error"); return }; _v.Skillvalue = int32(_tempNum_) } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon 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 } } }