Commit Graph

4084 Commits (994d2602845afe8d9202a1f7a758f0a3ed454527)

Author SHA1 Message Date
wangzhenxing 2f160b4e67 挂机界面修改 2023-11-03 14:21:13 +08:00
wangzhenxing 90134677d2 急速探索界面修改提交 2023-11-03 11:42:57 +08:00
PC-202302260912\Administrator e3e24353ef 神将 2023-11-02 19:22:51 +08:00
wangzhenxing 86d0aadc5d 超值连冲界面修改提交 2023-11-02 18:49:37 +08:00
wangzhenxing d972e70e05 推荐阵容修改提交 2023-11-02 18:10:22 +08:00
wangzhenxing 0167d707bf 首充修改提交 2023-11-02 17:46:09 +08:00
xiejun a45b0fbb23 点将台UI 2023-11-02 17:24:35 +08:00
PC-202302260912\Administrator 192e92416e 在线奖励相关 2023-11-02 16:58:30 +08:00
wangzhenxing c67eb7f7ad 神兵系统界面修改提交 2023-11-02 16:03:11 +08:00
PC-202302260912\Administrator 7c0cf86935 首充相关 2023-11-01 19:08:54 +08:00
wangzhenxing 9a86ec8026 神兵主界面修改提交 2023-11-01 19:02:00 +08:00
PC-202302260912\Administrator a87bca727c 限时折扣 2023-11-01 17:29:04 +08:00
xiejun f9bf9b27be 修改预制体 2023-11-01 17:19:09 +08:00
PC-202302260912\Administrator fc66533d1a 阵营推荐 2023-11-01 16:27:05 +08:00
wangzhenxing 730966a6df Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-01 15:47:46 +08:00
wangzhenxing dbac53d14d 属性信息界面,技能信息界面修改 2023-11-01 15:47:17 +08:00
xiejun f939ff8ac8 神将置换UI 2023-11-01 15:46:54 +08:00
PC-202302260912\Administrator 121a97c801 添加按钮 2023-11-01 15:24:32 +08:00
wangzhenxing 08fea279e1 化身卡修改提交 2023-11-01 15:11:41 +08:00
PC-202302260912\Administrator d4779c6a3d 超级特权相关 2023-11-01 14:39:15 +08:00
PC-202302260912\Administrator a4e942f285 修改限时兑换 2023-10-31 19:42:01 +08:00
PC-202302260912\Administrator 442e99da6d 限时兑换 2023-10-31 18:55:40 +08:00
wangzhenxing 7d0f4225b7 七日狂欢界面修改 2023-10-31 18:36:31 +08:00
wangzhenxing 6f771c23cb 月卡 开服狂欢界面修改 2023-10-31 17:25:27 +08:00
PC-202302260912\Administrator fd4f2f833e 七日登录 2023-10-31 17:14:03 +08:00
PC-202302260912\Administrator 90eab3e98d 7日登陆 2023-10-31 17:00:08 +08:00
wangzhenxing ad48afbfe9 礼物界面修改提交 2023-10-31 16:23:50 +08:00
xiejun 1e53fbc529 锻器阁 2023-10-31 15:30:06 +08:00
wangzhenxing 9d6308c909 法宝聚灵界面修改提交 2023-10-31 14:38:02 +08:00
PC-202302260912\Administrator b15c4f942e 礼物相关 2023-10-31 11:43:32 +08:00
wangzhenxing 55aa1ed967 英雄spine预设位置修改 2023-10-31 10:51:14 +08:00
PC-202302260912\Administrator c11ad012de 四象心法优化 2023-10-30 20:28:39 +08:00
wangzhenxing d1a9cff2c5 法宝聚灵修改提交 2023-10-30 19:16:17 +08:00
wangzhenxing d5334e08e4 四项心法界面修改 2023-10-30 17:11:52 +08:00
PC-202302260912\Administrator ae6fe98e10 四象心法 2023-10-30 16:34:27 +08:00
PC-202302260912\Administrator 7088098c1a 四象心法修改 2023-10-30 16:29:58 +08:00
wangzhenxing ed63b42413 法宝聚灵修改提交 2023-10-30 15:27:42 +08:00
PC-202302260912\Administrator f4012ea61e 红点位置修改 2023-11-06 17:17:32 +08:00
PC-202302260912\Administrator 24183b728a 等级背景框修正 2023-10-28 16:26:55 +08:00
PC-202302260912\Administrator 21d8e1ee5b 添加日常任务缺少的图片 2023-10-28 16:08:31 +08:00
PC-202302260912\Administrator b245afd6a6 修正天宫 2023-10-28 15:55:08 +08:00
wangzhenxing 0406690f56 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-28 15:41:33 +08:00
wangzhenxing 44f6ea0e86 抽取命石添加次数限制 2023-10-28 15:41:17 +08:00
PC-202302260912\Administrator aeb72a1f7b 天宫寻宝 2023-10-28 15:41:04 +08:00
xiejun 1c56d6629d 修改公会,和恭喜获得的UI 2023-10-27 17:39:09 +08:00
wangzhenxing c625b8d011 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-27 17:09:21 +08:00
wangzhenxing dd9444c745 屏蔽英雄觉醒显示 2023-10-27 17:09:16 +08:00
xiejun 8ef7efa6c1 达人活动UI和神印BUG 2023-10-27 16:41:28 +08:00
wangzhenxing 1c65cd4052 法灵修改 2023-10-27 16:16:37 +08:00
wangzhenxing e795b4834b 法灵红点提交 2023-10-27 14:10:43 +08:00
PC-202302260912\Administrator 7965174646 公告 2023-10-27 13:27:39 +08:00
PC-202302260912\Administrator ba397d1aaf 添加 2023-10-27 11:11:38 +08:00
wangzhenxing 9a1646ec48 法宝升级显示修改 2023-10-26 20:54:06 +08:00
wangzhenxing ed4865cc3c 法宝星级显示修改 2023-10-26 20:44:18 +08:00
xiejun f55839e351 预制体修改 2023-10-26 18:52:51 +08:00
xiejun 805179cc81 升星冲榜补充 2023-10-26 18:50:39 +08:00
xiejun fafab89f48 升星冲榜UI 2023-10-26 18:44:37 +08:00
wangzhenxing 3b64b3db82 法宝强化界面修改 2023-10-26 18:33:53 +08:00
wangzhenxing 0d08ea1a84 法灵提交 2023-10-26 17:16:10 +08:00
xiejun d9d842c5be 恭喜获得 2023-10-26 14:54:18 +08:00
xiejun 965fc5d494 十绝症UI 2023-10-25 18:51:09 +08:00
wangzhenxing a41aacf703 法灵强化界面预设提交 2023-10-25 18:39:36 +08:00
PC-202302260912\Administrator c70d1b7700 无限送抽 2023-10-25 16:56:39 +08:00
PC-202302260912\Administrator 84581526be 预制体修改 2023-10-25 16:12:49 +08:00
PC-202302260912\Administrator fe702e50c4 天宫寻宝 2023-10-25 16:06:27 +08:00
xiejun 663fbca133 神兵热榜 2023-10-24 20:02:38 +08:00
wangzhenxing 50a42471ec 删除无用预设脚本 2023-10-24 18:20:31 +08:00
xiejun a82fdafe48 回滚底部按钮 2023-10-24 13:36:37 +08:00
xiejun 100980e98b 删除老预制体 2023-10-23 17:51:23 +08:00
xiejun e1d0445714 修改bug,删除部分老预设 2023-10-23 17:44:09 +08:00
xiejun 443dbba568 充值UI修改 2023-10-20 18:51:12 +08:00
PC-202302260912\Administrator 98168f92a1 成就相关 2023-10-20 17:18:23 +08:00
PC-202302260912\Administrator 8006a761aa 信息界面调整 2023-10-20 15:22:34 +08:00
PC-202302260912\Administrator 99d70ca52d 月卡换底 2023-10-20 13:24:17 +08:00
PC-202302260912\Administrator 788392feca 超值连充半成品 2023-10-20 11:34:23 +08:00
xiejun d7762a4a00 登录界面替换UI 2023-10-19 22:51:00 +08:00
PC-202302260912\Administrator 34ba7a787d 月卡相关 2023-10-19 22:43:48 +08:00
xiejun 2212a7443d 邮件和邮件内容UI 2023-10-19 21:05:35 +08:00
xiejun bfbce921a3 屏蔽修行按钮,更换日常任务的UI,修改了好友的按钮选择显示逻辑 2023-10-19 17:42:21 +08:00
xiejun 432fc640f3 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-18 20:45:10 +08:00
xiejun 077b82bd84 好友,公会副本等UI修改 2023-10-18 20:41:04 +08:00
wangzhenxing b7949c7e91 法灵信息界面提交 2023-10-18 17:28:34 +08:00
wangzhenxing 152e0bcde0 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-16 17:11:50 +08:00
wangzhenxing c43520367a 潜能红点提交 2023-10-16 17:11:07 +08:00
xiejun bb83290058 排行榜UI 2023-10-16 16:16:02 +08:00
wangzhenxing a66437ec72 潜能提交 2023-10-16 15:12:47 +08:00
xiejun f9adc3d4a7 排行榜和修复BUG 2023-10-13 11:24:19 +08:00
xiejun ff21cd74d2 竞技场部分预制体修改 2023-10-10 18:53:44 +08:00
wangzhenxing fff8911f19 英雄信息界面预设修改 2023-10-10 10:29:23 +08:00
xiejun 44087689d4 灵兽 2023-10-08 16:53:34 +08:00
xiejun eb926fc087 灵兽 2023-09-28 17:05:40 +08:00
wangzhenxing de562386e0 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
2023-09-28 16:01:34 +08:00
wangzhenxing 1e1fd36489 玩家信息界面修改 2023-09-28 16:00:26 +08:00
wangzhenxing db71c4df20 神将主界面修改 2023-09-21 18:58:21 +08:00
wangzhenxing bb18772265 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2023-09-21 18:43:54 +08:00
xiejun d53329f6fb 灵兽部分UI 2023-09-21 18:36:44 +08:00
wangzhenxing b0650bbb20 主角礼物显示修改 2023-09-21 16:41:59 +08:00
xiejun c47462c5d8 Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-09-20 18:57:44 +08:00
xiejun 88740201b3 排行榜UI 2023-09-20 18:00:40 +08:00
wangzhenxing ff5bcbced9 礼物合成显示秀嘎,添加礼物商店跳转 2023-09-20 17:40:33 +08:00
wangzhenxing 266c5b12af 礼物修改 点将神符不足弹出提示 2023-09-20 14:37:05 +08:00
wangzhenxing 600f270128 礼物添加总属性显示,逍遥游寻仙修改 2023-09-19 18:03:00 +08:00
wangzhenxing 1556e5c6a9 礼物合成提交 2023-09-18 17:41:06 +08:00
xiejun af6b341a0c 修改子弹逻辑 2023-09-18 15:41:32 +08:00
wangzhenxing c037d9a2a2 玩家信息预设修改
(cherry picked from commit a6c2a99bbb)
2023-09-15 15:38:55 +08:00
wangzhenxing a6c2a99bbb 玩家信息预设修改 2023-09-15 14:58:13 +08:00
wangzhenxing e3a8cd725f 合并冲突提交 2023-09-15 14:24:03 +08:00
wangzhenxing acdb5a21cd 礼物修改提交 2023-09-15 14:11:14 +08:00
wangzhenxing 049cebd574 灵兽星际显示修改提交 2023-09-15 13:56:38 +08:00
PC-202302260912\Administrator dca95dff13 修改页面布局 2023-09-13 16:38:07 +08:00
wangzhenxing e80056fcd4 查看礼物信息提交 2023-09-13 15:44:06 +08:00
wangzhenxing eeb3859f72 礼物功能提交 2023-09-13 14:57:48 +08:00
xiejun 363b5a3818 图鉴UI 2023-09-04 18:27:40 +08:00
xiejun 87bd10593d 工会 2023-09-02 18:59:49 +08:00
xiejun 3ab79a59b7 副本UI 2023-09-02 18:53:21 +08:00
xiejun c6d6e21e57 修改 2023-09-02 18:04:06 +08:00
xiejun 0a3533dbfe 挑战副本 2023-09-02 17:17:15 +08:00
xiejun 5b8ef487f7 御灵 2023-09-02 17:16:34 +08:00
xiejun 1a34fec66e 修复bug 2023-09-01 20:18:46 +08:00
wangzhenxing c9418f9821 命石奖励预设修改 2023-09-01 19:01:33 +08:00
xiejun 83a8e9ab56 修改 2023-09-01 18:27:39 +08:00
wangzhenxing 55f0c6d3e6 魂印图鉴修改 ,命石修改 2023-09-01 18:04:52 +08:00
wangzhenxing 2b93776f7c 命格修改提交 2023-09-01 17:36:15 +08:00
wangzhenxing 18e10b4fb6 命格修改提交 2023-08-31 19:12:02 +08:00
wangzhenxing 5e1cc83b2a 命石修改提交 2023-08-31 15:20:27 +08:00
wangzhenxing 52393c592c 命石提交 2023-08-31 15:02:13 +08:00
xiejun 837e769c14 七界 2023-08-30 22:07:43 +08:00
xiejun 87c1193f8b 修改BUG 2023-08-30 21:25:36 +08:00
xiejun f1b9b526c1 代码修改 2023-08-30 20:33:29 +08:00
xiejun 96efe07502 prefab布鲁克 2023-08-29 19:18:35 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
xiejun 4d8b08104c 七界资源 2023-08-28 18:52:15 +08:00
xiejun f549956ebb 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
wangzhenxing 3037378c42 神将热榜, 图鉴预设修改提交 2023-08-23 16:04:46 +08:00
xiejun 65d783dae1 修改BUG 2023-08-18 17:55:02 +08:00
xiejun 21d0262140 修改预制体 2023-08-16 16:42:05 +08:00
wangzhenxing a2ed294523 英雄信息界面变身卡星级显示修改 2023-08-16 11:36:58 +08:00
xiejun 32d5e9bb97 修改BUG 2023-08-15 20:52:29 +08:00
xiejun 06733b98e2 配置 2023-08-15 17:36:26 +08:00
xiejun 01087658fc 公会UI 2023-08-15 16:26:36 +08:00
xiejun bbde945918 新角色立绘 2023-08-15 12:36:04 +08:00
xiejun 19231ba20a 公会UI 2023-08-14 16:36:26 +08:00
wangzhenxing 3e08e50ea5 周卡预设修改提交 2023-08-11 19:25:16 +08:00
xiejun 148443883c 神将 2023-08-11 19:03:48 +08:00
wangzhenxing bd11611e2d 易经宝库层级显示修改提交 最终大奖名字显示修改 2023-08-10 13:47:37 +08:00
xiejun 43d80275b9 神将部分UI替换 2023-08-04 18:58:14 +08:00
wangzhenxing 9b7627ffe0 商店界面预设修改提交 2023-07-31 18:12:46 +08:00
xiejun fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
wangzhenxing 5ac2ed1220 山河设计图添加关卡提示 2023-07-24 11:31:36 +08:00
xiejun 8a4e15e258 海贼UI替换 2023-07-21 17:04:16 +08:00
PC-202302260912\Administrator a1294d8746 天宫寻宝文字修改 2023-07-20 15:42:56 +08:00
PC-202302260912\Administrator da7727ba02 item预设特效显示修改 2023-07-18 16:09:16 +08:00
xiejun ed0681d015 路飞,萨博 2023-07-17 18:47:07 +08:00
PC-202302260912\Administrator 2082425679 抽卡界面预设修改,添加未开启信息提示 2023-07-17 17:38:43 +08:00
PC-202302260912\Administrator 65b4f5fc20 周卡活动名称修改 2023-07-17 14:48:27 +08:00
xiejun 937ec44bf5 立绘和代码修改 2023-07-13 14:38:34 +08:00
xiejun ab2e8eb833 增加技能特效spine 2023-07-06 14:08:10 +08:00
xiejun 214151b5ca 修改 2023-07-04 10:28:57 +08:00
xiejun ab6a726b3a 增加凯多角色 2023-07-02 21:52:32 +08:00
xiejun fd59086676 主界面UI替换 2023-06-30 00:13:43 +08:00
xiejun 0bb8dfbb6e 凱多的live2d 2023-06-29 15:04:58 +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 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 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
wangzhenxing ffe26f1210 【bt】====任务奖励预览修改 2022-10-26 11:22:35 +08:00
wangzhenxing 5fbc31d8e8 [gm]======免费充值界面修改 2022-10-25 13:51:43 +08:00
lihaiyang 7b65301173 【名望】====特权布局修改 2022-10-24 15:39:19 +08:00
lihaiyang 39dd11c6e8 【名望】====修正标题 2022-10-24 11:26:40 +08:00
lihaiyang 8806336bea 【名望】=====名望界面修改 2022-10-24 11:06:38 +08:00
wangzhenxing a0e830b025 [bt]======变身卡碎片显示修改 2022-10-21 10:25:10 +08:00
wangzhenxing 8d63d391a6 [gm]==============声望特权提交 2022-10-20 17:48:00 +08:00
wangzhenxing 480ae21f30 [gm]=====主程界面添加名望入口 2022-10-19 15:34:41 +08:00
lihaiyang 6d0f9e4e37 【无限充抽】======按钮位置修正 描述修正 2022-10-18 14:52:27 +08:00
lihaiyang 684c4477b7 【无限充抽】========修正奖励位置 修正描述 2022-10-18 14:39:57 +08:00
lihaiyang 329c203318 【GM刷冲特权】=========修正图标位置添加框 2022-10-18 14:26:38 +08:00
wangzhenxing 85d26f1b0c Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-10-17 16:15:06 +08:00
wangzhenxing 74d375cf7f [送无限抽]=======提交 2022-10-17 16:13:47 +08:00
lihaiyang 6fd794f3b1 【刷冲特权】=======背景透明度调整 2022-10-17 15:29:37 +08:00
lihaiyang a754caa9e4 【GM刷冲特权】========位置调整 2022-10-17 15:18:21 +08:00
wangzhenxing 436955609b 仙充直冲礼包提交 2022-10-13 14:54:03 +08:00
wangzhenxing a264f9dddd [首充]=======修改提交 2022-10-13 11:28:55 +08:00
wangzhenxing 1f9835e44f 道具详情预设修改 2022-09-23 16:07:05 +08:00
wangzhenxing efe732d91d [gm]=============刷冲特权提交 2022-09-23 15:24:10 +08:00
wangzhenxing a8f46604c9 [gm]======创角即送提交 2022-09-21 16:08:59 +08:00
wangzhenxing fdaec2ac28 [gm修改器]=====提交 2022-09-20 17:04:48 +08:00
wangzhenxing e4b2b44199 [全民福利]======优化 2022-09-16 17:29:23 +08:00
yuanshuai bf27ddd677 神尊特权预设修改 2022-09-15 18:11:56 +08:00
wangzhenxing 5a1440cd69 [全民福利]=====提交 2022-09-15 16:48:56 +08:00
lihaiyang f50028cef7 [无限资源阁]========界面修改提交 2022-09-01 18:22:04 +08:00
wangzhenxing ff824e3f3a [全民福利]=====预设修改提交 2022-09-14 13:33:22 +08:00
yuanshuai 7447eab324 神尊特权预设修改 2022-09-13 16:50:56 +08:00
yuanshuai 23416c35cf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-09-09 18:09:59 +08:00
yuanshuai d42106b07e 神尊特权提交 2022-09-09 18:09:45 +08:00
wangzhenxing b6b1f53d64 [bt]=====无限资源阁提交 2022-09-09 16:45:58 +08:00
yuanshuai e3f58fbbec 物品神应等级显示 2022-09-07 15:25:36 +08:00
yuanshuai b9ec95da65 预设修改 2022-09-06 16:10:15 +08:00
yuanshuai e91edae1cf 建木神树bug修改 2022-09-06 15:47:16 +08:00
yuanshuai 573ea577ce 建木神树修改提交 2022-09-06 10:16:57 +08:00
yuanshuai a506dc7997 界面显示修改提交 2022-09-02 14:26:03 +08:00
yuanshuai 08cf1d1ea8 添加重置 2022-09-02 13:15:24 +08:00
yuanshuai cfa84cff79 预设修改 2022-09-01 17:32:03 +08:00
yuanshuai 96f8605bb1 摘星阁脚本预设提交 2022-09-01 17:30:15 +08:00
wangzhenxing 44787f9e58 [背包]======背包提交法宝页签 2022-08-30 18:10:07 +08:00
yuanshuai a10a386b24 法宝修改提交 2022-08-30 15:55:37 +08:00
wangzhenxing 7ec1580c3e [变身卡]======开启添加等级限制 2022-08-18 17:02:35 +08:00
wangzhenxing bf31576d31 [森罗幻境]====一键扫荡按钮限时隐藏 2022-08-18 11:27:36 +08:00
wangzhenxing 0a0b37c6db Merge branch 'china/dev' into china/dev_slhj 2022-08-18 10:32:19 +08:00