Commit Graph

12454 Commits (1c65cd4052d8a23868e0fa975e2d3dc6a786ccdb)

Author SHA1 Message Date
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
xiejun 5058a5b63d test 2023-06-14 14:49:32 +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
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 cea97b3605 Merge branch 'china/dev_bt' into china/dev_bt_develop
Conflicts:
	Assets/ManagedResources/Atlas/CarbonNewAtlas/ArtFont/f_fuben_fubenming_08.png.meta
2023-03-20 11:39:20 +08:00
wangzhenxing d1e4786ef7 副本入口文字提交 2023-03-20 11:36:38 +08:00
wangzhenxing 4a411833a5 多队塔提交 2023-03-20 11:22:44 +08:00
wangzhenxing 3a5076bb2e 法相佩戴条件修改 2023-03-10 16:55:37 +08:00
wangzhenxing 4ad0ba6bf6 Merge branch 'china/dev_bt' into china/dev_bt_develop 2023-03-10 13:33:07 +08:00
wangzhenxing 5aeffabd6f 助战法相信息显示修改 2023-03-10 13:29:22 +08:00
wangzhenxing f8d5e6fcff 多队塔图片提交 2023-03-07 14:21:50 +08:00
lihaiyang bf13859e52 添加压制方面的图标 2023-03-03 15:18:03 +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
lihaiyang 480e7b1cbe 添加女娲图片 2023-03-01 11:28:06 +08:00
lihaiyang 330fe63d9f 女娲相关 2023-02-28 18:14:52 +08:00
lihaiyang 69d1882c7d 新增新将技能图标 2023-02-28 15:55:01 +08:00
yuanshuai a9a4d13fdf 删除log 2023-02-28 15:09:15 +08:00
yuanshuai cbfd2bd8ca 图鉴技能打印 2023-02-28 14:39:24 +08:00
wangzhenxing 0708630890 新英雄 ===================雨女资源提交 2023-02-28 10:59:28 +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
lihaiyang 171fbe8d90 雨女法宝图片 2023-02-23 18:46:00 +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 887a8b471f 法相升级预设修改提交 2023-02-21 16:39:28 +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
wangzhenxing 46ddd9696a itemview 去除法相点击事件 2023-02-21 11:48:11 +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
yuanshuai cd719257fd 装备栏预设修改 2023-02-20 11:57:29 +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
wangzhenxing 68893390bf 背包预设修改提交 2023-02-18 14:09:32 +08:00
wangzhenxing da9c6d43f4 装备界面修改 2023-02-18 14:03:52 +08:00
yuanshuai 98ddf9b5c2 法相相关脚本预设提交 2023-02-18 13:31:36 +08:00
wangzhenxing 0b6d8ab978 法相提交 2023-02-17 19:43:00 +08:00
lihaiyang 123ac3f9fe 身外化神界面 箭头拉大 2023-02-17 17:11:06 +08:00
wangzhenxing 870d163b8c 身外化身界面适配修改提交 2023-02-17 16:54:22 +08:00
lihaiyang b6be5e9106 置换卡图片 2023-02-17 14:41:21 +08:00
lihaiyang 4c0a6c1b1b 金刚印相关 2023-02-17 14:10:07 +08:00
yuanshuai c5d6479e9c 预设修改 2023-02-17 10:28:00 +08:00
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
lihaiyang f2df1887b8 Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop 2023-02-16 14:34:25 +08:00
lihaiyang e6b6985ff0 法相宝箱 2023-02-16 14:33:34 +08:00
wangzhenxing de59133024 【战斗】===========添加 buff金刚印记 2023-02-15 18:48:53 +08:00
yuanshuai 31fe9d43f0 灵脉修改 2023-02-15 15:33:16 +08:00
yuanshuai c10503dff3 灵脉预设修改 2023-02-15 15:31:46 +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
lihaiyang c2158cffde 法相强化石 2023-02-14 14:51:40 +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
lihaiyang 2981a65bbf 称号=====永结同心 2023-02-13 17:10:00 +08:00
wangzhenxing 5a82a6471c [战斗]===================法相被动提交 2023-02-13 17:08:29 +08:00
lihaiyang 0b4b59e542 称号=====永结同心 2023-02-13 16:40:15 +08:00
wangzhenxing c894b57bb7 登陆第一个请求添加日志 2023-02-13 14:54:48 +08:00
wangzhenxing 04ea826ab8 白金魂宝神应修改提交 2023-02-13 14:05:12 +08:00
lihaiyang b8f1abd4b8 添加法相图标 2023-02-13 13:55:28 +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 630e9dbe15 宝物显示修改提交 2023-01-29 16:16:04 +08:00
wangzhenxing f006e1aff4 寻宝迷踪红点提交 2023-01-29 15:17:03 +08:00
wangzhenxing 48e172ae28 云梦好礼红点修改,伤害结算界面星级修改 2023-01-27 10:49:10 +08:00
wangzhenxing f279260905 道具购买预设修改 2023-01-24 21:15:32 +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 32dc05ef86 易经宝库图片修改 2023-01-17 15:59:02 +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 c31676ff43 每日豪礼图片修改提交 2023-01-16 17:24:44 +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 47080ca0e1 英雄方框特效修改提交 2023-01-12 16:16:03 +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 1a290fb4e0 预设修改 2022-12-28 10:58:20 +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 c48eaa5fbf 挂机奖励预览界面修改 2022-12-27 10:11:37 +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 ce3c7eab80 登陆界面位置修改提交 2022-12-23 12:06:54 +08:00
shihongyi 5aa5224450 名望说明 2022-12-23 03:30: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 4864527d6d loading界面修改 2022-12-20 17:00:10 +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 d2e962697b Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-20 15:06:43 +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 0607e5179c 图片替换 2022-12-16 17:25:05 +08:00
wangzhenxing 093d259331 全民福利红点提交 2022-12-16 17:04:19 +08:00
wangzhenxing 7a45ce0103 灵兽山修改提交 2022-12-16 15:45:11 +08:00
wangzhenxing 1e5aad4541 服务器列表预设修改 2022-12-16 14:07:22 +08:00
wangzhenxing 94b29971b0 进度条加载界面修改 2022-12-16 11:09:37 +08:00
lihaiyang 005c67d8c2 【GM余额】==========修正图标 2022-12-16 07:11:58 +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 ff0526f20d 充值商城预设修改 2022-12-15 16:11:07 +08:00
wangzhenxing 97ff5b7df1 洞府特权奖励显示修改 2022-12-15 15:41:30 +08:00
wangzhenxing 2206d01288 太初特权入口修改 2022-12-15 14:29:02 +08:00
wangzhenxing 12a859cc14 自选箱预设修改 2022-12-15 13:55:52 +08:00
wangzhenxing 18e879ef91 刷冲gm文字修改 2022-12-15 11:39:09 +08:00
lihaiyang a7a7c3eb42 【10万真充】===修改图标 2022-12-20 18:16:27 +08:00
lihaiyang e5dc946d54 【寻宝】===========寻宝描述修正 2022-12-20 15:54:08 +08:00
wangzhenxing e73903cd17 gm修改器预设修改 2022-12-14 13:56:58 +08:00
wangzhenxing 37b9fa3b7b 英雄热榜预设修改 2022-12-13 18:10:28 +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
dengdan 5f9e01b3c0 修改逍遥游东海寻仙,幻魔入侵按钮样式 2022-12-12 11:11:39 +08:00
dengdan f9c5efb112 修改神尊特权按钮样式 2022-12-12 10:49:32 +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 efb24518ad 名望屏蔽说明 2022-12-12 00:51:12 +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
zhangshanxue f965a5be22 引导界面透明度修改 2022-12-09 16:33:03 +08:00
wangzhenxing 3dd7f21c4b 灵兽抽卡修改提交 2022-12-09 13:58:43 +08:00
wangzhenxing 5f15456794 飞升描述显示修改 2022-12-08 17:23:39 +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 4680624d43 日常副本预设修改 2022-12-06 13:44:29 +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 0dad2fdb77 超值基金资源修改 2022-12-02 17:45:01 +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