From 68e0f816166cf9fd08cc2d5f730fe5d162eba773 Mon Sep 17 00:00:00 2001 From: "PC-20230316NUNE\\Administrator" <2858626794@qq.com> Date: Mon, 15 Jan 2024 18:45:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataTables/Datas/副本系统/副本表.xlsx | Bin 9861 -> 9944 bytes .../{角色升级属性成长.xlsx => 角色升星属性成长.xlsx} | Bin ...色升级消耗表.xlsx => 角色升级消耗表( 抛弃 ).xlsx} | Bin .../resources/prefab/ui/主页/MainView.prefab | 2 +- JisolGameCocos/assets/script/App.ts | 4 +- JisolGameCocos/assets/script/AppData.ts | 2 +- .../assets/script/data/PlayerPetData.ts | 19 ++++- .../assets/script/ui/Consts/Pet/PetIcon.ts | 3 +- .../controller/game/GNoviceController.java | 2 +- .../controller/game/GPlayerPetController.java | 70 +++++++++--------- .../game/mode/GOnHookController.java | 2 +- .../cn/jisol/game/entity/table/PlayerPet.java | 1 - .../service/impl/ResourceServiceImpl.java | 3 +- .../Main/src/main/resources/application.yml | 4 +- 14 files changed, 65 insertions(+), 47 deletions(-) rename DataTables/Datas/宠物系统/宠物升级/{角色升级属性成长.xlsx => 角色升星属性成长.xlsx} (100%) rename DataTables/Datas/宠物系统/宠物升级/{角色升级消耗表.xlsx => 角色升级消耗表( 抛弃 ).xlsx} (100%) diff --git a/DataTables/Datas/副本系统/副本表.xlsx b/DataTables/Datas/副本系统/副本表.xlsx index 9dc13354375622e2138182ee81c38e5d926b7cbc..1b944757151ce18b6cea6fc21ee2a66de383a55d 100644 GIT binary patch delta 4988 zcmZ8lWmFW*-(5PSC6``WLSiXFmRvx}rAuHzkOnCiM3(Meq(wkNK)So7mX4(x2`PD$ zkb3q1oHx!pAMTuU=g!$n4xTpyZU@bS!dn{tO^7(H{JOJR!LsUO58`8|PRE=U_te*24cr$2Ypx+j)QBR$=#Jj#JaR$LZ0>@wN^D15E|(zc<%Fr~18 zP;2~bUe54LlVfxue&|{6=J?yY2PC_R%TC#SKVyo`@RaxFkYjeW)e^oADozY4Ho@6B zT6>r61ttgKU~t4ci=gj4Ea!A0Xb^upEODocNt)+V)U?P3YlUy*P?590r2XX+9-=5- z6ZzV7e5YWHz;$n^TrO?x7#`Y=e)2LTRy~{*5~vBbT|xkJMY0!h}_` zjhsHs+Y<0a#?pC-3nz?5uh?ZVM6DT82TNBiMxY&2xU8_{;=p#yE=C9Uf`?U{d_Gn0L7_G}v7AP_8TZM?vdW~%T&6x$pf zF$HgrZJ5T%Rb{t-c(dc)WZ2sZiEQVIP^#WOl`vjJI!&1rM`m`XIl7+^OdrpvocP2y zpa}A2?o6(uv^TT{U1Q;$gA(`xKw)62*d=uwI}o-m`;z~I=hW-mNe*rnB5_0zw?I$; ziP^jBkc_lwy%!swqpK_I%ZQDPy!87EbgRq)@g(}Ydac5P5)=ZvGXVZ!>lR}oO23 z7INh+=)>~R%<~#on|$``18jREDW93LypT7m%v5c^h}9E5K3Mqrq}wVw$jGD|==!&k z6M$#QiHjHNHOsK%J$vC*c7>&2e$F^fk#y^I1H+7D1z`lSy+yZv;Rqb5g?EOIuESHTk5rM^?b9;6gXCB&b)+Q7eDgYm_H*v3} z-aNv-*RIXhGw!z#Bd*jdwd6;XspJ|8J_t6mV<->kLW{O~Dz15QkbCN)w~!l!IABM^ zzSBE~=*|XUy075`D3*^uOju&aaJ~3N=PSlL0#pz#u=bb;gpd4Q@!~-}F#y1#4*-w? z004yZV^1$%XIoDpgp2d6xs%({9K)TQ)qRjv)jN8-7|9oVreoF%xWsizK`-TlTnO!> zYNBBI8nB=hxcnUWA5%7*XrGZe8efo8peLC(uV}oG z7m0FP`^9eC39>mU%P7Gw$7_TLzhcd8_@D)(q1}1(X8A5a?{0|HshnLSWa9XZ^Z1F3 z*3~@2piyJT^@mXf#Gy2XoQWqTPz5=WLf&)g{z;dijyyZ(sqqE*2f5|_-wNYo8{qj$ z5;B~DV-gD3c$s~)ZrM-g#>c8m5`IS@O+TO0n2in7CFBY7VqWX6pDQBPcSyIg{l`JT z8u{TP-u?KDsW*4A9hdaGt z>y!TF;$tcqv6J!VMT+^Y^$WkQ!GoE^FsM<31c94IqceGCR5WPj{3#?+QC>!w!E%4; zDUaXg;pE#_Iyqa#WQSIOI8M+EsTZjv<=M+|JY-jX%zHIxLxB~tlFy8`4rld0kOq>m84pvhLq^52dXsHe2=(4taysci(d;Y=@I6b9ydO-V|pYsg#&4A8j z70Ken;=`P#_U%wp8@Q!8wfs%M1^v$z{EQJMeg@q&r^w6RzaRksxU)g!v~urFBjS&Z|o|&}Ok#>u+5N9IDrP z!Xm*}hAtS#BT)0(?eL`&DOIwc!%j_G25@SjQuAsdh#q;51H++I2VS znhJx-HIJ7jbH@$Mdx)ge_}A_7O+3~G6Dl?qw(YK&c1q>qK+@@n*`1NfV1GTgbfh@x z%yU}iDTixs3d>4EMuXWI67NZ^utCe@3q+gYzwpm$9(Yxv@Qgq|zhTQ40~Cgpsgem?C6%{-p@ak zdDbQ42fH-Ref5*yA@-Qfx|sioACm_>UHaOeoMVanXZbc@98R=Kcr)P;f#4@9E%dn| zT!d4#xYYTq;uG_jp2{5*8T6Okrzslj#coIBGimo&0%~ zZ^7Nhi3Hlnqa|3K7UE(i>Ft_@GQMiI;JlgkA_(j*dDJ^#{=`ha$J(D*?^znUSXjnm z2poCF!Q5<;XU-F)KxHPOD_Z=8mpo;_TVB!8Y=y% z2pVGS(Gqu2r5(Ial-`C>x{0t7UH6(Nh3UlOeD%6IA}UOx(!Z#)zl`ab7*L2_kQ9Eg z{nq-WhM=TH;L(%>z$FFh<0G_SadR0v#G;8j3*h3&i_~rhhT-0GmCHwog6hn=QH9c-Y zY4g;EpYEoq4d+!&%D^;8Sudjv*KBfJli}iGuY<`S*r=(ikC^@oF$f1I@?u-$AEf&+ zHOHbo@&_a~{rP?W9Z9%lYz4-+mv}St9FqZwmxqN|&BCMKj+Kh` zseLxGKZw7gnOX{_Ki{i*F7}}|jCZRhghHse)?>7j$jOg0_+XkU zC&R@XGJdCE-<*h0?$ExyvgvJK7Sc=#(%r_jtMeb9LPH0Fx%+zdvUpI)Rjk+qmK6x{ z{tz|v)>3yqm@=C&v}q#cMBQmhQ$p6zDxEtrKWRLCAVH{4NAM$Q0w4VzVI5^Us!k)0 zfY#qxp^I&rpNLV`v@kHLqaB5>S!Be^D95_rW1hNCGmIZk-}l{GO527@U3MKmK8WID zhDDw;0)3!}w(|?C*+?pTkd*aD7mie|U{|gH@T=R+`l5T%b}exEQ%Dm`=EL}{P=D7| zg$`xts)l|(>%m{{3SXqKQw=g=u&*%69lMg0*Cd|~f%{_D@u98S^v*QpEg z1*W)7+=flTVS!~RfWvMl)~>j4nqE#U@*i7OSA)o9&C2HzNLi0E`erXjf|hgk-?W?o zwV?eaoQ@~j7#6>cxNSSVqJhe-w05@N+a;3AW&x2VU|YXf2$bNKx~s{Pxh$*2fGCZY!!0o=L@vAebpep>TB^|6 z5WREi#Df4KGt1K3e^hn#D zeqLqOh{>-)9^mIm6Pm=d`Fzv%@^cvM@@^4}Jf#$D>bLaYrEH~Vvye4bJ^Jy5!+hyw zK==z@=)(`9_`cz9b1(zaJJ{0IOb>*c-)+a@K^SUp$qw15?6tAkDrE8=b;)C!hxqZ= zlA-g)vx!DyS5(t+tI-7>GxqfPyrPsHyR*hBy7FcGmUcVWs-Lt27C(4FP0-KQ-mBj_YLZOzpEdFoP OM~Pb&zZLX%&wl|4Ayr=h delta 4914 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 item.petLevel = PetEquipData.getIns().getForgingBenchPetLevel(item.petId)); + app.event.emit(PlayerPetEvent.UPDATE) } @@ -49,7 +60,10 @@ export default class PlayerPetData extends BaseData{ //更新玩家宠物 async UpdatePlayerPet(){ //获取全部宠物 - this.datas = await API.GetPlayerPets(); + let datas = await API.GetPlayerPets(); + + datas.forEach(item => item.petLevel = PetEquipData.getIns().getForgingBenchPetLevel(item.petId)); + this.datas = datas; app.event.emit(GBattleDataEnum.UPDARE_ATTRIBUTE); //刷新属性 } @@ -68,12 +82,15 @@ export default class PlayerPetData extends BaseData{ //添加宠物 addPet(pet:PlayerPetOV){ + pet.petLevel = PetEquipData.getIns().getForgingBenchPetLevel(pet.petId); this.datas.push(pet); } //刷新返回宠物 onUpdateOV(operation:number,resource:PlayerPetOV){ + resource.petLevel = PetEquipData.getIns().getForgingBenchPetLevel(resource.petId); + //如果没有刷新的宠物 则 返回 if(!resource) return; diff --git a/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts index 1eceeb5e..7ab6d552 100644 --- a/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts +++ b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts @@ -60,7 +60,8 @@ export class PetIcon extends Component { } //设置宠物等级 - this.levelLabel.string = `Lv ${PetEquipData.getIns().getForgingBenchPetLevel(this.info.petId)}` + // this.levelLabel.string = `Lv ${PetEquipData.getIns().getForgingBenchPetLevel(this.info.petId)}` + this.levelLabel.string = `Lv ${this.info.petLevel}` } diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GNoviceController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GNoviceController.java index 33e108fd..cf2ba5d6 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GNoviceController.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GNoviceController.java @@ -51,7 +51,7 @@ public class GNoviceController { return NewsContext.onFail("你已经有宠物了!"); }else{ //选择宠物 - if (playerPetService.save(PlayerPet.builder().petPlayerId(player.getPlayerId()).petTbId(petId).petLevel(0).build())){ + if (playerPetService.save(PlayerPet.builder().petPlayerId(player.getPlayerId()).petTbId(petId).build())){ return NewsContext.onSuccess("选择宠物成功"); }else{ return NewsContext.onSuccess("选择宠物失败"); diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java index 4b94bd12..ef043f5e 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java @@ -124,40 +124,40 @@ public class GPlayerPetController { } - //提升宠物等级 - @ApiImplicitParams({}) - @ApiOperation(value = "提升宠物等级") - @PostMapping("/up/level/{petId}") - @Transactional - public NewsResource onUpLevel(@PathVariable Integer petId, @CurrentPlayer Player player){ - - - //获取需要升级的宠物 - PlayerPet pet = playerPetService.getById(petId); - if(Objects.isNull(pet) || !Objects.equals(pet.getPetPlayerId(), player.getPlayerId())){ - return NewsResource.onFail("你未拥有这个宠物"); - } - - TbGRoleUpLevel resource = TD.DATA.getTbGRoleUpLevel().get(pet.getPetLevel() + 1); - - if(Objects.isNull(resource)) return NewsResource.onFail("无法升级"); - - //星级不够则 无法升级 - if(pet.getPetStar() * 10 <= pet.getPetLevel()){ - return NewsResource.onFail("突破星级 可升级"); - } - //扣除玩家材料 - ArrayList resources = new ArrayList<>(resourceService.deduct(player, resource.materials)); - - //升级 - pet.setPetLevel(pet.getPetLevel() + 1); - - //保存 - if(!playerPetService.updateById(pet)) throw new RetryException(""); - resources.add(ResourceUpdateOV.onPet(ResourceUpdateOV.ResourceUpdateType.UPDATE,pet)); //刷新宠物 - - return NewsResource.onSuccess("升级成功",pet,resources.toArray(new ResourceUpdateOV[0])); - - } +// //提升宠物等级 +// @ApiImplicitParams({}) +// @ApiOperation(value = "提升宠物等级") +// @PostMapping("/up/level/{petId}") +// @Transactional +// public NewsResource onUpLevel(@PathVariable Integer petId, @CurrentPlayer Player player){ +// +// +// //获取需要升级的宠物 +// PlayerPet pet = playerPetService.getById(petId); +// if(Objects.isNull(pet) || !Objects.equals(pet.getPetPlayerId(), player.getPlayerId())){ +// return NewsResource.onFail("你未拥有这个宠物"); +// } +// +// TbGRoleUpLevel resource = TD.DATA.getTbGRoleUpLevel().get(pet.getPetLevel() + 1); +// +// if(Objects.isNull(resource)) return NewsResource.onFail("无法升级"); +// +// //星级不够则 无法升级 +// if(pet.getPetStar() * 10 <= pet.getPetLevel()){ +// return NewsResource.onFail("突破星级 可升级"); +// } +// //扣除玩家材料 +// ArrayList resources = new ArrayList<>(resourceService.deduct(player, resource.materials)); +// +// //升级 +// pet.setPetLevel(pet.getPetLevel() + 1); +// +// //保存 +// if(!playerPetService.updateById(pet)) throw new RetryException(""); +// resources.add(ResourceUpdateOV.onPet(ResourceUpdateOV.ResourceUpdateType.UPDATE,pet)); //刷新宠物 +// +// return NewsResource.onSuccess("升级成功",pet,resources.toArray(new ResourceUpdateOV[0])); +// +// } } diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java index 6780fef5..27e0b780 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java @@ -247,7 +247,7 @@ public class GOnHookController { } //捕捉 - PlayerPet pet = PlayerPet.builder().petPlayerId(player.getPlayerId()).petTbId(onHookPet.getPetTbId()).petLevel(0).build(); + PlayerPet pet = PlayerPet.builder().petPlayerId(player.getPlayerId()).petTbId(onHookPet.getPetTbId()).build(); if(playerPetService.save(pet)){ return NewsContext.onSuccess("捕捉成功",pet); }else{ diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/table/PlayerPet.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/table/PlayerPet.java index d91df6b0..98b3cbef 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/table/PlayerPet.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/table/PlayerPet.java @@ -18,7 +18,6 @@ public class PlayerPet { private Long petId; //宠物唯一Id private Long petPlayerId; //宠物的玩家Id private Integer petTbId; //宠物配置表Id - private Integer petLevel; //宠物等级 private Integer petStar; //宠物星级 private Integer petStarExp; //宠物星级经验 @Version diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java index 4d13d5a8..57f7be3b 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java @@ -16,6 +16,7 @@ import cn.jisol.ngame.util.spring.SpringBeanUtils; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.retry.RetryException; import org.springframework.stereotype.Service; import java.lang.reflect.Array; @@ -64,7 +65,7 @@ public class ResourceServiceImpl extends ServiceImpl i try{ res = this.initResource(playerId,type,value); }catch (Exception e){ - return this.addResourceValue(playerId,type,value); + throw new RetryException("服务器忙碌啦"); } }else{ throw new ResourceNotException("资源不够"); diff --git a/JisolGameServer/Main/src/main/resources/application.yml b/JisolGameServer/Main/src/main/resources/application.yml index 26fc9772..c9a856f9 100644 --- a/JisolGameServer/Main/src/main/resources/application.yml +++ b/JisolGameServer/Main/src/main/resources/application.yml @@ -4,8 +4,8 @@ spring: datasource: username: pet_jisol_cn password: sThsBwjfDcaw2wJR -# url: jdbc:mysql://kyu.jisol.cn:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&allowMultiQueries=true - url: jdbc:mysql://localhost:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&allowMultiQueries=true + url: jdbc:mysql://kyu.jisol.cn:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&allowMultiQueries=true +# url: jdbc:mysql://localhost:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&allowMultiQueries=true driver-class-name: com.mysql.cj.jdbc.Driver jackson: serialization: