From f5768f650ca63036e43efb43a0d6bcf7c51a9505 Mon Sep 17 00:00:00 2001 From: scooterboo Date: Thu, 20 Apr 2023 15:34:28 -0700 Subject: [PATCH] Fix file encoding to UTF-8 --- Resources/Scripts/Gadget/AncientOre.lua | 2 +- Resources/Scripts/Gadget/BigAster.lua | 2 +- Resources/Scripts/Gadget/CelestiaSplinter.lua | 2 +- Resources/Scripts/Gadget/ElecCannon.lua | 2 +- Resources/Scripts/Gadget/Fire_Source.lua | 2 +- Resources/Scripts/Gadget/GadgetMarkAction.lua | 2 +- Resources/Scripts/Gadget/ImmortalFire.lua | 2 +- Resources/Scripts/Gadget/KazuhaServeItem_Gadget.lua | 2 +- Resources/Scripts/Gadget/LitChargePoint.lua | 2 +- Resources/Scripts/Gadget/RockCannon.lua | 2 +- Resources/Scripts/Gadget/SceneObj_Gear_Windmill01.lua | 8 ++++---- Resources/Scripts/Gadget/SetALLGadgetState.lua | 2 +- Resources/Scripts/Gadget/SetGadgetState.lua | 2 +- Resources/Scripts/Gadget/SetGadgetState_BanMP.lua | 2 +- Resources/Scripts/Gadget/SetInteractOnDefault.lua | 2 +- Resources/Scripts/Gadget/SetSakuraActive.lua | 2 +- Resources/Scripts/Gadget/SetSlidingWallIntee.lua | 2 +- Resources/Scripts/Gadget/SetSplitterShootType.lua | 2 +- Resources/Scripts/Gadget/SetToysCD.lua | 2 +- Resources/Scripts/Gadget/WindSeedTimer.lua | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Resources/Scripts/Gadget/AncientOre.lua b/Resources/Scripts/Gadget/AncientOre.lua index 61f8000cd..8ed275cf3 100644 --- a/Resources/Scripts/Gadget/AncientOre.lua +++ b/Resources/Scripts/Gadget/AncientOre.lua @@ -1,4 +1,4 @@ -function OnClientExecuteReq(context, param1, param2, param3) +function OnClientExecuteReq(context, param1, param2, param3) local this_config = ScriptLib.GetContextGadgetConfigId(context) local this_group = ScriptLib.GetContextGroupId(context) --ScriptLib.PrintLog("GadgetState Get Change!!!!!!!") diff --git a/Resources/Scripts/Gadget/BigAster.lua b/Resources/Scripts/Gadget/BigAster.lua index a9bb752b3..368ae1c60 100644 --- a/Resources/Scripts/Gadget/BigAster.lua +++ b/Resources/Scripts/Gadget/BigAster.lua @@ -1,4 +1,4 @@ -local defs = { +local defs = { player_energy = "AVATAR_ASTER_SCORE" } diff --git a/Resources/Scripts/Gadget/CelestiaSplinter.lua b/Resources/Scripts/Gadget/CelestiaSplinter.lua index 090de785b..5fe1bf10c 100644 --- a/Resources/Scripts/Gadget/CelestiaSplinter.lua +++ b/Resources/Scripts/Gadget/CelestiaSplinter.lua @@ -1,4 +1,4 @@ -function OnClientExecuteReq(context, param1, param2, param3) +function OnClientExecuteReq(context, param1, param2, param3) local group_id=ScriptLib.GetContextGroupId(context) if group_id ~= nil and group_id ~= -1 then if param1==0 then diff --git a/Resources/Scripts/Gadget/ElecCannon.lua b/Resources/Scripts/Gadget/ElecCannon.lua index 3d049397b..63f6544b3 100644 --- a/Resources/Scripts/Gadget/ElecCannon.lua +++ b/Resources/Scripts/Gadget/ElecCannon.lua @@ -1,4 +1,4 @@ - + local stateChain={ {0101,0102,0103,0104,0105,0106,0107,0108,0109}, {0201,0202,0203,0204,0205,0206,0207,0208,0209}, diff --git a/Resources/Scripts/Gadget/Fire_Source.lua b/Resources/Scripts/Gadget/Fire_Source.lua index cdf22f5f1..4b93a6ae1 100644 --- a/Resources/Scripts/Gadget/Fire_Source.lua +++ b/Resources/Scripts/Gadget/Fire_Source.lua @@ -1,4 +1,4 @@ --- abilityRequest +-- abilityRequest function OnClientExecuteReq(context, param1, param2, param3) --ScriptLib.PrintLog("##param1="..param1) -- 获取机关当前状态 diff --git a/Resources/Scripts/Gadget/GadgetMarkAction.lua b/Resources/Scripts/Gadget/GadgetMarkAction.lua index ac5453696..0914a5fcd 100644 --- a/Resources/Scripts/Gadget/GadgetMarkAction.lua +++ b/Resources/Scripts/Gadget/GadgetMarkAction.lua @@ -1,4 +1,4 @@ ---[[====================================== +--[[====================================== || filename: GadgetMarkAction || owner: zijun.ma || description: 3.0开始应用的通用物件MarkAction diff --git a/Resources/Scripts/Gadget/ImmortalFire.lua b/Resources/Scripts/Gadget/ImmortalFire.lua index 2aa81d6b9..c4c182d66 100644 --- a/Resources/Scripts/Gadget/ImmortalFire.lua +++ b/Resources/Scripts/Gadget/ImmortalFire.lua @@ -1,4 +1,4 @@ -function OnBeHurt(context, element_type, strike_type, is_host) +function OnBeHurt(context, element_type, strike_type, is_host) -- 获取机关当前状态 local state = ScriptLib.GetGadgetState(context) if element_type == ElementType.Fire and state == GadgetState.Default then diff --git a/Resources/Scripts/Gadget/KazuhaServeItem_Gadget.lua b/Resources/Scripts/Gadget/KazuhaServeItem_Gadget.lua index 8cbf3523f..505eeb836 100644 --- a/Resources/Scripts/Gadget/KazuhaServeItem_Gadget.lua +++ b/Resources/Scripts/Gadget/KazuhaServeItem_Gadget.lua @@ -1,4 +1,4 @@ -function OnClientExecuteReq(context, param1, param2, param3) +function OnClientExecuteReq(context, param1, param2, param3) local ret = ScriptLib.SetGadgetState(context, param1) if 0 ~= ret then diff --git a/Resources/Scripts/Gadget/LitChargePoint.lua b/Resources/Scripts/Gadget/LitChargePoint.lua index 3a906c4e8..90e9cb6ce 100644 --- a/Resources/Scripts/Gadget/LitChargePoint.lua +++ b/Resources/Scripts/Gadget/LitChargePoint.lua @@ -1,4 +1,4 @@ -function OnClientExecuteReq(context, param1, param2, param3) +function OnClientExecuteReq(context, param1, param2, param3) if param1~=nil then --ScriptLib.PrintLog("GadgetState Get Change!!!!!!!") ScriptLib.SetGadgetState(context, param1) diff --git a/Resources/Scripts/Gadget/RockCannon.lua b/Resources/Scripts/Gadget/RockCannon.lua index 70a43ecc2..cd4f8003f 100644 --- a/Resources/Scripts/Gadget/RockCannon.lua +++ b/Resources/Scripts/Gadget/RockCannon.lua @@ -1,4 +1,4 @@ - + local stateChain={ {0101,0102,0103,0104,0105,0106,0107,0108,0109}, {0201,0202,0203,0204,0205,0206,0207,0208,0209}, diff --git a/Resources/Scripts/Gadget/SceneObj_Gear_Windmill01.lua b/Resources/Scripts/Gadget/SceneObj_Gear_Windmill01.lua index b6e22066d..38299cf23 100644 --- a/Resources/Scripts/Gadget/SceneObj_Gear_Windmill01.lua +++ b/Resources/Scripts/Gadget/SceneObj_Gear_Windmill01.lua @@ -8,15 +8,15 @@ function OnClientExecuteReq(context, param1, param2, param3) end end --- ʱص +-- 定时器回调 function OnTimer(context, now) - -- ȡصǰ״̬ + -- 获取机关当前状态 local state = ScriptLib.GetGadgetState(context) if state ~= GadgetState.Default then - -- ȡǰ״̬Ŀʼʱ + -- 获取当前状态的开始时间 local state_begin_time = ScriptLib.GetGadgetStateBeginTime(context) if now >= state_begin_time + _delay then - -- ʱ䳬ʱ䣬תΪDefault״̬ + -- 如果启动时间超过启动持续时间,则转换为Default状态 ScriptLib.SetGadgetState(context, GadgetState.Default) end end diff --git a/Resources/Scripts/Gadget/SetALLGadgetState.lua b/Resources/Scripts/Gadget/SetALLGadgetState.lua index 1f10d2ba7..61caaa531 100644 --- a/Resources/Scripts/Gadget/SetALLGadgetState.lua +++ b/Resources/Scripts/Gadget/SetALLGadgetState.lua @@ -1,4 +1,4 @@ -function OnClientExecuteReq(context, param1, param2, param3) +function OnClientExecuteReq(context, param1, param2, param3) --ScriptLib.PrintLog("GadgetState Get Change!!!!!!!") if param1 == 0 then diff --git a/Resources/Scripts/Gadget/SetGadgetState.lua b/Resources/Scripts/Gadget/SetGadgetState.lua index 3d79180d5..58738fb2e 100644 --- a/Resources/Scripts/Gadget/SetGadgetState.lua +++ b/Resources/Scripts/Gadget/SetGadgetState.lua @@ -1,4 +1,4 @@ -function OnClientExecuteReq(context, param1, param2, param3) +function OnClientExecuteReq(context, param1, param2, param3) --ScriptLib.PrintLog("GadgetState Get Change!!!!!!!") ScriptLib.SetGadgetState(context, param1) diff --git a/Resources/Scripts/Gadget/SetGadgetState_BanMP.lua b/Resources/Scripts/Gadget/SetGadgetState_BanMP.lua index cb8f2e3a6..d76f10f68 100644 --- a/Resources/Scripts/Gadget/SetGadgetState_BanMP.lua +++ b/Resources/Scripts/Gadget/SetGadgetState_BanMP.lua @@ -1,4 +1,4 @@ -function OnClientExecuteReq(context, param1, param2, param3) +function OnClientExecuteReq(context, param1, param2, param3) --联机状态下,由于未被及时卸载时被交互的保险 if true == ScriptLib.CheckIsInMpMode(context) then ScriptLib.PrintContextLog(context, "#SetGadgetState_BanMP# Is in MP mode, refuse state change.") diff --git a/Resources/Scripts/Gadget/SetInteractOnDefault.lua b/Resources/Scripts/Gadget/SetInteractOnDefault.lua index 20e46b113..2c5ffe73d 100644 --- a/Resources/Scripts/Gadget/SetInteractOnDefault.lua +++ b/Resources/Scripts/Gadget/SetInteractOnDefault.lua @@ -1,4 +1,4 @@ -function OnClientExecuteReq(context, param1, param2, param3) +function OnClientExecuteReq(context, param1, param2, param3) --当物件被设为Default状态时,将物件设为可交互 if param1 == 0 then diff --git a/Resources/Scripts/Gadget/SetSakuraActive.lua b/Resources/Scripts/Gadget/SetSakuraActive.lua index 09820ae90..268ffcc4f 100644 --- a/Resources/Scripts/Gadget/SetSakuraActive.lua +++ b/Resources/Scripts/Gadget/SetSakuraActive.lua @@ -1,4 +1,4 @@ -function OnClientExecuteReq(context, param1, param2, param3) +function OnClientExecuteReq(context, param1, param2, param3) --ScriptLib.PrintLog("GadgetState Get Change!!!!!!!") if param1 == 0 then diff --git a/Resources/Scripts/Gadget/SetSlidingWallIntee.lua b/Resources/Scripts/Gadget/SetSlidingWallIntee.lua index 9d477e8c3..69054f9bb 100644 --- a/Resources/Scripts/Gadget/SetSlidingWallIntee.lua +++ b/Resources/Scripts/Gadget/SetSlidingWallIntee.lua @@ -1,4 +1,4 @@ -function OnClientExecuteReq(context, param1, param2, param3) +function OnClientExecuteReq(context, param1, param2, param3) --ScriptLib.PrintLog("GadgetState Get Change!!!!!!!") if param1 == 0 then diff --git a/Resources/Scripts/Gadget/SetSplitterShootType.lua b/Resources/Scripts/Gadget/SetSplitterShootType.lua index 96f904229..f2b3fe98f 100644 --- a/Resources/Scripts/Gadget/SetSplitterShootType.lua +++ b/Resources/Scripts/Gadget/SetSplitterShootType.lua @@ -1,4 +1,4 @@ -function OnClientExecuteReq(context, param1, param2, param3) +function OnClientExecuteReq(context, param1, param2, param3) if param1 == 202 then ScriptLib.SetGroupVariableValue(context, "SplitterShootType", 202) end diff --git a/Resources/Scripts/Gadget/SetToysCD.lua b/Resources/Scripts/Gadget/SetToysCD.lua index 8c2df9582..deb3956f6 100644 --- a/Resources/Scripts/Gadget/SetToysCD.lua +++ b/Resources/Scripts/Gadget/SetToysCD.lua @@ -1,4 +1,4 @@ -function SetToysCD_MD_Success(context) +function SetToysCD_MD_Success(context) return ScriptLib.SetWidgetClientDetectorCoolDown(context, 220009, true) end diff --git a/Resources/Scripts/Gadget/WindSeedTimer.lua b/Resources/Scripts/Gadget/WindSeedTimer.lua index dff37dbdc..469e352ef 100644 --- a/Resources/Scripts/Gadget/WindSeedTimer.lua +++ b/Resources/Scripts/Gadget/WindSeedTimer.lua @@ -1,4 +1,4 @@ -local default_time = 18 +local default_time = 18 function OnTimer(context, now) local state_begin_time = ScriptLib.GetGadgetStateBeginTime(context)