From 28c7975613b70b691a3ee700c1c24cc046c8146f Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Tue, 18 Jul 2023 10:30:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81=E5=92=8C?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_recharge.json      | 19 +++++++++++
 bin/json/game_skillafteratk.json | 47 ++++++++++++++++++++++++++
 bin/json/game_skillatk.json      | 58 ++++++++++++++++++++++++++++++++
 comm/const.go                    |  3 ++
 modules/tools/modelGlobal.go     | 19 +++++++++++
 5 files changed, 146 insertions(+)
 create mode 100644 modules/tools/modelGlobal.go

diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json
index 6e1da60f2..41a52edf6 100644
--- a/bin/json/game_recharge.json
+++ b/bin/json/game_recharge.json
@@ -630,5 +630,24 @@
     "text": "0",
     "show": "98元",
     "image": ""
+  },
+  {
+    "id": "drawcard pack1",
+    "editionid": "debug",
+    "recharge_type": 5,
+    "monetaryunit": "￥",
+    "amount": 3000,
+    "vipexp": [
+      {
+        "a": "attr",
+        "t": "vipexp",
+        "n": 300
+      }
+    ],
+    "diamond_num_double": [],
+    "channel": "0",
+    "text": "0",
+    "show": "30元",
+    "image": ""
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 858eb0d12..8424fd739 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -42051,5 +42051,52 @@
     "DpsCondition": "",
     "RevisiCondition": "",
     "RevisiParams": []
+  },
+  {
+    "Id": 254014111,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      2000
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 254014211,
+    "EmitPR": 1000,
+    "From": 1,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      390001008,
+      1000,
+      1,
+      2
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 6f11d9245..2b2530f6b 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -29914,5 +29914,63 @@
     },
     "buffid": [],
     "map": ""
+  },
+  {
+    "id": 154014111,
+    "level": 1,
+    "MaxLV": 1,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_154014111",
+      "text": "挚爱甜心"
+    },
+    "ico": "jn_54014_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_1",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        254014111
+      ]
+    },
+    "Desc": {
+      "key": "skill_skill_atk_Desc_154014111_1",
+      "text": "对敌方1个目标发起攻击，造成攻击力 200%的伤害。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 154014211,
+    "level": 1,
+    "MaxLV": 1,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_154014211",
+      "text": "恋如糖雨"
+    },
+    "ico": "jn_54014_2",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_2",
+    "Type": 1,
+    "CD": 3,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        254014211
+      ]
+    },
+    "Desc": {
+      "key": "skill_skill_atk_Desc_154014211_1",
+      "text": "对全体己方队友附加2回合[color=#37d8a9]攻击提升[/color]状态。"
+    },
+    "buffid": [],
+    "map": ""
   }
 ]
\ No newline at end of file
diff --git a/comm/const.go b/comm/const.go
index 656d84b7f..3e6a2a569 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -293,6 +293,9 @@ const (
 
 	///工会战
 	TableUniongve = "uniongve"
+
+	//全局表
+	TableGlobal = "global"
 )
 
 // RPC服务接口定义处
diff --git a/modules/tools/modelGlobal.go b/modules/tools/modelGlobal.go
new file mode 100644
index 000000000..b6a5a5988
--- /dev/null
+++ b/modules/tools/modelGlobal.go
@@ -0,0 +1,19 @@
+package tools
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/modules"
+)
+
+type modelGlobal struct {
+	modules.MCompModel
+	module *Tools
+}
+
+func (this *modelGlobal) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+	err = this.MCompModel.Init(service, module, comp, options)
+	this.TableName = comm.TableGlobal
+	this.module = module.(*Tools)
+	return
+}