From 1ea1d5fed1369c0945741c8740b87ba43fe0c6ea Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Mon, 28 Nov 2022 17:12:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_worldbattle.json | 98 ++++++++++++++++++++++++----------
 1 file changed, 70 insertions(+), 28 deletions(-)

diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json
index 626966804..bd5da51c0 100644
--- a/bin/json/game_worldbattle.json
+++ b/bin/json/game_worldbattle.json
@@ -9,8 +9,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 102,
@@ -22,8 +25,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 103,
@@ -35,8 +41,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 104,
@@ -48,8 +57,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 105,
@@ -61,8 +73,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 106,
@@ -74,8 +89,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 107,
@@ -87,8 +105,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 108,
@@ -100,8 +121,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 109,
@@ -113,8 +137,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 110,
@@ -126,8 +153,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 111,
@@ -139,8 +169,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 112,
@@ -152,8 +185,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 113,
@@ -165,8 +201,11 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   },
   {
     "id": 114,
@@ -178,7 +217,10 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "EventList": [],
-    "playexp": 1000,
-    "NoMidwayExit": 0
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1000
+    }
   }
 ]
\ No newline at end of file

From ad4d20682033953847ee4c0d397ba86054908841 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 28 Nov 2022 17:26:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=8C=89=E7=AD=89=E7=BA=A7=E5=BC=80=E5=90=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_opencond.json | 17 +++++++++++++++++
 modules/user/api_login.go   |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 0b59bc2ae..28af15278 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -644,5 +644,22 @@
       "text": "功能暂未开启"
     },
     "uiid": 0
+  },
+  {
+    "id": "sign",
+    "name": {
+      "key": "num_2028",
+      "text": "签到"
+    },
+    "main": 5,
+    "optional": "",
+    "wkqbx": 2,
+    "kqbx": 0,
+    "img": "zc_icon_01",
+    "prompt": {
+      "key": "opencond_prompt_sign",
+      "text": "功能暂未开启"
+    },
+    "uiid": 0
   }
 ]
\ No newline at end of file
diff --git a/modules/user/api_login.go b/modules/user/api_login.go
index 52fa79c28..f4f8c15c2 100644
--- a/modules/user/api_login.go
+++ b/modules/user/api_login.go
@@ -144,7 +144,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
 
 	// 初始化随机任务数据
 	// this.module.ModuleRtask.InitCondiData(user.Uid)
-
+	//this.Sign(session, &pb.UserSignReq{})
 	// 日常登录任务
 	this.module.ModuleRtask.SendToRtask(session, comm.Rtype7, 1)