Commit Graph

578 Commits (8ab7558cac34545e55908f64e11caddc6ac58159)

Author SHA1 Message Date
gaoxin b6a00666ae 【动画】循环列表动画修改为平移动画,拖动时不再播放动画 2021-12-30 22:09:34 +08:00
jiaoyangna 09a810af3f 玉帝跳转提交 2021-12-24 14:52:05 +08:00
jiaoyangna 36ec134505 玉帝获取途径跳转提交 2021-12-24 14:20:06 +08:00
jiaoyangna e34092f93d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 10:54:16 +08:00
ZhangBiao 926e0a4fbd 【命石】一键合成修改 2021-12-23 16:17:35 +08:00
jiaoyangna 39254af42e 探索提交 2021-12-23 13:45:05 +08:00
ZhangBiao e6aa1d31fe Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
2021-12-23 09:43:06 +08:00
ZhangBiao 4b27fa6a1b 【副本】灰色红点提交 2021-12-20 15:45:06 +08:00
ZhangBiao a197f16837 Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-12-17 15:46:53 +08:00
ZhangBiao d939e6b32b 【新人商城】提交 2021-12-17 14:00:07 +08:00
gaoxin acf5e8e31a 【挂机物品】导致其他物品显示错误 2021-12-26 17:29:06 +08:00
gaoxin cb8f8fe0aa 【挂机物品】添加时间标签 2021-12-26 17:13:30 +08:00
ZhangBiao ad589aa449 【命格】提交 2021-12-10 17:18:18 +08:00
ZhangBiao ae3a2fa3e4 【命格】提交 2021-12-08 15:40:43 +08:00
ZhangBiao fe99e89eb9 【连购礼包】顶呱深处跳转修改 2021-12-06 19:11:45 +08:00
ZhangBiao 9db47caa8e 【连购礼包】跳转修改 2021-12-06 18:59:57 +08:00
jiaoyangna 77949c23e6 商店背景蒙黑处理 2021-12-06 17:56:47 +08:00
jiaoyangna 9ae56712c4 添加已获得标志 2021-12-06 16:04:01 +08:00
jiaoyangna 709f125845 商店修改 2021-12-06 15:43:05 +08:00
jiaoyangna 0ca366cdf4 添加加号提交 2021-12-06 11:11:16 +08:00
jiaoyangna 6309159f77 方寸寻宝修改提交 2021-12-06 09:58:04 +08:00
jiaoyangna 1253466912 天地烘炉提交 2021-12-02 15:18:56 +08:00
ZhangBiao 14b6087d77 【神将来源】获取途径报错修改 2021-11-27 17:21:24 +08:00
jiaoyangna 0c6ff17ddd 修改提交 2021-11-27 14:30:51 +08:00
wangzhenxing 3c22a1ef6c [立绘朝向]======静态立绘朝向改回原样 2021-11-27 13:17:36 +08:00
jiaoyangna f6c94a3cfe 变身卡详情提交 2021-11-26 19:36:20 +08:00
wangzhenxing 587a5cfc2e [战斗]=======133 136 137效果修改 2021-11-26 18:05:16 +08:00
jiaoyangna 5542212cc1 天地烘炉提交 2021-11-26 17:04:54 +08:00
gaoxin 290911903c 【法宝聚灵】修复开启宝箱获取时不显示数字 2021-11-22 13:37:12 +08:00
ZhangBiao aa52131d3f 【灵脉秘境】文字遮挡、跳转 2021-11-22 13:27:54 +08:00
gaoxin b10dad4285 【法宝聚灵】背包和掉落界面不显示碎片框 2021-11-22 12:01:16 +08:00
jiaoyangna 04ff9d99e4 碎片自选箱修改提交 2021-11-22 11:16:18 +08:00
jiaoyangna 1b11728534 道具点击报错修改提交 2021-11-19 18:39:04 +08:00
jiaoyangna bc62311af9 法宝之魂第二个界面提交 2021-11-19 16:52:15 +08:00
jiaoyangna 2911c5b77c 乾坤宝囊限时商店修改提交
(cherry picked from commit e8df9ca87e)
2021-11-17 10:36:57 +08:00
ZhangBiao 79f6f739ad 【天枢密卷】魂印文字过长修改 2021-11-09 14:44:39 +08:00
ZhangBiao ed02f4a86f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-09 10:22:33 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
jiaoyangna 173221dd1a 【ID1010656】
【商店优化】魂印商店中,玩家尚未获得过的魂印上添加“新”标志
2021-11-08 17:22:51 +08:00
jiaoyangna afcfc1b393 神魂星星修改提交 2021-11-05 17:38:10 +08:00
jiaoyangna 2aea503619 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:14:08 +08:00
jiaoyangna bd8cd97bf3 神魂星星修改提交 2021-11-05 17:13:49 +08:00
ZhangBiao 142956ca6a 【活动】活动修改提交 2021-11-05 16:43:09 +08:00
jiaoyangna 9d1e517743 四灵试炼层级报错修改 2021-11-05 13:53:56 +08:00
jiaoyangna d0d93e02ea 代码星星层级设置修改 2021-11-05 13:18:55 +08:00
gaoxin 2f65f4d391 【心魔试炼】界面报错修复 2021-11-05 11:06:10 +08:00
jiaoyangna 0d68d9229b 神魂提交 2021-11-05 10:18:10 +08:00
jiaoyangna 154aa77cd3 神魂特效修改提交 2021-11-04 10:46:25 +08:00
jiaoyangna 596c8477d3 Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-11-04 09:29:56 +08:00
jiaoyangna 34d8cf4440 神魂位置提交 2021-11-04 09:27:56 +08:00