Update - 1.14.0.129

EN: 1.14.0.129
CN: 1.14.0.129
JP: 1.14.0.133
KR: 1.14.0.135

lua/game/adventure/scoreboss/scorebosslevel.lua

@@ -220,7 +220,7 @@ function ScoreBossLevel:PlaySuccessPerform(entryLevelId, totalScore, totalStar)
 	EventManager.Add("ADVENTURE_LEVEL_UNLOAD_COMPLETE", self, levelEndCallback)
 	local function openBattleResultPanel()
 		EventManager.Remove("SettlementPerformLoadFinish", self, openBattleResultPanel)
-		EventManager.Hit(EventId.OpenPanel, PanelId.ScoreBossResult, entryLevelId, totalScore, totalStar, self.tbCharDamage)
+		EventManager.Hit(EventId.OpenPanel, PanelId.ScoreBossResult, entryLevelId, totalScore, totalStar, self.tbCharDamage, self.tbCharId)
 	end
 	EventManager.Add("SettlementPerformLoadFinish", self, openBattleResultPanel)
 	CS.AdventureModuleHelper.LevelStateChanged(true)

lua/game/adventure/soldier/soldierleveldata.lua

@@ -1342,7 +1342,6 @@ end
 function SoldierLevelData:OpenSandTable()
 	if self.bOpenSandTable then
 		EventManager.Hit("EnterStandTable")
-		self:SendDeploySync()
 	end
 	self.bOpenSandTable = false
 end

lua/game/codegen/game_enum_define.lua

@@ -2316,7 +2316,8 @@ GameEnum.OpenFuncType = {
 	NickNameReset = 29,
 	WeeklyQuest = 30,
 	QuestNewbie = 31,
-	TraceHunt = 32
+	TraceHunt = 32,
+	EnergyBattery = 33
 }
 GameEnum.TowerQuestType = {Core = 1, Normal = 2}
 GameEnum.poolType = {Elite = 1, Boss = 2}
@@ -2563,7 +2564,8 @@ GameEnum.activityThemeType = {
 	Tech_10108 = 14,
 	GunStorm_10109 = 15,
 	Summer_20103 = 16,
-	Summer_10110 = 17
+	Summer_10110 = 17,
+	BreakOut_30103 = 19
 }
 GameEnum.ActivityLevelType = {
 	Explore = 1,

lua/game/ui/activity/throwgifts/throwgiftlevelselectpanel_400015.lua

@@ -0,0 +1,24 @@
+local ThrowGiftLevelSelectPanel_400015 = class("ThrowGiftLevelSelectPanel_400015", BasePanel)
+ThrowGiftLevelSelectPanel_400015._sUIResRootPath = "UI_Activity/"
+ThrowGiftLevelSelectPanel_400015._tbDefine = {
+	{
+		sPrefabPath = "_400015/ThrowGiftsLevelSelectPanel.prefab",
+		sCtrlName = "Game.UI.Activity.ThrowGifts.ThrowGiftLevelSelectCtrl"
+	}
+}
+function ThrowGiftLevelSelectPanel_400015:Awake()
+	self.nTransition = 52
+	self.nLevelPanelId = PanelId.ThrowGiftLevelPanel_400015
+	self.nQuestPanelId = PanelId.Task_10110
+end
+function ThrowGiftLevelSelectPanel_400015:OnEnable()
+end
+function ThrowGiftLevelSelectPanel_400015:OnAfterEnter()
+end
+function ThrowGiftLevelSelectPanel_400015:OnDisable()
+end
+function ThrowGiftLevelSelectPanel_400015:OnDestroy()
+end
+function ThrowGiftLevelSelectPanel_400015:OnRelease()
+end
+return ThrowGiftLevelSelectPanel_400015

lua/game/ui/activity/throwgifts/throwgiftpanel_400015.lua

@@ -0,0 +1,30 @@
+local ThrowGiftPanel_400015 = class("ThrowGiftPanel_400015", BasePanel)
+ThrowGiftPanel_400015._sUIResRootPath = "UI_Activity/"
+local GamepadUIManager = require("GameCore.Module.GamepadUIManager")
+ThrowGiftPanel_400015._tbDefine = {
+	{
+		sPrefabPath = "_400015/ThrowGiftsPanel.prefab",
+		sCtrlName = "Game.UI.Activity.ThrowGifts.ThrowGiftCtrl"
+	}
+}
+function ThrowGiftPanel_400015:Awake()
+	self.nLevelPanelId = PanelId.ThrowGiftLevelPanel_400015
+	self.sGamepadPanelName = "ThrowGiftPanel_400015"
+	self.nTransition = 52
+	self._rootPath = "UI_Activity/_400015/GoalPerfab/Goal%s.prefab"
+	GamepadUIManager.EnterAdventure(true)
+	GamepadUIManager.EnableGamepadUI(self.sGamepadPanelName, {}, nil, true)
+end
+function ThrowGiftPanel_400015:OnEnable()
+end
+function ThrowGiftPanel_400015:OnAfterEnter()
+end
+function ThrowGiftPanel_400015:OnDisable()
+end
+function ThrowGiftPanel_400015:OnDestroy()
+	GamepadUIManager.DisableGamepadUI(self.sGamepadPanelName)
+	GamepadUIManager.QuitAdventure()
+end
+function ThrowGiftPanel_400015:OnRelease()
+end
+return ThrowGiftPanel_400015

lua/game/ui/activity/throwgifts/throwgiftslevelctrl.lua

@@ -1061,6 +1061,17 @@ function ThrowGiftsLevelCtrl:OnUpdate()
 		self._mapNode.rtScene.anchoredPosition = Vector2(nFinX, rtScenePos.y)
 	end
 end
+function ThrowGiftsLevelCtrl:CheckSpeed(nVy, nAngle)
+	local bSpeedCheck = true
+	if nAngle < 45 or 315 < nAngle then
+		bSpeedCheck = nVy <= 0
+	elseif nAngle < 135 or 225 < nAngle then
+		bSpeedCheck = true
+	else
+		bSpeedCheck = 0 <= nVy
+	end
+	return bSpeedCheck
+end
 function ThrowGiftsLevelCtrl:NormalGoalCheck(nCurPosX, nCurPosY)
 	local nSumX = nCurPosX - self.curGiftPenguin.mapStartPos.x
 	local nSumY = nCurPosY - self.curGiftPenguin.mapStartPos.y
@@ -1072,10 +1083,11 @@ function ThrowGiftsLevelCtrl:NormalGoalCheck(nCurPosX, nCurPosY)
 	local hitPos
 	for nId, mapAciveGoal in pairs(self.activeGoal) do
 		local GoalParentPos = mapAciveGoal.rtGoal.anchoredPosition
+		local nGoalParentAngle = mapAciveGoal.rtGoal.localEulerAngles.z % 360
 		local bHitGoal = self:CheckCollision(self.curGiftPenguin.tbBounds, mapAciveGoal.tbBoundsHitArea, nSumX, nSumY, mapAciveGoal.OffsetX, mapAciveGoal.OffsetY)
 		if bHitGoal then
 			local curVy = self.curGiftPenguin.nVelocityY
-			if 0 < curVy and self.curGiftPenguin.nSpecialType ~= 106 and self.curGiftPenguin.nSpecialType ~= 107 then
+			if not self:CheckSpeed(curVy, nGoalParentAngle) and self.curGiftPenguin.nSpecialType ~= 106 and self.curGiftPenguin.nSpecialType ~= 107 then
 				print("hit goal edge")
 				self:DestroyPenguin()
 				self.curGiftPenguin = nil
@@ -1165,8 +1177,9 @@ function ThrowGiftsLevelCtrl:BouncePenguinGoalCheck(nCurPosX, nCurPosY)
 	for nId, mapAciveGoal in pairs(self.activeGoal) do
 		local GoalParentPos = mapAciveGoal.rtGoal.anchoredPosition
 		local bHitGoal, bestNX, bestNY, minDepth = self:CheckCollision(self.curGiftPenguin.tbBounds, mapAciveGoal.tbBoundsHitArea, nSumX, nSumY, mapAciveGoal.OffsetX, mapAciveGoal.OffsetY)
+		local nGoalParentAngle = mapAciveGoal.rtGoal.localEulerAngles.z % 360
 		if bHitGoal then
-			if 0 < curVy then
+			if not self:CheckSpeed(curVy, nGoalParentAngle) then
 				if self.curGiftPenguin.nHitCount < 3 then
 					WwiseAudioMgr:PostEvent("Mode_Present_spring")
 					self.curGiftPenguin.nHitCount = self.curGiftPenguin.nHitCount + 1

lua/game/ui/activitylist/activitylistctrl.lua

@@ -67,12 +67,12 @@ function ActivityListCtrl:InitActivityList(nCurActId)
 		})
 	end
 	if nil ~= self.tbActList then
-		if nil ~= self._panel.nSelectActId and nil ~= self.nSelectActMainType then
+		if nil ~= self.nSelectActId and nil ~= self.nSelectActMainType then
 			local actData
 			if self.nSelectActMainType == AllEnum.ActivityMainType.Activity then
-				actData = PlayerData.Activity:GetActivityDataById(self._panel.nSelectActId)
+				actData = PlayerData.Activity:GetActivityDataById(self.nSelectActId)
 			elseif self.nSelectActMainType == AllEnum.ActivityMainType.ActivityGroup then
-				actData = PlayerData.Activity:GetActivityGroupDataById(self._panel.nSelectActId)
+				actData = PlayerData.Activity:GetActivityGroupDataById(self.nSelectActId)
 			end
 			local bOpen = false
 			if nil ~= actData then
@@ -87,12 +87,12 @@ function ActivityListCtrl:InitActivityList(nCurActId)
 					nType = AllEnum.MessageBox.Alert,
 					sContent = ConfigTable.GetUIText("Activity_Invalid_Tip_2")
 				})
-				self._panel.nSelectActId = nil
+				self.nSelectActId = nil
 			end
 		end
 		self.nSelectIndex = 1
-		if self._panel.nSelectActId ~= nil or nCurActId ~= nil then
-			local nActId = self._panel.nSelectActId == nil and nCurActId or self._panel.nSelectActId
+		if self.nSelectActId ~= nil or nCurActId ~= nil then
+			local nActId = self.nSelectActId == nil and nCurActId or self.nSelectActId
 			for k, actData in ipairs(self.tbActList) do
 				local actId = actData.nType == AllEnum.ActivityMainType.Activity and actData.actData:GetActId() or actData.actData:GetActGroupId()
 				if nil ~= nActId and actId == nActId then
@@ -453,7 +453,7 @@ function ActivityListCtrl:RefreshSelectActivity(bResetDay)
 	end
 	self.nSelectActMainType = actData.nType
 	if actData.nType == AllEnum.ActivityMainType.Activity then
-		self._panel.nSelectActId = actData.actData:GetActId()
+		self.nSelectActId = actData.actData:GetActId()
 		local actType = actData.actData:GetActType()
 		if actType == GameEnum.activityType.PeriodicQuest then
 			self:AddPeriodicActivityCtrl(actData.actData, bResetDay)
@@ -485,12 +485,12 @@ function ActivityListCtrl:RefreshSelectActivity(bResetDay)
 			self:AddSoldierActivityCtrl(actData.actData)
 		end
 	elseif actData.nType == AllEnum.ActivityMainType.ActivityGroup then
-		self._panel.nSelectActId = actData.actData:GetActGroupId()
+		self.nSelectActId = actData.actData:GetActGroupId()
 		self:AddActivityGroupCtrl(actData.actData)
 	end
-	if self._panel.nSelectActId ~= nil then
-		LocalData.SetPlayerLocalData("Activity_Tab_New_" .. self._panel.nSelectActId, 1)
-		RedDotManager.SetValid(RedDotDefine.Activity_New_Tab, self._panel.nSelectActId, false)
+	if self.nSelectActId ~= nil then
+		LocalData.SetPlayerLocalData("Activity_Tab_New_" .. self.nSelectActId, 1)
+		RedDotManager.SetValid(RedDotDefine.Activity_New_Tab, self.nSelectActId, false)
 	end
 end
 function ActivityListCtrl:FadeIn()
@@ -499,6 +499,7 @@ function ActivityListCtrl:FadeIn()
 end
 function ActivityListCtrl:Awake()
 	self.nSelectIndex = nil
+	self.nSelectActId = nil
 	self.nInitActId = nil
 	self.bPlayAnim = true
 	self.tbInitActIds = {}

lua/game/ui/activitylist/activitylistpanel.lua

@@ -6,7 +6,6 @@ ActivityListPanel._tbDefine = {
 	}
 }
 function ActivityListPanel:Awake()
-	self.nSelectActId = nil
 end
 function ActivityListPanel:OnEnable()
 end

lua/game/ui/activitytheme/10110/story/summeradvstoryctrl.lua

@@ -67,6 +67,10 @@ SummerAdvStoryCtrl._mapNodeConfig = {
 	txtPersonality3 = {
 		sComponentName = "TMP_Text",
 		sLanguageId = "Personality_Chaos"
+	},
+	txtBtnGo = {
+		sComponentName = "TMP_Text",
+		sLanguageId = "InfinityTower_Plot_Review"
 	}
 }
 SummerAdvStoryCtrl._mapEventConfig = {

lua/game/ui/activitytheme/10110/summeradvctrl.lua

@@ -176,19 +176,26 @@ function SummerAdvCtrl:OnEnable()
 					nActId
 				}, self._mapNode.storyRedDot)
 			elseif i == AllEnum.ActivityThemeFuncIndex.MiniGame then
-				local nActId = actData.ActivityId
-				RedDotManager.RegisterNode(RedDotDefine.Activity_IceCreamTruck_New, {nActId}, self._mapNode.miniGameRedDot)
+				if state == ActivityState.Closed then
+					self._mapNode.miniGameRedDot:SetActive(false)
+				else
+					local nActId = actData.ActivityId
+					RedDotManager.RegisterNode(RedDotDefine.Activity_ThrowGift_New, {nActId}, self._mapNode.miniGameRedDot)
+				end
 			end
 		end
 	end
 	local sAnimName = "SummerAdvPanel_in"
+	local sSoundName = "mode_10110_activity"
 	if self.animRoot ~= nil then
 		self.animRoot = self.gameObject:GetComponent("Animator")
 		sAnimName = "SummerAdvPanel_in1"
+		sSoundName = "mode_10110_activity_01"
 	end
 	self.animRoot = self.gameObject:GetComponent("Animator")
 	local nAnimLength = NovaAPI.GetAnimClipLength(self.animRoot, {sAnimName})
 	self.animRoot:Play(sAnimName, 0, 0)
+	CS.WwiseAudioManager.Instance:PlaySound(sSoundName)
 	EventManager.Hit(EventId.TemporaryBlockInput, nAnimLength)
 	self:AddTimer(1, nAnimLength, function()
 		for k, v in pairs(self.tbBtnAnimator) do
@@ -343,7 +350,7 @@ function SummerAdvCtrl:RefreshButtonTimer(actData, timer, txtTrans, imgTrans, re
 			local endTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(activityData.EndTime)
 			if curTime < openTime then
 				state = ActivityState.NotOpen
-			elseif curTime >= openTime and curTime <= endTime then
+			elseif curTime >= openTime and curTime < endTime then
 				state = ActivityState.Open
 			else
 				state = ActivityState.Closed
@@ -427,6 +434,9 @@ function SummerAdvCtrl:RefreshMiniGameButtonState(actData)
 		self._mapNode.txtMiniGameEnd.gameObject:SetActive(state == ActivityState.Closed)
 		self._mapNode.goMiniGameEnd.gameObject:SetActive(state == ActivityState.Closed)
 		if state ~= ActivityState.Open then
+			RedDotManager.SetValid(RedDotDefine.Activity_ThrowGift_New, {
+				actData.ActivityId
+			}, false)
 		end
 		self.tbActState[activityId] = state
 	end
@@ -596,11 +606,14 @@ function SummerAdvCtrl:OnBtn_ClickActivityEntrance(btn, nIndex)
 	end
 	if actData.PanelId ~= nil and ActivityState.Open == state then
 		if nIndex == AllEnum.ActivityThemeFuncIndex.MiniGame then
-			LocalData.SetPlayerLocalData("Activity_MiniGame_10110_New", true)
-			RedDotManager.SetValid(RedDotDefine.Activity_GroupNew_MiniGame, {
+			LocalData.SetPlayerLocalData("Activity_ThrowGift_New", true)
+			RedDotManager.SetValid(RedDotDefine.Activity_ThrowGift_New, {
 				actData.ActivityId
 			}, false)
-			EventManager.Hit(EventId.OpenPanel, actData.PanelId, actData.ActivityId, self.nActId)
+			local func = function()
+				EventManager.Hit(EventId.OpenPanel, actData.PanelId, actData.ActivityId, self.nActId)
+			end
+			EventManager.Hit(EventId.SetTransition, 37, func)
 		elseif self.ActivityGroupCfg.TransitionId ~= nil and self.ActivityGroupCfg.TransitionId > 0 then
 			EventManager.Hit(EventId.SetTransition, self.ActivityGroupCfg.TransitionId, function()
 				EventManager.Hit(EventId.OpenPanel, actData.PanelId, actData.ActivityId)

lua/game/ui/activitytheme/20103/summercheckinthemectrl.lua

@@ -276,12 +276,11 @@ function SummerCheckinThemeCtrl:RegisterReddot()
 				local nNeedWorldLevel = tonumber(activityData.LimitParam) or 0
 				if nNeedWorldLevel > PlayerData.Base:GetWorldClass() then
 					self._mapNode.reddotShow:SetActive(false)
-				else
-					RedDotManager.RegisterNode(RedDotDefine.TrekkerVersus, {
-						self.nActId,
-						nActId
-					}, self._mapNode.reddotShow)
 				end
+				RedDotManager.RegisterNode(RedDotDefine.TrekkerVersus, {
+					self.nActId,
+					nActId
+				}, self._mapNode.reddotShow)
 			elseif i == AllEnum.ActivityThemeFuncIndex.FateCard then
 				RedDotManager.RegisterNode(RedDotDefine.Activity_Group_PenguinCard_Level, {
 					self.nActId

lua/game/ui/activitytheme/30103/activitybreakoutctrl.lua

@@ -163,11 +163,11 @@ end
 function ActivityBreakOutCtrl:OnBtnClick_Go()
 	local actGroupCfg = self.actData:GetActGroupCfgData()
 	if actGroupCfg ~= nil then
-		EventManager.Hit(EventId.OpenPanel, PanelId.BreakOutThemePanel_S2, actGroupCfg.Id)
+		EventManager.Hit(EventId.OpenPanel, PanelId.BreakOutThemePanel_S3, actGroupCfg.Id)
 	end
 end
 function ActivityBreakOutCtrl:OnBtnClick_GoTaskPanel()
-	EventManager.Hit(EventId.OpenPanel, PanelId.Task_30102, self.nActTaskId)
+	EventManager.Hit(EventId.OpenPanel, PanelId.Task_30103, self.nActTaskId)
 end
 function ActivityBreakOutCtrl:OnBtnClick_Detail()
 	local actGroupCfg = self.actData:GetActGroupCfgData()

lua/game/ui/activitytheme/30103/breakoutthemectrl.lua

@@ -390,7 +390,7 @@ function BreakOutThemeCtrl:OnBtn_ClickActivityEntrance(btn, nIndex)
 end
 function BreakOutThemeCtrl:JumpTo_LevelDetail(nActId, nLevelId)
 	local OpenPanel = function()
-		EventManager.Hit(EventId.OpenPanel, PanelId.BreakOutLevelDetailPanelS2, nActId, nLevelId)
+		EventManager.Hit(EventId.OpenPanel, PanelId.BreakOutLevelDetailPanelS3, nActId, nLevelId)
 	end
 	EventManager.Hit(EventId.SetTransition, 3, OpenPanel)
 end

lua/game/ui/activitytheme/taskcommon/taskcommonctrl_01.lua

@@ -70,6 +70,7 @@ function TaskCommonCtrl_01:OnEnable()
 	self:refresh_Tab()
 	self:refresh_Task()
 	self:refresh_Group()
+	self:SetEndTimer()
 end
 function TaskCommonCtrl_01:FadeIn()
 	EventManager.Hit(EventId.SetTransition)
@@ -428,6 +429,39 @@ function TaskCommonCtrl_01:SetImgBar_FillAmount(mapTask, tr)
 	NovaAPI.SetTMPText(tr:Find("tmpTaskDesc"):GetComponent("TMP_Text"), mapTask.sDesc)
 	NovaAPI.SetTMPText(tr:Find("tmpTaskProgress"):GetComponent("TMP_Text"), string.format("%s/%s", tostring(nCur), tostring(nMax)))
 end
+function TaskCommonCtrl_01:SetEndTimer()
+	if self.endTimer ~= nil then
+		self.endTimer:Cancel(false)
+		self.endTimer = nil
+	end
+	if self.ins_ActivityTaskData == nil then
+		return
+	end
+	local nEndTime = self.ins_ActivityTaskData.nEndTime or 0
+	if nEndTime <= 0 then
+		return
+	end
+	local nRemain = nEndTime - CS.ClientManager.Instance.serverTimeStamp
+	if nRemain <= 0 then
+		self:AddTimer(1, 0, function()
+			self:OnActivityEnd()
+		end, true, true, true)
+		return
+	end
+	self.endTimer = self:AddTimer(1, nRemain, function()
+		self:OnActivityEnd()
+	end, true, true, false)
+end
+function TaskCommonCtrl_01:OnActivityEnd()
+	EventManager.Hit(EventId.OpenMessageBox, ConfigTable.GetUIText("Activity_End_Notice"))
+	EventManager.Hit(EventId.CloesCurPanel)
+end
+function TaskCommonCtrl_01:OnDisable()
+	if self.endTimer ~= nil then
+		self.endTimer:Cancel(false)
+		self.endTimer = nil
+	end
+end
 function TaskCommonCtrl_01:SetBigNum(number)
 	local nNum = number
 	if 999999 < nNum then

lua/game/ui/avg/_cn/config/dp_single157.lua

@@ -0,0 +1,131 @@
+return {
+	{
+		cmd = "SetGroupId",
+		param = {"15701"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"avg_emoji_sweaty",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"none",
+			"chat_a",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"呼……可算做完了。",
+			0,
+			"",
+			false,
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"没想到还挺费功夫的。",
+			0,
+			"",
+			false,
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"你们平时都是做这些工作的吗？",
+			0,
+			"",
+			false,
+			""
+		}
+	},
+	{
+		cmd = "SetGroupId",
+		param = {"15702"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"avg_emoji_flower",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"none",
+			"chat_b",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"哼哼~全部完成了哦~",
+			0,
+			"",
+			false,
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"看吧，我努力一下也是能做到的~",
+			0,
+			"",
+			false,
+			""
+		}
+	},
+	{cmd = "End"}
+}

lua/game/ui/avg/_cn/config/stm08_02.lua

@@ -14545,7 +14545,7 @@ return {
 		cmd = "SetTalk",
 		param = {
 			3,
-			"avg1_150",
+			"avg3_150",
 			"依照《恩赐预言书》的记载，监视着每一个和魔<r=mowang></r>王有关的征兆。",
 			0,
 			"",

lua/game/ui/avg/_cn/config/stm08_18_a.lua

@@ -3486,14 +3486,14 @@ return {
 		cmd = "SetCharHead",
 		param = {
 			0,
-			1,
+			0,
 			nil,
 			-50.0,
 			1.2,
-			"avg1_103",
-			"h",
+			"avg1_111",
+			"f",
 			"012",
-			"avg_emoji_sweaty",
+			"avg_emoji_sigh",
 			2,
 			nil,
 			nil,
@@ -3562,14 +3562,14 @@ return {
 		cmd = "SetCharHead",
 		param = {
 			0,
-			0,
+			1,
 			nil,
 			-50.0,
 			1.2,
-			"avg1_111",
-			"f",
+			"avg1_103",
+			"h",
 			"012",
-			"avg_emoji_sigh",
+			"avg_emoji_sweaty",
 			2,
 			nil,
 			nil,

lua/game/ui/avg/_cn/preset/avgcharacter.lua

@@ -109,7 +109,8 @@ return {
 	{
 		id = "avg1_114",
 		name = "猫眼",
-		name_bg_color = "#8e65ad"
+		name_bg_color = "#8e65ad",
+		reuseL2DPose = "b"
 	},
 	{
 		id = "avg1_115",
@@ -208,7 +209,8 @@ return {
 	{
 		id = "avg1_137",
 		name = "埃莉诺",
-		name_bg_color = "#e78fab"
+		name_bg_color = "#e78fab",
+		reuseL2DPose = "b"
 	},
 	{
 		id = "avg1_138",
@@ -249,7 +251,8 @@ return {
 	{
 		id = "avg1_145",
 		name = "乙叶",
-		name_bg_color = "#90a1c6"
+		name_bg_color = "#90a1c6",
+		reuseL2DPose = "b"
 	},
 	{
 		id = "avg1_146",
@@ -321,6 +324,13 @@ return {
 		name_bg_color = "#b0e0f6",
 		ver = "1.13.0"
 	},
+	{
+		id = "avg1_161",
+		name = "***",
+		name_bg_color = "#f4e0d7",
+		reuse = "avg3_161",
+		ver = "2.1.0"
+	},
 	{
 		id = "avg1_163",
 		name = "格蕾霍恩",
@@ -350,13 +360,13 @@ return {
 	},
 	{
 		id = "avg2_938",
-		name = "***",
+		name = "冻冻公爵",
 		name_bg_color = "#0ABEC5",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg2_939",
-		name = "***",
+		name = "水塔楼星骸",
 		name_bg_color = "#0ABEC5",
 		ver = "1.14.0"
 	},
@@ -1266,13 +1276,13 @@ return {
 	},
 	{
 		id = "avg3_233",
-		name = "***",
+		name = "希娅兔子玩偶",
 		name_bg_color = "#0ABEC5",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_234",
-		name = "***",
+		name = "地理协会职员（女）",
 		name_bg_color = "#0ABEC5",
 		ver = "1.14.0"
 	},
@@ -3025,39 +3035,53 @@ return {
 	},
 	{
 		id = "avg3_1314",
-		name = "***",
+		name = "冻冻A",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_975",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_1315",
-		name = "***",
+		name = "冻冻B",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_975",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_1316",
-		name = "***",
+		name = "冻冻C",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_975",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_1317",
-		name = "***",
+		name = "寄居蟹A",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_945",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_1318",
-		name = "***",
+		name = "寄居蟹B",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_945",
 		ver = "1.14.0"
 	},
+	{
+		id = "avg3_1319",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg1_136",
+		ver = "1.16.0"
+	},
+	{
+		id = "avg3_1320",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg3_232",
+		ver = "2.1.0"
+	},
 	{
 		id = "avg4_100",
 		name = "菈露发光",

lua/game/ui/avg/_cn/preset/avgcontacts.lua

@@ -258,7 +258,7 @@ return {
 	{
 		id = 157,
 		icon = "Icon/Head/head_15701_S",
-		name = "***",
+		name = "花铃",
 		landmark = "塞尔斯泰晨曦街78号",
 		signature = "变态……",
 		ver = "1.14.0"

lua/game/ui/avg/_en/config/dp_single157.lua

@@ -0,0 +1,141 @@
+return {
+	{
+		cmd = "SetGroupId",
+		param = {"15701"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"avg_emoji_sweaty",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"none",
+			"chat_a",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"Phew... Finally finished.",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"I didn't expect it to take this much work.",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"Is this the kind of thing you all usually do?",
+			""
+		}
+	},
+	{
+		cmd = "SetGroupId",
+		param = {"15702"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"avg_emoji_flower",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"none",
+			"chat_b",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"Hehe~ All done now!",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"See? When I put my mind to it, I can get things done too~",
+			""
+		}
+	},
+	{cmd = "End"}
+}

lua/game/ui/avg/_en/config/pm11401.lua

@@ -132,7 +132,7 @@ return {
 			"",
 			false,
 			"",
-			"It's ME, THE GREAT CHATON!!!!",
+			"It's ME, THE GREAT CHATION!!!!",
 			""
 		}
 	},

lua/game/ui/avg/_en/config/stm08_02.lua

@@ -14545,7 +14545,7 @@ return {
 		cmd = "SetTalk",
 		param = {
 			3,
-			"avg1_150",
+			"avg3_150",
 			"",
 			0,
 			"",

lua/game/ui/avg/_en/config/stm08_18_a.lua

@@ -3486,14 +3486,14 @@ return {
 		cmd = "SetCharHead",
 		param = {
 			0,
-			1,
+			0,
 			nil,
 			-50.0,
 			1.2,
-			"avg1_103",
-			"h",
+			"avg1_111",
+			"f",
 			"012",
-			"avg_emoji_sweaty",
+			"avg_emoji_sigh",
 			2,
 			nil,
 			nil,
@@ -3562,14 +3562,14 @@ return {
 		cmd = "SetCharHead",
 		param = {
 			0,
-			0,
+			1,
 			nil,
 			-50.0,
 			1.2,
-			"avg1_111",
-			"f",
+			"avg1_103",
+			"h",
 			"012",
-			"avg_emoji_sigh",
+			"avg_emoji_sweaty",
 			2,
 			nil,
 			nil,

lua/game/ui/avg/_en/preset/avgcharacter.lua

@@ -350,13 +350,13 @@ return {
 	},
 	{
 		id = "avg2_938",
-		name = "***",
+		name = "Glopo Duke",
 		name_bg_color = "#0ABEC5",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg2_939",
-		name = "***",
+		name = "Water Tower Stellaroid",
 		name_bg_color = "#0ABEC5",
 		ver = "1.14.0"
 	},
@@ -1266,13 +1266,13 @@ return {
 	},
 	{
 		id = "avg3_233",
-		name = "***",
+		name = "Shia Rabbit Plushie",
 		name_bg_color = "#0ABEC5",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_234",
-		name = "***",
+		name = "Trekker Association Staff (F)",
 		name_bg_color = "#0ABEC5",
 		ver = "1.14.0"
 	},
@@ -3025,35 +3025,35 @@ return {
 	},
 	{
 		id = "avg3_1314",
-		name = "***",
+		name = "Glopo A",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_975",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_1315",
-		name = "***",
+		name = "Glopo B",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_975",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_1316",
-		name = "***",
+		name = "Glopo C",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_975",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_1317",
-		name = "***",
+		name = "Hermit Crab A",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_945",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_1318",
-		name = "***",
+		name = "Hermit Crab B",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_945",
 		ver = "1.14.0"

lua/game/ui/avg/_en/preset/avgcontacts.lua

@@ -255,6 +255,14 @@ return {
 		landmark = "Petal Bloom Guild Camp, Eastern Forest, Philae Outskirts",
 		signature = "Have you seen my rag doll?"
 	},
+	{
+		id = 157,
+		icon = "Icon/Head/head_15701_S",
+		name = "Karin",
+		landmark = "78 Dawn Street, Sailstead",
+		signature = "Stay away perv",
+		ver = "1.14.0"
+	},
 	{
 		id = 158,
 		icon = "Icon/Head/head_15801_S",
@@ -284,6 +292,13 @@ return {
 		landmark = "United Harvest (Philae)",
 		signature = "Bold in heart, brave in spirit!"
 	},
+	{
+		id = 3223,
+		icon = "Icon/Head/head_npc22301_S",
+		name = "Caterine",
+		landmark = "",
+		signature = ""
+	},
 	{
 		id = 999,
 		icon = "Icon/Head/head_group_S",

lua/game/ui/avg/_jp/config/cg_132_03.lua

@@ -5020,7 +5020,7 @@ return {
 			false,
 			"",
 			"でも、私は本当のことを知ってしまった。",
-			""
+			"でも、僕は本当のことを知ってしまった。"
 		}
 	},
 	{

lua/game/ui/avg/_jp/config/dp_single157.lua

@@ -0,0 +1,141 @@
+return {
+	{
+		cmd = "SetGroupId",
+		param = {"15701"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"avg_emoji_sweaty",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"none",
+			"chat_a",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"ふぅ……やっと終わったデス。",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"それにしても、思ってたより時間かかったデスけど……",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"おまえたち、いつもこんなことしてるんデスか？",
+			""
+		}
+	},
+	{
+		cmd = "SetGroupId",
+		param = {"15702"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"avg_emoji_flower",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"none",
+			"chat_b",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"フフン♪全部片づいたデス！",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"あたしにかかれば、このくらいどうってことないデスよ！",
+			""
+		}
+	},
+	{cmd = "End"}
+}

lua/game/ui/avg/_jp/config/stm07_09.lua

@@ -2483,7 +2483,7 @@ return {
 			"vo_STm07_09_001",
 			false,
 			"",
-			"主殿、セイナ殿がすべての敵を倒し、==RT==ロープウェイ乗り場での戦闘が終了したようです。",
+			"主殿、セイナさんがすべての敵を倒し、==RT==ロープウェイ乗り場での戦闘が終了したようです。",
 			""
 		}
 	},

lua/game/ui/avg/_jp/config/stm08_05.lua

@@ -5259,7 +5259,7 @@ return {
 			false,
 			"",
 			"やだもう。==W==魔王ちゃんってば、==W==アタシとふたりっきりで過ごした、==RT==あの熱ぅ～～い夜の屋上でのこと、==W==忘れちゃったの？",
-			"やだもう。==W==魔王くんってば、==W==アタシとふたりっきりで過ごした、==RT==あの熱ぅ～～い夜のこと、==W==忘れちゃったの？"
+			"やだもう。==W==魔王くんってば、==W==アタシとふたりっきりで過ごした、==RT==あの熱ぅ～～い夜の屋上でのこと、==W==忘れちゃったの？"
 		}
 	},
 	{
@@ -12233,7 +12233,7 @@ return {
 		cmd = "SetTalk",
 		param = {
 			0,
-			"魔王（ナズナ版）",
+			"魔王（ナズナ）",
 			"",
 			1,
 			"",
@@ -12763,7 +12763,7 @@ return {
 		cmd = "SetTalk",
 		param = {
 			0,
-			"魔王（ナズナ版）",
+			"魔王（ナズナ）",
 			"",
 			0,
 			"",
@@ -13607,7 +13607,7 @@ return {
 		cmd = "SetTalk",
 		param = {
 			0,
-			"魔王（ナズナ版）",
+			"魔王（ナズナ）",
 			"",
 			0,
 			"",

lua/game/ui/avg/_jp/config/stm08_16_b.lua

@@ -3135,7 +3135,7 @@ return {
 		cmd = "SetTalk",
 		param = {
 			9,
-			"avg3_210",
+			"avg3_100",
 			"",
 			1,
 			"",

lua/game/ui/avg/_jp/config/stm08_18_a.lua

@@ -3486,14 +3486,14 @@ return {
 		cmd = "SetCharHead",
 		param = {
 			0,
-			1,
+			0,
 			nil,
 			-50.0,
 			1.2,
-			"avg1_103",
-			"h",
+			"avg1_111",
+			"f",
 			"012",
-			"avg_emoji_sweaty",
+			"avg_emoji_sigh",
 			2,
 			nil,
 			nil,
@@ -3562,14 +3562,14 @@ return {
 		cmd = "SetCharHead",
 		param = {
 			0,
-			0,
+			1,
 			nil,
 			-50.0,
 			1.2,
-			"avg1_111",
-			"f",
+			"avg1_103",
+			"h",
 			"012",
-			"avg_emoji_sigh",
+			"avg_emoji_sweaty",
 			2,
 			nil,
 			nil,

lua/game/ui/avg/_jp/preset/avgcharacter.lua

@@ -208,7 +208,8 @@ return {
 	{
 		id = "avg1_137",
 		name = "エレノア",
-		name_bg_color = "#e78fab"
+		name_bg_color = "#e78fab",
+		reuseL2DPose = "b"
 	},
 	{
 		id = "avg1_138",
@@ -350,13 +351,13 @@ return {
 	},
 	{
 		id = "avg2_938",
-		name = "***",
+		name = "冻冻公爵",
 		name_bg_color = "#0ABEC5",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg2_939",
-		name = "***",
+		name = "水塔楼星骸",
 		name_bg_color = "#0ABEC5",
 		ver = "1.14.0"
 	},
@@ -1266,13 +1267,13 @@ return {
 	},
 	{
 		id = "avg3_233",
-		name = "***",
+		name = "希娅兔子玩偶",
 		name_bg_color = "#0ABEC5",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_234",
-		name = "***",
+		name = "地理协会职员（女）",
 		name_bg_color = "#0ABEC5",
 		ver = "1.14.0"
 	},
@@ -3025,39 +3026,46 @@ return {
 	},
 	{
 		id = "avg3_1314",
-		name = "***",
+		name = "冻冻A",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_975",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_1315",
-		name = "***",
+		name = "冻冻B",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_975",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_1316",
-		name = "***",
+		name = "冻冻C",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_975",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_1317",
-		name = "***",
+		name = "寄居蟹A",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_945",
 		ver = "1.14.0"
 	},
 	{
 		id = "avg3_1318",
-		name = "***",
+		name = "寄居蟹B",
 		name_bg_color = "#0ABEC5",
 		reuse = "avg2_945",
 		ver = "1.14.0"
 	},
+	{
+		id = "avg3_1319",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg1_136",
+		ver = "1.16.0"
+	},
 	{
 		id = "avg4_100",
 		name = "菈露发光",

lua/game/ui/avg/_jp/preset/avgcontacts.lua

@@ -258,7 +258,7 @@ return {
 	{
 		id = 157,
 		icon = "Icon/Head/head_15701_S",
-		name = "***",
+		name = "カリン",
 		landmark = "セルスティ-サンライズ通り78番地",
 		signature = "よく効く酔い止めあるデスよ",
 		ver = "1.14.0"

lua/game/ui/avg/_kr/config/dp_single157.lua

@@ -0,0 +1,141 @@
+return {
+	{
+		cmd = "SetGroupId",
+		param = {"15701"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"avg_emoji_sweaty",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"none",
+			"chat_a",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"훗…… 드디어 다 했다예요.",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"생각보다 손이 많이 갔다예요.",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"평소에는 이런 일을 하는 거냐예요?",
+			""
+		}
+	},
+	{
+		cmd = "SetGroupId",
+		param = {"15702"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"avg_emoji_flower",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_157",
+			0,
+			"none",
+			"chat_b",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"흥흥~ 전부 완료했다예요~",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_157",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"봐요, 나도 노력하면 할 수 있다예요~",
+			""
+		}
+	},
+	{cmd = "End"}
+}

lua/game/ui/avg/_kr/config/stm08_02.lua

@@ -14545,7 +14545,7 @@ return {
 		cmd = "SetTalk",
 		param = {
 			3,
-			"avg1_150",
+			"avg3_150",
 			"",
 			0,
 			"",