From a6d16c13e5fd1efcfa663f06bdd33b5a7a3d20e0 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 30 Dec 2020 18:08:44 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AF=BB=E5=AE=9D=E3=80=91=E5=8A=A0?= =?UTF-8?q?=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont/r_tongyong_suoding1.png | Bin 0 -> 14811 bytes .../ArtFont/r_tongyong_suoding1.png.meta | 88 +++ .../ArtFont/r_tongyong_suoding2.png | Bin 0 -> 14908 bytes .../ArtFont/r_tongyong_suoding2.png.meta | 88 +++ .../FindTreasure/FindTreasureMainPanel.prefab | 68 +- .../~Lua/Message/CommonProto_pb.lua | 13 +- .../~Lua/Message/MessageTypeProto_pb.lua | 594 +++++++++--------- .../~Lua/Message/PlayerInfoProto_pb.lua | 31 + .../~Lua/Modules/Battle/BattleManager.lua | 14 +- .../FindTreasure/FindTreasureMainPanel.lua | 37 +- .../~Lua/Modules/Net/NetManager.lua | 12 + .../~Lua/Modules/Popup/RewardItemPopup.lua | 7 + .../~Lua/Modules/Task/TaskManager.lua | 20 +- 13 files changed, 623 insertions(+), 349 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding1.png create mode 100644 Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding1.png.meta create mode 100644 Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding2.png create mode 100644 Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding2.png.meta diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding1.png b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding1.png new file mode 100644 index 0000000000000000000000000000000000000000..fc2f35917ef4231b4ada39e84f70605d9bcf9dc5 GIT binary patch literal 14811 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding1.png.meta b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding1.png.meta new file mode 100644 index 0000000000..8862d864c2 --- /dev/null +++ b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: ee4c210c371746647b90319fad34e582 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1b93a933024200a46b17ce3e0fc669c6 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: RoleInfoAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding2.png b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_tongyong_suoding2.png new file mode 100644 index 0000000000000000000000000000000000000000..dd50507fbd557298d614397af21726bb5ee13c7e GIT binary patch literal 14908 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 M6*Xb+ 0 and #b.heroId > 0 or #a.heroId <= 0 and #b.heroId <= 0 then - return ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(a.missionId%10000)).TaskType > - ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(b.missionId%10000)).TaskType + if a.lock == b.lock then + return ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(a.missionId%10000)).TaskType > + ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(b.missionId%10000)).TaskType + else + return a.lock > b.lock + end else return #a.heroId < #b.heroId end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 8378851474..4795a1f255 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -4720,4 +4720,16 @@ function this.NewGeneralAttackRequest(activityId,privilageTypeId,func) end end) end +--迷宫寻宝加锁 +function this.MissingRoomLockRequest(missionId,lock,func) + local data = PlayerInfoProto_pb.MissingRoomLockRequest() + data.missionId = missionId + data.lock = lock + local msg = data:SerializeToString() + Network:SendMessageWithCallBack(MessageTypeProto_pb.MISSING_ROOM_LOCK_REQUEST, MessageTypeProto_pb.MISSING_ROOM_LOCK_RESPONSE, msg, function(buffer) + if func then + func() + end + end) +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 0acfe9e20a..93ec10a630 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -44,6 +44,8 @@ function RewardItemPopup:InitComponent() this.btnMapBack = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnBack") -- 战斗结果按钮 this.btnResult = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnResult") + this.btnBattleBack = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnBattleBack") + -- 战斗回放按钮 -- 任意位置继续 this.btnGoOn = Util.GetGameObject(self.gameObject, "btnBack/Image") @@ -65,6 +67,7 @@ function RewardItemPopup:InitComponent() -- 战斗结果按钮 this.btnResultMax = Util.GetGameObject(self.gameObject, "bg/btnResult") this.btnMapBackMax = Util.GetGameObject(self.gameObject, "bg/btnBack") + -- this.btnBattleBackMax = Util.GetGameObject(self.gameObject, "bg/btnBattleBack") --车迟斗法 显示 this.guildCarDelay = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/guildCarDelay") @@ -108,6 +111,9 @@ function RewardItemPopup:BindEvent() Util.AddClick(this.btnResultMax, function () UIManager.OpenPanel(UIName.DamageResultPanel, 1) end) + Util.AddClick(this.btnBattleBack, function () + BattleManager.BattleBackFun() + end) end --界面打开时调用(用于子类重写) --bagType 1 正常背包 2 地图临时背包 @@ -135,6 +141,7 @@ function RewardItemPopup:OnOpen(...) end local haveRecord = BattleRecordManager.isHaveRecord() this.btnResult:SetActive(haveRecord and args[5]) + this.btnBattleBack:SetActive(haveRecord and args[5]) this.btnResultMax:SetActive(haveRecord and args[5]) -- 设置背景遮罩的显隐 diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index 0c688ef9e8..f25cc9bee1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -32,7 +32,8 @@ function this.InitTypeTaskList(_userMissionList) userMissionList.type = _userMissionList[i].type userMissionList.takeTimes = _userMissionList[i].takeTimes userMissionList.heroId = _userMissionList[i].heroId - -- LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state) + userMissionList.lock = _userMissionList[i].lock + -- LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state.." lock "..userMissionList.lock) if not TypeTaskData[_userMissionList[i].type] then TypeTaskData[_userMissionList[i].type] = {} end @@ -64,6 +65,7 @@ function this.SetTypeTaskList(type, data) t.type = data[i].type t.takeTimes = data[i].takeTimes t.heroId = data[i].heroId + t.lock = data[i].lock table.insert(TypeTaskData[type], t) LogRed(Language[11982]..data[i].type..Language[11983]..data[i].missionId..Language[11984]..data[i].state) end @@ -149,7 +151,7 @@ function this.SetMissionIdState(type, Id, state) end --(后台推送刷新调用) -function this.SetTypeTaskInfo(type, Id, state, progress, takeTimes,heroId) +function this.SetTypeTaskInfo(type, Id, state, progress, takeTimes,heroId,lock) -- LogError("任务 "..type.." id:"..Id.." state:"..state.." progress "..progress) if not TypeTaskData[type] then TypeTaskData[type] = {} @@ -164,6 +166,7 @@ function this.SetTypeTaskInfo(type, Id, state, progress, takeTimes,heroId) type = type, takeTimes = takeTimes, heroId = heroId, + lock = lock, }) else --部分数据刷新 @@ -178,6 +181,7 @@ function this.SetTypeTaskInfo(type, Id, state, progress, takeTimes,heroId) taskInfo.state = state taskInfo.progress = progress taskInfo.takeTimes = takeTimes + taskInfo.lock = lock --taskInfo.heroId = heroId --taskInfo.heroId = {} --for i = 1, #heroId do @@ -199,7 +203,7 @@ function this.RefreshTypeTaskInfo(taskInfoList) for i = 1, #taskInfoList do local taskInfo = taskInfoList[i] -- Log("服务器推送任务刷新type:"..taskInfo.type.."missionId:"..taskInfo.missionId.."state:"..taskInfo.state.."progress:"..taskInfo.progress.."takeTimes:"..taskInfo.takeTimes) - this.SetTypeTaskInfo(taskInfo.type, taskInfo.missionId, taskInfo.state, taskInfo.progress, taskInfo.takeTimes,taskInfo.heroId) + this.SetTypeTaskInfo(taskInfo.type, taskInfo.missionId, taskInfo.state, taskInfo.progress, taskInfo.takeTimes,taskInfo.heroId,taskInfo.lock) end Game.GlobalEvent:DispatchEvent(GameEvent.MissionDaily.OnMissionDailyChanged) Game.GlobalEvent:DispatchEvent(GameEvent.DynamicTask.OnMissionChange) @@ -330,6 +334,7 @@ function this.RefreshFindTreasureData(msg) type = msg.infos[i].type, takeTimes = msg.infos[i].takeTimes, heroId = msg.infos[i].heroId, + lock = msg.infos[i].lock, }) end end @@ -358,6 +363,15 @@ function this.RefreshFindTreasureStatrData(missionId,state) Game.GlobalEvent:DispatchEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot) CheckRedPointStatus(RedPointType.SecretTer_FindTreasure) end + +--迷宫寻宝前端派遣自行赋值 +function this.RefreshFindTreasureStatrData2(missionId,lockState) + for _, taskInfo in pairs(TypeTaskData[TaskTypeDef.FindTreasure]) do + if taskInfo.missionId == missionId then + taskInfo.lock = lockState + end + end +end --刷新下可领取状态 function this.SetFindTreasureDataState() for _, taskInfo in pairs(TypeTaskData[TaskTypeDef.FindTreasure]) do