From fe8aaf91701d296afe95439a0f48b193732252f1 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 4 Apr 2023 14:12:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 5 +++++ modules/practice/module.go | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/comm/imodule.go b/comm/imodule.go index aa57d5304..1d8bc5dd8 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -14,6 +14,10 @@ type ( ITaskComplete interface { TaskComplete(session IUserSession, taskid int32) } + //功能开启通知 + IOpenCmdNotice interface { + OpenCmdNotice(session IUserSession, key string) + } ) /* @@ -439,6 +443,7 @@ type ( //练功房 IPractice interface { ITaskComplete + IOpenCmdNotice //添加武馆资源 AddItems(session IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode) //pvp切磋结果通知 diff --git a/modules/practice/module.go b/modules/practice/module.go index 35d74fe2d..db1077e9f 100644 --- a/modules/practice/module.go +++ b/modules/practice/module.go @@ -55,6 +55,7 @@ func (this *Practice) Init(service core.IService, module core.IModule, options c this.service = service.(base.IRPCXService) return } + func (this *Practice) Start() (err error) { err = this.ModuleBase.Start() var module core.IModule @@ -189,6 +190,10 @@ func (this *Practice) TaskComplete(session comm.IUserSession, taskid int32) { } } +func (this *Practice) OpenCmdNotice(session comm.IUserSession, key string) { + +} + func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) { this.Debug("ChallengeResults", log.Field{Key: "bid", Value: bid}, From 5e3456b99023263a64916f01d2b0f97b58ab27d4 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 4 Apr 2023 14:14:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 30 +++ bin/json/game_opencond.json | 261 +++++++++++++++----- bin/json/game_signextra.json | 36 +++ bin/json/game_skillafteratk.json | 7 +- bin/json/game_skillatk.json | 1 - bin/json/game_skillbuff.json | 2 +- bin/json/game_skillpassive.json | 22 +- bin/json/game_worldall.json | 18 +- bin/json/game_worldtask.json | 24 +- sys/configure/structs/Game.SignExtraData.go | 2 + sys/configure/structs/game.opencondData.go | 15 ++ 11 files changed, 315 insertions(+), 103 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index edd103ff3..656f16157 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -298,5 +298,35 @@ "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 + }, + { + "id": 120, + "PlayType": "test", + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "bossfight_spinymandrilla_02" + ], + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 + }, + { + "id": 121, + "PlayType": "test", + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_02", + "battleScenes": [ + "bossfight_naturetitan_01" + ], + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 } ] \ No newline at end of file diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 01032ae63..4204d2d64 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -20,7 +20,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "backpack", @@ -43,7 +44,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "shop", @@ -66,7 +68,8 @@ "text": "功能暂未开启" }, "uiid": 1, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "friend", @@ -89,7 +92,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "mall", @@ -112,7 +116,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "rdtask", @@ -135,7 +140,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "currency", @@ -158,7 +164,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 1 + "activateType": 1, + "notify": [] }, { "id": "alliance", @@ -181,7 +188,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "task", @@ -204,7 +212,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "trials", @@ -227,7 +236,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "moon", @@ -250,7 +260,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "story", @@ -273,7 +284,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "kungfu", @@ -296,7 +308,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "event", @@ -319,7 +332,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "mistyIsland", @@ -342,7 +356,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "vikingexpedition", @@ -365,7 +380,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "vikingexpedition2", @@ -388,7 +404,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "vikingexpedition3", @@ -411,7 +428,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "hjeart demon tower", @@ -434,7 +452,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "catchsheep", @@ -457,7 +476,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "darkcuisine", @@ -480,7 +500,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "underground Arena", @@ -503,7 +524,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "crazycompetition", @@ -526,7 +548,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "fiveheroeschallenge", @@ -549,7 +572,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "library", @@ -572,7 +596,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "bonfiredance", @@ -595,7 +620,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "caravan", @@ -618,7 +644,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "gourmetrestaurant", @@ -641,7 +668,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "goberblacksmithshop", @@ -664,7 +692,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "hunting", @@ -687,7 +716,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "channel_lock_icon", @@ -710,7 +740,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "channel_lock_world", @@ -733,7 +764,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "channel_lock_guild", @@ -756,7 +788,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "channel_lock_private", @@ -779,7 +812,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "channel_lock_public", @@ -802,7 +836,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "channel_lock_system", @@ -825,7 +860,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "guild", @@ -848,7 +884,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "arena", @@ -871,7 +908,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "sign", @@ -894,7 +932,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "reddot", @@ -917,7 +956,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "Monthly_card", @@ -940,7 +980,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "Gift_Bag", @@ -963,7 +1004,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "role", @@ -986,7 +1028,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "Mystery", @@ -1009,7 +1052,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "Income", @@ -1032,7 +1076,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "fuse", @@ -1055,7 +1100,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "activitytask", @@ -1078,7 +1124,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "Fight_MidwayExit", @@ -1101,7 +1148,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "Fight_Speed", @@ -1124,7 +1172,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "Fight_Auto", @@ -1147,7 +1196,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "equip_compose", @@ -1170,7 +1220,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "equip_compose_middle", @@ -1193,7 +1244,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "equip_compose_high", @@ -1216,7 +1268,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "mainline_elite", @@ -1239,7 +1292,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "mail", @@ -1262,7 +1316,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "teacher", @@ -1285,7 +1340,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "world_task", @@ -1308,7 +1364,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "battle_pass", @@ -1331,7 +1388,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "enchant_boss", @@ -1354,7 +1412,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "vikingexpedition_entrance", @@ -1377,7 +1436,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "GuildBoss", @@ -1400,7 +1460,8 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "slidescreen_up", @@ -1423,7 +1484,8 @@ "text": "请先完成主线剧情" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "slidescreen_left", @@ -1446,7 +1508,8 @@ "text": "请先完成主线剧情" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "slidescreen_right", @@ -1469,7 +1532,8 @@ "text": "请先完成主线剧情" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { "id": "Master_challenges_the_tower", @@ -1492,15 +1556,21 @@ "text": "功能暂未开启" }, "uiid": 0, - "activateType": 0 + "activateType": 0, + "notify": [] }, { - "id": " ", + "id": "practice_ pillar1", "name": { "key": "", "text": "" }, - "main": [], + "main": [ + { + "key": 1, + "param": 1 + } + ], "optional": "", "wkqbx": 0, "kqbx": 0, @@ -1510,6 +1580,61 @@ "text": "" }, "uiid": 0, - "activateType": 0 + "activateType": 1, + "notify": [ + "practice" + ] + }, + { + "id": "practice_ pillar2", + "name": { + "key": "", + "text": "" + }, + "main": [ + { + "key": 3, + "param": 20010 + } + ], + "optional": "", + "wkqbx": 0, + "kqbx": 0, + "img": "", + "prompt": { + "key": "", + "text": "" + }, + "uiid": 0, + "activateType": 1, + "notify": [ + "practice" + ] + }, + { + "id": "practice_ pillar3", + "name": { + "key": "", + "text": "" + }, + "main": [ + { + "key": 3, + "param": 20020 + } + ], + "optional": "", + "wkqbx": 0, + "kqbx": 0, + "img": "", + "prompt": { + "key": "", + "text": "" + }, + "uiid": 0, + "activateType": 1, + "notify": [ + "practice" + ] } ] \ No newline at end of file diff --git a/bin/json/game_signextra.json b/bin/json/game_signextra.json index 2fb9117f9..7aa64c382 100644 --- a/bin/json/game_signextra.json +++ b/bin/json/game_signextra.json @@ -1,6 +1,10 @@ [ { "id": 1, + "txt": { + "key": "sign_reward", + "text": "累计签到{0}天领取" + }, "day": 7, "groups": 1, "extra": [ @@ -13,6 +17,10 @@ }, { "id": 2, + "txt": { + "key": "sign_reward", + "text": "累计签到{0}天领取" + }, "day": 14, "groups": 1, "extra": [ @@ -25,6 +33,10 @@ }, { "id": 3, + "txt": { + "key": "sign_reward", + "text": "累计签到{0}天领取" + }, "day": 21, "groups": 1, "extra": [ @@ -37,6 +49,10 @@ }, { "id": 4, + "txt": { + "key": "sign_reward", + "text": "累计签到{0}天领取" + }, "day": 7, "groups": 2, "extra": [ @@ -49,6 +65,10 @@ }, { "id": 5, + "txt": { + "key": "sign_reward", + "text": "累计签到{0}天领取" + }, "day": 14, "groups": 2, "extra": [ @@ -61,6 +81,10 @@ }, { "id": 6, + "txt": { + "key": "sign_reward", + "text": "累计签到{0}天领取" + }, "day": 21, "groups": 2, "extra": [ @@ -73,6 +97,10 @@ }, { "id": 7, + "txt": { + "key": "sign_reward", + "text": "累计签到{0}天领取" + }, "day": 7, "groups": 3, "extra": [ @@ -85,6 +113,10 @@ }, { "id": 8, + "txt": { + "key": "sign_reward", + "text": "累计签到{0}天领取" + }, "day": 14, "groups": 3, "extra": [ @@ -97,6 +129,10 @@ }, { "id": 9, + "txt": { + "key": "sign_reward", + "text": "累计签到{0}天领取" + }, "day": 21, "groups": 3, "extra": [ diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 0d8dc361a..2800fcf2a 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -12030,7 +12030,8 @@ "Type": 31, "Argu": [ 0, - 1 + 2, + 8 ], "FollowSK": [], "SucFollowSK": [], @@ -21918,7 +21919,7 @@ { "Id": 255007316, "EmitPR": 1000, - "From": 4, + "From": 15, "Where": [], "Order": "", "Limit": 1, @@ -21944,7 +21945,7 @@ { "Id": 255007317, "EmitPR": 1000, - "From": 4, + "From": 15, "Where": [], "Order": "", "Limit": 10, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 44714cdda..f3fd5e199 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -11992,7 +11992,6 @@ "ChildSkill": { "Id": [ 255006311, - 255006312, 255006313, 255006314 ] diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 0f0440bf4..953e565de 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -1328,7 +1328,7 @@ "BufParNum": 1, "RelyCheckArgu": [], "CoexistCheckArgu": [], - "Effect": 0, + "Effect": 3, "AddEffect": false, "RemoveType": false, "OverlayTimes": 50, diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 705a3fd76..677861a6d 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -582,32 +582,32 @@ "Id": 435003211, "When": 5, "FromCheck": "", - "TargetCheck": "Target=3,HasBuff=0", + "TargetCheck": "Target=3", "MainSkillCheck": "", "AfterSkillCheck": "", - "BuffCheck": "", + "BuffCheck": "Effect=0", "AddCon": [], "PasPr": 1000, "Type": "CallSkillPas", "MaxEmitTimes": 99, "Callback": [ - 235003211 + 235003215 ] }, { "Id": 435003212, "When": 5, "FromCheck": "", - "TargetCheck": "Target=3,HasBuff=1", + "TargetCheck": "Target=3", "MainSkillCheck": "", "AfterSkillCheck": "", - "BuffCheck": "", + "BuffCheck": "Effect=1", "AddCon": [], "PasPr": 1000, "Type": "CallSkillPas", "MaxEmitTimes": 99, "Callback": [ - 235003212 + 235003215 ] }, { @@ -922,7 +922,7 @@ "Id": 413004111, "When": 16, "FromCheck": "Target=3,Hpproless=500", - "TargetCheck": "424006211", + "TargetCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -1123,7 +1123,9 @@ "PasPr": 1000, "Type": "CallSkillPas", "MaxEmitTimes": 1, - "Callback": [] + "Callback": [ + 215002212 + ] }, { "Id": 415002212, @@ -1137,7 +1139,9 @@ "PasPr": 1000, "Type": "CallSkillPas", "MaxEmitTimes": 99, - "Callback": [] + "Callback": [ + 235003215 + ] }, { "Id": 415002311, diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json index 96642ea6e..03315619e 100644 --- a/bin/json/game_worldall.json +++ b/bin/json/game_worldall.json @@ -1,6 +1,6 @@ [ { - "id": 20010, + "id": 210, "name": { "key": "mainline_name_10001", "text": "章节1全部任务" @@ -24,7 +24,7 @@ ] }, { - "id": 30010, + "id": 310, "name": { "key": "Side_Quest", "text": "武馆支线1" @@ -48,7 +48,7 @@ ] }, { - "id": 30020, + "id": 320, "name": { "key": "Side_Quest", "text": "铁匠铺支线1" @@ -72,7 +72,7 @@ ] }, { - "id": 30030, + "id": 330, "name": { "key": "Side_Quest", "text": "铁匠铺支线2" @@ -96,7 +96,7 @@ ] }, { - "id": 30040, + "id": 340, "name": { "key": "Side_Quest", "text": "武馆支线2" @@ -120,7 +120,7 @@ ] }, { - "id": 30050, + "id": 350, "name": { "key": "Side_Quest", "text": "武馆支线3" @@ -144,7 +144,7 @@ ] }, { - "id": 30060, + "id": 360, "name": { "key": "Side_Quest", "text": "铁匠铺支线3" @@ -168,7 +168,7 @@ ] }, { - "id": 10010, + "id": 110, "name": { "key": "story_80", "text": "日常测试任务" @@ -192,7 +192,7 @@ ] }, { - "id": 40010, + "id": 410, "name": { "key": "story_80", "text": "周常测试任务" diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index c6619acf1..b9d9d847e 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -729,7 +729,7 @@ "lockend": 5, "ontxe": 20010, "id_after": 0, - "group": 110, + "group": 111, "des": 1, "icon": "", "task_Tname": { @@ -765,7 +765,7 @@ "lockend": 5, "ontxe": 20010, "id_after": 0, - "group": 110, + "group": 112, "des": 1, "icon": "", "task_Tname": { @@ -801,7 +801,7 @@ "lockend": 20, "ontxe": 20010, "id_after": 0, - "group": 110, + "group": 113, "des": 1, "icon": "", "task_Tname": { @@ -837,7 +837,7 @@ "lockend": 20, "ontxe": 20010, "id_after": 0, - "group": 110, + "group": 114, "des": 1, "icon": "", "task_Tname": { @@ -873,7 +873,7 @@ "lockend": 20, "ontxe": 20010, "id_after": 0, - "group": 110, + "group": 115, "des": 1, "icon": "", "task_Tname": { @@ -909,7 +909,7 @@ "lockend": 20, "ontxe": 20010, "id_after": 0, - "group": 110, + "group": 116, "des": 1, "icon": "", "task_Tname": { @@ -981,7 +981,7 @@ "lockend": 5, "ontxe": 20010, "id_after": 0, - "group": 410, + "group": 411, "des": 4, "icon": "", "task_Tname": { @@ -1017,7 +1017,7 @@ "lockend": 5, "ontxe": 20010, "id_after": 0, - "group": 410, + "group": 412, "des": 4, "icon": "", "task_Tname": { @@ -1053,7 +1053,7 @@ "lockend": 20, "ontxe": 20010, "id_after": 0, - "group": 410, + "group": 413, "des": 4, "icon": "", "task_Tname": { @@ -1089,7 +1089,7 @@ "lockend": 20, "ontxe": 20010, "id_after": 0, - "group": 410, + "group": 414, "des": 4, "icon": "", "task_Tname": { @@ -1125,7 +1125,7 @@ "lockend": 20, "ontxe": 20010, "id_after": 0, - "group": 410, + "group": 415, "des": 4, "icon": "", "task_Tname": { @@ -1161,7 +1161,7 @@ "lockend": 20, "ontxe": 20010, "id_after": 0, - "group": 410, + "group": 416, "des": 4, "icon": "", "task_Tname": { diff --git a/sys/configure/structs/Game.SignExtraData.go b/sys/configure/structs/Game.SignExtraData.go index 1fddd9cfe..2553c5d1d 100644 --- a/sys/configure/structs/Game.SignExtraData.go +++ b/sys/configure/structs/Game.SignExtraData.go @@ -12,6 +12,7 @@ import "errors" type GameSignExtraData struct { Id int32 + Txt string Day int32 Groups int32 Extra []*Gameatn @@ -25,6 +26,7 @@ func (*GameSignExtraData) GetTypeId() int32 { func (_v *GameSignExtraData)Deserialize(_buf map[string]interface{}) (err error) { { 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; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["day"].(float64); !_ok_ { err = errors.New("day error"); return }; _v.Day = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["groups"].(float64); !_ok_ { err = errors.New("groups error"); return }; _v.Groups = int32(_tempNum_) } { diff --git a/sys/configure/structs/game.opencondData.go b/sys/configure/structs/game.opencondData.go index 9dc1b6bb5..88cc4d548 100644 --- a/sys/configure/structs/game.opencondData.go +++ b/sys/configure/structs/game.opencondData.go @@ -21,6 +21,7 @@ type GameOpencondData struct { Prompt string Uiid int32 ActivateType int32 + Notify []string } const TypeId_GameOpencondData = -1990600014 @@ -53,6 +54,20 @@ func (_v *GameOpencondData)Deserialize(_buf map[string]interface{}) (err error) {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["prompt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Prompt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Prompt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["uiid"].(float64); !_ok_ { err = errors.New("uiid error"); return }; _v.Uiid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["activateType"].(float64); !_ok_ { err = errors.New("activateType error"); return }; _v.ActivateType = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["notify"].([]interface{}); !_ok_ { err = errors.New("notify error"); return } + + _v.Notify = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Notify = append(_v.Notify, _list_v_) + } + } + return } From 990ac20953a7aafbaf6593bea21e290abcba5a7d Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 4 Apr 2023 14:21:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=BF=80=E6=B4=BB=20?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/sys/api_activate.go | 24 ++++++++++++++++-------- modules/sys/api_getlist.go | 6 ------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/modules/sys/api_activate.go b/modules/sys/api_activate.go index 1502e29c5..f649a9f38 100644 --- a/modules/sys/api_activate.go +++ b/modules/sys/api_activate.go @@ -2,6 +2,7 @@ package sys import ( "go_dreamfactory/comm" + "go_dreamfactory/lego/core" "go_dreamfactory/pb" "google.golang.org/protobuf/proto" @@ -15,14 +16,8 @@ func (this *apiComp) Activate(session comm.IUserSession, req *pb.SysFuncActivate rsp := &pb.SysFuncActivateResp{} - iuser := this.module.ModuleUser - user := iuser.GetUser(session.GetUserId()) - if user == nil { - code = pb.ErrorCode_UserSessionNobeing - return - } - if opencfg := this.module.configure.getOpencondCfgByCid(req.Cid); opencfg != nil { - + opencfg := this.module.configure.getOpencondCfgByCid(req.Cid) + if opencfg != nil { if id := this.module.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足 code = pb.ErrorCode_OpenCondErr return @@ -43,5 +38,18 @@ func (this *apiComp) Activate(session comm.IUserSession, req *pb.SysFuncActivate if err := session.SendMsg(string(this.module.GetType()), SysSubTypeFunc, rsp); err != nil { code = pb.ErrorCode_SystemError } + + //手动激活通知模块 + for _, m := range opencfg.Notify { + i, err := this.service.GetModule(core.M_Modules(m)) + if err != nil { + this.module.Errorln(err) + continue + } + + if ic, ok := i.(comm.IOpenCmdNotice); ok { + ic.OpenCmdNotice(session, req.Cid) + } + } return } diff --git a/modules/sys/api_getlist.go b/modules/sys/api_getlist.go index eb1b48fbc..b01b7618a 100644 --- a/modules/sys/api_getlist.go +++ b/modules/sys/api_getlist.go @@ -15,12 +15,6 @@ func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetLi rsp := &pb.SysFuncGetListResp{} rsp.Cond = make(map[string]int32, 0) - iuser := this.module.ModuleUser - user := iuser.GetUser(session.GetUserId()) - if user == nil { - code = pb.ErrorCode_UserSessionNobeing - return - } if len(req.Keys) == 0 { confList := this.module.configure.getOpencondList()