Merge branch '3.5' into '3.5'

Fix file encoding to UTF-8

See merge request YuukiPS/GC-Resources!2

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！！！！！！！")

Resources/Scripts/Gadget/BigAster.lua

@@ -1,4 +1,4 @@
-local defs = {
+local defs = {
 	player_energy = "AVATAR_ASTER_SCORE"
 }
 

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

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},

Resources/Scripts/Gadget/Fire_Source.lua

@@ -1,4 +1,4 @@
--- abilityRequest
+-- abilityRequest
 function OnClientExecuteReq(context, param1, param2, param3)
 	--ScriptLib.PrintLog("##param1="..param1)
 	-- 获取机关当前状态

Resources/Scripts/Gadget/GadgetMarkAction.lua

@@ -1,4 +1,4 @@
---[[======================================
+--[[======================================
 ||	filename:       GadgetMarkAction
 ||	owner:          zijun.ma
 ||	description:    3.0开始应用的通用物件MarkAction

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

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

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)

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},

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

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

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)

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.")

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

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

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

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

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
 

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)