Commit Graph

491 Commits (ae03663c79c4633ebd59e3fc35ac0cdbe9906d66)

Author SHA1 Message Date
zhangqiang f7be239ea7 【踏碎凌霄】排行榜 2021-05-29 18:37:45 +08:00
wangzhenxing a7de414589 [限时抽卡活动] 抽卡优化,奖励展示修改 2021-05-29 18:27:03 +08:00
wangzhenxing 62f5514f80 [限时抽卡] 【公会福利红包】bug修改 2021-05-29 16:26:05 +08:00
wangzhenxing b49fcce742 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 15:37:09 +08:00
wangzhenxing 574d95b607 [限时祈愿活动]======修改bug提交 2021-05-29 15:35:52 +08:00
zhangqiang 4b289f571b 【关卡属性提升界面修改】 2021-05-29 15:06:16 +08:00
wangzhenxing 2526371970 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:09:29 +08:00
wangzhenxing 510b2460ea [限时祈愿] 活动奖励界面提交 2021-05-28 15:09:18 +08:00
gaoxin 1e36398a50 【内存优化】Util.Loadsprite 替换为 spLoader 2021-05-28 14:41:58 +08:00
zhangqiang ffed262485 【bug】 2021-05-28 13:48:43 +08:00
wangzhenxing 675ef2efd7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2021-05-28 10:47:07 +08:00
wangzhenxing 21574bebf1 【限时祈愿】==祈愿活动提交 2021-05-28 10:36:55 +08:00
zhangqiang fe6b69bfe6 【bug】提交 2021-05-28 10:32:42 +08:00
zhangqiang 4bfbd360dd 【山河社稷图】特效层级调整 2021-05-27 23:20:09 +08:00
zhangqiang 9922678210 【山河社稷图】开启章节界面修改 2021-05-27 23:09:37 +08:00
gaoxin 38e4008d81 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 20:45:26 +08:00
gaoxin f5071a9845 【bug】修复战斗结算报错,修复挂机奖励提升白片 2021-05-27 20:45:20 +08:00
zhangqiang 0b2ef33938 【山河社稷图】特效修改提交 2021-05-27 20:29:05 +08:00
jiaoyangna d9c94e250f 删除log 2021-05-27 20:24:10 +08:00
zhangqiang b92e659e53 【山河社稷图】特效提交 2021-05-27 20:17:53 +08:00
jiaoyangna 1e247043ac Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-27 19:42:22 +08:00
jiaoyangna 20f117702c 无尽副本修改提交 2021-05-27 18:37:51 +08:00
zhangqiang fd964d842b 【提交】 2021-05-27 16:51:29 +08:00
jiaoyangna 5dc0ea68ab 无尽副本提交 2021-05-27 15:35:10 +08:00
zhangqiang 56463b82bb 【漏提】 2021-05-27 15:20:21 +08:00
jiaoyangna 7779c1dbb1 无尽副本修改提交 2021-05-27 15:04:21 +08:00
ZhangBiao a6512d2778 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 14:44:59 +08:00
ZhangBiao f832ecfc33 【修行】玩家信息界面显示的神印图标,在一行和两行的玩家之间切换,有遮挡 2021-05-27 14:44:49 +08:00
zhangqiang 397d24ee32 【山河社稷图】胜利条件显示增加 2021-05-27 14:40:34 +08:00
jiaoyangna 7d5ff8c3f1 设置按钮修改 2021-05-27 14:05:05 +08:00
jiaoyangna f49cefd6b3 战斗结算修改 2021-05-27 11:23:38 +08:00
jiaoyangna da6437e2a2 无尽提交 2021-05-27 10:46:22 +08:00
ZhangBiao 9d4ec4495d 【云游商人】无可替换装备时,去除二次弹窗,改为系统提示 2021-05-27 09:23:45 +08:00
jiaoyangna 35d0927881 无尽副本修改提交 2021-05-26 22:00:33 +08:00
jiaoyangna 736293cbe9 头像框颜色提交 2021-05-26 20:53:18 +08:00
zhangqiang aca4aa47ac 【音效修改】 2021-05-26 19:40:03 +08:00
jiaoyangna 618d8094ea 无尽副本修改提交 2021-05-26 17:27:47 +08:00
ZhangBiao e242e08b01 【名字颜色修改】 2021-05-26 17:03:42 +08:00
jiaoyangna bb2cd6a263 无尽副本修改提交 2021-05-26 14:57:28 +08:00
jiaoyangna c95211428b Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-26 11:55:14 +08:00
ZhangBiao 51576888a2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 11:53:54 +08:00
ZhangBiao 5155b4aeb3 【主界面】提交 2021-05-26 11:53:45 +08:00
zhangqiang da9aeed441 【心魔试炼】提交 2021-05-26 11:48:44 +08:00
ZhangBiao 172f98c207 【修行】玩家界面预览报错修改 2021-05-26 11:28:59 +08:00
jiaoyangna 911f443e40 添加属性提升 2021-05-26 09:51:41 +08:00
jiaoyangna 3846170f2d 属性提升界面修改提交 2021-05-25 21:40:41 +08:00
jiaoyangna 5fb2aa23ce 无尽副本修改提交 2021-05-25 16:20:56 +08:00
ZhangBiao d09ff174d2 【修行】取消玩家信息界面神印神将头像,练气期预览报错修改 2021-05-25 15:50:41 +08:00
gaoxin e7c8d5290d 【仙缘抽】修复报错 2021-05-25 10:30:18 +08:00
gaoxin bfbc185604 【抽卡】仙缘汇聚箱加入山河社稷图星数条件 2021-05-24 20:33:26 +08:00