Commit Graph

9456 Commits (d1c46a2b4ef1205f769f7691ce0d498736dc775c)

Author SHA1 Message Date
wangzhenxing 895b577935 Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
Conflicts:
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/ConfigData.lua
2023-02-16 18:37:01 +08:00
wangzhenxing a713a185cf 法相常量提交 2023-02-16 18:34:04 +08:00
yuanshuai d13e485b05 神将置换功能提交 2023-02-16 18:11:55 +08:00
wangzhenxing 27b390e8c2 Revert "法相协议提交"
This reverts commit cd865d4df5.
2023-02-16 17:53:13 +08:00
wangzhenxing d902496f69 Merge branch 'china/dev_bt' into china/dev_bt_develop 2023-02-16 17:48:43 +08:00
wangzhenxing cd865d4df5 法相协议提交 2023-02-16 17:03:02 +08:00
wangzhenxing de59133024 【战斗】===========添加 buff金刚印记 2023-02-15 18:48:53 +08:00
yuanshuai 31fe9d43f0 灵脉修改 2023-02-15 15:33:16 +08:00
wangzhenxing eb010bb2a9 【战斗】=====================被动448修改, 死亡不释放技能修改 2023-02-15 14:18:54 +08:00
wangzhenxing d724309a7d 魂印图鉴去掉天书密卷限制 2023-02-14 18:13:22 +08:00
wangzhenxing fe7af8dc80 Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop 2023-02-14 18:06:43 +08:00
wangzhenxing d6baa6f578 魂印图鉴去掉天书密卷限制 2023-02-14 18:05:59 +08:00
yuanshuai 48b5d195ce 灵脉修改提交 2023-02-14 18:03:36 +08:00
yuanshuai 4ec80f9aad Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop 2023-02-14 16:22:13 +08:00
yuanshuai 33effd862a 灵脉修改 2023-02-14 16:21:41 +08:00
wangzhenxing 0a2f07e93d 合并dev_bt分支 2023-02-14 16:19:23 +08:00
wangzhenxing 41259cc2f4 [战斗]=======添加被动454 2023-02-14 16:05:08 +08:00
wangzhenxing 549e36ed7c [战斗]===========法相被动修改提交 2023-02-14 15:10:01 +08:00
wangzhenxing 5127ef5d90 [战斗]===================法相被动提交 2023-02-14 15:08:51 +08:00
wangzhenxing 84a9fd51f6 心魔挑战开启快速挑战 2023-02-13 18:33:35 +08:00
wangzhenxing 63a652ae54 [战斗]===========法相被动修改提交 2023-02-13 18:32:31 +08:00
wangzhenxing 754c01c918 心魔挑战开启快速挑战 2023-02-13 17:49:11 +08:00
wangzhenxing 5a82a6471c [战斗]===================法相被动提交 2023-02-13 17:08:29 +08:00
wangzhenxing c894b57bb7 登陆第一个请求添加日志 2023-02-13 14:54:48 +08:00
wangzhenxing 04ea826ab8 白金魂宝神应修改提交 2023-02-13 14:05:12 +08:00
wangzhenxing 76c744eba3 仙晶礼包修改 2023-02-11 13:42:23 +08:00
wangzhenxing 6a44a24e2b 野球拳法跳转修改 2023-02-10 17:03:29 +08:00
wangzhenxing 0a2e186913 十连抽卡不显示4星 2023-02-10 16:33:32 +08:00
wangzhenxing 8177a8d6cb 降妖夺宝十连抽修改 2023-02-10 14:48:20 +08:00
wangzhenxing 9f005990d4 日常签到红点修改提交 2023-02-10 11:25:37 +08:00
wangzhenxing d69827a119 寻宝迷踪红点修改提交 2023-02-02 18:28:51 +08:00
wangzhenxing abc5909014 云游商人修改提交 2023-02-02 17:50:47 +08:00
wangzhenxing 91710e2985 [战斗]========================效果添加152,添加筛选逻辑权重 2023-02-01 16:13:50 +08:00
wangzhenxing 7ed1c88ee4 周卡修改提交 2023-01-29 17:20:29 +08:00
wangzhenxing f006e1aff4 寻宝迷踪红点提交 2023-01-29 15:17:03 +08:00
wangzhenxing 48e172ae28 云梦好礼红点修改,伤害结算界面星级修改 2023-01-27 10:49:10 +08:00
wangzhenxing ba747f657a 神印升品空白修改 2023-01-24 20:29:23 +08:00
wangzhenxing 4a4682981a 装备摘星阁处理 2023-01-24 19:57:57 +08:00
wangzhenxing 655ba53d17 超值基金红点 2023-01-24 10:26:09 +08:00
wangzhenxing bf382d665c 特惠商城显示修改 2023-01-24 09:46:00 +08:00
wangzhenxing 325da0493a 妖晶显示修改 2023-01-17 11:37:40 +08:00
wangzhenxing 396f584fd4 自选箱显示修改 2023-01-17 11:32:08 +08:00
wangzhenxing 5e431ee842 连充奖励大小修改 2023-01-17 10:45:21 +08:00
wangzhenxing c57bb588c7 连续礼包显示修改 2023-01-17 10:31:25 +08:00
wangzhenxing 12f0ccfe39 合成界面页签显示修改 2023-01-16 17:20:32 +08:00
wangzhenxing d9baf95138 主城添加每日好礼 2023-01-16 16:33:28 +08:00
wangzhenxing 260db13451 超值基金,热榜红点提交 2023-01-16 14:37:14 +08:00
wangzhenxing db0da7a0d6 罗浮争锋挑战限制修改 2023-01-16 11:28:30 +08:00
wangzhenxing a3a8277390 战斗表现修改提交 2023-01-13 14:41:41 +08:00
wangzhenxing 693774b012 玉虚论道修改 2023-01-13 14:00:37 +08:00
wangzhenxing 59b4801c07 玉虚论道星级修改 2023-01-13 13:44:12 +08:00
wangzhenxing 15607b8b70 法宝合成修改提交 2023-01-13 10:46:41 +08:00
wangzhenxing fd4f7908c3 车迟斗法修改 2023-01-12 18:27:23 +08:00
wangzhenxing 3782873283 公会车迟斗法修改 2023-01-12 18:20:27 +08:00
wangzhenxing b3b95119c0 备战界面星级显示修改 2023-01-12 16:47:04 +08:00
wangzhenxing fde119c5cb 【战斗】=============御甲修改 2023-01-12 11:02:04 +08:00
wangzhenxing d557b603b3 【战斗】=================效果 151提交 2023-01-11 11:44:40 +08:00
wangzhenxing 6a2b5b8b09 推荐阵容调整位置 加红点 2023-01-10 16:39:58 +08:00
wangzhenxing d38eac6169 轩辕宝镜屏蔽 排行榜 奖励 按钮 2023-01-10 15:38:13 +08:00
wangzhenxing 4953aad743 图鉴星级显示修改 2023-01-05 17:12:24 +08:00
wangzhenxing 4ca7445e8b 跳过战斗修改 2023-01-04 18:16:08 +08:00
shihongyi 20e94b546f 名望说明 2022-12-23 03:32:58 +08:00
shihongyi 2f338e29a4 Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-23 03:30:53 +08:00
wangzhenxing ecaec3154e 每日充值活动修改 2022-12-30 15:40:43 +08:00
wangzhenxing 286e8c0839 我是gm 红点提交 2022-12-30 15:08:22 +08:00
wangzhenxing 3acd9919ab 豪华补给红点提交 2022-12-29 17:45:27 +08:00
wangzhenxing 44919e781c 牛气冲天奖励显示修改 2022-12-29 17:15:16 +08:00
yuanshuai 681f2e9d5b 免费充值修改 2022-12-29 10:01:38 +08:00
yuanshuai d91ea13f26 名望特权bug修改 2022-12-28 15:17:10 +08:00
yuanshuai 045398bccd 超值基金返利图标改为仙晶 2022-12-28 14:24:44 +08:00
yuanshuai f7aafe47ec 神印红点bug修改 2022-12-28 14:15:25 +08:00
yuanshuai dcbfd1f4c7 一键升级bug修复 2022-12-28 13:59:16 +08:00
yuanshuai ec6592a0d3 一键升级bug修改 2022-12-28 13:47:06 +08:00
yuanshuai 84056854b4 名望特权bug修改 2022-12-28 10:12:58 +08:00
yuanshuai a25e17fa7f 轩辕宝镜挑战次数bug修改 2022-12-27 18:24:45 +08:00
wangzhenxing 65ff601bfc 神应页签显示修改 2022-12-27 16:41:24 +08:00
wangzhenxing c9eb00de9e 精炼技能显示修改 2022-12-27 15:55:20 +08:00
wangzhenxing 5a9de1f434 玲珑宝镜红点提交 2022-12-27 15:44:08 +08:00
wangzhenxing c1e82cdeac 神将召唤自选箱修改 2022-12-27 14:32:01 +08:00
wangzhenxing c70f8421d3 送10万真充修改 2022-12-27 14:18:35 +08:00
wangzhenxing cc4ba83a7f 登陆界面logo显示修改 2022-12-27 14:06:10 +08:00
wangzhenxing 8f057bec74 登陆界面logo隐藏不显示 2022-12-27 13:38:33 +08:00
yuanshuai d122e5f4cb 红包概率取整 2022-12-27 11:04:30 +08:00
wangzhenxing bf32c8e1a7 月卡刷新修改 2022-12-26 16:23:48 +08:00
wangzhenxing db66b84788 Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-26 16:04:15 +08:00
wangzhenxing 45e3afaaaa 物品信息界面修改提交 2022-12-26 16:03:38 +08:00
yuanshuai 65f8e5e166 鸿蒙阵修改 2022-12-26 15:48:44 +08:00
wangzhenxing 44f87c01d6 Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-26 14:30:04 +08:00
wangzhenxing c36e9928f0 角色定位信息报错修改 2022-12-26 14:29:23 +08:00
yuanshuai ec8fa4a8ca 欧皇红包概率显示修改 2022-12-26 14:03:59 +08:00
wangzhenxing 3a77e7088e 角色信息框修改 2022-12-26 13:45:47 +08:00
yuanshuai 22ca5ed37b 锻器阁未开启飘字 2022-12-23 18:23:15 +08:00
yuanshuai 118fdc7a2d 锻器阁装备合成改为神装升星 2022-12-23 17:30:23 +08:00
wangzhenxing 9b72d4d948 Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-23 16:22:04 +08:00
wangzhenxing da5316e20b 名望特权显示修改 2022-12-23 16:19:47 +08:00
yuanshuai 030254afe4 Revert "锻器阁修改"
This reverts commit 9bdfb3aa91.
2022-12-23 16:19:25 +08:00
wangzhenxing 136bc6c12a 英雄一键升级修改 2022-12-23 14:56:30 +08:00
yuanshuai 6f0c4d9a8e 鸿蒙阵调整 2022-12-23 14:45:37 +08:00
yuanshuai 729f426538 红包概率弹窗调整 2022-12-23 14:13:15 +08:00
yuanshuai 2429aa88fc 挑战副本优化 2022-12-23 13:28:25 +08:00
wangzhenxing 7a66818c2e 备战界面星级显示修改 2022-12-22 14:21:59 +08:00
yuanshuai b836038a31 降妖夺宝修改 2022-12-21 16:11:55 +08:00
yuanshuai 99a65d573a 挑战副本界面修改 2022-12-21 10:46:20 +08:00
yuanshuai 0965bf200d --奇珍宝阁相关红点屏蔽 2022-12-20 17:49:37 +08:00
wangzhenxing 2d9bcdcee0 Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-20 15:08:05 +08:00
wangzhenxing a6bd546897 玉虚轮道备战星级修改 2022-12-20 15:07:17 +08:00
yuanshuai 45517e7e27 珍奇宝阁屏蔽 2022-12-20 15:05:59 +08:00
yuanshuai 305ad1343b 一键升级修改 2022-12-19 15:27:18 +08:00
yuanshuai 3371b86e57 妖晶和仙晶累充活动提交 2022-12-19 13:38:36 +08:00
wangzhenxing 093d259331 全民福利红点提交 2022-12-16 17:04:19 +08:00
wangzhenxing 7a45ce0103 灵兽山修改提交 2022-12-16 15:45:11 +08:00
shihongyi a995973b01 Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-16 02:06:21 +08:00
wangzhenxing 21d46821f4 【战斗】===========================187被动对治疗神将也会生效 战斗都不一致可考虑两端是否一致 2022-12-15 18:26:42 +08:00
wangzhenxing 2502a07a13 主城特惠商城入口红点修改 2022-12-15 17:56:12 +08:00
wangzhenxing 782fc8e54e 点将台红点修改 2022-12-15 17:18:16 +08:00
wangzhenxing 97ff5b7df1 洞府特权奖励显示修改 2022-12-15 15:41:30 +08:00
wangzhenxing 2206d01288 太初特权入口修改 2022-12-15 14:29:02 +08:00
wangzhenxing 18e879ef91 刷冲gm文字修改 2022-12-15 11:39:09 +08:00
wangzhenxing 7109e86706 英雄热榜提交 2022-12-13 16:06:12 +08:00
wangzhenxing bef029e5ca 战斗跳过添加开启条件 2022-12-12 15:43:33 +08:00
wangzhenxing 0c73ac6d25 妖晶抽卡修改 2022-12-12 13:28:28 +08:00
shihongyi dc36b34dcc Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-12 01:14:36 +08:00
shihongyi cd4989e510 Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-12 00:50:17 +08:00
shihongyi ee547c870e 超值基金icon换仙晶 2022-12-11 20:13:29 +08:00
shihongyi ce5ba6cfda Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-11 01:36:05 +08:00
shihongyi fe1390c635 点将台资源条 2022-12-10 20:31:12 +08:00
shihongyi 555b0d075e Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-10 20:27:57 +08:00
zhangshanxue 93786984b1 登录修改 2022-12-09 17:41:21 +08:00
wangzhenxing 45341d0471 引导界面透明度修改 2022-12-09 16:55:44 +08:00
wangzhenxing 3dd7f21c4b 灵兽抽卡修改提交 2022-12-09 13:58:43 +08:00
wangzhenxing e840b0d42a 日常副本修改提交 2022-12-08 17:00:29 +08:00
yuanshuai 106c095086 宝箱红包类型道具获取概率弹窗 2022-12-07 18:26:11 +08:00
wangzhenxing 658c0fde90 gm修改器修改 2022-12-07 16:07:15 +08:00
wangzhenxing e6273954b4 gm修改器修改 2022-12-07 15:39:35 +08:00
wangzhenxing 2d35f6f270 [bt]======添加战斗跳过 2022-12-07 11:41:20 +08:00
wangzhenxing 5892d97ab8 登陆界面添加儿童,第三方协议 2022-12-07 10:58:59 +08:00
wangzhenxing 354d9894b4 飞升天赋描述显示修改 2022-12-06 17:38:41 +08:00
wangzhenxing e1ee0827c0 【主城】========鸿蒙阵按钮new状态修改 2022-12-06 17:23:35 +08:00
wangzhenxing 669de51788 主城界面修改提交 2022-12-06 17:12:03 +08:00
wangzhenxing 4696592705 [sdk]============================充值修改,由分改成元 2022-12-06 16:45:40 +08:00
yuanshuai 10fc014141 十万真充修改 2022-12-06 15:30:06 +08:00
wangzhenxing d0c97f58bf 神尊修改 2022-12-06 11:28:22 +08:00
wangzhenxing 2bf115a8d8 挂机奖励预览修改 2022-12-06 11:07:34 +08:00
wangzhenxing 161fbe7f5a 妖晶抽卡次数添加限制 2022-12-05 18:26:25 +08:00
wangzhenxing 611af0d444 日常副本修改提交 2022-12-05 14:45:59 +08:00
yuanshuai cb636ad718 挑战副本结算修改 2022-12-02 15:55:32 +08:00
yuanshuai 8023aa69f0 挑战副本奖励显示修改 2022-12-02 11:47:07 +08:00
yuanshuai 848a5ed792 好感度天赋修改 2022-12-02 11:27:59 +08:00
wangzhenxing cd3952af1e gm修改器显示修改 2022-12-01 18:03:52 +08:00
wangzhenxing 530bb0696b [bt]======刷冲特权修改提交 2022-12-01 17:04:21 +08:00
wangzhenxing 5ae9572db0 【bt】========签到去掉再来一次 2022-12-01 16:36:42 +08:00
yuanshuai ab06f65c78 好感度天赋修改提交 2022-12-01 16:26:39 +08:00
wangzhenxing 81a5c3e014 gm修改器修改 2022-12-01 16:03:19 +08:00
wangzhenxing 214b316ac9 [bt]========主城鸿蒙镇修改提交 2022-12-01 14:24:05 +08:00
shihongyi a35fe3f22f Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-01 02:20:32 +08:00
shihongyi 13abae007f 铁匠铺资源条 2022-12-01 01:35:28 +08:00
wangzhenxing 1e19300811 [bt]======gm修改器 2022-11-30 18:36:50 +08:00
wangzhenxing aa4353177b [bt=======妖晶跳转修改提交] 2022-11-30 14:34:17 +08:00
wangzhenxing 032ef3d34d [bt]======充值修改 2022-11-29 17:42:48 +08:00
yuanshuai 1ebe336d52 阵容推荐修改 2022-11-29 17:11:21 +08:00
wangzhenxing e759eb6190 【bt】=======法宝聚灵屏蔽星级加成 2022-11-29 14:20:22 +08:00
wangzhenxing cf593a743a 【bt】=====送10万真充红点修改 2022-11-29 14:04:41 +08:00
wangzhenxing 5c49a471da [gm]====送10万充提交 2022-11-28 18:40:45 +08:00
yuanshuai 828e56c6be 挂机战斗修改提交 2022-11-25 15:43:42 +08:00
yuanshuai a18efd9a1f 挂机战斗优化 2022-11-24 19:00:24 +08:00
yuanshuai 5005e8da5f 挂机战斗修改 2022-11-24 18:28:48 +08:00
wangzhenxing df423a0729 月卡显示修改 2022-11-24 10:37:40 +08:00
wangzhenxing e4338672fa [bt]======刷冲特权修改 2022-11-23 15:34:41 +08:00
yuanshuai 3c2e86f97c 一键升级bug修改 2022-11-23 15:28:32 +08:00
wangzhenxing bfd7967d52 抽卡红点修改 2022-11-23 14:33:39 +08:00
wangzhenxing fe76eb75a7 [bt]======无限充值 2022-11-23 14:03:20 +08:00
wangzhenxing 83198aaf33 [bt]========寻仙招募添加title 2022-11-23 11:25:17 +08:00
yuanshuai 7acb7c8f44 关卡挂机游戏提交 2022-11-22 18:19:37 +08:00
wangzhenxing 9982bc0df8 [bt]=====太初特权修改 2022-11-22 18:08:25 +08:00
wangzhenxing 4b4ed9f63a [bt]=======名望特权修改 2022-11-22 15:30:03 +08:00
wangzhenxing fec63345d6 [bt]======探索修改 2022-11-22 15:05:42 +08:00
wangzhenxing e1455a6dbd [bt]======聊天修改 2022-11-22 14:23:35 +08:00
wangzhenxing d914ebd111 魂宝灵宝增加精炼技能,神印增加套装技能 2022-11-18 17:35:05 +08:00
wangzhenxing 8b7c2bae30 【战斗】========添加被动443,444,445 2022-11-17 18:27:11 +08:00
shihongyi f5f24fa343 按钮改名字 2022-11-20 01:22:57 +08:00
yuanshuai 4b10be80c9 主城神尊名望特权添加特效 2022-11-17 14:21:56 +08:00
wangzhenxing 0011740ede Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-11-17 10:51:19 +08:00
wangzhenxing 689ebec257 关卡奖励图标适配 2022-11-17 10:50:37 +08:00
yuanshuai 41d594edbc 挑战副本修改优化 2022-11-17 10:48:24 +08:00
wangzhenxing 0834419332 开服冲榜修改提交 2022-11-16 17:30:05 +08:00
shihongyi 96c1e0cde9 神尊特权按钮文字 2022-11-19 00:53:32 +08:00
wangzhenxing 190617c6e5 【洞府】=======望月居库存上限显示修改 2022-11-16 14:45:53 +08:00
yuanshuai 1545823af6 挑战副本修改提交 2022-11-16 14:01:40 +08:00
wangzhenxing 51c7375d65 【战斗】==========人物受击后立绘变红 2022-11-16 13:31:13 +08:00
yuanshuai a04fb2ac2f Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-11-15 16:35:55 +08:00
yuanshuai 617d292b47 英雄一键升级 2022-11-15 16:35:48 +08:00
wangzhenxing 3a4a24c725 英雄升级资源包添加排序 2022-11-15 16:16:43 +08:00
wangzhenxing 3a952c6753 英雄培养优化 2022-11-15 15:57:48 +08:00
wangzhenxing 2c0e9d672c 开服冲榜显示阵容信息修改提交 2022-11-15 11:44:50 +08:00
wangzhenxing f1e9105b96 寻仙招募移到点将台修改 2022-11-14 17:43:00 +08:00
wangzhenxing e7f973409e 主城屏蔽天书密卷入口 2022-11-14 16:16:50 +08:00
wangzhenxing 4e0f854117 开服冲榜修改提交 2022-11-14 13:05:34 +08:00
yuanshuai 5fc4f301c4 挑战副本修改 2022-11-14 11:19:18 +08:00
wangzhenxing 8c2401173f 装备评分显示修改 2022-11-11 16:38:39 +08:00
wangzhenxing 8badc5fcda 山河设计图第一次打开修改 2022-11-11 15:33:43 +08:00