Commit Graph

9003 Commits (fd5cd6836c2469821c6b52f37cb0b6f766fa664c)

Author SHA1 Message Date
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 12675fb170 神将置换添加新职业 2023-04-21 14:18:03 +08:00
wangzhenxing 1f94c3d234 变身卡添加职业 2023-04-21 13:24:26 +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
wangzhenxing 2b06b98c0b 【战斗】=========技能147修改 2023-04-19 15:20:19 +08:00
wangzhenxing a1c038b5c0 新英雄宝物修改提交 2023-04-19 13:49:21 +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
wangzhenxing 14c546f315 【战斗】==============新将战斗修改提交 2023-04-14 16:53:08 +08:00
wangzhenxing 379fb97b98 英雄图鉴预设修改提交 2023-04-14 13:58:47 +08:00
wangzhenxing 9b40cb5314 [战斗]======被动327修改 2023-04-12 17:44:00 +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 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
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
yuanshuai 31f51cca80 神兵红点提交 2023-04-04 18:21:14 +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 be268b9662 神兵升星强化优化 2023-04-04 14:54:14 +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 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
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 4848d707ff 多队塔修改提交 2023-03-21 16:12:57 +08:00
wangzhenxing 91b1bbb82c 遴选多队塔代码 2023-03-21 10:58:00 +08:00
wangzhenxing 82ba7d45c4 Merge branch 'china/dev_bt' into china/dev_bt_develop
Conflicts:
	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayOtherTeamPanel.prefab
	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTreasurePanel.prefab
	Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua
	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/GodsWayTreasurePanel.lua
	Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayOtherTeamPanel.lua
	Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua
2023-03-21 10:39:18 +08:00
wangzhenxing c5c237493b 登陆界面幼儿协议,分享协议修改提交 2023-03-21 10:16:56 +08:00
wangzhenxing 6f9af97445 多队塔提交 2023-03-21 10:11:06 +08:00
wangzhenxing 6d55ae95d7 Revert "多队塔提交"
This reverts commit 4a411833a5.
2023-03-20 11:42:40 +08:00
wangzhenxing 4a411833a5 多队塔提交 2023-03-20 11:22:44 +08:00
wangzhenxing 3a5076bb2e 法相佩戴条件修改 2023-03-10 16:55:37 +08:00
wangzhenxing 5aeffabd6f 助战法相信息显示修改 2023-03-10 13:29:22 +08:00
wangzhenxing b094de690f 技能描述显示修改 2023-03-03 13:22:44 +08:00
wangzhenxing f2b6ff1412 [战斗]=============被动441 455修改 2023-03-02 17:54:57 +08:00
wangzhenxing 47074a40d0 [战斗]=========新英雄技能被动提交 2023-03-01 17:24:25 +08:00
yuanshuai a9a4d13fdf 删除log 2023-02-28 15:09:15 +08:00
yuanshuai cbfd2bd8ca 图鉴技能打印 2023-02-28 14:39:24 +08:00
wangzhenxing 1d36c0b7f4 Merge branch 'china/dev_bt' into china/dev_bt_develop 2023-02-28 10:25:57 +08:00
wangzhenxing bee3a99dbc 变身卡左移按钮显示修改提交 2023-02-24 15:26:41 +08:00
wangzhenxing 08145e72d9 [战斗]=======================每回合添加最大buff添加数,伤害数,治疗御甲数限制 2023-02-24 15:19:33 +08:00
wangzhenxing 1c60b69d1a [战斗]=======================每回合添加最大buff添加数,伤害数,治疗御甲数限制 2023-02-24 11:02:14 +08:00
wangzhenxing 438e09fdcd Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop 2023-02-23 15:33:07 +08:00
yuanshuai b2438ab501 升星冲榜添加我的排名 2023-02-22 18:31:53 +08:00
wangzhenxing 6fe2c64214 获得宝箱修改提交 2023-02-22 10:45:17 +08:00
wangzhenxing b1e56c1280 获取宝物法相展示修改提交 2023-02-21 15:25:14 +08:00
yuanshuai 7bb73f1175 神将置换卡bug修改 2023-02-21 14:24:00 +08:00
wangzhenxing 2985c1f5a2 法相装备修改提交 2023-02-21 14:20:46 +08:00
yuanshuai 4963f1abaf 神将置换卡bug修改 2023-02-21 11:26:45 +08:00
wangzhenxing 34077030ca 法相红点修改提交 2023-02-20 22:24:28 +08:00
wangzhenxing 6b718c2217 去除属性log 2023-02-20 21:07:24 +08:00
wangzhenxing ff6f452f32 法相属性显示修改 2023-02-20 18:49:34 +08:00
wangzhenxing 7f20d17b42 法相背包显示修改 2023-02-20 17:58:28 +08:00
wangzhenxing 0b88a77535 法相修改提交 2023-02-20 17:38:59 +08:00
yuanshuai 6ab148bdeb 灵脉bug修改 2023-02-20 16:57:18 +08:00
wangzhenxing 91b13fb22c 法相显示修改提交 2023-02-20 16:20:17 +08:00
yuanshuai 0d44032d25 灵脉修改 2023-02-20 15:06:47 +08:00
wangzhenxing db4d23bdfa Merge branch 'china/dev_bt_develop_faxiang' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop_faxiang 2023-02-20 14:46:58 +08:00
wangzhenxing 76c81f44d4 法相增加属性计算修改 2023-02-20 14:46:37 +08:00
yuanshuai 250078eb33 一键装备法相bug修改 2023-02-20 14:25:44 +08:00
wangzhenxing 8195d63809 Merge branch 'china/dev_bt_develop_faxiang' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop_faxiang 2023-02-20 11:44:40 +08:00
wangzhenxing 2218dd8f6e 法相属性刷新 2023-02-20 11:44:20 +08:00
yuanshuai 3687ad47cc 法相显示修改 2023-02-20 11:23:50 +08:00
yuanshuai 9fecd102e9 法相背包显示修改 2023-02-20 10:59:12 +08:00
wangzhenxing 726b53355e 法相背包修改提交 2023-02-19 21:21:45 +08:00
wangzhenxing d84f374bf2 法相修改提交 2023-02-19 20:08:48 +08:00
wangzhenxing 1f83739af1 法相升级升星提交 2023-02-18 22:21:24 +08:00
wangzhenxing 8cb653fcb4 Merge branch 'china/dev_bt_develop_faxiang' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop_faxiang 2023-02-18 15:57:37 +08:00
wangzhenxing dd7394cc29 法相manager修改提交 2023-02-18 15:57:20 +08:00
yuanshuai c2f2f9255b 法相修改提交 2023-02-18 15:52:52 +08:00
wangzhenxing 7276228e94 法相manager提交 2023-02-18 15:41:04 +08:00
yuanshuai 98ddf9b5c2 法相相关脚本预设提交 2023-02-18 13:31:36 +08:00
wangzhenxing 0b6d8ab978 法相提交 2023-02-17 19:43:00 +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 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 655ba53d17 超值基金红点 2023-01-24 10:26:09 +08:00
wangzhenxing bf382d665c 特惠商城显示修改 2023-01-24 09:46:00 +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