Commit Graph

11754 Commits (6d5a716b10cbe9072dfbf2a81c8cb88950acc723)
 

Author SHA1 Message Date
jiaoyangna af30beccd3 资源条跳转错误修改提交 2021-12-30 18:12:56 +08:00
jiaoyangna 57b0689de6 【ID1010911】
【森罗优化】退出森罗幻境时弹出累积收益
2021-12-30 18:06:36 +08:00
jiaoyangna 5ab9c8d915 Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
2021-12-30 16:47:19 +08:00
skuld 839e007b13 Merge branch 'tansuo' of http://60.1.1.230/gaoxin/JL_Client into tansuo 2022-01-03 00:52:13 +08:00
skuld 40d00536ea bat Resource Commit:2022/01/03, 0:51:54 2022-01-03 00:51:55 +08:00
ZhangBiao fc9377b8e9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-30 16:29:54 +08:00
ZhangBiao 5672203920 【云游商人】优化 2021-12-30 16:29:37 +08:00
wangzhenxing c318dea91a 【战前属性】====战前属性增加新类型 413计算 2021-12-30 16:22:44 +08:00
gaoxin 72400429f3 【邮件】有附件时添加分割线 2022-01-02 02:49:20 +08:00
gaoxin 4c0a3a3864 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-02 02:48:25 +08:00
gaoxin f4e149e898 【邮件】有附件时添加分割线 2022-01-02 02:48:03 +08:00
ZhangBiao f500bc9ed1 【云游商人】更改索引方式 2021-12-30 15:51:12 +08:00
jiaoyangna eee9a714f3 修行名字颜色修改提交 2021-12-30 15:22:06 +08:00
jiaoyangna 5d8b9ffea4 修行等级显示提交 2021-12-30 15:13:24 +08:00
jiaoyangna 973e19ac66 超值返利修改提交 2021-12-30 15:05:21 +08:00
jiaoyangna 3ad7485c1c 地图修改提交 2021-12-30 15:01:00 +08:00
jiaoyangna dc4a07c6da 名字修改提交 2021-12-30 14:57:24 +08:00
jiaoyangna 185eb85640 超值返利修改提交 2021-12-30 14:45:54 +08:00
jiaoyangna 84e7aa2ae2 超值返利修改提交 2021-12-30 14:45:23 +08:00
wangzhenxing c5d42ab873 [玉虚论道]======音效数据修改提交 2021-12-30 14:44:40 +08:00
wangzhenxing 270e359507 [玉虚论道]=====对战界面添加音效 2021-12-30 14:41:43 +08:00
jiaoyangna b118d30185 添加修行等级 2021-12-30 14:38:06 +08:00
jiaoyangna d4d1653bc2 探索优化 2021-12-30 14:01:30 +08:00
jiaoyangna 80263f61f0 探索优化提交 2021-12-30 13:50:39 +08:00
wangzhenxing a5bdf99a26 [玉虚论道]=====他人队伍信息灵兽星级位置修改 2021-12-30 13:35:27 +08:00
jiaoyangna 4b6de5c984 探索优化提交 2021-12-30 13:27:57 +08:00
jiaoyangna 9a0ec7feee 添加切换效果 2021-12-30 11:55:15 +08:00
ZhangBiao 0f32a05956 【装备界面】增加摘星阁加持 2021-12-30 11:49:12 +08:00
jiaoyangna 7b67ef38df Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-12-30 11:43:22 +08:00
jiaoyangna 2a14bc799f 探索中优化 2021-12-30 11:41:13 +08:00
ZhangBiao 44aa663ab0 Merge branch 'china/dev' into 0功能/家园 2021-12-30 11:24:38 +08:00
ZhangBiao f148668636 【家园】提交 2021-12-30 11:00:27 +08:00
jiaoyangna a7fde7ccf2 报错修改提交 2021-12-30 10:14:01 +08:00
jiaoyangna d17a9aa29d 死亡之后站立不动 2021-12-30 10:07:02 +08:00
ZhangBiao 630d56c810 【家园】装备强化升级 2021-12-29 20:17:45 +08:00
jiaoyangna 2e8d75023d 添加动画 2021-12-29 18:39:59 +08:00
wangzhenxing db071514f9 【战斗】======被动283修改 2021-12-29 17:59:48 +08:00
jiaoyangna b46a62c25a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-29 17:11:09 +08:00
jiaoyangna f0a4cec767 【ID1010975】
【优化】超值返利每日首次登陆有红点提示
2021-12-29 17:10:48 +08:00
jiaoyangna 657574b61a 探索地图修改提交 2021-12-29 16:21:59 +08:00
jiaoyangna 89c298f593 探索地图修改提交 2021-12-29 16:05:16 +08:00
wangzhenxing beb2acd3af 【战斗】=========buff图标大小修改提交 2021-12-29 15:20:11 +08:00
jiaoyangna 4318b37891 探索中修改提交 2021-12-29 14:53:45 +08:00
jiaoyangna d91afe4326 探索 2021-12-29 14:35:11 +08:00
jiaoyangna 73eebe80e0 探索提交 2021-12-29 14:33:19 +08:00
jiaoyangna 32cc5de541 探索提交 2021-12-29 14:30:02 +08:00
jiaoyangna 4e4ebd563c 探索提交 2021-12-29 14:24:44 +08:00
ZhangBiao a1301a4a22 【家园】任务 2021-12-29 14:03:16 +08:00
jiaoyangna a6652757b1 探索提交 2021-12-29 13:29:21 +08:00
wangzhenxing 33f1934d02 【战斗】========角色皮肤释放技能表现修改 2021-12-29 13:08:32 +08:00