Commit Graph

7649 Commits (1f4499e8bb45cf0979cffe4b2bb902125a6a4575)
 

Author SHA1 Message Date
gaoxin 1f4499e8bb 【物品特效】修复魂印特效显示错误 2021-07-09 17:05:55 +08:00
gaoxin 1a33172a27 【地图】节点27是特效节点 2021-07-09 15:02:11 +08:00
gaoxin c33b24ba18 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-09 14:57:02 +08:00
gaoxin be7cc055a1 【物品特效】不再根据品质显示特效,根据新字段Quantity1判断显示 2021-07-09 14:56:57 +08:00
jiaoyangna 21b85bedff 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移  调整间距

(cherry picked from commit eae0af74e5)
2021-07-09 14:47:17 +08:00
gaoxin 5d60ef45ab 【地图】添加第27号事件点 2021-07-09 14:37:40 +08:00
gaoxin 49b55f863a 【地图资源导入】 2021-07-09 13:59:43 +08:00
gaoxin b11fe20dfd 【Android】删除对某特殊sdk的配置 2021-07-09 11:58:35 +08:00
gaoxin b45278e389 【version】删除AssetBundles中无用的version配置 2021-07-09 11:57:46 +08:00
gaoxin 9b48609229 【C#Log】C#层log打印走log等级控制 2021-07-09 11:56:53 +08:00
ZhangBiao 5e1897515b 【商店】商店黑屏修复 2021-07-09 11:10:38 +08:00
ZhangBiao 3194181f65 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-08 18:42:23 +08:00
ZhangBiao b02b315f78 Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-08 18:41:26 +08:00
jiaoyangna 23c58e1bd0 九元露图片提交
(cherry picked from commit 75b93cdff1)
2021-07-08 18:41:24 +08:00
ZhangBiao fc8e199a43 【鸿蒙阵】使者处于突破等级且突破,共鸣神将不算突破 2021-07-08 18:41:14 +08:00
jiaoyangna fa30243bf5 玉皇大帝修改提交
(cherry picked from commit 6ea9ee51c0)
2021-07-08 18:30:29 +08:00
zhangqiang 21ec904da5 【心魔试炼】点击快速战斗偶先报错卡死 2021-07-08 18:08:16 +08:00
zhangqiang c723fa04af 【飘邈之旅】页签的入口文字要与图片统一成“飘邈之旅”字 2021-07-08 16:20:22 +08:00
ZhangBiao e250223aa2 【鸿蒙阵】增加logerror
(cherry picked from commit 30f2a8cb1a)
2021-07-08 15:55:04 +08:00
zhangqiang 9c2dee5856 【缥缈之旅】没解锁天数完成了任务,礼包显示灰点 2021-07-07 15:56:29 +08:00
zhangqiang 803fcee6bf 【碎片图标】点击碎片图标弹出弹窗,再点击弹窗中图标,显示错误 2021-07-07 15:16:31 +08:00
jiaoyangna df4a9b0d74 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-07 11:57:49 +08:00
jiaoyangna 2042f3ace8 Merge branch '0优化/主题活动' into china/dev 2021-07-07 11:57:31 +08:00
jiaoyangna c72ccc962b 【ID1009632】
【优化】修改无尽副本对话ui
2021-07-07 11:53:23 +08:00
jiaoyangna 8ec0256d78 排序修改提交 2021-07-07 11:44:40 +08:00
zhangqiang 5163eab963 【缥缈之旅】停在活动界面等待活动结束,没有自动退出,继续操作活动内的按钮,弹服务器紧急维护 2021-07-07 11:40:30 +08:00
jiaoyangna fd9f4248b6 百宝商会文字错乱修改 2021-07-07 11:30:21 +08:00
jiaoyangna 7aa590621c 百宝商会文字错乱修改 2021-07-07 11:28:50 +08:00
jiaoyangna 05ef24c89c 【ID1009632】
【优化】修改无尽副本对话ui
2021-07-06 19:01:27 +08:00
jiaoyangna 735f694270 隐藏页签 2021-07-06 17:04:36 +08:00
zhangqiang 22e00b9fcd 【心魔试炼】增加快速挑战功能 2021-07-06 16:50:48 +08:00
jiaoyangna 13905916d1 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 16:48:59 +08:00
jiaoyangna 6cc47ddac1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-06 15:50:41 +08:00
jiaoyangna bc185698d3 颜色修改提交 2021-07-06 15:50:32 +08:00
gaoxin 8297176603 Merge remote-tracking branch 'origin/china/quick' into china/dev
# Conflicts:
#	Assets/Editor/AutoPack.cs
#	Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.atlas.txt
#	Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.png
#	Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2021-07-06 15:37:43 +08:00
gaoxin 441952c2fb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-06 15:27:44 +08:00
gaoxin 9c58070aa8 Merge branch 'china/dev-c' into china/dev
# Conflicts:
#	Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
#	Assets/ManagedResources/BG/t_tehuishenzhuang_ditu.png.meta
#	Assets/ManagedResources/DynamicAtlas/s_suoxiangpimi_banner_zh.png.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua
#	Assets/Scripts/Editor/GameEditor/FrameTool/ConfigWindow.cs
2021-07-06 15:27:09 +08:00
jiaoyangna 1cd1e719b4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-06 15:26:06 +08:00
jiaoyangna 337ad7b1d2 颜色修改提交 2021-07-06 15:26:02 +08:00
jiaoyangna bc34bdce69 【ID1009609】
【优化】无尽副本优化
2021-07-06 15:19:56 +08:00
zhangqiang c66cd98958 【化虚坛】神将合成材料框没有隐藏bug 2021-07-06 14:53:15 +08:00
jiaoyangna 3219a1a2b8 【ID1009609】
【优化】无尽副本优化
2021-07-06 14:43:45 +08:00
jiaoyangna d55789480a 图片修改提交 2021-07-06 14:43:12 +08:00
jiaoyangna 8dfb6ac056 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 11:41:01 +08:00
jiaoyangna cd8e1554de 图片提交 2021-07-06 11:22:53 +08:00
jiaoyangna 4ba69227f5 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 11:17:49 +08:00
zhangqiang d29613e32a 【缥缈之旅】替换资源 2021-07-06 10:22:17 +08:00
jiaoyangna b36edb9ae9 资源导入工具修改提交 2021-07-05 18:52:37 +08:00
zhangqiang d25b80dd1b 【缥缈之旅】bug 2021-07-05 18:01:31 +08:00
jiaoyangna f63f411268 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 17:19:25 +08:00