Commit Graph

8067 Commits (404618f9bc5311147ced1aaa68ac169f5f364001)

Author SHA1 Message Date
ZhangBiao 404618f9bc 【家园】摘星阁突破显示 2022-01-06 11:53:37 +08:00
ZhangBiao 68ad9cf7e1 【家园】提交 2022-01-06 11:45:28 +08:00
ZhangBiao 499e1d2d49 【家园】界面微调 2022-01-06 10:56:59 +08:00
ZhangBiao 893e33d920 【家园】提交 2022-01-06 10:33:08 +08:00
ZhangBiao 2f03bf5ab7 【家园】提交 2022-01-05 19:12:54 +08:00
ZhangBiao 29a16ba5c8 【家园】提交 2022-01-05 18:16:10 +08:00
ZhangBiao aa761fc4e9 【家园】提交 2022-01-05 18:04:57 +08:00
ZhangBiao b45f74781c 【家园】提交 2022-01-05 17:06:34 +08:00
ZhangBiao 6f4942e87e 【家园】提交 2022-01-05 16:21:20 +08:00
ZhangBiao f0de43aad2 【家园】提交 2022-01-05 14:17:53 +08:00
ZhangBiao a4ab9eb231 【家园】报错提交 2022-01-05 11:05:11 +08:00
ZhangBiao ee7dc987a8 【家园】资源 2022-01-05 10:40:12 +08:00
ZhangBiao c0d27feac2 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2022-01-05 10:16:25 +08:00
ZhangBiao 19c27ae7bb 【家园】提交 2022-01-05 10:12:23 +08:00
ZhangBiao 5e0c53e322 【家园】替换底图 2022-01-04 18:58:34 +08:00
ZhangBiao 14044932b5 【命格】属性加成报错修改 2022-01-04 16:57:52 +08:00
gaoxin 5724728062 【职业筛选】颜色修改,添加混乱 2022-01-04 15:45:06 +08:00
ZhangBiao a07fdc40ac 【家园】提交 2022-01-04 15:10:35 +08:00
gaoxin 9de91f4259 【修行】删除黄点显示 2022-01-04 14:30:22 +08:00
gaoxin c07ba438a0 【职业筛选】颜色修改 2022-01-04 14:07:15 +08:00
gaoxin ad8653d679 Merge branch '0优化/山河社稷图筛选显示' into china/dev 2022-01-04 13:22:22 +08:00
ZhangBiao fbe50eb413 【家园】提交 2022-01-04 10:51:59 +08:00
gaoxin 9b2057bede 【山河筛选】添加职业呼吸效果 2022-01-03 02:17:03 +08:00
ZhangBiao 39244f8ce5 【家园】特权完成,2021最后的提交!! 2021-12-31 18:58:04 +08:00
ZhangBiao 2b3afae7ea 【家园】特权 2021-12-31 18:13:10 +08:00
gaoxin 0c9b3b4f96 【角色信息】修复回收立绘错误 2021-12-31 17:55:01 +08:00
gaoxin d1b84299c2 【修行优化】点击圆点弹出TIPS后,切换点击其他圆点应切换TIPS内容,而非关闭之前的TIPS 2022-01-03 02:43:00 +08:00
ZhangBiao 27ead6dcff 【家园】提交 2021-12-31 16:30:53 +08:00
ZhangBiao cf9cbc5ac9 【家园】摘星阁装备属性加持+战斗力 2021-12-31 13:44:11 +08:00
ZhangBiao bd2d5ccd50 【家园】提交 2021-12-30 20:24:59 +08:00
ZhangBiao 85319e89f0 【家园】提交 2021-12-30 20:09:16 +08:00
ZhangBiao 8de1e4e596 【家园】资源提交 2021-12-30 19:02:52 +08:00
jiaoyangna 57b0689de6 【ID1010911】
【森罗优化】退出森罗幻境时弹出累积收益
2021-12-30 18:06:36 +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 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 973e19ac66 超值返利修改提交 2021-12-30 15:05:21 +08:00
wangzhenxing c5d42ab873 [玉虚论道]======音效数据修改提交 2021-12-30 14:44:40 +08:00
wangzhenxing 270e359507 [玉虚论道]=====对战界面添加音效 2021-12-30 14:41:43 +08:00
ZhangBiao 0f32a05956 【装备界面】增加摘星阁加持 2021-12-30 11:49:12 +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
ZhangBiao 630d56c810 【家园】装备强化升级 2021-12-29 20:17:45 +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
ZhangBiao a1301a4a22 【家园】任务 2021-12-29 14:03:16 +08:00