Commit Graph

12504 Commits (a5ae1cdc625990493e629be092691f77ad1081fb)

Author SHA1 Message Date
wangzhenxing e7a19ce338 灵兽升星修改
(cherry picked from commit 51003c0c8c)
2023-09-15 15:39:11 +08:00
wangzhenxing c037d9a2a2 玩家信息预设修改
(cherry picked from commit a6c2a99bbb)
2023-09-15 15:38:55 +08:00
wangzhenxing b368ef5fe0 礼物修改提交 2023-09-15 14:42:17 +08:00
wangzhenxing acdb5a21cd 礼物修改提交 2023-09-15 14:11:14 +08:00
wangzhenxing 049cebd574 灵兽星际显示修改提交 2023-09-15 13:56:38 +08:00
wangzhenxing 883f9af02e 时空神将推荐阵容显示修改提交 2023-09-14 16:21:33 +08:00
wangzhenxing 56736a3aca [战斗]=======================效果162 提交 2023-09-14 16:20:43 +08:00
PC-202302260912\Administrator dca95dff13 修改页面布局 2023-09-13 16:38:07 +08:00
wangzhenxing e80056fcd4 查看礼物信息提交 2023-09-13 15:44:06 +08:00
wangzhenxing eeb3859f72 礼物功能提交 2023-09-13 14:57:48 +08:00
wangzhenxing b2e7822bf1 【战斗】===============效果10修改提交 2023-09-08 14:09:13 +08:00
wangzhenxing 4b34e64de7 工会开启 工会技能 2023-09-06 15:11:01 +08:00
wangzhenxing 6085b2193a 多对塔挑战修改 2023-09-06 14:43:33 +08:00
wangzhenxing fdae5c1348 嘲讽图标修改 2023-09-06 10:31:10 +08:00
wangzhenxing 5314b7ccf6 添加嘲讽图标 2023-09-05 20:59:52 +08:00
wangzhenxing db98c5dd91 Merge branch 'dev_oneDis' of http://192.168.1.21:3000/root/miduo_client into dev_oneDis
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2023-09-05 15:04:26 +08:00
PC-202302260912\Administrator 99bf06bd3b 魂印狂欢图标 2023-09-07 14:51:19 +08:00
wangzhenxing 2a5188a8fc 协议提交 2023-09-05 14:55:38 +08:00
wangzhenxing db3b8d9562 【战斗】====================被动添加479 2023-09-04 18:45:16 +08:00
wangzhenxing c889e67a43 英雄属性详情界面去除工会技能跳转 2023-09-04 16:57:01 +08:00
wangzhenxing 241fda7f84 命石修改提交 2023-09-02 12:28:14 +08:00
wangzhenxing c39a4e1fcc 命石修改提交 2023-09-01 23:41:45 +08:00
wangzhenxing f792ab4c7d 命石修改 2023-09-01 19:35:49 +08:00
wangzhenxing 1318c74f59 红点修改提交 2023-09-01 19:26:54 +08:00
PC-202302260912\Administrator 83eea07584 牛气冲天图片修正 2023-09-04 19:03:24 +08:00
wangzhenxing c9418f9821 命石奖励预设修改 2023-09-01 19:01:33 +08:00
wangzhenxing 3ac8d1ee2c 魂印图鉴修改提交 2023-09-01 18:48:59 +08:00
wangzhenxing ffaab0f625 命石飘战力提交 2023-09-01 18:29:25 +08:00
wangzhenxing 55f0c6d3e6 魂印图鉴修改 ,命石修改 2023-09-01 18:04:52 +08:00
wangzhenxing 2b93776f7c 命格修改提交 2023-09-01 17:36:15 +08:00
wangzhenxing 0e083205a3 命格修改提交 2023-09-01 12:34:34 +08:00
wangzhenxing 18e10b4fb6 命格修改提交 2023-08-31 19:12:02 +08:00
wangzhenxing 5e1cc83b2a 命石修改提交 2023-08-31 15:20:27 +08:00
wangzhenxing 52393c592c 命石提交 2023-08-31 15:02:13 +08:00
wangzhenxing e0cd811e75 百抽活动去掉时间显示 2023-08-31 10:31:27 +08:00
wangzhenxing f9774fd187 百抽活动修改提交,最多只显示七天奖励 2023-08-29 18:58:09 +08:00
wangzhenxing f838e2d0f2 轩辕宝镜修改 2023-08-29 15:21:53 +08:00
wangzhenxing 4ade868f90 抽卡去掉妖精限制提示 2023-08-28 14:04:41 +08:00
wangzhenxing 595487091b 【战斗】=======battlelogic修改 2023-08-25 18:58:32 +08:00
wangzhenxing 47edf3b630 【战斗】==================被动477 478修改 2023-08-25 18:32:56 +08:00
wangzhenxing 0d6566c725 【战斗】============被动472修改 2023-08-25 17:14:55 +08:00
wangzhenxing d9778dbae4 【战斗】=================被动修改提交 2023-08-25 16:03:57 +08:00
wangzhenxing 91c292a809 [战斗]================被动475修改 2023-08-25 11:49:56 +08:00
wangzhenxing 4cbe612e03 新英雄 buff图标提示提交 2023-08-24 18:21:09 +08:00
wangzhenxing d28ca0a5fb 【战斗】===============新英雄被动修改 2023-08-24 18:20:04 +08:00
wangzhenxing 461029ab50 [战斗]=================战斗battleutil 修改 2023-08-24 14:48:59 +08:00
wangzhenxing 4205ce3afc [战斗]==============被动474修改 2023-08-24 10:27:30 +08:00
wangzhenxing 178ba22181 [战斗]======================时空女儿国王 新英雄提交 2023-08-23 16:33:16 +08:00
wangzhenxing 3037378c42 神将热榜, 图鉴预设修改提交 2023-08-23 16:04:46 +08:00
wangzhenxing 07ffec7f1f 【合服】=============登录协议添加serverid 2023-08-22 13:59:39 +08:00
wangzhenxing 4e388c1923 礼包提示修改 2023-08-17 13:44:14 +08:00
wangzhenxing a2ed294523 英雄信息界面变身卡星级显示修改 2023-08-16 11:36:58 +08:00
wangzhenxing 9cb8cd4b06 玩家战斗力计算提交注释 2023-08-14 16:15:07 +08:00
wangzhenxing 3e08e50ea5 周卡预设修改提交 2023-08-11 19:25:16 +08:00
wangzhenxing 67e00f2348 神兵上阵列表显示修改提交 2023-08-10 13:50:58 +08:00
wangzhenxing bd11611e2d 易经宝库层级显示修改提交 最终大奖名字显示修改 2023-08-10 13:47:37 +08:00
wangzhenxing 14db632938 屏蔽宝物 树添加的属性==================战斗力不一致问题 2023-08-09 17:57:35 +08:00
wangzhenxing 8800ec962b 封神之路双队塔开启条件修改 2023-08-09 13:54:59 +08:00
wangzhenxing 34834da938 心愿法宝开启文字提示修改 2023-08-08 17:21:11 +08:00
wangzhenxing 201d64e5b3 置换玉去除加号 2023-08-08 15:45:59 +08:00
wangzhenxing 971ef8c453 变身卡战斗力计算修改 2023-08-08 15:45:14 +08:00
wangzhenxing 23e7d219e7 刷冲特权满足条件修改 2023-08-07 21:20:37 +08:00
wangzhenxing 56cdd1b8d3 gm刷冲描述修改 ,特权特权激活修改 2023-08-07 20:10:34 +08:00
wangzhenxing f591f0c76e 快速挑战入口开启条件修改 2023-08-07 18:59:29 +08:00
wangzhenxing 59c75221b0 七界秘宝开启奖励显示修改 2023-08-07 15:47:14 +08:00
wangzhenxing a4e6d63433 修行对应颜色名字修改 2023-08-07 14:28:11 +08:00
wangzhenxing 5b88556d9a 心愿抽卡提示修改 2023-08-04 16:41:33 +08:00
wangzhenxing 9b7edc9908 聊天限制修改 2023-08-04 16:28:28 +08:00
wangzhenxing 6d82c9d02d 工会屏蔽修改工会宣言入口 2023-08-04 16:24:24 +08:00
wangzhenxing 49d7c26a39 心魔试炼快速挑战开启条件修改 2023-08-04 15:15:08 +08:00
wangzhenxing 7f0038e9c4 宝物===========红点修改提交 2023-08-03 16:16:33 +08:00
wangzhenxing 163c0eff09 神印套装技能显示修改 2023-08-03 15:23:20 +08:00
wangzhenxing 0a3f661417 主角变身卡升星升到最高星级,提升另外一个显示异常修改 2023-08-03 11:45:46 +08:00
PC-202302260912\Administrator d0c184cc42 狂欢图标修改 2023-08-02 17:09:16 +08:00
wangzhenxing 92d9d4a413 山河设计图提示修改 2023-08-02 15:44:43 +08:00
wangzhenxing c32b71d3fc 变身卡无法升星修改,法宝超过10级显示修改 2023-08-02 14:46:18 +08:00
wangzhenxing 073d87eda7 妖精累充banner图替换修改 2023-08-01 16:31:26 +08:00
wangzhenxing 1fe1525b62 明望特权上面显示经验升级所需经验修改 2023-07-31 18:53:23 +08:00
wangzhenxing 9b7627ffe0 商店界面预设修改提交 2023-07-31 18:12:46 +08:00
wangzhenxing cda1bc9893 灵脉秘境置灰能进入问题修改 2023-07-31 17:56:30 +08:00
wangzhenxing c9bb9fabcc 聊天开启条件修改,提示修改 2023-07-31 17:43:39 +08:00
wangzhenxing a025c1b250 特殊渠道特殊礼包显示处理 2023-07-31 16:03:24 +08:00
wangzhenxing 143e47c6ee 特殊渠道特殊展示修改提交 2023-07-31 15:22:25 +08:00
wangzhenxing b3d94c4dc9 聊天发言限制修改 2023-07-31 14:50:23 +08:00
wangzhenxing 5edb051da9 心愿抽卡改回之前提示 2023-07-31 14:32:22 +08:00
wangzhenxing fbf0411174 刷冲特权价格修改 2023-07-31 14:07:26 +08:00
wangzhenxing 11fd9a1061 小7礼包特殊处理 2023-07-28 15:22:23 +08:00
wangzhenxing 6dbb9aca5d 儿童协议,分享特殊显示提交 2023-07-28 14:21:40 +08:00
wangzhenxing 7523d9d667 明望特权等级添加默认值 2023-07-26 15:15:52 +08:00
wangzhenxing aa86f127f4 神将法宝心愿抽卡提示修改 2023-07-26 14:26:34 +08:00
wangzhenxing dff7664cab 聊天==============添加聊天限制 2023-07-26 10:31:27 +08:00
wangzhenxing 5ac2ed1220 山河设计图添加关卡提示 2023-07-24 11:31:36 +08:00
wangzhenxing d4585f2c97 【战斗】=====================被动添加470 2023-07-21 17:46:35 +08:00
wangzhenxing 1e7aba83c2 礼包,屏蔽附赠仙晶的提示 2023-07-21 14:59:53 +08:00
wangzhenxing f298816345 寻宝激活按钮改为跳到刷冲特权界面 2023-07-20 18:48:34 +08:00
wangzhenxing a2d3393829 变身卡升级升星去除 消耗妖精显示 2023-07-20 18:39:01 +08:00
wangzhenxing 06022bf0ae 变身卡升级升星屏蔽化身之力显示
(cherry picked from commit 5855e6e1cf)
2023-07-20 18:12:41 +08:00
wangzhenxing e9e1eec1f8 屏蔽宗门红包入口显示 2023-07-20 18:05:17 +08:00
PC-202302260912\Administrator a1294d8746 天宫寻宝文字修改 2023-07-20 15:42:56 +08:00
PC-202302260912\Administrator 1540c24358 推送礼包去除 showtype 33 数据 2023-07-19 19:03:15 +08:00
PC-202302260912\Administrator 1081ed5827 推送 折扣礼包==================注释删除的推送礼包 2023-07-19 18:06:01 +08:00
PC-202302260912\Administrator b6718cefca 装备心愿抽卡显示剩余必中次数 2023-07-19 15:40:15 +08:00
PC-202302260912\Administrator a40bfe0fd8 功能开启条件修改 2023-07-19 15:05:02 +08:00
PC-202302260912\Administrator 2cb20e9bba 英雄获取途径显示修改 2023-07-19 14:35:52 +08:00
PC-202302260912\Administrator 609bc6e6b1 抽卡注释小tip提示信息 2023-07-18 16:17:15 +08:00
PC-202302260912\Administrator da7727ba02 item预设特效显示修改 2023-07-18 16:09:16 +08:00
PC-202302260912\Administrator e7084afe68 法宝==================法宝特性激活显示等级修改 2023-07-18 16:08:15 +08:00
PC-202302260912\Administrator 4e949b17b0 日常副本入口文字图片修改提交 2023-07-17 17:50:16 +08:00
PC-202302260912\Administrator 2082425679 抽卡界面预设修改,添加未开启信息提示 2023-07-17 17:38:43 +08:00
PC-202302260912\Administrator 65b4f5fc20 周卡活动名称修改 2023-07-17 14:48:27 +08:00
PC-202302260912\Administrator 15cce82e7a 法宝抽卡添加开启限制 2023-07-17 14:27:56 +08:00
PC-202302260912\Administrator 04fc28856d 关卡奖励提示图片文字修改提交 2023-07-17 11:03:51 +08:00
PC-202302260912\Administrator addd9312da 玲珑商店图片资源提交 2023-07-14 14:29:52 +08:00
PC-202302260912\Administrator 08e1057cf6 月卡基金50倍图片修改提交 2023-07-14 13:58:47 +08:00
PC-202302260912\Administrator eafdbd9f44 Revert "屏蔽挂机界面寻宝入口显示及红点检测"
This reverts commit 374e6d80cd.
2023-07-14 11:27:34 +08:00
PC-202302260912\Administrator 2987bc24a2 心魔试炼=================屏蔽神应显示 2023-07-14 11:24:26 +08:00
PC-202302260912\Administrator b5bcce6eab 抽卡道具显示修改 2023-07-13 17:52:56 +08:00
PC-202302260912\Administrator 48596fc57f Merge branch 'china/dev_fengTi' of http://192.168.1.21:3000/root/miduo_client into china/dev_fengTi 2023-07-13 17:24:55 +08:00
PC-202302260912\Administrator 49958d7b10 背包==================屏蔽魂印,变身,聚灵按钮 2023-07-13 17:01:05 +08:00
PC-202302260912\Administrator 1632820d89 代金券弹窗提示修改 2023-07-12 18:59:49 +08:00
PC-202302260912\Administrator 6a8cc22103 刷充特权原特权价格显示修改 2023-07-12 18:59:06 +08:00
PC-202302260912\Administrator 02a2374c53 主城=======洞府,跨服战入口屏蔽,灵兽山位置修改 2023-07-12 18:23:39 +08:00
PC-202302260912\Administrator 8419048c88 日常副本图片修改提交 2023-07-12 17:41:04 +08:00
PC-202302260912\Administrator c5bc3d8e04 超值连冲==================屏蔽 12元 30元挡位礼包 2023-07-12 15:41:52 +08:00
PC-202302260912\Administrator 18691fb97e 法宝技能信息显示修改 2023-07-11 13:48:33 +08:00
PC-202302260912\Administrator e3f5c7de9d 法宝心愿修改 2023-07-11 11:43:02 +08:00
PC-202302260912\Administrator de3f2d011a 心愿宝箱奖励排序修改 2023-07-10 18:56:20 +08:00
PC-202302260912\Administrator daacab6cbe 罗浮争锋显示倒计时修改 2023-07-10 18:49:38 +08:00
PC-202302260912\Administrator 22122de56a 心愿法宝抽卡入口改成开服n天后显示 2023-07-10 17:09:33 +08:00
PC-202302260912\Administrator cf6de3c6e5 身外化身属性预览界面修改 2023-07-07 17:48:19 +08:00
PC-202302260912\Administrator a72f5e0405 友情抽卡排序修改 2023-07-07 16:27:41 +08:00
PC-202302260912\Administrator 4a15931ce1 【七界试炼】======入口提示修改 2023-07-07 15:51:59 +08:00
PC-202302260912\Administrator cd209bdb76 [青龙秘宝]=================屏蔽青龙秘宝活动时间,倒计时显示 2023-07-07 14:08:39 +08:00
PC-202302260912\Administrator 32ac61db17 罗浮争锋移到竞技场,屏蔽竞技场巅峰赛 2023-07-07 13:51:34 +08:00
PC-202302260912\Administrator 8bae77bd5b [法宝]====================法宝特性描述修改 2023-07-07 10:27:42 +08:00
PC-202302260912\Administrator e56b1e3823 御兽斋=============屏蔽御兽斋入口及红点 2023-07-06 16:36:34 +08:00
PC-202302260912\Administrator 65f0eac110 法宝25级特性显示修改 2023-07-06 16:28:19 +08:00
PC-202302260912\Administrator 236cb983d9 itemview预设修改 2023-07-06 16:26:25 +08:00
PC-202302260912\Administrator cecf89dc70 装备招募显示修改 2023-07-06 15:48:40 +08:00
PC-202302260912\Administrator 8050e9995d 七界屏蔽排行奖励界面入口 2023-07-06 15:04:17 +08:00
wangzhenxing 543bdb6579 =====================战斗修改及添加log 2023-07-04 17:43:52 +08:00
PC-202302260912\Administrator 122addf38f 四相心法----------------屏蔽技能按钮 2023-07-04 15:09:41 +08:00
wangZhenXing 1bc056f23a 心愿法宝修改提交 2023-07-03 16:01:29 +08:00
PC-202302260912\Administrator 5838089889 七界试炼,灵脉秘境更换入口,日常任务副本只保留前两个
(cherry picked from commit 0646849c2f)
2023-06-28 15:50:22 +08:00
PC-202302260912\Administrator 3f1ab4f07f 探索对应特权跳转修改 2023-06-28 15:28:39 +08:00
PC-202302260912\Administrator 374e6d80cd 屏蔽挂机界面寻宝入口显示及红点检测 2023-06-28 14:51:14 +08:00
PC-202302260912\Administrator 3d5ed9271e 代金券购买礼包提交 2023-06-28 14:14:34 +08:00
PC-202302260912\Administrator f97eb65108 召唤图标替换 2023-07-04 16:11:56 +08:00
PC-202302260912\Administrator 4f70ed6a2a 添加货币图片 2023-07-04 14:23:55 +08:00
PC-202302260912\Administrator 146c855499 超值基金按钮 2023-06-25 17:01:04 +08:00
PC-202302260912\Administrator 1b6b5ecdad 抽卡设置心愿修改提交 2023-06-20 17:14:48 +08:00
PC-202302260912\Administrator 71c005e068 永久特权描述显示修改 2023-06-16 14:32:50 +08:00
PC-202302260912\Administrator a6d235528f 屏蔽宗门技能 2023-06-14 18:42:21 +08:00
PC-202302260912\Administrator 6c6a7d19f7 山河社稷图提交开放章节提示 2023-06-14 18:12:47 +08:00
PC-202302260912\Administrator 795c3e52f0 心願抽卡修改提交 2023-06-13 18:46:34 +08:00
wangzhenxing 8f3e691ba6 充值界面屏蔽下面仙晶提示 2023-06-12 15:04:25 +08:00
wangzhenxing b22a8d6975 新手开启新手引导 2023-06-12 14:31:23 +08:00
wangzhenxing 53625b9dc0 资源条去除仙晶显示 2023-06-08 14:19:46 +08:00
wangzhenxing 485ad2f433 刷冲特权修改 2023-06-07 16:36:08 +08:00
wangzhenxing cea83cf20a 战斗兼容老板剧情英雄释放技能 2023-06-07 16:26:57 +08:00
wangzhenxing 707417eb37 疯体屏蔽创角界面 2023-06-07 13:28:35 +08:00
wangzhenxing d1c46a2b4e 心愿奖励预览提交 2023-06-07 11:36:53 +08:00
wangzhenxing 3301f19f00 心愿法宝修改提交 2023-06-06 19:48:57 +08:00
wangzhenxing 3a09658c74 女儿国王预设修改 2023-06-06 19:40:31 +08:00
wangzhenxing 20f7c9da96 名望礼包修改提交 2023-06-06 19:38:21 +08:00
wangzhenxing e0f0d8686b 女儿国王spine修改 2023-06-06 17:23:20 +08:00
wangzhenxing 2694f5ad57 礼包报错修改提交 2023-06-06 17:16:28 +08:00
wangzhenxing 14e16c3d34 心愿法宝弹窗修改 2023-06-06 16:50:56 +08:00
lihaiyang 0fe2f64c97 修改美术图标 2023-06-06 16:14:20 +08:00
wangzhenxing ebfddaad60 法宝心愿修改提交 2023-06-06 15:57:53 +08:00
lihaiyang 5738e0f178 修正月卡页面 2023-06-02 16:56:16 +08:00
wangzhenxing 545568fa46 月卡界面修改提交 2023-06-02 16:13:04 +08:00
wangzhenxing 5f920395c6 Merge branch 'china/dev_fengTi' of http://10.2.1.230/gaoxin/JL_Client into china/dev_fengTi 2023-06-02 16:11:10 +08:00
wangzhenxing a9b13b206c 山河设计图添加开服时间限制 2023-06-02 16:09:28 +08:00
lihaiyang 3e2ef02fca GM特权修改为永久特权 2023-06-02 15:48:05 +08:00
lihaiyang 1b6edf1cee 新神兵 2023-06-02 15:43:36 +08:00
lihaiyang f0ce97f220 修正月卡和特种特权的图 2023-06-02 13:54:03 +08:00
lihaiyang f595ebee5b 修改称号等美术图标 2023-06-02 13:18:06 +08:00
lihaiyang bc18297d46 十万真充改为1万红包 2023-06-02 10:05:33 +08:00
lihaiyang 6d33b61b56 修正 2023-06-01 11:49:05 +08:00
lihaiyang effa8b9dce 新增图标 2023-06-01 11:45:09 +08:00
lihaiyang fd47661916 修正字体大小 2023-06-01 10:59:49 +08:00
wangzhenxing df07616ab3 变身卡修改提交 2023-05-31 17:21:13 +08:00
wangzhenxing 250fa4d5ee 法相升星属性修改 2023-05-31 14:20:29 +08:00
wangzhenxing 09ea7051f0 屏蔽大闹天宫,森罗幻境 2023-05-30 10:26:42 +08:00
wangzhenxing f4aeeacc4d 主城屏蔽gm修改器 2023-05-29 17:17:24 +08:00
wangzhenxing ac172339ae 心愿抽卡修改提交 2023-05-27 19:04:30 +08:00
wangzhenxing a0fa68be2a 登陆界面去掉儿童协议,主角信息去掉特权等级按钮 2023-05-26 18:43:52 +08:00
wangzhenxing be76933912 Merge branch 'china/dev_bt' into china/dev_bt_develop 2023-05-17 17:00:37 +08:00
yuanshuai f472f8ba83 嘲讽技能修改提交 2023-05-17 16:36:35 +08:00
yuanshuai f390986b97 嘲讽技能修改 2023-05-17 16:12:30 +08:00
lihaiyang 138259e82e 嘲讽相关 2023-05-16 17:21:58 +08:00
yuanshuai 7fc9813a7f 时空猪八戒技能修改 2023-05-16 15:19:44 +08:00
lihaiyang 63fc1c6ee2 【天蓬】图标 2023-05-16 11:49:23 +08:00
yuanshuai 86ece9cc1f 技能修改 2023-05-16 09:57:52 +08:00
yuanshuai d73e8d0bfc 受到伤害时,如果攻击者处于嘲讽状态回复自身[a]点怒气 2023-05-15 18:21:04 +08:00
yuanshuai 8005fbe6d7 时空猪八戒被动提交 2023-05-15 17:38:51 +08:00
yuanshuai de787a85f7 天蓬相关技能提交 2023-05-12 16:55:47 +08:00
yuanshuai 4ece26aaf4 七界试炼输了也消耗挑战次数bug修复 2023-05-10 14:31:18 +08:00
yuanshuai d4a971e087 Merge branch 'china/dev_bt_develop' into china/dev_bt
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/HomeLandEquipPopup.lua
2023-05-08 17:42:35 +08:00
yuanshuai b02ebc8b22 摘星阁bug修改 2023-05-08 17:27:12 +08:00
yuanshuai 9f4109c16f 七界试炼bug修复 2023-05-08 15:00:52 +08:00
yuanshuai db1e9a9305 时空职业bug修改 2023-05-08 11:21:53 +08:00
yuanshuai 7a388d96ea Merge branch 'china/dev_bt_develop' into china/dev_bt 2023-04-27 11:35:59 +08:00
yuanshuai 4af5d91b68 宝物合成bug修改 2023-04-25 18:13:49 +08:00
wangzhenxing 075fd4ab01 鸿蒙阵下阵卸下装备修改 2023-04-24 17:34:12 +08:00
wangzhenxing 35ee3bdf48 摘星阁修改 2023-04-23 15:23:41 +08:00
wangzhenxing 7b87ea154d 化虚潭升星修改 2023-04-23 13:53:18 +08:00
wangzhenxing 934d262918 玉虚谭升星修改 2023-04-23 13:45:34 +08:00
wangzhenxing 254c85f3de 化虚潭预设修改 2023-04-21 16:26:06 +08:00
wangzhenxing 12675fb170 神将置换添加新职业 2023-04-21 14:18:03 +08:00
wangzhenxing 1f94c3d234 变身卡添加职业 2023-04-21 13:24:26 +08:00
lihaiyang a925e4f461 优化法宝图片 2023-04-21 11:00:03 +08:00
wangzhenxing 7758ec6d8d 法宝自选箱,宝物添加时空选项 2023-04-21 10:50:09 +08:00
wangzhenxing 42aeb38e6f 多队塔编对修改提交 2023-04-20 13:13:22 +08:00
wangzhenxing 7c2598c7e7 英雄属性添加时空英雄属性 2023-04-19 17:49:29 +08:00
lihaiyang 7da600c422 新将图标 2023-04-19 17:37:23 +08:00
wangzhenxing 2b06b98c0b 【战斗】=========技能147修改 2023-04-19 15:20:19 +08:00
wangzhenxing a1c038b5c0 新英雄宝物修改提交 2023-04-19 13:49:21 +08:00
wangzhenxing 3bdc14d9a3 法相等级星级显示修改 2023-04-19 10:57:48 +08:00
wangzhenxing db154ba52b 【战斗】=============被动464修改 2023-04-18 16:42:35 +08:00
wangzhenxing 001e399620 [战斗]=========被动464 修改 2023-04-18 15:42:27 +08:00
wangzhenxing 5999c18900 新英雄上阵修改提交 2023-04-18 15:34:22 +08:00
wangzhenxing 2f17b7af58 [战斗]=======新英雄技能被动修改提交 2023-04-18 14:28:17 +08:00
lihaiyang ca935de5b9 悟空 技能字 2023-04-21 13:25:09 +08:00
lihaiyang 9d60989032 更换法宝图标大小 2023-04-17 18:21:15 +08:00
lihaiyang 5f67dbc3fd 【战意】相关图标 2023-04-17 17:44:41 +08:00
lihaiyang 53f92c1562 【新将图标】 2023-04-17 17:26:50 +08:00
wangzhenxing 14c546f315 【战斗】==============新将战斗修改提交 2023-04-14 16:53:08 +08:00
wangzhenxing 379fb97b98 英雄图鉴预设修改提交 2023-04-14 13:58:47 +08:00
wangzhenxing 5cd902e5a6 英雄时空标签修改提交 2023-04-14 13:54:57 +08:00
wangzhenxing d074625942 英雄列表预设修改提交 2023-04-14 13:52:47 +08:00
wangzhenxing bd567ad367 神兵icon显示修改 2023-04-13 14:29:49 +08:00
wangzhenxing 9b40cb5314 [战斗]======被动327修改 2023-04-12 17:44:00 +08:00
lihaiyang 531bada120 礼包图片 2023-04-12 16:45:39 +08:00
wangzhenxing 06b9371e79 多队塔秘宝修改提交 2023-04-12 15:33:19 +08:00
wangzhenxing ec97eb8183 英雄碎片宝箱修改提交 2023-04-12 15:12:36 +08:00
wangzhenxing 6d3fe931d3 [神兵]==============修改提交 2023-04-12 11:31:04 +08:00
wangzhenxing 3f8a00cb14 [神兵]==================修改提交 2023-04-11 14:41:36 +08:00
wangzhenxing c294eb3406 神兵信息显示修改 2023-04-07 18:40:50 +08:00
wangzhenxing 301805237c 多队塔三队屏蔽提示 2023-04-07 17:20:38 +08:00
wangzhenxing 0e2fc0aad2 战斗测试界面修改提交 2023-04-07 16:56:54 +08:00
wangzhenxing f3639bf28e 【神兵】========被动,红点修改提交 2023-04-07 16:54:53 +08:00
wangzhenxing be9f720590 [战斗]======神兵服务器发过来的数据处理 2023-04-07 16:11:39 +08:00
yuanshuai ac104c73ca 预设修改 2023-04-07 14:32:34 +08:00
lihaiyang e615c5d7ce 添加神兵buff 2023-04-07 14:16:52 +08:00
yuanshuai f123e5fe04 回炉修改 2023-04-07 14:11:44 +08:00
yuanshuai 2653838516 脚本修改 2023-04-07 13:48:56 +08:00
wangzhenxing 0681ff2a30 [战斗]=========战斗去除无用log 2023-04-07 11:33:50 +08:00
yuanshuai 0b3e5511b2 神兵帮助 2023-04-07 11:13:15 +08:00
yuanshuai fc26bf5c5d 神兵bug修改 2023-04-07 10:46:39 +08:00
yuanshuai fc218b4002 神兵回炉代码提交 2023-04-07 10:29:10 +08:00
lihaiyang d8a97002d5 神兵强化石 和货币上传 2023-04-07 10:21:41 +08:00
yuanshuai a7ccff7ff1 神兵功能优化 2023-04-06 18:13:54 +08:00
wangzhenxing 01430e7126 Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop 2023-04-06 17:22:06 +08:00
wangzhenxing b3071916c1 【战斗】===========神兵战斗提交 2023-04-06 17:21:35 +08:00
yuanshuai c8184bbca4 神兵功能优化 2023-04-06 15:28:55 +08:00
wangzhenxing ab3484709d [战斗]=========添加神兵目标选择 2023-04-06 14:22:20 +08:00
wangzhenxing cbd60b5e14 [战斗]==================战斗添加神兵 2023-04-06 14:02:32 +08:00
wangzhenxing 17f09032eb Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop 2023-04-06 13:47:59 +08:00
yuanshuai 8af6417b72 神兵bug修改 2023-04-06 13:40:13 +08:00
lihaiyang d6c082583a 商店图标 2023-04-04 18:42:30 +08:00
yuanshuai 31f51cca80 神兵红点提交 2023-04-04 18:21:14 +08:00
lihaiyang c3bac10fc9 添加神兵技能图片 2023-04-04 18:02:54 +08:00
wangzhenxing e4de1d7188 Merge branch 'china/dev_bt' into china/dev_bt_develop 2023-04-04 16:55:09 +08:00
wangzhenxing d3c0c9671b battlemanager 提交 2023-04-04 16:49:58 +08:00
wangzhenxing 478347bc6d 战斗============================被动441修改 2023-04-04 16:27:15 +08:00
yuanshuai 6f5528173c 添加技能图标 2023-04-04 15:38:45 +08:00
yuanshuai 22ebe21c0a 预设提交 2023-04-04 14:59:06 +08:00
yuanshuai 047274e736 Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop 2023-04-04 14:55:05 +08:00
yuanshuai be268b9662 神兵升星强化优化 2023-04-04 14:54:14 +08:00
lihaiyang f6ed14e951 神兵修为布局 2023-04-04 14:49:53 +08:00
yuanshuai 3d5e8c8c5b 战力相关提交 2023-04-04 11:59:36 +08:00
wangzhenxing 12e2cecaa1 神兵属性,神兵羁绊,神兵分解提交 2023-04-04 11:15:32 +08:00
yuanshuai feaeb268f5 神兵详情界面修改 2023-04-03 11:18:04 +08:00
yuanshuai 6c5acdab26 神兵更换代码提交 2023-03-31 18:20:38 +08:00
yuanshuai a176bca619 神兵相关修改提交 2023-03-31 17:52:12 +08:00
yuanshuai bda6306f3d 神兵升级升星相关功能提交 2023-03-30 16:27:13 +08:00
yuanshuai 782c351cec Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua
2023-03-30 13:27:35 +08:00
yuanshuai 6c215136f2 神兵相关功能提交 2023-03-30 13:16:11 +08:00
wangzhenxing a753de6a59 神兵技能信息预设修改提交 2023-03-30 13:11:09 +08:00
wangzhenxing 207c1f3426 神兵信息弹窗修改提交 2023-03-29 17:21:33 +08:00
wangzhenxing 8eb24fd591 公共协议修改提交 2023-03-29 15:30:25 +08:00
wangzhenxing a2b791c0de 战斗协议修改提交 2023-03-29 13:10:25 +08:00
wangzhenxing 10fee38b64 神兵提交 2023-03-29 10:48:35 +08:00
wangzhenxing 24ad78e8da 神兵主界面修改提交 2023-03-28 17:51:43 +08:00
wangzhenxing 826f58ce6e 神兵提交 2023-03-28 13:57:59 +08:00
wangzhenxing 8a4a28a635 聊天去掉gm礼包限制 2023-03-28 10:25:45 +08:00
lihaiyang 8a737a3337 神兵图标 2023-03-24 17:52:32 +08:00
lihaiyang 7d20a309a4 添加压制方面的图标 2023-03-24 11:15:36 +08:00
wangzhenxing c370823e04 神兵常量提交 2023-03-24 11:08:03 +08:00
wangzhenxing a2726648ff 多队塔战斗判定修改提交 2023-03-23 16:57:29 +08:00
wangzhenxing f65a4314d1 多队塔胜利条件修改 2023-03-23 10:43:53 +08:00
wangzhenxing 1fa9ba8050 多队塔详情界面挑战添加限制 2023-03-22 18:26:47 +08:00
wangzhenxing 04a84da290 多队塔红点提交 2023-03-22 14:58:19 +08:00
wangzhenxing 614ec0b6e1 多队塔排行榜显示修改提交 2023-03-22 10:45:26 +08:00
wangzhenxing e45c2bcae1 Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop 2023-03-21 16:13:38 +08:00
wangzhenxing 4848d707ff 多队塔修改提交 2023-03-21 16:12:57 +08:00
lihaiyang 0eaa10d4d3 多队塔界面修改 2023-03-21 16:02:24 +08:00
wangzhenxing 91b1bbb82c 遴选多队塔代码 2023-03-21 10:58:00 +08:00