diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yujianxing_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yujianxing_zh.png new file mode 100644 index 0000000000..c11d250c02 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yujianxing_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yujianxing_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yujianxing_zh.png.meta new file mode 100644 index 0000000000..2e19d5a130 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yujianxing_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 2ed5ea14979567b4bb38a247271f5a3d +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: fbeb2b0f682426c41b5c6e54e4f2ee9f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/YuJianXing/RiceSinglePlayerView.prefab b/Assets/ManagedResources/Prefabs/UI/YuJianXing/RiceSinglePlayerView.prefab index 4d09fea26a..8fbf977f21 100644 --- a/Assets/ManagedResources/Prefabs/UI/YuJianXing/RiceSinglePlayerView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/YuJianXing/RiceSinglePlayerView.prefab @@ -229,6 +229,86 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 1 +--- !u!1 &4902773343167608226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6079931969892452556} + - component: {fileID: 9139777253356738529} + - component: {fileID: 1603115514734952050} + m_Layer: 0 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6079931969892452556 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4902773343167608226} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8297825075348053570} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 25} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9139777253356738529 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4902773343167608226} + m_CullTransparentMesh: 0 +--- !u!114 &1603115514734952050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4902773343167608226} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: + LanguageIndex: 0 --- !u!1 &5077064202207718042 GameObject: m_ObjectHideFlags: 0 @@ -306,6 +386,7 @@ RectTransform: m_Children: - {fileID: 3664931752169833090} - {fileID: 2505788211121999286} + - {fileID: 6079931969892452556} m_Father: {fileID: 267655612942774993} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -453,7 +534,7 @@ RectTransform: m_GameObject: {fileID: 7048199163809225410} m_LocalRotation: {x: 0.27059805, y: 0.27059805, z: -0.6532815, w: 0.6532815} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_Children: [] m_Father: {fileID: 8297825075348053570} m_RootOrder: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index adb9c851cb..220916a997 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -488,6 +488,7 @@ PanelType = { QiJie = {14,16,1240},--七界试炼 WorldArena = { 107,16,23}, --玉虚论道 Compound_equip = { 14, 16,1258 }, --装备合成 + YuJianXing = {14,16}--御剑行 } diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index 975c87b546..196244a024 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -517,5 +517,6 @@ GameEvent = { GameFinished = "YuJianXing.GameFinished", UpdateRank = "YuJianXing.UpdateRank", UpdateBetTime = "YuJianXing.UpdateBetTime", + EndBetPanel = "YuJianXing.EndBetPanel", }, } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet.lua index d9f2a7d7d6..a435fbea6d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet.lua @@ -75,6 +75,10 @@ function this:Refresh(func) end end Util.AddOnceClick(btnBet,function () + if BagManager.GetTotalItemNum(configData.JoinCost[1]) < configData.JoinCost[2] then + PopupTipPanel.ShowTip("御剑令不足,无法开示竞猜!") + return + end UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.YuJianXingBetSelectNum,i) end) end @@ -99,6 +103,7 @@ function this:SetTime() self.roundTime.text = string.format("距本轮竞猜结束: %s",TimeToMS(roundTime)) if roundTime <= 0 then self.parent:ClosePanel() + Game.GlobalEvent:DispatchEvent(GameEvent.YuJianXing.EndBetPanel) end end,1,-1) self.timer:Start() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index e644c0456a..04079622a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -5928,8 +5928,11 @@ function this.RidingSwardRewardRequest(_time,_swardId,func) local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.RidingSwardRewardRequest , MessageTypeProto_pb.RidingSwardRewardResponse , msg, function(buffer) local data = buffer:DataByte() - local msg = ActivityProto_pb.RidingSwardInfoResponse() + local msg = ActivityProto_pb.RidingSwardRewardResponse() msg:ParseFromString(data) + for i = 1, #msg.drop.itemlist do + LogPink(tostring(msg.drop.itemlist[i].itemId).." "..tostring(msg.drop.itemlist[i].itemNum)) + end if func then func(msg) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingBetSelectNum.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingBetSelectNum.lua index ed883ca63c..f6b9e6af7a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingBetSelectNum.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingBetSelectNum.lua @@ -47,9 +47,11 @@ function this:BindEvent() end function this:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.YuJianXing.UpdateRank, self.OnClose,self) end function this:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.YuJianXing.UpdateRank, self.OnClose,self) end function this:OnShow(_parent,...) @@ -60,6 +62,8 @@ end function this:Refresh() local curGetNum = BagManager.GetTotalItemNum(configData.JoinCost[1]) > configData.MaxRaiseNum[2] and configData.MaxRaiseNum[2] or BagManager.GetTotalItemNum(configData.JoinCost[1]) + self.curNum.text = BagManager.GetTotalItemNum(configData.JoinCost[1]) + self.minNum.text = configData.JoinCost[2] self.slider.value = configData.JoinCost[2] self.slider.maxValue = curGetNum self.buyNumLab.text = self.slider.value @@ -68,6 +72,7 @@ end function this:SetTime() local roundTime = YuJianXingManager.nextTimeCount- GetTimeStamp() + LogRed("roundTime:"..tostring(TimeToMS(roundTime))) if self.timer then self.timer:Stop() self.timer = nil @@ -82,6 +87,10 @@ function this:SetTime() end function this:OnClose() + if self.timer then + self.timer:Stop() + self.timer = nil + end end function this:OnDestroy() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua index 3cd7d1a104..e85688c228 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua @@ -93,6 +93,7 @@ function this:SingleDataShow(go,data) end function this:OnClose() + LogRed("############") end function this:OnDestroy() diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/RiceSinglePlayerView.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/RiceSinglePlayerView.lua index a512be4002..c5e5df70a7 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/RiceSinglePlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/RiceSinglePlayerView.lua @@ -11,6 +11,18 @@ local SwardName = { [3] = "y_yujianxing_jian03", [4] = "y_yujianxing_jian04", } +local SWARDNAMES = { + [1] = "清风剑", + [2] = "夏禹剑", + [3] = "赤霄剑", + [4] = "幻夜剑", +} +local SWARDCOLORS = { + [1] = "CDF8D8", + [2] = "E8B546", + [3] = "e25b58", + [4] = "800080", +} local RidingSwardSence = ConfigManager.GetConfig(ConfigName.RidingSwardSence) function RiceSinglePlayerView:New(gameObject) @@ -26,6 +38,7 @@ function RiceSinglePlayerView:InitComponent() self.gameObject:GetComponent("RectTransform").sizeDelta = Vector2.New(12500,100) self.player = Util.GetGameObject(self.gameObject,"Root") self.playerRoot = Util.GetGameObject(self.gameObject,"Player") + self.playerName = Util.GetGameObject(self.playerRoot,"Name"):GetComponent("Text") self.playerLiveRoot = Util.GetGameObject(self.player,"Live") self.swordRoot = Util.GetGameObject(self.player,"Sword") self.upPre = Util.GetGameObject(self.gameObject,"upPre") @@ -140,9 +153,11 @@ function RiceSinglePlayerView:SetPlayerAndSword() self.liveNode:OnClose() end self.liveNode = PlayerLiveView:New(self.playerLiveRoot,1) - self.liveNode:OnOpen(25,Vector3.zero,WALK_DIR.IDLE_RIGHT) + self.liveNode:OnOpen(18,Vector3.zero,WALK_DIR.IDLE_RIGHT) self.liveNode:SetTitleHide() + self.playerName.text = string.format( "【%s】%s",SWARDCOLORS[self.index],SWARDNAMES[self.index],YuJianXingManager.modelList[self.index].userName) + self.swordRoot:GetComponent("Image").sprite = self.spLoader:LoadSprite(SwardName[self.index]) end diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua index 51c6f42a8e..5ef63e1c52 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua @@ -12,6 +12,7 @@ function this.Initialize() this.lastResult = {} --上一场剧本的时间和ID this.curRecordList = {} --当前纪录数据 this.curBetList = {} --当前竞猜数据 + this.modelList = {}--玩家名等数据 this.InWaiting = false this.sendEvent = true this.CloseMap() @@ -53,8 +54,10 @@ function this.UpdataServerPanelData(msg,func) end this.nextTimeCount = msg.time/1000--下一场倒计时 LogYellow("当前state:"..tostring(msg.state).." 下一阶段倒计时:"..TimeToMS(this.nextTimeCount- GetTimeStamp() )) + this.modelList = {} this.modelList = msg.modelInfo--玩家模板信息 this.activityTimeCount = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.YuJianXing).endTime + this.curResultId = {} this.curResultId = msg.rankId Game.GlobalEvent:DispatchEvent(GameEvent.YuJianXing.UpdateRank) if func then diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua index 0cb7022458..22e51c7af0 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua @@ -31,6 +31,8 @@ function YuJianXingPanel:InitComponent() --waiting self.waiting = Util.GetGameObject(self.gameObject, "Waiting") self.waitTime = Util.GetGameObject(self.waiting, "time"):GetComponent("Text") + --upview + self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft }) end --绑定事件(用于子类重写) @@ -91,6 +93,7 @@ end -- 打开,重新打开时回调 function YuJianXingPanel:OnShow() + self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.YuJianXing }) if YuJianXingManager.curState == 2 then YuJianXingManager.InWaiting = true end @@ -211,6 +214,7 @@ end --界面销毁时调用(用于子类重写) function YuJianXingPanel:OnDestroy() + SubUIManager.Close(self.UpView) end return YuJianXingPanel \ No newline at end of file