fix(adventure): fix repeated counting ending rewards

koishijs · May 16, 2021 · dfd683c · dfd683c
1 parent 66cae53
commit dfd683c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/packages/plugin-adventure/package.json b/packages/plugin-adventure/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-adventure",
   "version": "0.2.0",
-  "description": "Adventure Game for Koishi",
+  "description": "Adventure game framework for Koishi.js",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

diff --git a/packages/plugin-adventure/src/index.ts b/packages/plugin-adventure/src/index.ts
@@ -127,12 +127,12 @@ export function apply(ctx: Context, config?: Config) {
   const endingReward = [300, 200, 100]
   ctx.on('adventure/ending', ({ app, user, username }, id) => {
     if (user.flag & User.Flag.noLeading) return
-    const count = Phase.endingCount[id], reward = endingReward[count]
-    if (reward) {
+    const set = Phase.endingCount[id]
+    const count = set.size, reward = endingReward[count]
+    if (reward && set.add(user.id).size > count) {
       app.broadcast(`恭喜 ${username} 达成了结局「${Phase.endingMap[id]}」的全服${leadingOrder[count]}，将获得 ${reward}￥ 的奖励！`).catch()
       user.money += reward
       user.wealth += reward
     }
-    Phase.endingCount[id] += 1
   })
 }
diff --git a/packages/plugin-adventure/src/phase.ts b/packages/plugin-adventure/src/phase.ts
@@ -89,7 +89,7 @@ export namespace Phase {
   }
 
   export const endingMap: Record<string, string> = {}
-  export const endingCount: Record<string, number> = {}
+  export const endingCount: Record<string, Set<string>> = {}
   export const reversedEndingMap: Record<string, string> = {}
   /** 键：prefix，值：[剧情线名，结局数] */
   export const lines: Record<string, [string, number]> = {}
@@ -114,7 +114,7 @@ export namespace Phase {
     for (const id in map) {
       const name = `${prefix}-${id}`
       endingMap[name] = map[id]
-      endingCount[name] = 0
+      endingCount[name] = new Set()
       Show.redirect(map[id], 'ending', checkEnding)
       reversedEndingMap[map[id]] = name
       if (bad.includes(id)) {
@@ -565,15 +565,12 @@ export namespace Phase {
       })
 
     ctx.on('connect', async () => {
-      const endings = Object.keys(endingCount)
-      if (!endings.length) return
-      let sql = 'SELECT'
-      for (const id of endings) {
-        sql += ` find_ending('${id}') AS '${id}',`
-      }
-      const [data] = await ctx.database.mysql.query<[Record<string, number>]>(sql.slice(0, -1))
-      for (const key in data) {
-        endingCount[key] = data[key]
+      if (!Object.keys(endingCount).length) return
+      const data = await ctx.database.mysql.query<Pick<User, 'id' | 'endings'>[]>('select id, endings from user where json_length(endings)')
+      for (const { id, endings } of data) {
+        for (const name in endings) {
+          endingCount[name]?.add(id)
+        }
       }
     })
   }

diff --git a/packages/plugin-assets/package.json b/packages/plugin-assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-assets",
-  "description": "Asset provider plugin for Koishi",
+  "description": "A classic assets provider for Koishi.js",
   "version": "1.1.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

diff --git a/packages/plugin-chat/package.json b/packages/plugin-chat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-chat",
-  "description": "Chat plugin for Koishi",
+  "description": "Display and respond to messages for Koishi.js",
   "version": "0.5.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",