diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 97dd4cae8..186fced7f 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -36,7 +36,7 @@
},
{
"index": "init_hero",
- "var": "15001, 25001",
+ "var": "15001,25001",
"intr": "初始英雄"
},
{
@@ -46,7 +46,7 @@
},
{
"index": "cameramax",
- "var": "10.4,16.4,151.5",
+ "var": "0,1.54,-2.62",
"intr": "镜头坐标最大值"
},
{
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 6da12b98c..5d1f0855d 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -25,7 +25,8 @@
"skill1": 110001,
"skill2": 110002,
"skill3": 110003,
- "enteranivalue": 100
+ "enteranivalue": 100,
+ "camerainterval": 0.5
},
{
"id": 11002,
@@ -53,7 +54,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11003,
@@ -72,7 +74,9 @@
"intr": "",
"events": "EventDataSet/Hero_11003.asset",
"cite": "",
- "effectstay": [],
+ "effectstay": [
+ "this,Skill/Role/11003/effect_11003_wuqitexiao"
+ ],
"hpspace": {
"x": 0,
"y": -0.69,
@@ -81,7 +85,8 @@
"skill1": 110004,
"skill2": 110005,
"skill3": 110012,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11004,
@@ -109,7 +114,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11005,
@@ -137,7 +143,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11006,
@@ -165,7 +172,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11009,
@@ -186,14 +194,15 @@
"cite": "",
"effectstay": [],
"hpspace": {
- "x": 0.33,
+ "x": 0,
"y": -0.1,
- "z": 0.02
+ "z": 0
},
"skill1": 110010,
"skill2": 110011,
"skill3": 110013,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 22002,
@@ -221,7 +230,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 90001,
@@ -249,7 +259,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11011,
@@ -277,7 +288,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11008,
@@ -305,7 +317,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11017,
@@ -324,7 +337,9 @@
"intr": "",
"events": "EventDataSet/Hero_11017.asset",
"cite": "",
- "effectstay": [],
+ "effectstay": [
+ "Bone001/Dummy001,Skill/Role/11017/effect_11017_weapon1"
+ ],
"hpspace": {
"x": 0,
"y": 0,
@@ -333,7 +348,8 @@
"skill1": 110006,
"skill2": 110007,
"skill3": 110014,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11018,
@@ -352,7 +368,10 @@
"intr": "",
"events": "EventDataSet/Hero_11018.asset",
"cite": "",
- "effectstay": [],
+ "effectstay": [
+ "Bip001,Skill/Role/11018/effect_11018_sleep",
+ "Bip001,Skill/Role/11018/effect_11018_fengsha"
+ ],
"hpspace": {
"x": 0,
"y": -0.31,
@@ -361,7 +380,8 @@
"skill1": 110008,
"skill2": 110009,
"skill3": 110015,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11019,
@@ -389,7 +409,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11020,
@@ -417,7 +438,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11021,
@@ -445,7 +467,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 11099,
@@ -473,7 +496,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 12001,
@@ -501,7 +525,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 12003,
@@ -520,7 +545,9 @@
"intr": "",
"events": "EventDataSet/Hero_11003.asset",
"cite": "",
- "effectstay": [],
+ "effectstay": [
+ "this,Skill/Role/12003/effect_12003_wuqitexiao"
+ ],
"hpspace": {
"x": 0,
"y": 0.154,
@@ -529,7 +556,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 12009,
@@ -557,7 +585,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 12017,
@@ -576,7 +605,9 @@
"intr": "",
"events": "EventDataSet/Hero_11017.asset",
"cite": "",
- "effectstay": [],
+ "effectstay": [
+ "Bone001/Dummy001,Skill/Role/12017/effect_12017_weapon1_bad"
+ ],
"hpspace": {
"x": 0,
"y": 0,
@@ -585,7 +616,8 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
},
{
"id": 12018,
@@ -613,6 +645,7 @@
"skill1": 0,
"skill2": 0,
"skill3": 0,
- "enteranivalue": 0
+ "enteranivalue": 0,
+ "camerainterval": 0.6
}
]
\ No newline at end of file
diff --git a/bin/json/game_serverlist.json b/bin/json/game_serverlist.json
new file mode 100644
index 000000000..1dc4001d8
--- /dev/null
+++ b/bin/json/game_serverlist.json
@@ -0,0 +1,30 @@
+[
+ {
+ "id": 1,
+ "ip": "10.0.1.238",
+ "port": 7981,
+ "groupId": 0,
+ "name": "熊猫"
+ },
+ {
+ "id": 2,
+ "ip": "10.0.1.239",
+ "port": 7982,
+ "groupId": 0,
+ "name": "野鸡"
+ },
+ {
+ "id": 3,
+ "ip": "10.0.1.237",
+ "port": 7983,
+ "groupId": 0,
+ "name": "鸭子"
+ },
+ {
+ "id": 4,
+ "ip": "10.0.0.9",
+ "port": 7984,
+ "groupId": 0,
+ "name": "乌龟"
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index e4401add2..71e4f1b87 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -181,7 +181,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,Pro1=Buff_Per_Atk,QuaType1=1,ParNum1=1,Val1=400",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=400",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -199,7 +199,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001002,Round=2,Type=ProBuff,Pro1=Buff_Per_Atk,QuaType1=0,ParNum1=1,Val1=400",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001002,Round=2,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=0,BufParNum1=1,BufVal1=400",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -217,7 +217,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,Type=ProBuff,Pro1=Buff_Per_Def,QuaType1=1,ParNum1=1,Val1=600",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=600",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -235,7 +235,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001004,Round=2,Type=ProBuff,Pro1=Buff_Per_Def,QuaType1=0,ParNum1=1,Val1=600",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001004,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=0,BufParNum1=1,BufVal1=600",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -253,7 +253,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001005,Round=2,Type=ProBuff,Pro1=Buff_Per_Agi,QuaType1=1,ParNum1=1,Val1=300",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001005,Round=2,Type=ProBuff,BufPro1=Buff_Per_Agi,BufQuaType1=1,BufParNum1=1,BufVal1=300",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -271,7 +271,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001006,Round=2,Type=ProBuff,Pro1=BBuff_Per_Agi,QuaType1=0,ParNum1=1,Val1=300",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001006,Round=2,Type=ProBuff,BufPro1=BBuff_Per_Agi,BufQuaType1=0,BufParNum1=1,BufVal1=300",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -289,7 +289,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001007,Round=2,Type=ProBuff,Pro1=Add_Cri,QuaType1=1,ParNum1=1,Val1=300",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001007,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=1,BufParNum1=1,BufVal1=300",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -307,7 +307,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001008,Round=2,Type=ProBuff,Pro1=Add_Cri,QuaType1=0,ParNum1=1,Val1=300",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001008,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=0,BufParNum1=1,BufVal1=300",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -325,7 +325,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001009,Round=2,Type=ProBuff,Pro1=SufferDam,QuaType1=1,ParNum1=1,Val1=25",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001009,Round=2,Type=ProBuff,BufPro1=SufferDam,BufQuaType1=1,BufParNum1=1,BufVal1=25",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -343,7 +343,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001010,Round=2,Type=ProBuff,Pro1=MissPr,QuaType1=1,ParNum1=1,Val1=50",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001010,Round=2,Type=ProBuff,BufPro1=MissPr,BufQuaType1=1,BufParNum1=1,BufVal1=50",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -361,7 +361,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=10,Id=390001011,Round=-1,Type=ProBuff,Pro1=Buff_Per_Atk,QuaType1=1,ParNum1=1,Val1=50,Pro2=SufferDam,QuaType2=0,ParNum2=10,Val2=30",
+ "Argu": "DoVal=1,Pr=1000,NumVal=10,Id=390001011,Round=-1,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=50,BufPro2=SufferDam,BufQuaType2=0,BufParNum2=10,BufVal2=30",
"AddEffect": false,
"FollowSK": [],
"FailFollowSK": [],
@@ -379,7 +379,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001012,Round=2,Type=ProBuff,Pro1=Add_SufCri,QuaType1=1,ParNum1=1,Val1=300",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001012,Round=2,Type=ProBuff,BufPro1=Add_SufCri,BufQuaType1=1,BufParNum1=1,BufVal1=300",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -565,7 +565,9 @@
"Type": "Dmg",
"Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
"AddEffect": false,
- "FollowSK": [],
+ "FollowSK": [
+ 290038002
+ ],
"FailFollowSK": [],
"MustHit": false,
"Tags": [
@@ -583,11 +585,9 @@
],
"EmitPR": 1000,
"Type": "BuffAction",
- "Argu": "DoVal=1,Pr=500,ActionType=0,BuffType=1,ID=202,ActionVal=1",
+ "Argu": "DoVal=1,Pr=500,ActionType=0,BuffType=1,RelyType1=1,ID1=201,ActionVal=1",
"AddEffect": false,
- "FollowSK": [
- 290038002
- ],
+ "FollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"Tags": [
@@ -705,7 +705,7 @@
],
"EmitPR": 1000,
"Type": "FrontTre",
- "Argu": "DoVal=1,Pr=1000,FrontSkId=290042001,Par=300",
+ "Argu": "DoVal=1,Pr=1000,Par=300",
"AddEffect": false,
"FollowSK": [],
"FailFollowSK": [],
@@ -785,7 +785,7 @@
],
"EmitPR": 1000,
"Type": "BuffAction",
- "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType=1,ID=202,ActionVal=-1",
+ "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType=1,RelyType1=1,ID1=201,ActionVal=-1",
"AddEffect": false,
"FollowSK": [
290046002
@@ -807,7 +807,7 @@
],
"EmitPR": 1000,
"Type": "Dmg",
- "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,TempProTarget=0,TempPro=CauseDam,TempFrontType=3,TempFrontID=201,TempFrontTpyeVal=1,TempFrontQuaType=1,TempFrontVal=30",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,TempProTarget=0,TempPro=CauseDam,TempFrontSkId=290046001,TempFrontType=3,TempFrontID=201,TempFrontTpyeVal=1,TempFrontQuaType=1,TempFrontVal=30",
"AddEffect": false,
"FollowSK": [],
"FailFollowSK": [],
@@ -847,7 +847,7 @@
],
"EmitPR": 1000,
"Type": "FrontDmg",
- "Argu": "DoVal=1,Pr=1000,FrontSkId=290047001,DmgSourceType=0,DmgPar=400",
+ "Argu": "DoVal=1,Pr=1000,DmgSourceType=0,DmgPar=400",
"AddEffect": false,
"FollowSK": [],
"FailFollowSK": [],
@@ -961,7 +961,7 @@
],
"EmitPR": 1000,
"Type": "BuffAction",
- "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,ID1=202,RelyType1=1,BuffType2=0,ID2=390001004,RelyType2=0,ActionVal1=-1",
+ "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=202,BuffType2=0,RelyType2=0,ID2=390001004,ActionVal1=-1",
"AddEffect": false,
"FollowSK": [],
"FailFollowSK": [],
@@ -979,7 +979,7 @@
],
"EmitPR": 1000,
"Type": "BuffAction",
- "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,ID1=201,RelyType1=1,ActionVal=-1",
+ "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=201,ActionVal=-1",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -997,7 +997,7 @@
],
"EmitPR": 1000,
"Type": "BuffAction",
- "Argu": "DoVal=1,Pr=1000,ActionType=1,BuffType1=1,ID1=201,RelyType1=1,ActionVal=-1,Tag=0",
+ "Argu": "DoVal=1,Pr=1000,ActionType=1,BuffType1=1,RelyType1=1,ID1=201,ActionVal=-1,Tag=0",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -1015,7 +1015,7 @@
],
"EmitPR": 1000,
"Type": "BuffAction",
- "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,ID1=202,RelyType1=1,ActionVal=-1,Tag=1",
+ "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=202,ActionVal=-1,Tag=1",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -1033,7 +1033,7 @@
],
"EmitPR": 1000,
"Type": "BuffCD",
- "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,ID1=201,RelyType1=1,QuaType=1,Val=1",
+ "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=201,QuaType=1,Val=1",
"AddEffect": false,
"FollowSK": [],
"FailFollowSK": [],
@@ -1051,7 +1051,7 @@
],
"EmitPR": 1000,
"Type": "BuffCD",
- "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,ID1=202,RelyType1=1,QuaType=1,Val=1",
+ "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=202,QuaType=1,Val=1",
"AddEffect": true,
"FollowSK": [],
"FailFollowSK": [],
@@ -1279,7 +1279,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,Pro1=Buff_Per_Atk,QuaType1=1,ParNum1=1,Val1=400",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=400",
"AddEffect": false,
"FollowSK": [],
"FailFollowSK": [],
@@ -1297,7 +1297,7 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001007,Round=2,Type=ProBuff,Pro1=Add_Cri,QuaType1=1,ParNum1=1,Val1=300",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001007,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=1,BufParNum1=1,BufVal1=300",
"AddEffect": false,
"FollowSK": [],
"FailFollowSK": [],
@@ -1315,7 +1315,43 @@
],
"EmitPR": 1000,
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,Type=ProBuff,Pro1=Buff_Per_Def,QuaType1=1,ParNum1=1,Val1=600",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=600",
+ "AddEffect": false,
+ "FollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": []
+ },
+ {
+ "Id": 290066001,
+ "Desc": "对敌方随机目标造成80%攻击力伤害",
+ "From": 2,
+ "Limit": 1,
+ "Where": [],
+ "Order": [
+ "Type=Rnd"
+ ],
+ "EmitPR": 1000,
+ "Type": "Dmg",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
+ "AddEffect": false,
+ "FollowSK": [
+ 290066002
+ ],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": []
+ },
+ {
+ "Id": 290066002,
+ "Desc": "50%概率额外造成50%防御力伤害",
+ "From": 0,
+ "Limit": 0,
+ "Where": [],
+ "Order": [],
+ "EmitPR": 500,
+ "Type": "Dmg",
+ "Argu": "DoVal=1,Pr=1000,Id=290066001,ProSou1=0,Pro1=Total_Def,ProPar1=500",
"AddEffect": false,
"FollowSK": [],
"FailFollowSK": [],
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 51bd5f696..76c6852b5 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -2668,5 +2668,53 @@
]
}
]
+ },
+ {
+ "Id": 190066000,
+ "Name": "",
+ "Type": 1,
+ "Desc": "对敌方随机目标造成80%攻击力伤害，50%概率额外造成50%防御力伤害",
+ "MaxLV": 6,
+ "CD": [
+ 4,
+ 4,
+ 4,
+ 4,
+ 4,
+ 4
+ ],
+ "Target": 1,
+ "ChildSkill": [
+ {
+ "Id": [
+ 290066001
+ ]
+ },
+ {
+ "Id": [
+ 290066001
+ ]
+ },
+ {
+ "Id": [
+ 290066001
+ ]
+ },
+ {
+ "Id": [
+ 290066001
+ ]
+ },
+ {
+ "Id": [
+ 290066001
+ ]
+ },
+ {
+ "Id": [
+ 290066001
+ ]
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json
index 6c583df18..a5b446996 100644
--- a/bin/json/game_taskround.json
+++ b/bin/json/game_taskround.json
@@ -271,7 +271,7 @@
"condition_second": 1,
"condition_condition": 5,
"active": 0,
- "id_after": 20003,
+ "id_after": 30102,
"reword": [
{
"a": "attr",
@@ -294,7 +294,7 @@
"condition_second": 2,
"condition_condition": 5,
"active": 0,
- "id_after": 20004,
+ "id_after": 30103,
"reword": [
{
"a": "attr",
@@ -317,7 +317,7 @@
"condition_second": 3,
"condition_condition": 5,
"active": 0,
- "id_after": 20005,
+ "id_after": 30104,
"reword": [
{
"a": "attr",
@@ -340,7 +340,7 @@
"condition_second": 4,
"condition_condition": 5,
"active": 0,
- "id_after": 20006,
+ "id_after": 30105,
"reword": [
{
"a": "attr",
@@ -363,7 +363,7 @@
"condition_second": 5,
"condition_condition": 5,
"active": 0,
- "id_after": 20007,
+ "id_after": 30106,
"reword": [
{
"a": "attr",
@@ -386,7 +386,7 @@
"condition_second": 6,
"condition_condition": 5,
"active": 0,
- "id_after": 20008,
+ "id_after": 30107,
"reword": [
{
"a": "attr",
@@ -409,7 +409,7 @@
"condition_second": 7,
"condition_condition": 5,
"active": 0,
- "id_after": 20009,
+ "id_after": 30108,
"reword": [
{
"a": "attr",
@@ -432,7 +432,7 @@
"condition_second": 8,
"condition_condition": 5,
"active": 0,
- "id_after": 20010,
+ "id_after": 30109,
"reword": [
{
"a": "attr",
@@ -455,7 +455,7 @@
"condition_second": 9,
"condition_condition": 5,
"active": 0,
- "id_after": 20011,
+ "id_after": 30110,
"reword": [
{
"a": "attr",
@@ -478,7 +478,7 @@
"condition_second": 10,
"condition_condition": 5,
"active": 0,
- "id_after": 20012,
+ "id_after": 30111,
"reword": [
{
"a": "attr",
@@ -501,7 +501,7 @@
"condition_second": 11,
"condition_condition": 5,
"active": 0,
- "id_after": 20013,
+ "id_after": 30112,
"reword": [
{
"a": "attr",
@@ -524,7 +524,7 @@
"condition_second": 12,
"condition_condition": 5,
"active": 0,
- "id_after": 20014,
+ "id_after": 30113,
"reword": [
{
"a": "attr",
@@ -547,7 +547,7 @@
"condition_second": 13,
"condition_condition": 5,
"active": 0,
- "id_after": 20015,
+ "id_after": 30114,
"reword": [
{
"a": "attr",
@@ -570,7 +570,7 @@
"condition_second": 14,
"condition_condition": 5,
"active": 0,
- "id_after": 20016,
+ "id_after": 30115,
"reword": [
{
"a": "attr",
@@ -593,7 +593,7 @@
"condition_second": 15,
"condition_condition": 5,
"active": 0,
- "id_after": 20017,
+ "id_after": 30116,
"reword": [
{
"a": "attr",
@@ -616,7 +616,7 @@
"condition_second": 16,
"condition_condition": 5,
"active": 0,
- "id_after": 20018,
+ "id_after": 30117,
"reword": [
{
"a": "attr",
@@ -639,7 +639,7 @@
"condition_second": 17,
"condition_condition": 5,
"active": 0,
- "id_after": 20019,
+ "id_after": 30118,
"reword": [
{
"a": "attr",
@@ -662,7 +662,7 @@
"condition_second": 18,
"condition_condition": 5,
"active": 0,
- "id_after": 20020,
+ "id_after": 30119,
"reword": [
{
"a": "attr",
diff --git a/bin/json/game_ui.json b/bin/json/game_ui.json
index c16149869..978cf680f 100644
--- a/bin/json/game_ui.json
+++ b/bin/json/game_ui.json
@@ -430,5 +430,17 @@
"packagename": "zhandou",
"comname": "battlereadywindow2",
"des": "战斗布阵界面"
+ },
+ {
+ "id": "roledetail",
+ "file": "RoleDetailWindow",
+ "unloadpkg": 0,
+ "loadtype": 1,
+ "full": 1,
+ "blur": 0,
+ "package": "roledetails/roledetails",
+ "packagename": "roledetails",
+ "comname": "main",
+ "des": "英雄详细信息"
}
]
\ No newline at end of file
diff --git a/modules/web/api.go b/modules/web/api.go
index df6449361..bf8cb3cd1 100644
--- a/modules/web/api.go
+++ b/modules/web/api.go
@@ -11,18 +11,18 @@ import (
*/
type Api_Comp struct {
cbase.ModuleCompBase
- options *Options //模块参数
- module *Web //当前模块对象
- gin gin.ISys //gin 框架 web的热门框架
+ options *Options //模块参数
+ moduleWeb *Web //当前模块对象
+ gin gin.ISys //gin 框架 web的热门框架
}
//组件初始化接口 启动web服务 并注册api
func (this *Api_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.ModuleCompBase.Init(service, module, comp, options)
this.options = options.(*Options)
- this.module = module.(*Web)
+ this.moduleWeb = module.(*Web)
this.gin, err = gin.NewSys(gin.SetListenPort(this.options.Port))
this.gin.POST("/register", this.Register)
- this.gin.POST("/serverlist", this.ServerList)
+ this.gin.GET("/serverlist", this.ServerList)
return
}
diff --git a/modules/web/api_register.go b/modules/web/api_register.go
index 14ca7d5ee..2e191c4c6 100644
--- a/modules/web/api_register.go
+++ b/modules/web/api_register.go
@@ -13,7 +13,7 @@ func (this *Api_Comp) Register(c *engine.Context) {
rsp := &pb.UserRegisterResp{}
err := c.BindJSON(&req)
if err == nil {
- err := this.module.modelUser.User_Create(&pb.DBUser{
+ err := this.moduleWeb.modelUser.User_Create(&pb.DBUser{
Binduid: req.Account,
Sid: req.Sid,
})
diff --git a/modules/web/api_srvlist.go b/modules/web/api_srvlist.go
index 0bddfaebb..96d2ed429 100644
--- a/modules/web/api_srvlist.go
+++ b/modules/web/api_srvlist.go
@@ -1,7 +1,13 @@
package web
-import "go_dreamfactory/lego/sys/gin/engine"
+import (
+ "go_dreamfactory/lego/sys/gin/engine"
+ "net/http"
+)
//服务列表
func (this *Api_Comp) ServerList(c *engine.Context) {
+ conf := this.moduleWeb.configure.getServerListConf()
+
+ c.JSON(http.StatusOK, conf)
}
diff --git a/modules/web/config.go b/modules/web/config.go
new file mode 100644
index 000000000..b714579a9
--- /dev/null
+++ b/modules/web/config.go
@@ -0,0 +1,51 @@
+package web
+
+import (
+ "fmt"
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/modules"
+ cfg "go_dreamfactory/sys/configure/structs"
+)
+
+const (
+ game_serverlist = "game_serverlist.json"
+)
+
+type configureComp struct {
+ modules.MCompConfigure
+}
+
+func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ err = this.MCompConfigure.Init(service, module, comp, options)
+ err = this.LoadConfigure(game_serverlist, cfg.NewGame_serverList)
+ return
+}
+
+func (this *configureComp) getConfig() (data *cfg.Game_serverList, err error) {
+ var (
+ v interface{}
+ ok bool
+ )
+ if v, err = this.GetConfigure(game_serverlist); err != nil {
+ return
+ } else {
+ if data, ok = v.(*cfg.Game_serverList); !ok {
+ err = fmt.Errorf("%T no is *cfg.Game_ActiveReward", v)
+ return
+ }
+ }
+ return
+}
+
+func (this *configureComp) getServerListConf() (data []*cfg.Game_serverListData) {
+ conf, err := this.getConfig()
+ if err != nil {
+ return data
+ }
+
+ if conf != nil {
+ return conf.GetDataList()
+ }
+
+ return
+}
diff --git a/modules/web/module.go b/modules/web/module.go
index 307d28bda..aff0f40df 100644
--- a/modules/web/module.go
+++ b/modules/web/module.go
@@ -23,6 +23,7 @@ type Web struct {
options *Options
api_comp *Api_Comp //提供weba pi服务的组件
modelUser *user.ModelUser
+ configure *configureComp
}
//模块名
@@ -45,4 +46,5 @@ func (this *Web) OnInstallComp() {
this.ModuleBase.OnInstallComp()
this.api_comp = this.RegisterComp(new(Api_Comp)).(*Api_Comp)
this.modelUser = this.RegisterComp(new(user.ModelUser)).(*user.ModelUser)
+ this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 5c1c029cf..d689c13ab 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -42,6 +42,11 @@ type Tables struct {
shopitem *Game_shopitem
taskRound *Game_taskRound
activeReward *Game_activeReward
+ storyChapter *Game_storyChapter
+ storyEasy *Game_storyEasy
+ storyHard *Game_storyHard
+ storyPurgatory *Game_storyPurgatory
+ serverList *Game_serverList
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -229,5 +234,35 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.activeReward, err = NewGame_activeReward(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_storychapter") ; err != nil {
+ return nil, err
+ }
+ if tables.storyChapter, err = NewGame_storyChapter(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_storyeasy") ; err != nil {
+ return nil, err
+ }
+ if tables.storyEasy, err = NewGame_storyEasy(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_storyhard") ; err != nil {
+ return nil, err
+ }
+ if tables.storyHard, err = NewGame_storyHard(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_storypurgatory") ; err != nil {
+ return nil, err
+ }
+ if tables.storyPurgatory, err = NewGame_storyPurgatory(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_serverlist") ; err != nil {
+ return nil, err
+ }
+ if tables.serverList, err = NewGame_serverList(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
diff --git a/sys/configure/structs/game.comData.go b/sys/configure/structs/game.comData.go
new file mode 100644
index 000000000..90e4d0dbd
--- /dev/null
+++ b/sys/configure/structs/game.comData.go
@@ -0,0 +1,29 @@
+
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+package cfg
+
+import "errors"
+
+type Game_comData struct {
+ Index string
+ Var string
+ Intr string
+}
+
+func (Game_comData) GetTypeId() int {
+ return -395344177
+}
+
+func NewGame_comData(_buf map[string]interface{}) (_v *Game_comData, err error) {
+ _v = &Game_comData{}
+ { var _ok_ bool; if _v.Index, _ok_ = _buf["index"].(string); !_ok_ { err = errors.New("index error"); return } }
+ { var _ok_ bool; if _v.Var, _ok_ = _buf["var"].(string); !_ok_ { err = errors.New("var error"); return } }
+ { var _ok_ bool; if _v.Intr, _ok_ = _buf["intr"].(string); !_ok_ { err = errors.New("intr error"); return } }
+ return
+}
diff --git a/sys/configure/structs/game.serverList.go b/sys/configure/structs/game.serverList.go
new file mode 100644
index 000000000..3b5f79227
--- /dev/null
+++ b/sys/configure/structs/game.serverList.go
@@ -0,0 +1,42 @@
+
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+package cfg
+
+type Game_serverList struct {
+ _dataMap map[int32]*Game_serverListData
+ _dataList []*Game_serverListData
+}
+
+func NewGame_serverList(_buf []map[string]interface{}) (*Game_serverList, error) {
+ _dataList := make([]*Game_serverListData, 0, len(_buf))
+ dataMap := make(map[int32]*Game_serverListData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := NewGame_serverListData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &Game_serverList{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *Game_serverList) GetDataMap() map[int32]*Game_serverListData {
+ return table._dataMap
+}
+
+func (table *Game_serverList) GetDataList() []*Game_serverListData {
+ return table._dataList
+}
+
+func (table *Game_serverList) Get(key int32) *Game_serverListData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/game.serverListData.go b/sys/configure/structs/game.serverListData.go
new file mode 100644
index 000000000..d220bfbd7
--- /dev/null
+++ b/sys/configure/structs/game.serverListData.go
@@ -0,0 +1,33 @@
+
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+package cfg
+
+import "errors"
+
+type Game_serverListData struct {
+ Id int32
+ Ip string
+ Port int32
+ GroupId int32
+ Name string
+}
+
+func (Game_serverListData) GetTypeId() int {
+ return 292904775
+}
+
+func NewGame_serverListData(_buf map[string]interface{}) (_v *Game_serverListData, err error) {
+ _v = &Game_serverListData{}
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Ip, _ok_ = _buf["ip"].(string); !_ok_ { err = errors.New("ip error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["port"].(float64); !_ok_ { err = errors.New("port error"); return }; _v.Port = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["groupId"].(float64); !_ok_ { err = errors.New("groupId error"); return }; _v.GroupId = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } }
+ return
+}