Commit Graph

1400 Commits (37508d244d04c7eb7568ac4f732a0e9f0a7a37a5)

Author SHA1 Message Date
wangzhenxing df07616ab3 变身卡修改提交 2023-05-31 17:21:13 +08:00
wangzhenxing ac172339ae 心愿抽卡修改提交 2023-05-27 19:04:30 +08:00
wangzhenxing 1f94c3d234 变身卡添加职业 2023-04-21 13:24:26 +08:00
wangzhenxing 3f8a00cb14 [神兵]==================修改提交 2023-04-11 14:41:36 +08:00
yuanshuai 0b3e5511b2 神兵帮助 2023-04-07 11:13:15 +08:00
yuanshuai a7ccff7ff1 神兵功能优化 2023-04-06 18:13:54 +08:00
yuanshuai 31f51cca80 神兵红点提交 2023-04-04 18:21:14 +08:00
wangzhenxing 12e2cecaa1 神兵属性,神兵羁绊,神兵分解提交 2023-04-04 11:15:32 +08:00
yuanshuai a176bca619 神兵相关修改提交 2023-03-31 17:52:12 +08:00
wangzhenxing c370823e04 神兵常量提交 2023-03-24 11:08:03 +08:00
wangzhenxing 04a84da290 多队塔红点提交 2023-03-22 14:58:19 +08:00
wangzhenxing 614ec0b6e1 多队塔排行榜显示修改提交 2023-03-22 10:45:26 +08:00
wangzhenxing 91b1bbb82c 遴选多队塔代码 2023-03-21 10:58:00 +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 2985c1f5a2 法相装备修改提交 2023-02-21 14:20:46 +08:00
wangzhenxing d84f374bf2 法相修改提交 2023-02-19 20:08:48 +08:00
yuanshuai c2f2f9255b 法相修改提交 2023-02-18 15:52:52 +08:00
wangzhenxing 0b6d8ab978 法相提交 2023-02-17 19:43: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 260db13451 超值基金,热榜红点提交 2023-01-16 14:37:14 +08:00
wangzhenxing b3b95119c0 备战界面星级显示修改 2023-01-12 16:47:04 +08:00
wangzhenxing 6a2b5b8b09 推荐阵容调整位置 加红点 2023-01-10 16:39: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 286e8c0839 我是gm 红点提交 2022-12-30 15:08:22 +08:00
wangzhenxing 3acd9919ab 豪华补给红点提交 2022-12-29 17:45:27 +08:00
yuanshuai 118fdc7a2d 锻器阁装备合成改为神装升星 2022-12-23 17:30:23 +08:00
wangzhenxing 136bc6c12a 英雄一键升级修改 2022-12-23 14:56:30 +08:00
yuanshuai 0965bf200d --奇珍宝阁相关红点屏蔽 2022-12-20 17:49:37 +08:00
yuanshuai 3371b86e57 妖晶和仙晶累充活动提交 2022-12-19 13:38:36 +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 bef029e5ca 战斗跳过添加开启条件 2022-12-12 15:43:33 +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 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
wangzhenxing 214b316ac9 [bt]========主城鸿蒙镇修改提交 2022-12-01 14:24:05 +08:00
shihongyi a35fe3f22f Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-12-01 02:20:32 +08:00
shihongyi 13abae007f 铁匠铺资源条 2022-12-01 01:35:28 +08:00
wangzhenxing 1e19300811 [bt]======gm修改器 2022-11-30 18:36:50 +08:00
wangzhenxing 032ef3d34d [bt]======充值修改 2022-11-29 17:42:48 +08:00
wangzhenxing 5c49a471da [gm]====送10万充提交 2022-11-28 18:40:45 +08:00
wangzhenxing bfd7967d52 抽卡红点修改 2022-11-23 14:33:39 +08:00
wangzhenxing 3a952c6753 英雄培养优化 2022-11-15 15:57:48 +08:00
wangzhenxing 076df36a1d 开服冲榜修改提交 2022-11-10 18:31:08 +08:00
wangzhenxing 3c1e1c389d 添加名望特权红点 2022-11-08 18:33:09 +08:00
wangzhenxing ceeef789ed 探索特权修改提交 2022-11-08 13:45:52 +08:00
wangzhenxing 223fb60204 神魂特效显示修改,冲榜活动奖励修改 2022-11-07 17:24:41 +08:00
wangzhenxing 9fc80d7006 gm修改器显示修改提交 2022-11-04 17:49:27 +08:00
wangzhenxing 2d3304e7bd gm修改器添加条件限制 2022-11-04 17:18:11 +08:00
wangzhenxing f697f7893b 特权商店处理提交 2022-11-03 17:39:42 +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 0543114a36 角色星级扩展 2022-11-02 16:26:40 +08:00
wangzhenxing da4b07d862 星级显示修改提交 2022-11-02 15:47:17 +08:00
wangzhenxing ddc23a9319 [gm]======背包使用添加类型 2022-11-01 10:09:17 +08:00
wangzhenxing 1e62991c2c [gm]=====开服冲榜提交 2022-10-31 18:13:41 +08:00
wangzhenxing ac078416dd [gm]======转盘提交 2022-10-27 15:32:13 +08:00
wangzhenxing 74d375cf7f [送无限抽]=======提交 2022-10-17 16:13:47 +08:00
wangzhenxing aaef40e7a9 [主角修为]=======屏蔽主角修为功能 2022-10-13 15:49:43 +08:00
wangzhenxing a264f9dddd [首充]=======修改提交 2022-10-13 11:28:55 +08:00
wangzhenxing 3f49477a2a functions 改成utf-8 编码 2022-09-29 10:31:21 +08:00
wangzhenxing f1c0a2fcd8 [背包]====直冲卡添加使用 2022-09-23 15:50:28 +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
yuanshuai 817dd37a71 神尊特权驭兽斋bug修改 2022-09-18 11:50:01 +08:00
yuanshuai d42106b07e 神尊特权提交 2022-09-09 18:09:45 +08:00
yuanshuai e91edae1cf 建木神树bug修改 2022-09-06 15:47:16 +08:00
wangzhenxing 60b499f13c [洞府]======资源条显示修改 2022-09-05 11:14:13 +08:00
wangzhenxing 24d9637fb2 [共鸣去掉法宝] 2022-08-31 11:18:55 +08:00
wangzhenxing 19e5205496 [限时招募礼包]====红点提交 2022-08-18 18:01:14 +08:00
wangzhenxing bb9f877652 [显示招募]====添加珍奇宝阁 2022-08-17 17:45:12 +08:00
wangzhenxing 06ba097de4 [背包]=========装备碎片提交 2022-08-11 11:19:05 +08:00
wangzhenxing 5120ccdf8c [法宝背包显示修改]======== 2022-08-10 13:46:01 +08:00
wangzhenxing bf108a4f18 [周卡]======周卡修改提交 2022-07-26 17:39:41 +08:00
wangzhenxing b0dfb411b8 [数字游戏]======红点修改提交 2022-07-25 15:06:04 +08:00
yuanshuai cd0d9bad9e 添加八日登陆红点 2022-07-21 13:43:03 +08:00
yuanshuai 4e1c0323fb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-07-18 16:11:55 +08:00
yuanshuai e7db9b7373 数字游戏按钮控制 2022-07-18 16:05:39 +08:00
wangzhenxing 09b57fd635 【疯体iOS】=====添加按钮 2022-07-15 16:00:33 +08:00
wangzhenxing 46f9a08c22 【抽卡】=======自选箱描述修改 2022-07-12 19:04:18 +08:00
yuanshuai 92b971ad82 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-07-11 15:43:11 +08:00
yuanshuai d952b9a44c 数字游戏模块提交 2022-07-11 15:43:04 +08:00
wangzhenxing 47f407fad6 [跳转]======添加跳转108类型 2022-07-11 15:21:28 +08:00
wangzhenxing 91bf4423f9 [主程排行榜]======排行榜红点,列表显示修改 2022-06-20 15:14:35 +08:00
wangzhenxing 8125728ae8 【装备】======套装属性技能激活提示信息修改 2022-06-14 18:20:03 +08:00
wangzhenxing 12e0c83271 【合成装备】=======套装属性显示修改 2022-06-14 17:59:20 +08:00
wangzhenxing 207fb46d9a 【装备】=======装备套装技能描述提示修改 2022-06-14 17:48:38 +08:00
wangzhenxing 1cc17d4e4b [装备合成]=======装备详情显示修改 2022-06-14 17:32:32 +08:00
wangzhenxing 5d41ecc114 【装备】======添加蓝白装备 2022-06-14 15:58:18 +08:00
wangzhenxing 56380704c7 【装备】====装备添加青金品质 2022-06-13 16:38:48 +08:00
yuanshuai 3b8922d9f7 Merge branch '0功能/周卡月卡' into china/dev 2022-06-10 11:24:15 +08:00
yuanshuai af1452a76a 提示文字修改 2022-06-09 17:39:57 +08:00
wangzhenxing ee3fecc198 [主题活动累充有礼]=====红点修改 2022-06-09 15:51:44 +08:00
wangzhenxing d5be125722 【抽卡】=======抽卡宝箱描述修改 2022-06-08 18:14:25 +08:00
wangzhenxing 0086c01ff6 [首充]======首充修改提交 2022-06-07 15:48:54 +08:00
wangzhenxing e7df09c284 [寻仙招募]======修改提交 2022-05-23 11:29:10 +08:00
wangzhenxing 3b4e771d16 [神将信息展示]======神将信息修改 2022-05-19 16:38:52 +08:00
yuanshuai d39933b48d 红点提交 2022-05-18 20:06:18 +08:00
wangzhenxing d4a6bfdda2 【神将排版优化】========神将信息界面修改 2022-05-18 20:00:57 +08:00
yuanshuai 9c9018b1da 终身卡功能提交 2022-05-18 19:39:19 +08:00
wangzhenxing 8eec6cb793 【关卡排行】=====关卡界面关卡排行榜修改 2022-05-18 13:48:03 +08:00
wangzhenxing 05b20af01f [排行榜]=======主界面排行榜显示修改 2022-05-17 17:46:39 +08:00
wangzhenxing a6f1b4b53f 【神印】=====圆圈品质框i修改 2022-05-06 22:28:25 +08:00
yuanshuai 9e0e197a2b 商店代币页签红点修改 2022-04-28 17:12:25 +08:00
yuanshuai 4e70fc5113 限时活动红点修改 2022-04-28 14:26:35 +08:00
yuanshuai d1111be7eb 化身卡升级升星红点提交 2022-04-27 18:08:55 +08:00
yuanshuai bce1445a77 神印商店红点添加 2022-04-26 19:08:26 +08:00
wangzhenxing 81122369c6 bug修改提交 2022-04-26 16:09:21 +08:00
yuanshuai 8a7c4160f0 背包页签修改 2022-04-26 11:56:20 +08:00
yuanshuai f0cb395539 背包页签修改 2022-04-26 11:45:13 +08:00
yuanshuai 55833325bf 跨服相关修改 2022-04-25 17:57:31 +08:00
yuanshuai 4e5ccff820 身外化身界面调整 2022-04-25 14:42:17 +08:00
wangzhenxing 3678f78c75 神印币添加跳转 2022-04-24 21:26:32 +08:00
wangzhenxing e498661919 神印添加背包分解 2022-04-24 16:36:27 +08:00
wangzhenxing 7cdf302e90 神印修改提交 2022-04-24 14:20:11 +08:00
yuanshuai 765134f4b3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua
2022-04-22 18:33:04 +08:00
yuanshuai c3919b7e82 变身卡强化相关代码提交 2022-04-22 18:24:33 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
wangzhenxing f49bb38f8f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-20 16:20:41 +08:00
wangzhenxing 3021107155 globaldefine提交 2022-04-20 16:20:24 +08:00
yuanshuai 50683260c7 挑战副本红点提交 2022-04-20 13:23:08 +08:00
wangzhenxing 0cad07009a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-19 17:24:53 +08:00
wangzhenxing 53e7c44e2a [战斗]=======战斗提交 2022-04-19 17:23:37 +08:00
yuanshuai b4a626d9e2 挑战副本脚本修改提交 2022-04-18 18:48:06 +08:00
yuanshuai 9ebdab46b3 挑战副本相关脚本提交 2022-04-14 16:07:45 +08:00
wangzhenxing f442f6df70 globaldefine提交 2022-04-06 13:56:39 +08:00
jiaoyangna 7a1ccac3cd 【ID1011398】
山河设计图每日玉衡龙魂丹领取调整
2022-04-02 14:45:12 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
jiaoyangna 5348a49256 Revert "冲突提交"
This reverts commit b5a29c9152.
2022-03-22 11:06:54 +08:00
jiaoyangna c93b9e3f04 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-21 18:29:21 +08:00
jiaoyangna b5a29c9152 冲突提交 2022-03-21 18:29:03 +08:00
wangzhenxing def9ca5701 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-21 17:38:57 +08:00
wangzhenxing 47a9fc98e3 globaldefine常量提交 2022-03-21 17:38:27 +08:00
jiaoyangna 18803bfc29 东海寻仙提交 2022-03-18 13:25:09 +08:00
jiaoyangna 31b1721510 探索提交 2022-03-17 15:21:08 +08:00
gaoxin de178b9875 【锻器阁】未解锁的功能显示未解锁提示 2022-03-11 16:36:47 +08:00
张彪 4d97370a24 【车迟斗法】跨服 2022-03-03 16:52:08 +08:00
张彪 5a416c5149 【车迟斗法】工会界面倒计时 2022-03-03 13:30:25 +08:00
wangzhenxing 51e89fea29 英雄觉醒后天赋显示修改 2022-02-21 14:25:52 +08:00
张彪 51196cf150 【灵兽宝阁】新增几档灵兽特惠礼包界面提交 2022-02-18 15:14:25 +08:00
张彪 7083b34f51 【战力冲刺】提交 2022-02-18 14:05:59 +08:00
张彪 14af727eab 【战力冲刺】提交 2022-02-17 16:27:36 +08:00
gaoxin 2342bd8af8 【拍脸】寻仙招募拍脸添加 2022-02-23 18:08:50 +08:00
jiaoyangna 7e62f47ca8 【ID1011130】
【活动优化】超值返利
2022-02-11 11:26:34 +08:00
wangzhenxing 01506ba48c [角色天赋]======角色天赋显示修改 2022-02-10 17:52:40 +08:00
gaoxin 2704959c15 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-08 13:58:58 +08:00
jiaoyangna b28899db3f 神将置换星级设置报错修改提交 2022-02-08 13:40:25 +08:00
gaoxin 4ff738d8a2 【事件上报】修改区服字段上报内容为账号id 2022-02-08 11:02:21 +08:00
张彪 d1bb3391ac 【超值基金】提交 2022-01-24 17:09:55 +08:00
wangzhenxing b18db8765d [飞升]=====飞升特效修改提交 2022-01-21 17:09:14 +08:00
wangzhenxing e5494e65ab [飞升]=====图鉴显示修改 2022-01-21 13:55:17 +08:00
wangzhenxing 7de5fdac9e [飞升]=====特效问题修改 2022-01-20 17:58:57 +08:00
jiaoyangna 90c21e5a73 协议提交 2022-01-20 16:17:26 +08:00
jiaoyangna 039f212694 Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-20 15:32:17 +08:00
wangzhenxing 46f337312e [飞升]========特效修改 2022-01-20 15:06:04 +08:00
jiaoyangna 70d3d943a8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-20 11:42:25 +08:00
wangzhenxing e734c4a03d [飞升]=======飞升修改 2022-01-20 11:41:20 +08:00
jiaoyangna 1c24a85612 添加红点 2022-01-20 11:22:39 +08:00
wangzhenxing f40c997a4f [飞升]======飞升特效修改 2022-01-20 10:09:57 +08:00
wangzhenxing 7fd7ef19f3 [飞升]====卡牌背景修改 2022-01-19 17:50:39 +08:00
jiaoyangna a797e80b39 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-19 17:47:28 +08:00
jiaoyangna a544abe9cc 众志成城 2022-01-19 17:47:07 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
wangzhenxing 4034a90a33 [飞升]======优化修改提交 2022-01-19 15:29:47 +08:00
jiaoyangna b5cc0635ae Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-18 14:49:50 +08:00
jiaoyangna ac24c2e0ce 【ID1010998】
【春节活动】签到领奖活动
2022-01-18 14:48:27 +08:00
wangzhenxing a6e05ae8e8 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-18 09:53:04 +08:00
wangzhenxing 1de7293630 [飞升]======卡牌飞升预设修改 2022-01-17 16:53:26 +08:00
wangzhenxing d5fd95373f [抽卡奖池]======抽卡奖池预览修改 2022-01-17 15:56:27 +08:00
ZhangBiao 4e00c5e9c3 【名望礼包】红点 2022-01-17 14:10:08 +08:00
wangzhenxing 3311a00b91 【飞升】=======globadefine修改 2022-01-15 13:25:48 +08:00
wangzhenxing ef0a0ff436 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2022-01-15 12:47:22 +08:00
wangzhenxing 853fde91b2 [飞升]============飞升修改提交 2022-01-15 12:26:12 +08:00
wangzhenxing c2c9eda981 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 18:50:17 +08:00
wangzhenxing 05377b9595 [图鉴]==== 图鉴 图鉴详情界面修改 2022-01-14 18:49:49 +08:00
jiaoyangna 3369bcc73c 心愿修改提交 2022-01-14 18:40:00 +08:00
jiaoyangna 053de388f2 神将修改提交 2022-01-14 14:52:56 +08:00
jiaoyangna 0323c50be5 法宝角标修改 2022-01-14 11:31:33 +08:00
jiaoyangna e4ea506ed1 神将情报修改提交 2022-01-14 10:17:19 +08:00
wangzhenxing ff7b7ba5ed [飞升]=====bug修改提交 2022-01-12 16:41:51 +08:00
wangzhenxing 039f9a3deb [图鉴]======图鉴修改提交 2022-01-11 18:11:13 +08:00
gaoxin 0ee930c550 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 14:01:01 +08:00
gaoxin 5d2838554d Merge branch '0活动/新大圣升星' into china/dev 2022-01-14 14:00:20 +08:00
wangzhenxing c219f28f6a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 13:57:09 +08:00
wangzhenxing 549343e721 [图鉴]=========添加公用获取英雄品质图片方法 2022-01-11 13:56:45 +08:00
jiaoyangna 041f21d530 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 12:02:20 +08:00
ZhangBiao f94e79b6e2 【百宝商会】新增跳转 2022-01-11 11:29:43 +08:00
jiaoyangna 40e37473dc 【ID1011029】
【优化】 神将界面优化
2022-01-11 11:09:44 +08:00
gaoxin ee60ae6c9a 【限时升星】显示优化,红点添加,条件屏蔽添加 2022-01-10 11:44:39 +08:00
gaoxin dfb04baf75 【限时升星】添加可选择的升星有礼活动 2022-01-08 18:40:04 +08:00
wangzhenxing e5c176cd9f [飞升]============特效显示修改提交 2022-01-07 10:08:55 +08:00
ZhangBiao 6b1c28a920 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2022-01-06 16:40:24 +08:00
jiaoyangna b1be355601 Merge branch 'tansuo' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/ExploreAtlas.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2022-01-06 16:07:59 +08:00
ZhangBiao 9c874f1789 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
#	Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
2022-01-06 15:38:48 +08:00
ZhangBiao 499e1d2d49 【家园】界面微调 2022-01-06 10:56:59 +08:00
ZhangBiao 893e33d920 【家园】提交 2022-01-06 10:33:08 +08:00
wangzhenxing d2b10ebb38 [飞升]=============飞升特效修改提交 2022-01-05 18:25:59 +08:00