From 26cc480866518cda85f71455b27dd34f3d3ff6cc Mon Sep 17 00:00:00 2001 From: "DESKTOP-5RP3AKU\\Jisol" <2858626794@qq.com> Date: Tue, 23 Jan 2024 02:53:23 +0800 Subject: [PATCH] qqqq --- DataTables/Datas/__tables__.xlsx | Bin 11029 -> 11081 bytes DataTables/Datas/常用/资源表.xlsx | Bin 10435 -> 10434 bytes DataTables/Datas/礼包/商店/商店礼包布局.xlsx | Bin 10287 -> 11785 bytes DataTables/Datas/礼包/礼包.xlsx | Bin 13733 -> 15459 bytes .../assets/resources/WorldCanvas.prefab | 2 +- .../assets/resources/config/json/tbggift.json | 20 + .../resources/config/json/tbgresource.json | 2 +- .../assets/resources/config/json/tbgshop.json | 21 +- .../resources/prefab/ui/主页/MainView.prefab | 2808 +++++++++++------ .../resources/prefab/ui/商店/商店礼包.prefab | 7 +- .../resources/prefab/ui/商店/商店页面.prefab | 23 +- JisolGameCocos/assets/script/App.ts | 8 +- .../battle/modes/default/GNormalModeBase.ts | 2 +- .../assets/script/config/data/schema.ts | 22 +- JisolGameCocos/assets/script/data/GiftData.ts | 7 +- .../assets/script/data/PetEquipData.ts | 2 +- .../assets/script/data/ResourceData.ts | 1 + .../assets/script/ui/Consts/Pet/PetIcon.ts | 13 +- .../assets/script/ui/Shop/ShopGiftItem.ts | 11 +- .../assets/script/ui/Shop/ShopView.ts | 27 +- JisolGameCocos/extensions/ngame | 2 +- .../Main/src/main/java/cfg/TB/TbGShop.java | 12 +- .../Main/src/main/java/cfg/TbGShop.java | 10 +- .../Main/src/main/resources/application.yml | 6 +- .../Main/src/main/resources/json/tbggift.json | 20 + .../src/main/resources/json/tbgresource.json | 2 +- .../Main/src/main/resources/json/tbgshop.json | 21 +- 27 files changed, 2061 insertions(+), 988 deletions(-) diff --git a/DataTables/Datas/__tables__.xlsx b/DataTables/Datas/__tables__.xlsx index 1ead771783b400c91f44c797d6ab2b964378b63f..b7ade450e85b08333769e489041e3d980d028e54 100644 GIT binary patch delta 4005 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 I?!TG;1DD@)fB*mh delta 3954 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 diff --git a/DataTables/Datas/常用/资源表.xlsx b/DataTables/Datas/常用/资源表.xlsx index ee89383a80b98df35e6b22a127668798ea350bf4..32b6ed908415ae28fde91d891a924cdb26570060 100644 GIT binary patch delta 3069 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 LJqD#D00000NTsmJ delta 3076 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 Ufi{Tra*ToS=@RUgU%l-850*|I=l}o! delta 4143 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 O8)D^6f!=(7fBip*F>MwA delta 10435 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 extends GDefaultMode{ //调整相机 this.camera.enabled = true; let camreaPos = this.camera.node.worldPosition; - this.camera.node.worldPosition = v3(0,450,camreaPos.z) + this.camera.node.worldPosition = v3(0,400,camreaPos.z) } //获取配置 diff --git a/JisolGameCocos/assets/script/config/data/schema.ts b/JisolGameCocos/assets/script/config/data/schema.ts index 2d8d1081..1562dbb3 100644 --- a/JisolGameCocos/assets/script/config/data/schema.ts +++ b/JisolGameCocos/assets/script/config/data/schema.ts @@ -1212,18 +1212,14 @@ export namespace TB { export class TbGShop { constructor(_json_: any) { - if (_json_.id === undefined) { throw new Error() } - this.id = _json_.id if (_json_.tig === undefined) { throw new Error() } this.tig = _json_.tig if (_json_.giftId === undefined) { throw new Error() } this.giftId = _json_.giftId + if (_json_.type === undefined) { throw new Error() } + this.type = _json_.type } - /** - * id - */ - readonly id: number /** * 备注 */ @@ -1232,6 +1228,10 @@ export class TbGShop { * 礼包Id */ readonly giftId: number + /** + * 0.点卷商店 1.金币商店 + */ + readonly type: number resolve(tables:Tables) { @@ -2012,23 +2012,23 @@ export class TbGGift{ export class TbGShop{ - private _dataMap: Map + private _dataMap: Map private _dataList: TB.TbGShop[] constructor(_json_: any) { - this._dataMap = new Map() + this._dataMap = new Map() this._dataList = [] for(var _json2_ of _json_) { let _v: TB.TbGShop _v = new TB.TbGShop(_json2_) this._dataList.push(_v) - this._dataMap.set(_v.id, _v) + this._dataMap.set(_v.tig, _v) } } - getDataMap(): Map { return this._dataMap; } + getDataMap(): Map { return this._dataMap; } getDataList(): TB.TbGShop[] { return this._dataList; } - get(key: number): TB.TbGShop | undefined { return this._dataMap.get(key); } + get(key: string): TB.TbGShop | undefined { return this._dataMap.get(key); } resolve(tables:Tables) { diff --git a/JisolGameCocos/assets/script/data/GiftData.ts b/JisolGameCocos/assets/script/data/GiftData.ts index dae06b7b..25cbdad7 100644 --- a/JisolGameCocos/assets/script/data/GiftData.ts +++ b/JisolGameCocos/assets/script/data/GiftData.ts @@ -12,8 +12,9 @@ export default class GiftData extends BaseData{ records:GiftRecord[] = []; dayRecords:GiftDayRecord[] = []; - onInit() { - + async onInit() { + await this.UpdateGiftRecord(); + await this.UpdateGiftDayRecord(); } //查询充值记录 @@ -38,6 +39,8 @@ export default class GiftData extends BaseData{ //购买礼包 async buy(giftId:number){ await API.BuyGift(giftId); + await this.UpdateGiftRecord(); + await this.UpdateGiftDayRecord(); app.event.emit(GiftDataEnum.BUY); } diff --git a/JisolGameCocos/assets/script/data/PetEquipData.ts b/JisolGameCocos/assets/script/data/PetEquipData.ts index e208db64..0903ce5c 100644 --- a/JisolGameCocos/assets/script/data/PetEquipData.ts +++ b/JisolGameCocos/assets/script/data/PetEquipData.ts @@ -119,7 +119,7 @@ export default class PetEquipData extends BaseData{ //获取指定宠物等级 getForgingBenchPetLevel(petId:number = this.info.forgingPetId){ let exp = this.info.forgingPetLevels[`${petId}`] || 0; - let list = TD.TbGRoleEquipLevel.getDataList().filter(info => info.exp <= exp); + let list = TD.TbGRoleEquipLevel.getDataList().filter(info => (exp-=info.exp) >= 0); return list[list.length - 1].id; } diff --git a/JisolGameCocos/assets/script/data/ResourceData.ts b/JisolGameCocos/assets/script/data/ResourceData.ts index 91b38b3e..feda99ba 100644 --- a/JisolGameCocos/assets/script/data/ResourceData.ts +++ b/JisolGameCocos/assets/script/data/ResourceData.ts @@ -14,6 +14,7 @@ export enum ResourceType{ DungeonGold = 90004, //钥匙:金币副本 DungeonForgedStones = 90005, //钥匙:锻造石副本 Q1S = 90006, //魂:一品宠物魂 + GiftCoupons = 90007, //兑换券 } //资源刷新类型 diff --git a/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts index 7ab6d552..da9f8065 100644 --- a/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts +++ b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts @@ -25,8 +25,6 @@ export class PetIcon extends Component { info:PlayerPetOV; onLoad(){ - this.reset(); - //监听 app.event.on(PlayerPetEvent.UPDATE_INFO,this.onUpdateInfo,this) } @@ -35,13 +33,6 @@ export class PetIcon extends Component { app.event.off(PlayerPetEvent.UPDATE_INFO,this.onUpdateInfo,this) } - //初始化 - reset(){ - - this.starNode.active = false; - - } - //信息更新 onUpdateInfo(info:PlayerPetOV){ if(this.info && info.petId == this.info.petId){ @@ -51,6 +42,9 @@ export class PetIcon extends Component { //刷新页面 onUpdateView(){ + + this.starNode.active = false; + this.spine.skeletonData = app.battleRes.getRoleSpine(this.info.petTbId); this.spine.setAnimation(0,UIPetAnim.std,true); @@ -67,7 +61,6 @@ export class PetIcon extends Component { //设置icon set(info:PlayerPetOV){ - this.reset(); this.info = info; this.onUpdateView(); } diff --git a/JisolGameCocos/assets/script/ui/Shop/ShopGiftItem.ts b/JisolGameCocos/assets/script/ui/Shop/ShopGiftItem.ts index 6099ea99..73ea2472 100644 --- a/JisolGameCocos/assets/script/ui/Shop/ShopGiftItem.ts +++ b/JisolGameCocos/assets/script/ui/Shop/ShopGiftItem.ts @@ -5,6 +5,7 @@ import { TD } from '../../App'; import { Label } from 'cc'; import JNScrollView from '../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollView'; import GiftData from '../../data/GiftData'; +import NumberTools from '../../tools/NumberTools'; const { ccclass, property } = _decorator; @ccclass('ShopGiftItem') @@ -16,6 +17,9 @@ export class ShopGiftItem extends JNScrollViewItem { @property(Label) giftLimit:Label; //限购 + @property(Label) + giftPrice:Label; //价格 + @property(JNScrollView) views:JNScrollView; //礼包列表 @@ -25,10 +29,6 @@ export class ShopGiftItem extends JNScrollViewItem { this.gift = TD.TbGGift.get(data.giftId); - } - - protected start(): void { - this.giftName.string = this.data.tig; if(this.gift.limit == TbGEnum.TGiftLimit.Unlimited) @@ -38,10 +38,11 @@ export class ShopGiftItem extends JNScrollViewItem { if(this.gift.limit == TbGEnum.TGiftLimit.Limit) this.giftLimit.string = `限制( ${GiftData.getIns().getGiftRecordCount(this.gift.id)}/${this.gift.limitValue} )`; + this.giftPrice.string = `${NumberTools.NumberStr(this.gift.exchanges[0].value)} ${TD.TbGResource.get(this.gift.exchanges[0].id).name}`; this.views.refreshData(this.gift.rewards); - } + } //点击购买礼包 async onClickBuy(){ diff --git a/JisolGameCocos/assets/script/ui/Shop/ShopView.ts b/JisolGameCocos/assets/script/ui/Shop/ShopView.ts index 8c45a7e7..0e1bb32d 100644 --- a/JisolGameCocos/assets/script/ui/Shop/ShopView.ts +++ b/JisolGameCocos/assets/script/ui/Shop/ShopView.ts @@ -3,6 +3,9 @@ import JNLayerBase from '../../../../extensions/ngame/assets/ngame/ui/base/JNLay import JNScrollView from '../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollView'; import { app, TD } from '../../App'; import GiftData, { GiftDataEnum } from '../../data/GiftData'; +import { Sprite } from 'cc'; +import { color } from 'cc'; +import { EventTouch } from 'cc'; const { ccclass, property } = _decorator; //商店页面 @@ -13,6 +16,13 @@ export class ShopView extends JNLayerBase { @property(JNScrollView) views:JNScrollView + //商店标签 + @property(Node) + tigs:Node; + + //页面下标 + index:number = 0; + async onJNLoad(data?: any) { super.onJNLoad(data); @@ -31,13 +41,24 @@ export class ShopView extends JNLayerBase { async onUpdateView() { - await GiftData.getIns().UpdateGiftRecord(); - await GiftData.getIns().UpdateGiftDayRecord(); + this.tigs.children.forEach((item,index) => { + if(this.index == index){ + item.getComponentInChildren(Sprite).color = color(0,0,0); + }else{ + item.getComponentInChildren(Sprite).color = color(255,255,255); + } + }) - this.views.refreshData(TD.TbGShop.getDataList()); + this.views.refreshData(TD.TbGShop.getDataList().filter(item => item.type == this.index)); } + //切换下标 + onClickTigs(touch:EventTouch){ + this.index = touch.target.getSiblingIndex(); + this.onUpdateView(); + } + } diff --git a/JisolGameCocos/extensions/ngame b/JisolGameCocos/extensions/ngame index a98403e0..7d40b6c6 160000 --- a/JisolGameCocos/extensions/ngame +++ b/JisolGameCocos/extensions/ngame @@ -1 +1 @@ -Subproject commit a98403e0e131001f21f870c9d511c3c63fbbc486 +Subproject commit 7d40b6c6e3089fe4feb559e85fd051aa74885cab diff --git a/JisolGameServer/Main/src/main/java/cfg/TB/TbGShop.java b/JisolGameServer/Main/src/main/java/cfg/TB/TbGShop.java index 214b6934..0bbbbf9f 100644 --- a/JisolGameServer/Main/src/main/java/cfg/TB/TbGShop.java +++ b/JisolGameServer/Main/src/main/java/cfg/TB/TbGShop.java @@ -16,19 +16,15 @@ import com.google.gson.JsonObject; public final class TbGShop extends AbstractBean { public TbGShop(JsonObject _buf) { - id = _buf.get("id").getAsInt(); tig = _buf.get("tig").getAsString(); giftId = _buf.get("giftId").getAsInt(); + type = _buf.get("type").getAsInt(); } public static TbGShop deserialize(JsonObject _buf) { return new cfg.TB.TbGShop(_buf); } - /** - * id - */ - public final int id; /** * 备注 */ @@ -37,6 +33,10 @@ public final class TbGShop extends AbstractBean { * 礼包Id */ public final int giftId; + /** + * 0.点卷商店 1.金币商店 + */ + public final int type; public static final int __ID__ = 319422095; @@ -46,9 +46,9 @@ public final class TbGShop extends AbstractBean { @Override public String toString() { return "{ " - + "(format_field_name __code_style field.name):" + id + "," + "(format_field_name __code_style field.name):" + tig + "," + "(format_field_name __code_style field.name):" + giftId + "," + + "(format_field_name __code_style field.name):" + type + "," + "}"; } } diff --git a/JisolGameServer/Main/src/main/java/cfg/TbGShop.java b/JisolGameServer/Main/src/main/java/cfg/TbGShop.java index 1af8b239..1ae6ab9b 100644 --- a/JisolGameServer/Main/src/main/java/cfg/TbGShop.java +++ b/JisolGameServer/Main/src/main/java/cfg/TbGShop.java @@ -14,24 +14,24 @@ import com.google.gson.JsonElement; public final class TbGShop { - private final java.util.HashMap _dataMap; + private final java.util.HashMap _dataMap; private final java.util.ArrayList _dataList; public TbGShop(JsonElement _buf) { - _dataMap = new java.util.HashMap(); + _dataMap = new java.util.HashMap(); _dataList = new java.util.ArrayList(); for (com.google.gson.JsonElement _e_ : _buf.getAsJsonArray()) { cfg.TB.TbGShop _v; _v = cfg.TB.TbGShop.deserialize(_e_.getAsJsonObject()); _dataList.add(_v); - _dataMap.put(_v.id, _v); + _dataMap.put(_v.tig, _v); } } - public java.util.HashMap getDataMap() { return _dataMap; } + public java.util.HashMap getDataMap() { return _dataMap; } public java.util.ArrayList getDataList() { return _dataList; } - public cfg.TB.TbGShop get(int key) { return _dataMap.get(key); } + public cfg.TB.TbGShop get(String key) { return _dataMap.get(key); } } diff --git a/JisolGameServer/Main/src/main/resources/application.yml b/JisolGameServer/Main/src/main/resources/application.yml index 26fc9772..0b5e7c94 100644 --- a/JisolGameServer/Main/src/main/resources/application.yml +++ b/JisolGameServer/Main/src/main/resources/application.yml @@ -11,6 +11,6 @@ spring: serialization: write-dates-as-timestamps: true -mybatis-plus: - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file +#mybatis-plus: +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/resources/json/tbggift.json b/JisolGameServer/Main/src/main/resources/json/tbggift.json index 0eb93bef..7012e553 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbggift.json +++ b/JisolGameServer/Main/src/main/resources/json/tbggift.json @@ -93,5 +93,25 @@ "value": 20 } ] + }, + { + "id": 210001, + "name": "锻造礼包", + "tig": "锻造礼包", + "limit": 1, + "limitValue": 0, + "exchanges": [ + { + "id": 90001, + "value": 2000 + } + ], + "rewards": [ + { + "type": 1, + "id": 90002, + "value": 20 + } + ] } ] \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/resources/json/tbgresource.json b/JisolGameServer/Main/src/main/resources/json/tbgresource.json index d445d0ca..bdc29411 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbgresource.json +++ b/JisolGameServer/Main/src/main/resources/json/tbgresource.json @@ -50,7 +50,7 @@ { "id": 90007, "icon": "90007", - "name": "兑换券", + "name": "点卷", "tig": "用于购买礼包", "args": "", "quality": 1 diff --git a/JisolGameServer/Main/src/main/resources/json/tbgshop.json b/JisolGameServer/Main/src/main/resources/json/tbgshop.json index 2e667d2a..224d286e 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbgshop.json +++ b/JisolGameServer/Main/src/main/resources/json/tbgshop.json @@ -1,22 +1,27 @@ [ { - "id": 1, "tig": "金币礼包", - "giftId": 180001 + "giftId": 180001, + "type": 0 }, { - "id": 2, "tig": "好多金币礼包", - "giftId": 180002 + "giftId": 180002, + "type": 0 }, { - "id": 3, "tig": "限购矿石礼包", - "giftId": 190001 + "giftId": 190001, + "type": 0 }, { - "id": 4, "tig": "每日矿石礼包", - "giftId": 200001 + "giftId": 200001, + "type": 0 + }, + { + "tig": "锻造礼包", + "giftId": 210001, + "type": 1 } ] \ No newline at end of file