關於Twitch忠誠點數/小奇點的功能支持

Author: TwhomeGH

[BP]iiTNTC/scripts/core/EventActionForm.js

@@ -105,11 +105,34 @@ export class EventActionForm {
         if (action.actionType !== 'Clear Blocks') {
             form.button('Edit', () => this.showActionTypeForm(action, true, index));
         }
+        
+        if (action.type) {
+           form.button('RewardType', () => this.TypeSet(action));
+        }
         form.button('Delete', () => this.showClearActionFromEvent(action, index));
         form.show();
     }
 
-      
+    TypeSet(action){
+        let typeActions=[
+                { id: 1, type: "Bits",description:"依據觀眾花費的小奇點" },
+                { id: 2, type: "Reward",description:"依據頻道忠誠點數兌換" }
+            ]
+            
+        const defaultIndex = typeActions.findIndex(t => t.type === action.type) || 0;
+            
+        new ModalForm(this._player, "Twitch Reward Type")
+            .dropdown("Type:", typeActions.map(action => `${action.type} - ${action.description}`), defaultIndex)
+            .submitButton('Apply')
+            .show(response => {
+            const selectedIndex = response[0];
+            const selectedType = typeActions[selectedIndex].type;
+            // ✅ 更新 action.type
+            action.type = selectedType;
+        
+            console.log(`更新後的 type: ${action.type}`);
+        });
+    }
     RangeSet(action,isEdit,index){
          if (action.actionType !== 'RangeSet')
             return;

[BP]iiTNTC/scripts/game/actions/RewardAction.js

@@ -8,8 +8,9 @@ export class REActionForm extends EventActionFormBase {
     show() {
         const chatEvents = this._eventActionForm.actionManager.getAllEvents();
         const form = new ActionForm(this._player, 'Reward Actions');
+     
         chatEvents.forEach((actions, eventKey) => {
-            form.button(`§2§kii§r§e${eventKey} §8Chat§2§kii§r\n§2Actions: [${actions.length}]`, () => {
+            form.button(`§2§kii§r§e${eventKey}:${actions[0].type}§2§kii§r\n§2Actions: [${actions.length}]`, () => {
                 this.showRActionsForm(eventKey, `Actions for ${eventKey} Reward`, actions);
             });
         });
@@ -20,20 +21,31 @@ export class REActionForm extends EventActionFormBase {
     showCreateNewActionForm() {
         new ModalForm(this._player, 'Create New Reward Action')
             .textField('number', 'Enter the number for action', "50", "100")
+            .dropdown('Type', ['Bits', 'Reward'], 0)
             .submitButton('Continue')
             .show(response => {
             const chat = response[0];
+            const typeIndex = response[1]; // 選單的索引
+            const types = ['Bits', 'Reward']; 
+            const chat2 = types[typeIndex];  // 真正的 type 值
+
             this._eventActionForm.showCreateActionForm({
                 eventKey: chat,
-                chat
+                type:chat2
             }, this._actionOptions);
         });
     }
     showRActionsForm(eventKey, formTitle, chatActions) {
         const form = new ActionForm(this._player, formTitle);
-        form.body(`§2§kii§r§fTotal Actions: §d${chatActions.length}§2§kii§r\nUse Point: §e${eventKey}§f.`);
+        console.log(JSON.stringify(chatActions,null,4))
+        
+        let typelist=chatActions.map(action => action.type)
+        form.body(`§2§kii§r§fTotal Actions: §d${chatActions.length}§2§kii§r\nUse Point: §e${eventKey}§f\nType:${typelist}`);
         chatActions.forEach((action, index) => {
             let text = '';
+            if (action.type){
+                text += ` - ${action.type}`
+            }
             if (action.actionType === 'Summon') {
                 text += ` - ${action.summonOptions.entityName.toUpperCase()} x${action.summonOptions?.amount}`;
             }

[BP]iiTNTC/scripts/game/events/tiktok/giftEvents.js

@@ -67,9 +67,16 @@ export default [
     },
     {
       "reward":100,
+      "type":"Bits",
       "actionType": "Screen Title",
       "screenTitle": "Title"    
     },
+    {
+      "reward":1002,
+      "type":"Reward",
+      "actionType": "Screen Title",
+      "screenTitle": "333"    
+    },
     {
       "text":"22",
       "actionType":"Clear Blocks"

[BP]iiTNTC/scripts/game/events/tiktok/keyExtra.js

@@ -81,7 +81,8 @@ export const keyExtractors = {
             return { 
                 key:action.reward,
                 eventKey: action.reward,
-                reward:action.reward
+                reward:action.reward,
+                type:action.type
             };
         }
         return null;

[BP]iiTNTC/scripts/game/events/tiktok/onAction.js

@@ -21,7 +21,9 @@ export const ActionTypeDisplay = {
   "Screen Subtitle": "顯示副標題",
   "Fill":"填滿",
   "Clear Blocks":"清除方塊",
-  "Command":"運行特別指令"
+  "Command":"運行特別指令",
+  "Bits":"依據Twitch小奇點",
+  "Reward":"依據Twitch忠誠點數兌換"
 };
 
 export function onAction(game, message={}) {
@@ -329,6 +331,13 @@ export function onAction(game, message={}) {
                 let DisplayAction="運行類型："+ActionTypeDisplay[action.actionType] || `?? ${action.actionType}`
                 if(debug)game.player.sendMessage(DisplayAction);
                 game.player.runCommand(`scoreboard players add "${DisplayAction}" display ${ActionSort} `)
+                
+                ActionSort--
+                
+                DisplayAction=ActionTypeDisplay[action.type] || `?? ${action.type}`
+                if(debug)game.player.sendMessage(DisplayAction);
+                game.player.runCommand(`scoreboard players add "${DisplayAction}" display ${ActionSort} `)
+                
                 });
                 ActionSort--
             }

[BP]iiTNTC/scripts/game/events/tiktok/onReward.js

@@ -5,12 +5,21 @@ import { executeAction } from "../../actions/executeAction";
  * @param {string} message the message sent by TikTokLiveMCBE
  */
 export function onReward(game, message) {
-    const { uniqueId, nickname, comment,rewardCost } = JSON.parse(message);
+    const { uniqueId, nickname, comment,rewardCost,type } = JSON.parse(message);
     const chatActions = game.rewardActionManager.getAllEvents();
-    chatActions.forEach((actions, eventKey) => {
-        if (eventKey === rewardCost) {
-            actions.forEach(action => executeAction(game, action));
+    
+	chatActions.forEach((actions, eventKey) => {
+		//console.log(JSON.stringify(actions,null,4))
+		console.log(JSON.stringify(eventKey,null,4))
+        
+		if (eventKey === rewardCost) {
+            actions.forEach(action => {
+				 if (action.type == type) {
+					executeAction(game, action)
+				 }
+				});
         }
+		
     });
     game.player.sendMessage(`§7[§aReward§7]: §f${nickname} §7: §f${comment}`);
 }