Commit Graph

12537 Commits (edebfb4d631f09afde5b399e4859e5bba710f8c8)

Author SHA1 Message Date
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