Commit Graph

3913 Commits (55aa1ed9670416b4250c38f663045117f65b7741)

Author SHA1 Message Date
xiejun f52a94841e 修改战斗的代码,已经调整live2D 2023-06-28 15:58:29 +08:00
PC-202302260912\Administrator 02a2374c53 主城=======洞府,跨服战入口屏蔽,灵兽山位置修改 2023-07-12 18:23:39 +08:00
PC-202302260912\Administrator cf6de3c6e5 身外化身属性预览界面修改 2023-07-07 17:48:19 +08:00
PC-202302260912\Administrator 32ac61db17 罗浮争锋移到竞技场,屏蔽竞技场巅峰赛 2023-07-07 13:51:34 +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
xiejun b47c16dcb7 test 2023-06-20 18:01:51 +08:00
PC-202302260912\Administrator 6c6a7d19f7 山河社稷图提交开放章节提示 2023-06-14 18:12:47 +08:00
wangzhenxing 8f3e691ba6 充值界面屏蔽下面仙晶提示 2023-06-12 15:04:25 +08:00
wangzhenxing d1c46a2b4e 心愿奖励预览提交 2023-06-07 11:36:53 +08:00
wangzhenxing 3a09658c74 女儿国王预设修改 2023-06-06 19:40:31 +08:00
wangzhenxing e0f0d8686b 女儿国王spine修改 2023-06-06 17:23:20 +08:00
wangzhenxing 14e16c3d34 心愿法宝弹窗修改 2023-06-06 16:50:56 +08:00
wangzhenxing ebfddaad60 法宝心愿修改提交 2023-06-06 15:57:53 +08:00
lihaiyang 5738e0f178 修正月卡页面 2023-06-02 16:56:16 +08:00
lihaiyang f0ce97f220 修正月卡和特种特权的图 2023-06-02 13:54:03 +08:00
lihaiyang fd47661916 修正字体大小 2023-06-01 10:59:49 +08:00
wangzhenxing df07616ab3 变身卡修改提交 2023-05-31 17:21:13 +08:00
wangzhenxing ac172339ae 心愿抽卡修改提交 2023-05-27 19:04:30 +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 db1e9a9305 时空职业bug修改 2023-05-08 11:21:53 +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
wangzhenxing 7758ec6d8d 法宝自选箱,宝物添加时空选项 2023-04-21 10:50:09 +08:00
wangzhenxing d074625942 英雄列表预设修改提交 2023-04-14 13:52:47 +08:00
wangzhenxing 06b9371e79 多队塔秘宝修改提交 2023-04-12 15:33:19 +08:00
wangzhenxing 6d3fe931d3 [神兵]==============修改提交 2023-04-12 11:31:04 +08:00
wangzhenxing 0e2fc0aad2 战斗测试界面修改提交 2023-04-07 16:56:54 +08:00
yuanshuai ac104c73ca 预设修改 2023-04-07 14:32:34 +08:00
yuanshuai fc218b4002 神兵回炉代码提交 2023-04-07 10:29:10 +08:00
yuanshuai a7ccff7ff1 神兵功能优化 2023-04-06 18:13:54 +08:00
yuanshuai c8184bbca4 神兵功能优化 2023-04-06 15:28:55 +08:00
wangzhenxing cbd60b5e14 [战斗]==================战斗添加神兵 2023-04-06 14:02:32 +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 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 04a84da290 多队塔红点提交 2023-03-22 14:58:19 +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 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 0708630890 新英雄 ===================雨女资源提交 2023-02-28 10:59:28 +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 887a8b471f 法相升级预设修改提交 2023-02-21 16:39:28 +08:00
wangzhenxing 0b88a77535 法相修改提交 2023-02-20 17:38:59 +08:00
yuanshuai cd719257fd 装备栏预设修改 2023-02-20 11:57:29 +08:00
wangzhenxing 1f83739af1 法相升级升星提交 2023-02-18 22:21:24 +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
yuanshuai c5d6479e9c 预设修改 2023-02-17 10:28:00 +08:00
yuanshuai d13e485b05 神将置换功能提交 2023-02-16 18:11:55 +08:00
yuanshuai c10503dff3 灵脉预设修改 2023-02-15 15:31:46 +08:00
wangzhenxing 84a9fd51f6 心魔挑战开启快速挑战 2023-02-13 18:33:35 +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 f279260905 道具购买预设修改 2023-01-24 21:15:32 +08:00
wangzhenxing c57bb588c7 连续礼包显示修改 2023-01-17 10:31:25 +08:00
wangzhenxing 3782873283 公会车迟斗法修改 2023-01-12 18:20:27 +08:00
wangzhenxing 6a2b5b8b09 推荐阵容调整位置 加红点 2023-01-10 16:39:58 +08:00
wangzhenxing 4953aad743 图鉴星级显示修改 2023-01-05 17:12:24 +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 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 1a290fb4e0 预设修改 2022-12-28 10:58:20 +08:00
wangzhenxing c48eaa5fbf 挂机奖励预览界面修改 2022-12-27 10:11:37 +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 3a77e7088e 角色信息框修改 2022-12-26 13:45:47 +08:00
wangzhenxing da5316e20b 名望特权显示修改 2022-12-23 16:19:47 +08:00
yuanshuai 6f0c4d9a8e 鸿蒙阵调整 2022-12-23 14:45:37 +08:00
wangzhenxing ce3c7eab80 登陆界面位置修改提交 2022-12-23 12:06:54 +08:00
yuanshuai 99a65d573a 挑战副本界面修改 2022-12-21 10:46:20 +08:00
wangzhenxing 4864527d6d loading界面修改 2022-12-20 17:00:10 +08:00
wangzhenxing 093d259331 全民福利红点提交 2022-12-16 17:04:19 +08:00
wangzhenxing 1e5aad4541 服务器列表预设修改 2022-12-16 14:07:22 +08:00
wangzhenxing 94b29971b0 进度条加载界面修改 2022-12-16 11:09:37 +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 ff0526f20d 充值商城预设修改 2022-12-15 16:11:07 +08:00
wangzhenxing 12a859cc14 自选箱预设修改 2022-12-15 13:55:52 +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
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
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 669de51788 主城界面修改提交 2022-12-06 17:12:03 +08:00
yuanshuai 10fc014141 十万真充修改 2022-12-06 15:30:06 +08:00
wangzhenxing 4680624d43 日常副本预设修改 2022-12-06 13:44:29 +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
dengdan 704db5b119 调整部分页面按钮和字体 2022-12-01 19:34:34 +08:00
wangzhenxing 9c478291a2 gm修改器预设修改 2022-12-01 17:52:30 +08:00
wangzhenxing 530bb0696b [bt]======刷冲特权修改提交 2022-12-01 17:04:21 +08:00
yuanshuai ab06f65c78 好感度天赋修改提交 2022-12-01 16:26:39 +08:00
dengdan 99243d3f40 修改部分系统的按钮样式 2022-12-01 16:13:06 +08:00
dengdan b968848bc4 修改部分系统按钮样式 2022-12-01 15:35:21 +08:00
wangzhenxing 214b316ac9 [bt]========主城鸿蒙镇修改提交 2022-12-01 14:24:05 +08:00
dengdan 1eba8d64f8 修改部分系统按钮样式 2022-12-01 09:50:03 +08:00
dengdan dcff772716 修改部分系统的按钮样式 2022-11-30 21:51:06 +08:00
dengdan 52d19fbdc5 修改部分按钮颜色 2022-11-30 19:12:59 +08:00
wangzhenxing 1e19300811 [bt]======gm修改器 2022-11-30 18:36:50 +08:00
lihaiyang 151b4366aa 【无限资源阁】=======修正标点 2022-11-30 11:06:27 +08:00
wangzhenxing 032ef3d34d [bt]======充值修改 2022-11-29 17:42:48 +08:00
yuanshuai 1ebe336d52 阵容推荐修改 2022-11-29 17:11:21 +08:00
wangzhenxing a0752534a9 [bt]====刷冲修改 2022-11-29 14:57:13 +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 86bfbe1496 刷冲特权预设修改 2022-11-23 15:45:31 +08:00
wangzhenxing e4338672fa [bt]======刷冲特权修改 2022-11-23 15:34:41 +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 4b4ed9f63a [bt]=======名望特权修改 2022-11-22 15:30:03 +08:00
wangzhenxing e1455a6dbd [bt]======聊天修改 2022-11-22 14:23:35 +08:00
wangzhenxing d914ebd111 魂宝灵宝增加精炼技能,神印增加套装技能 2022-11-18 17:35:05 +08:00
lihaiyang 44fcc55ce4 【刷冲特权】===========字体修改 2022-11-03 16:59:11 +08:00
yuanshuai 4b10be80c9 主城神尊名望特权添加特效 2022-11-17 14:21:56 +08:00
yuanshuai 38d96a2191 神尊界面调整 2022-11-17 11:30:16 +08:00
yuanshuai 41d594edbc 挑战副本修改优化 2022-11-17 10:48:24 +08:00
shihongyi 141c732e4d 月卡去掉左下收益图 2022-11-18 23:46:44 +08:00
lihaiyang 155f83671d 【无限资源阁】===修正字体描述 2022-11-16 11:34:18 +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
lihaiyang 98f68504bc 【挑战副本】======修正描述 2022-11-15 14:03:56 +08:00
wangzhenxing f1e9105b96 寻仙招募移到点将台修改 2022-11-14 17:43:00 +08:00
yuanshuai 5fc4f301c4 挑战副本修改 2022-11-14 11:19:18 +08:00
wangzhenxing 186b9c16db 新手引导界面透明度降低 2022-11-14 11:12:23 +08:00
wangzhenxing 9a26b3559f 森罗幻境奖励界面优化 2022-11-11 15:04:40 +08:00
wangzhenxing f0eb2a75ab 好感度修改提交 2022-11-10 15:37:34 +08:00
yuanshuai 298478e182 ... 2022-11-10 14:01:14 +08:00
wangzhenxing 3b88556b82 gm按钮修改 2022-11-10 11:09:10 +08:00
wangzhenxing 5113dfb137 元神抽卡添加10连 2022-11-10 10:22:17 +08:00
wangzhenxing b39188841a 每日累充修改 魂印描述修改 2022-11-09 17:55:54 +08:00
shihongyi 3df404296c 四元阵 10连 2022-11-12 03:51:53 +08:00
wangzhenxing eeca517eaf 屏蔽普通特权入口 2022-11-09 10:24:03 +08:00
wangzhenxing 0ed8fcf2f4 [心魔]======红点优化 2022-11-08 15:58:18 +08:00
wangzhenxing 119c186c34 [主城]=======按钮修改提交 2022-11-08 14:51:51 +08:00
wangzhenxing 223fb60204 神魂特效显示修改,冲榜活动奖励修改 2022-11-07 17:24:41 +08:00
wangzhenxing 1a2a407d66 太初特权添加提示 2022-11-07 15:00:36 +08:00
lihaiyang dbfe9e32ee 【开服狂欢】=========布局修正 2022-11-08 18:17:08 +08:00
lihaiyang 1b958a87d8 【神尊特权】======添加tips 2022-11-03 07:03:35 +08:00
wangzhenxing b73735f7cb 刷冲特权优化,通关某关卡添加空判断 2022-11-04 15:40:41 +08:00
lihaiyang 4058cc96f5 【点金】===页面布局调整 2022-11-02 14:06:47 +08:00
lihaiyang 1e7c2fae98 【刷充特权】===========刷冲特权页面调整 2022-11-03 11:34:46 +08:00
lihaiyang 024b3d5c07 【开服狂欢】==========修正购买按钮长度 2022-11-03 10:06:18 +08:00
lihaiyang 85e9632df7 【刷冲特权】============布局修改 2022-11-02 19:06:25 +08:00
wangzhenxing de4deae3ad 刷冲预设修改提交 2022-11-03 16:05:29 +08:00
yuanshuai b32a8c4625 神尊特权优化 2022-11-03 15:27:00 +08:00
wangzhenxing 19ce8e51d5 英雄升星扩展 2022-11-03 14:33:09 +08:00
lihaiyang d5ba8bdfe9 【天宫寻宝】==========修改title 2022-11-02 13:33:21 +08:00
yuanshuai 3ff54b15a3 Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-11-03 10:57:55 +08:00
yuanshuai 45ad268ee8 神尊特权 幸运转盘 GM刷冲礼包功能优化 2022-11-03 10:57:45 +08:00
wangzhenxing 9163954640 背包添加变身卡描述 2022-11-02 18:14:24 +08:00
wangzhenxing fa54c65598 变身卡加成预览提交 2022-11-02 17:20:28 +08:00
wangzhenxing c8357f1daa 开服冲榜预设修改 2022-11-02 13:35:00 +08:00
wangzhenxing d2af9edc0f [gm]======变身卡修改提交 2022-11-02 11:48:41 +08:00
lihaiyang 840e322366 【热榜】==========界面优化 2022-11-02 10:46:05 +08:00
wangzhenxing 1e62991c2c [gm]=====开服冲榜提交 2022-10-31 18:13:41 +08:00
wangzhenxing b27dc2f3c3 [gm]========gm转盘修改 2022-10-28 15:45:53 +08:00
wangzhenxing 7e20349490 [gm]=====转盘预设修改 2022-10-28 10:58:52 +08:00
wangzhenxing ac078416dd [gm]======转盘提交 2022-10-27 15:32:13 +08:00
lihaiyang 6400a78108 【刷冲GM】UI大小调整 2022-10-26 18:25:11 +08:00