From 204aa8d60776371d32b9402bf7fceb858f40adc4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-MMO982B\\User" <752966621@qq.com> Date: Wed, 16 Jul 2025 11:11:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E5=92=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=88=98=E6=96=97=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BG/UI/6all1/fx_yang_zh.png | Bin 1690 -> 1466 bytes .../BG/UI/6all1/fx_yin_zh.png | Bin 1579 -> 1367 bytes .../UI/EightDayGift/EightDayGiftPanel.prefab | 46 +++++++-------- .../Prefabs/UI/Gem/GemPanel.prefab | 46 +++++++-------- .../Prefabs/UI/Mail/MailMainPanel.prefab | 53 ++++++++++++------ .../UI/Mail/MainSingleInfoPanel.prefab | 40 +++++++++++-- .../Prefabs/UI/Practice/PracticePanel.prefab | 40 ++++++------- .../UI/TianShuMiJuan/IncarnationPanel.prefab | 36 ++++++------ .../UppperMonthCard.prefab | 20 +++---- .../Modules/Battle/View/Unit/EnemyView.lua | 4 +- .../Modules/Battle/View/Unit/MonsterView.lua | 4 +- .../Modules/Battle/View/Unit/PlayerView.lua | 3 +- .../Modules/Battle/View/Unit/RoleView.lua | 2 +- .../Modules/Battle/View/Unit/SkillCaster.lua | 21 ++++--- .../Modules/Battle/View/Unit/WeaponView.lua | 4 +- .../Modules/EightDay/EightDayGiftPanel.lua | 2 +- .../Modules/Operating/UppperMonthCard.lua | 4 +- .../~Lua/Modules/Story/StoryManager.lua | 2 +- 18 files changed, 194 insertions(+), 133 deletions(-) diff --git a/Assets/ManagedResources/BG/UI/6all1/fx_yang_zh.png b/Assets/ManagedResources/BG/UI/6all1/fx_yang_zh.png index ef287d1a5492251273421c8244ede7a9d02b47ea..c64e252242c59105f65d98aaeeb4f136855eb6e0 100644 GIT binary patch delta 655 zcmbQmyNg?~Gr-TCmrII^fq{Y7)59eQNGk!c3I`jId?WYb{zOF$#_Ww=B1{U#j;1EY zCN8F?PA<-dhHeHHjz%tSuFfW==8l$@mX4;A>zHIWJhMH$#G1I zlN*>F>zgKU=rb@dKJ|2Q45_&FX2#vzW&?o+#aB#g4sf01_;AbI$kEkIqh~@1^BO;a zd%vXm1>884rw9f`TWMYYI+wp$OY7()`3-MAm+#-FvhV);i&DqbqE1Heo|ydee>RpEkT;PB-oUa94+=n5{d9 zamAO$7rd=o&BT{&Oww%J+QnqK@}}Y;rv$GjbM`s^NK$c6=$lc`*>P;+y~DE2{3!*w zCQNz#A z*Y(K`A<2s_Z&H_9%(&9{(qz-3%^IsLOmeSy(@Za$BV0xl^U zAr5!$9*b*b4zj%VBz}2*>z-}74{9}+iLg#mOx-{K;jAl)-CI0fuHa6q|J#vvtV2BI z%_HeWx({}#Zr00_S*iW@y1A*;-IkjgJ7dyj|9jQ=H+3Qp)8wWTwyr)bU$j55cW8ZV zy6}x{7`W->mlUD+h7=x#)AFIncr-UW|qGSpX delta 814 zcmV+}1JV4t3z`ifiBL{Q4GJ0x0000DNk~Le0000<0000a2nGNE0L2*>Sdk$p0duiR z6atf110j=t0vnSX10s{W0$-CJ0w$9^0~(Va0wt4p13`bzpJtQ*00O;9L_t(|+U#20 zZQC#qmJKi971R-w5v13?ITIAl29ZXPyMcsGV88V>8X+1X8X+9Pp^6i#9(epcnNFhv z_z(gjk00+oes|91dc7vA>2140u!6*5JJsZm=ie@CyvUKGxlPPN{rdU+=8=>#pCSD( zB57u&9JPNOPja*j`|Tm}1gzOx?CorhnSi5kV;f21Va_ur8##^)Ae|wSG63uN86t@S zX>|U8=0bsL5O?iiuKcVZorqNM1?otA*E6MYG)^iYB{DQ$!{K@dfEva80DB1HyNh9u zlvwvsvnD%80uJ#8se#G2umCC}4k9cLGr-WLFSdU%DlfN|077%yHc$Ckvt}RQcSfY| zDVE~y;klmw{Q&7;vIhkikAVQ`qG*U&mW+T@;7H-%%oH^fIgem>fj*ZCo)q9;6fwyW z%9C)sFaVSh0`rNRtpBO8=B*N`RJ~O$hc6at{gvRtQ1E+6_7z7Y#kA=~r5=m?tG7z_ zgkFD(uDDl#H0fqixwXRK3VrjUkPy{^02Ll<*Dk>CP@CY7%GI`(k zw`ou57~F(Yr6InlSA!oza>uq++zHI{jv*Dd-b7r? zZ8i{44HZjZ4NGACG~3>6g^|-?jxEwGsZF1*$M0cMzM^f=RJ|qrW!0f$36F!es@u9Y z$j*CzZ}$yLjir-pk2r6dY;mdk`10+#_a-v2-ER1O+Ooop>wxG5#(Ruh?{!amG)(Yl zI>vgzO1N=TkFZyL`}DadUiqdNOTl7KY{&k6pAB>Y% z_W8MFCzd$oR{E7H=p5R!(2pf@3C}~RMi%`Q`fn$&UD&))^<-AxV=bo>(aKE|7AP(I zZghsN-23%y_n?@meRYp^sbsEKKVg<~Zh7ln`kYkmduP5{ z+Yys46>YNdnqjQ)rG3fgEzczUuRY@CvVKui!JZk}FXPs|6raGUbgeAu^6U+<-@my$ zaM62sL(_KOY9pN^FH0)ElyK@lRNRnsZo0z%|At8)6%Q~-$K+hQv8Q__Fy%0Ky85}S Ib4q9e00i^%*#H0l delta 760 zcmcc4wVFqJmj(ZiNLvo6=h}OkG|HP_j~cNB*=g_zVyS_ztz3(xm-Tz z=Dqs-_@{tZmrIILmY}^-mBlv;uT2en9EUtyL)=yBPfqTQUUI9zm@_fACuH%VP!|o^ zYDv$Xd`!s!NgGWSl|pU1CN<4m8F=2}d-jtGy+t;wZ!Zot=j8pvBl@y{iMXT?XzBUJKhS(j>X@R@E%wySW9p^_Mea^CSVSqrTbM~?+&Vhm3 z%_r#zKebodA{5?irZCy8xsm;8I`@a|hN~WZ-1aQSBQU7f=BO%@ukoy;ej|ws(TU%F z3Qal|v~23B{k@g`?g49Wt_W>^t~&3CyVrLqu2rITTUKv;a_>uT{o9g!#YKCCQdU1M zTdOd6ivBZ!_nZGda=#eU>mKaXvfikVKKjnZTgaVKo~{O(q??7i1#s z`?ol8Q{hXQ_)nt6{^~vJqbn}zDyrr#G?{UCk*kVin6ahq&Vy21R^FQPz3=Y+R<-xD j{oOYq+w1$|8QB=lGOd=)wvs&$Ow0_Pu6{1-oD!M1 then --type>1 的都为技能,目前是只有技能才有特效,播放play_skill_self -- name="skill" diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua index 358fa36cd1..309ffd3a86 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua @@ -398,7 +398,7 @@ function RoleView:OnSkillPlay() cardRenderMat:SetInt("_IsMask", 0) end - self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "attack", false) + self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "atk", false) end function RoleView:OnSkillEnd() diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua index e9cca44a98..1ebad5870b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua @@ -97,10 +97,11 @@ function SkillCaster:OnSkillCast(skill) posy=displaceoffset[2] end end - LogError(tostring(postion)) - LogError(tostring(Vector3.New(postion.x-(self.owner.camp==0 and posx or(-posx)),postion.y+posy,postion.z))) + --LogError(tostring(postion)) + --LogError(tostring(Vector3.New(postion.x-(self.owner.camp==0 and posx or(-posx)),postion.y+posy,postion.z))) + LogError("===========================:"..self.owner.RoleLiveGO.name) self.owner.RoleLiveGO.transform:DOMove(Vector3.New(postion.x-(self.owner.camp==0 and posx or(-posx)),postion.y+posy,startPos.z), combat.AttackDisplaceTime/1000, false):OnComplete(function () - self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder+50 + self.owner.RoleLiveGO.transform.parent.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.parent.gameObject:GetComponent("Canvas").sortingOrder+50 if self.owner.OnSkillPlay then self.owner:OnSkillPlay(localtype,combat) end @@ -120,6 +121,7 @@ function SkillCaster:OnSkillCast(skill) end --LogError("技能位移Id"..combat.Id.."开始时间"..os.date()) + LogError("技能位移Id"..combat.Id.."开始时间"..self.owner.RoleLiveGO.name) self.owner.RoleLiveGO.transform:DOMove(Vector3.New(t.GameObject.transform.position.x-(self.owner.camp==0 and displaceoffset[1] or(-displaceoffset[1])),t.GameObject.transform.position.y+displaceoffset[2],t.GameObject.transform.position.z), combat.AttackDisplaceTime/1000, false):OnComplete(function () self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder+50 @@ -206,10 +208,15 @@ function SkillCaster:OnSkillCast(skill) -- 调用上层接口 if self.owner.RoleLiveGO and combat.AttackDisplacement ==1 then - LogError("技能返回位移Id"..combat.Id.."开始时间"..os.date()) + LogError("技能返回位移Id"..combat.Id.."开始时间"..os.date().."=="..self.owner.RoleLiveGO.name) self.owner:DelayFunc(combat.AttackDisplaceBackTime/1000+((type(combat.SkillNumbetTime[1][1]) == "userdata" or combat.SkillNumbetTime[1][1]==0) and 0 or combat.SkillNumbetTime[#combat.SkillNumbetTime][2])/1000, function() - self.owner.RoleLiveGO.transform:DOMove(startPos, combat.AttackDisplaceTime/1000, false):OnComplete(function () - self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder-50 + self.owner.RoleLiveGO.transform:DOMove(startPos, combat.AttackDisplaceTime/1000, false):OnComplete(function () + LogError("技能返回位移Id"..combat.Id.."开始时间"..os.date().."=="..self.owner.RoleLiveGO.name) + local Canvas = self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas") + if Canvas==nil then + Canvas = self.owner.RoleLiveGO.transform.parent.parent.gameObject:GetComponent("Canvas") + end + Canvas.sortingOrder = Canvas.sortingOrder-50 self.owner.GameObject:SetActive(true) LogError("技能返回位移Id"..combat.Id.."结束时间"..os.date()) --self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder-50 @@ -905,7 +912,7 @@ function SkillCaster:CheckSkillHitEffect(checkType, combat, skill) if compnet~=nil then -- compnet.transform.localScale = Vector3.one * 3 -- compnet.transform.sizeDelta = Vector2.New(1000, 1000) - compnet.AnimationState:SetAnimation(0, "attack", true) + compnet.AnimationState:SetAnimation(0, "atk", true) compnet.AnimationState.TimeScale=combat.HitTimeScale/1000 end if self:CheckRotate(go2, combat.HitOrientation) then diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/WeaponView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/WeaponView.lua index 02fc05193e..85d5fe6ed3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/WeaponView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/WeaponView.lua @@ -250,7 +250,7 @@ function WeaponView:OnSkillCastingStart(skill) else self.castingNameNode:SetActive(false) end - self:PlaySpineAnim(self.RoleLiveGOGraphic3, 0, "attack" , false) + self:PlaySpineAnim(self.RoleLiveGOGraphic3, 0, "atk" , false) -- coroutine.wait(1.5) --self.turnEffect:SetActive(false) end) @@ -264,7 +264,7 @@ function WeaponView:OnSkillCastingStart(skill) if self.isMainPlayer then self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "idle" , false) else - self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "attack" , false) + self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "atk" , false) end end diff --git a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua index 9b034fa1c4..bfaa4bad10 100644 --- a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua @@ -216,7 +216,7 @@ function EightDayGiftPanel:SetSingleReward(item,i) local view = SubUIManager.Open(SubUIConfig.ItemView,icon.transform) ItemViewList[i] = view end - ItemViewList[i]:OnOpen(false,EightDayRewardConfig[i].Reward[1],0.6,false) + ItemViewList[i]:OnOpen(false,EightDayRewardConfig[i].Reward[1],0.75,false) --2\3\8可领取的金框 if i == 2 or i == 3 or i == 8 then diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index cf96901ef9..5d20cd8bf4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -188,7 +188,7 @@ function UpperMonthCard:SetRewardInfo() self.itemLst[i].go.gameObject:SetActive(true) self.itemLst[i].name.text = string.format("第%s天",NumToChinese[i]) local reward = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LuxuryFundConfig,"Type",self.baseType,"Day",i).reward[1] - self.itemLst[i].itemView:OnOpen(false, reward, 1.1, false, false, false, self.sortingOrder) + self.itemLst[i].itemView:OnOpen(false, reward, 1, false, false, false, self.sortingOrder) --1 已领取 0 未领 -- LogGreen(tostring(mission[i].missionId).." ".."state:"..tostring(mission[i].otherData.State)) self.itemLst[i].yiGet.gameObject:SetActive(false) @@ -202,7 +202,7 @@ function UpperMonthCard:SetRewardInfo() end end local v = self.gridRect.sizeDelta - v.y = (math.ceil(#self.itemLst/5) * self.itemHeight) + ((math.ceil(#self.itemLst/5)) * 94) + v.y = (math.ceil(#self.itemLst/5) * self.itemHeight) + ((math.ceil(#self.itemLst/5)) * 65) self.gridRect.sizeDelta = v end diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua index d0599551ae..f3f6e68928 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua @@ -308,7 +308,7 @@ function this.SetLive2dAnim(object, ainIndex, delayTime, setData, effectRoot, di local animName = { [1] = "idle", [2] = "hit", - [3] = "attack", + [3] = "atk", [4] = "touch", } if not delayTime then delayTime = 0 end