diff --git a/src/api/config/AllItemConfigCategory.json b/src/api/config/AllItemConfigCategory.json index 4dad6a6..43e5911 100644 --- a/src/api/config/AllItemConfigCategory.json +++ b/src/api/config/AllItemConfigCategory.json @@ -16694,7 +16694,7 @@ "TreasureBowl": false, "Icon": "Item_Icon_7877", "Description": "凿痕映青苔，曲水引桃源。", - "GetMethod": "来源：未知", + "GetMethod": "来源：夜市商人", "Importantdata": false }, { @@ -22056,6 +22056,29 @@ "GetMethod": "来源:鲁明处兑换", "Importantdata": false }, + { + "Id": 400031, + "Name": "藏礼屋", + "DetailsPageName": "礼厅皮肤:藏礼屋", + "Type": 7, + "RelatedId": 40032, + "StockType": 6, + "StorageType": 1, + "Transport": false, + "BackpackTransfer": false, + "SuperpositionMax": 9999999999, + "HasLimit": 1, + "AbleThrow": false, + "Gift": false, + "Favorability": 0, + "Track": false, + "Grade": 2, + "TreasureBowl": false, + "Icon": "Item_Icon_400031", + "Description": "礼厅建筑的外观皮肤，使用后可在桃源殿解锁研究皮肤科技:藏礼屋", + "GetMethod": "来源:鲁明处兑换", + "Importantdata": false + }, { "Id": 500001, "Name": "榕树皮肤", diff --git a/src/api/config/BusinessManConfigCategory.json b/src/api/config/BusinessManConfigCategory.json index 04d9290..3d5b04a 100644 --- a/src/api/config/BusinessManConfigCategory.json +++ b/src/api/config/BusinessManConfigCategory.json @@ -480,7 +480,7 @@ "ResetItemNum": 0, "Increment": 0, "ResetLimited": 0, - "ResetType": 0, + "ResetType": 5, "ResetTypeParameter": 500 }, { diff --git a/src/api/config/DecorationsConfigCategory.json b/src/api/config/DecorationsConfigCategory.json index 48ba139..41c653d 100644 --- a/src/api/config/DecorationsConfigCategory.json +++ b/src/api/config/DecorationsConfigCategory.json @@ -1246,7 +1246,7 @@ "Id": 67, "Name": "武陵溪", "Type": 2, - "Manual": false, + "Manual": true, "Order": 67, "score": 15, "Preview": true, diff --git a/src/api/config/FunctionItemConfigCategory.json b/src/api/config/FunctionItemConfigCategory.json index 04f8325..58b5ce2 100644 --- a/src/api/config/FunctionItemConfigCategory.json +++ b/src/api/config/FunctionItemConfigCategory.json @@ -3903,6 +3903,14 @@ "UseTypeParameter": 7031, "UseTypeParameter2": 0 }, + { + "Id": 40032, + "Name": "藏礼屋", + "UseType": 13, + "ScaleCondition": 20, + "UseTypeParameter": 7032, + "UseTypeParameter2": 0 + }, { "Id": 50001, "Name": "图纸:榕树皮肤", diff --git a/src/api/config/GoodsForSaleConfigCategory.json b/src/api/config/GoodsForSaleConfigCategory.json index 129e746..d89b139 100644 --- a/src/api/config/GoodsForSaleConfigCategory.json +++ b/src/api/config/GoodsForSaleConfigCategory.json @@ -6335,6 +6335,28 @@ "Specialty": 0, "RefreshCycle": 0 }, + { + "Id": 8026, + "GroupId": 405, + "Scale": 0, + "ItemId": 7877, + "SaleNum": [ + 500, + 500 + ], + "Weight": 1, + "OverlayWeight": 0, + "SaleCondition": 0, + "SaleConditionParemeter": 0, + "SellingCurrencyType": 1, + "Price": 2000, + "Discount": 90, + "DiscountWeight": 10, + "SaleMax": 1000, + "DiscountMark": "", + "Specialty": 0, + "RefreshCycle": 0 + }, { "Id": 9001, "GroupId": 406, @@ -7082,5 +7104,27 @@ "DiscountMark": "", "Specialty": 0, "RefreshCycle": 0 + }, + { + "Id": 10031, + "GroupId": 407, + "Scale": 0, + "ItemId": 400031, + "SaleNum": [ + 1, + 1 + ], + "Weight": 1, + "OverlayWeight": 0, + "SaleCondition": 0, + "SaleConditionParemeter": 0, + "SellingCurrencyType": 9, + "Price": 1, + "Discount": 0, + "DiscountWeight": 0, + "SaleMax": 1, + "DiscountMark": "", + "Specialty": 0, + "RefreshCycle": 0 } ] \ No newline at end of file diff --git a/src/api/config/ScienceConfigCategory.json b/src/api/config/ScienceConfigCategory.json index 54b4937..16e1f24 100644 --- a/src/api/config/ScienceConfigCategory.json +++ b/src/api/config/ScienceConfigCategory.json @@ -7892,8 +7892,8 @@ "EffectParameter": 503, "Icon": "Science_5003", "Performance": 0, - "ScienceDescribe": "编辑场景可以移动资源", - "ResultDescribe": "编辑场景可以移动资源" + "ScienceDescribe": "布局模式下可以移动资源", + "ResultDescribe": "布局模式下可以移动资源" }, { "Id": 7001, @@ -8762,5 +8762,33 @@ "Performance": 0, "ScienceDescribe": "鲁明（位于陶渊明家）处购买图纸", "ResultDescribe": "解锁建筑皮肤:芳轮溉春" + }, + { + "Id": 7032, + "Type": 4, + "Name": "藏礼屋", + "PrefixScience": 0, + "ScienceGroup": 7032, + "ScienceLv": 10, + "Scale": 20, + "Structure": 30, + "Drawing": true, + "ItemId_1": 327, + "ItemNum_1": 500, + "ItemId_2": 803, + "ItemNum_2": 700, + "ItemId_3": 808, + "ItemNum_3": 700, + "ItemId_4": 819, + "ItemNum_4": 350, + "Copper": 320000, + "Volume": 260000, + "EffectType": 5, + "ObjectAction": 0, + "EffectParameter": 0, + "Icon": "Science_7032", + "Performance": 0, + "ScienceDescribe": "鲁明（位于陶渊明家）处购买图纸", + "ResultDescribe": "解锁建筑皮肤:藏礼屋" } ] \ No newline at end of file diff --git a/src/api/config/SkillBuffConfigCategory.json b/src/api/config/SkillBuffConfigCategory.json index 5d69d2d..87bbdb9 100644 --- a/src/api/config/SkillBuffConfigCategory.json +++ b/src/api/config/SkillBuffConfigCategory.json @@ -21341,8 +21341,8 @@ { "Id": 3611, "Name": "", - "TriggerTime": 3, - "TriggerParameter": 1, + "TriggerTime": 1, + "TriggerParameter": 0, "Gain": 0, "Immunity": false, "Disperse": false, @@ -21351,8 +21351,8 @@ "LinkEffect": [ 3611 ], - "ContinuedType": 2, - "ContinuedParameter": 10, + "ContinuedType": 1, + "ContinuedParameter": 0, "Overlay": false, "OverlayMax": 0, "BarShow": false, @@ -21376,8 +21376,8 @@ "LinkEffect": [ 3612 ], - "ContinuedType": 2, - "ContinuedParameter": 10, + "ContinuedType": 1, + "ContinuedParameter": 0, "Overlay": false, "OverlayMax": 0, "BarShow": false, @@ -21401,8 +21401,8 @@ "LinkEffect": [ 3613 ], - "ContinuedType": 2, - "ContinuedParameter": 10, + "ContinuedType": 1, + "ContinuedParameter": 0, "Overlay": false, "OverlayMax": 0, "BarShow": false, @@ -21426,8 +21426,8 @@ "LinkEffect": [ 3614 ], - "ContinuedType": 2, - "ContinuedParameter": 10, + "ContinuedType": 1, + "ContinuedParameter": 0, "Overlay": false, "OverlayMax": 0, "BarShow": false, @@ -21451,8 +21451,8 @@ "LinkEffect": [ 3615 ], - "ContinuedType": 2, - "ContinuedParameter": 10, + "ContinuedType": 1, + "ContinuedParameter": 0, "Overlay": false, "OverlayMax": 0, "BarShow": false, @@ -21476,8 +21476,8 @@ "LinkEffect": [ 3616 ], - "ContinuedType": 2, - "ContinuedParameter": 10, + "ContinuedType": 1, + "ContinuedParameter": 0, "Overlay": false, "OverlayMax": 0, "BarShow": false, @@ -21501,8 +21501,8 @@ "LinkEffect": [ 3617 ], - "ContinuedType": 2, - "ContinuedParameter": 10, + "ContinuedType": 1, + "ContinuedParameter": 0, "Overlay": false, "OverlayMax": 0, "BarShow": false, @@ -21526,8 +21526,8 @@ "LinkEffect": [ 3618 ], - "ContinuedType": 2, - "ContinuedParameter": 10, + "ContinuedType": 1, + "ContinuedParameter": 0, "Overlay": false, "OverlayMax": 0, "BarShow": false, @@ -21551,8 +21551,8 @@ "LinkEffect": [ 3619 ], - "ContinuedType": 2, - "ContinuedParameter": 10, + "ContinuedType": 1, + "ContinuedParameter": 0, "Overlay": false, "OverlayMax": 0, "BarShow": false, @@ -21576,8 +21576,8 @@ "LinkEffect": [ 3620 ], - "ContinuedType": 2, - "ContinuedParameter": 10, + "ContinuedType": 1, + "ContinuedParameter": 0, "Overlay": false, "OverlayMax": 0, "BarShow": false, @@ -21850,7 +21850,7 @@ "BuffProbability": 100, "LinkEffect": [], "ContinuedType": 2, - "ContinuedParameter": 10, + "ContinuedParameter": 1, "Overlay": false, "OverlayMax": 0, "BarShow": false, diff --git a/src/api/config/SkillBulletConfigCategory.json b/src/api/config/SkillBulletConfigCategory.json index 9f84ff8..5ee38ef 100644 --- a/src/api/config/SkillBulletConfigCategory.json +++ b/src/api/config/SkillBulletConfigCategory.json @@ -6861,11 +6861,12 @@ "FlightDistance": 0, "Disappear": 2, "DisappearParameter": 10000, - "DetectTime": 1, - "TestParameters": 0, + "DetectTime": 3, + "TestParameters": 1, "NumberOfTargets": 0, "Buff": [ - 3611 + 3611, + 3631 ], "Skill": 0, "SpecialEffect": "Bullet_Skill_XiaoGui", @@ -6886,11 +6887,12 @@ "FlightDistance": 0, "Disappear": 2, "DisappearParameter": 10000, - "DetectTime": 1, - "TestParameters": 0, + "DetectTime": 3, + "TestParameters": 1, "NumberOfTargets": 0, "Buff": [ - 3612 + 3612, + 3631 ], "Skill": 0, "SpecialEffect": "Bullet_Skill_XiaoGui", @@ -6911,11 +6913,12 @@ "FlightDistance": 0, "Disappear": 2, "DisappearParameter": 10000, - "DetectTime": 1, - "TestParameters": 0, + "DetectTime": 3, + "TestParameters": 1, "NumberOfTargets": 0, "Buff": [ - 3613 + 3613, + 3631 ], "Skill": 0, "SpecialEffect": "Bullet_Skill_XiaoGui", @@ -6936,11 +6939,12 @@ "FlightDistance": 0, "Disappear": 2, "DisappearParameter": 10000, - "DetectTime": 1, - "TestParameters": 0, + "DetectTime": 3, + "TestParameters": 1, "NumberOfTargets": 0, "Buff": [ - 3614 + 3614, + 3631 ], "Skill": 0, "SpecialEffect": "Bullet_Skill_XiaoGui", @@ -6961,11 +6965,12 @@ "FlightDistance": 0, "Disappear": 2, "DisappearParameter": 10000, - "DetectTime": 1, - "TestParameters": 0, + "DetectTime": 3, + "TestParameters": 1, "NumberOfTargets": 0, "Buff": [ - 3615 + 3615, + 3631 ], "Skill": 0, "SpecialEffect": "Bullet_Skill_XiaoGui", @@ -6986,11 +6991,12 @@ "FlightDistance": 0, "Disappear": 2, "DisappearParameter": 10000, - "DetectTime": 1, - "TestParameters": 0, + "DetectTime": 3, + "TestParameters": 1, "NumberOfTargets": 0, "Buff": [ - 3616 + 3616, + 3631 ], "Skill": 0, "SpecialEffect": "Bullet_Skill_XiaoGui", @@ -7011,11 +7017,12 @@ "FlightDistance": 0, "Disappear": 2, "DisappearParameter": 10000, - "DetectTime": 1, - "TestParameters": 0, + "DetectTime": 3, + "TestParameters": 1, "NumberOfTargets": 0, "Buff": [ - 3617 + 3617, + 3631 ], "Skill": 0, "SpecialEffect": "Bullet_Skill_XiaoGui", @@ -7036,11 +7043,12 @@ "FlightDistance": 0, "Disappear": 2, "DisappearParameter": 10000, - "DetectTime": 1, - "TestParameters": 0, + "DetectTime": 3, + "TestParameters": 1, "NumberOfTargets": 0, "Buff": [ - 3618 + 3618, + 3631 ], "Skill": 0, "SpecialEffect": "Bullet_Skill_XiaoGui", @@ -7061,11 +7069,12 @@ "FlightDistance": 0, "Disappear": 2, "DisappearParameter": 10000, - "DetectTime": 1, - "TestParameters": 0, + "DetectTime": 3, + "TestParameters": 1, "NumberOfTargets": 0, "Buff": [ - 3619 + 3619, + 3631 ], "Skill": 0, "SpecialEffect": "Bullet_Skill_XiaoGui", @@ -7086,11 +7095,12 @@ "FlightDistance": 0, "Disappear": 2, "DisappearParameter": 10000, - "DetectTime": 1, - "TestParameters": 0, + "DetectTime": 3, + "TestParameters": 1, "NumberOfTargets": 0, "Buff": [ - 3620 + 3620, + 3631 ], "Skill": 0, "SpecialEffect": "Bullet_Skill_XiaoGui", diff --git a/src/api/config/StructureConfigCategory.json b/src/api/config/StructureConfigCategory.json index 9ab484a..2e98ca5 100644 --- a/src/api/config/StructureConfigCategory.json +++ b/src/api/config/StructureConfigCategory.json @@ -306,7 +306,9 @@ "StrengthenId": 30, "ShowOccupyPlace": true, "Prefab": "Structure_30", - "SkinConfigIds": [], + "SkinConfigIds": [ + 1052 + ], "Picture": "Structure_Picture_30", "NamePicture": "Structure_Name_30", "Sound": "", @@ -4141,7 +4143,9 @@ "StrengthenId": 302, "ShowOccupyPlace": false, "Prefab": "Structure_302", - "SkinConfigIds": [], + "SkinConfigIds": [ + 1031 + ], "Picture": "Structure_Picture_306", "NamePicture": "Structure_Name_306", "Sound": "", @@ -4243,7 +4247,9 @@ "StrengthenId": 306, "ShowOccupyPlace": false, "Prefab": "Structure_306", - "SkinConfigIds": [], + "SkinConfigIds": [ + 1032 + ], "Picture": "Structure_Picture_306", "NamePicture": "Structure_Name_306", "Sound": "", diff --git a/src/api/config/StructureSkinConfigCategory.json b/src/api/config/StructureSkinConfigCategory.json index 2362de3..39354d3 100644 --- a/src/api/config/StructureSkinConfigCategory.json +++ b/src/api/config/StructureSkinConfigCategory.json @@ -278,6 +278,24 @@ "ScienceId": 7016, "Integral": 100 }, + { + "Id": 1031, + "SkinName": "幽篁渡·一", + "SkinPrefab": "Structure_Skin_1031", + "Picture": "Structure_Skin_Picture_1031", + "GetMethod": "外观礼包", + "ScienceId": 0, + "Integral": 100 + }, + { + "Id": 1032, + "SkinName": "幽篁渡·二", + "SkinPrefab": "Structure_Skin_1032", + "Picture": "Structure_Skin_Picture_1031", + "GetMethod": "外观礼包", + "ScienceId": 0, + "Integral": 100 + }, { "Id": 1037, "SkinName": "藤月观畦庐", @@ -412,5 +430,14 @@ "GetMethod": "鲁明处购买图纸后在桃源殿进行研究", "ScienceId": 7031, "Integral": 100 + }, + { + "Id": 1052, + "SkinName": "藏礼屋", + "SkinPrefab": "Structure_Skin_1052", + "Picture": "Structure_Skin_Picture_1052", + "GetMethod": "鲁明处购买图纸后在桃源殿进行研究", + "ScienceId": 7032, + "Integral": 100 } ] \ No newline at end of file diff --git a/src/utils/utils.ts b/src/utils/utils.ts index e8cc93a..d9c5483 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -98,3 +98,23 @@ export function guid() { export function s4() { return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1); } + +export function getAccount(account: string, channel: string) { + if (channel == '000000000000' && !account.includes(channel)) { + account = channel + account; + } + return account; +} + +export function channelFill(val: any) { + let len = val.length; + for (let i = 0; i < 6 - len; i++) { + val = '0' + val; + } + return val; +} + +export function getCompleteChannel(channel: any, subChannel: any) { + + return channelFill(channel) + channelFill(subChannel); +} diff --git a/src/views/gameBug/clientBug/index.vue b/src/views/gameBug/clientBug/index.vue index d435745..3a7cae2 100644 --- a/src/views/gameBug/clientBug/index.vue +++ b/src/views/gameBug/clientBug/index.vue @@ -1,186 +1,194 @@ diff --git a/src/views/gameCCD/hotfix/component/checkCCD.vue b/src/views/gameCCD/hotfix/component/checkCCD.vue index dfac96c..0c7d4e7 100644 --- a/src/views/gameCCD/hotfix/component/checkCCD.vue +++ b/src/views/gameCCD/hotfix/component/checkCCD.vue @@ -36,7 +36,8 @@ import { reactive, toRefs, defineComponent } from 'vue'; import { allChannelList } from '/src/utils/game'; import axios from 'axios'; -import {gameCCD} from "/@/api/game"; +import { gameCCD } from '/@/api/game'; +import * as http from 'node:http'; const baseURL: string | undefined | boolean = import.meta.env.VITE_API_URL; @@ -89,18 +90,23 @@ export default defineComponent({ }; // 新增 const addVersion = () => { - // let url = `${baseURL}frontApi/game/ccd/get`; - // axios - // .post(url, { - // params: state.tableData.param, - // }) - // .then((res) => { - // console.log(res); - // }); - gameCCD(state.tableData.param).then((res) => { - console.log(res); - }) - // window.open(baseURL + '/frontApi/game/loginUrl/get?channelType=' + state.tableData.param.channelType + '&platform=' + state.tableData.param.platform+ '&version=' + state.tableData.param.version); + const url = `${baseURL}frontApi/game/ccd/get`; + const Http = new XMLHttpRequest(); + Http.open('POST', url, true); + Http.setRequestHeader('Access-Control-Allow-Origin', '*'); + Http.send(JSON.stringify(state.tableData.param)); + Http.onreadystatechange = (e) => { + if (e) { + console.log(e); + return; + } + if (e.target.readyState == 4 && e.target.status == 200) { + console.log(Http.responseText, state.tableData.param); + } + // let data = JSON.parse(Http.responseText) + // console.log(Http.responseText, state.tableData.param); + // state.tableData.ip = data.origin + }; }; return { openDialog, diff --git a/src/views/gameCCD/hotfix/index.vue b/src/views/gameCCD/hotfix/index.vue index f400e28..e4b7da7 100644 --- a/src/views/gameCCD/hotfix/index.vue +++ b/src/views/gameCCD/hotfix/index.vue @@ -35,71 +35,64 @@ 新增 - - - - - - 校验 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/views/gameRole/account/index.vue b/src/views/gameRole/account/index.vue index 286540e..e10e74e 100644 --- a/src/views/gameRole/account/index.vue +++ b/src/views/gameRole/account/index.vue @@ -133,7 +133,7 @@ export default defineComponent({ }); const accountList = () => { - state.tableData.data = []; + state.tableData.data = []; console.log(state.queryParams); gameAccountList(state.queryParams).then((res) => { if (!res.data.list || res.data.list.length == 0) { diff --git a/src/views/gameRole/itemRecord/index.vue b/src/views/gameRole/itemRecord/index.vue index ec2c49a..cf7d671 100644 --- a/src/views/gameRole/itemRecord/index.vue +++ b/src/views/gameRole/itemRecord/index.vue @@ -11,6 +11,19 @@ + + + + + + + + @@ -20,54 +33,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -83,20 +94,19 @@ import AllItemConfigCategory from '/@/api/config/AllItemConfigCategory.json'; interface TableDataState { tableData: { param: { - pageSize: number; - pageNum: number; + pageSize: number; + pageNum: number; serverId: number; uid: string; itemId: string; }; data: object[]; - total: number; + total: number; }; servers: object[]; - rankNames: object[]; serverSwitch: number; serverCategorize: object[]; - allItemConfig: object[]; + allItemConfig: object[]; } export default defineComponent({ @@ -112,11 +122,12 @@ export default defineComponent({ pageNum: 1, }, data: [], + total: 0, }, serverSwitch: 0, servers: [], serverCategorize: ServerCategorize, - allItemConfig: AllItemConfigCategory, + allItemConfig: AllItemConfigCategory, }); const onList = () => { @@ -125,16 +136,16 @@ export default defineComponent({ text: 'Loading', background: 'rgba(0, 0, 0, 0.7)', }); - state.tableData.data = []; + state.tableData.data = []; gameItemRecordTwo(state.tableData.param) .then((res) => { - if (!res.data.logs || res.data.logs.length == 0) { - // ElMessage.error('未查询到物品交易记录！'); - return; - } - console.log('itemRecord: ', res); - state.tableData.total = res.data.total; - state.tableData.data = res.data.logs; + if (!res.data.logs || res.data.logs.length == 0) { + // ElMessage.error('未查询到物品交易记录！'); + return; + } + console.log('itemRecord: ', res); + state.tableData.total = res.data.total || 0; + state.tableData.data = res.data.logs || []; }) .finally(() => { loading.close(); @@ -160,6 +171,6 @@ export default defineComponent({ diff --git a/src/views/gameRole/role/index.vue b/src/views/gameRole/role/index.vue index a32701c..63a48db 100644 --- a/src/views/gameRole/role/index.vue +++ b/src/views/gameRole/role/index.vue @@ -354,6 +354,11 @@ {{ scope.row.num }} + + +