Commit Graph

191 Commits (27ead6dcff6ad7cd143f765d34ca9b6db7b3daac)

Author SHA1 Message Date
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
gaoxin da2b205955 【挂机】添加新人商城入口 2021-12-30 00:01:14 +08:00
jiaoyangna 39254af42e 探索提交 2021-12-23 13:45:05 +08:00
jiaoyangna f9689bafde 删除没用的log 2021-12-21 13:10:52 +08:00
jiaoyangna e2eada47d1 删除log 2021-12-20 22:00:12 +08:00
jiaoyangna b841b77467 关卡解锁跳转添加提交 2021-12-20 15:43:54 +08:00
jiaoyangna 5ab2f2f40a 关卡tips 关卡条件修改提交 2021-12-20 14:56:43 +08:00
gaoxin ce0c1db2f3 【关卡】解锁提示资源提交 2021-12-27 16:55:17 +08:00
gaoxin 5bfb89d276 【关卡挂机】未解锁跳转功能添加 2021-12-27 13:11:33 +08:00
gaoxin 7d02fd5394 【解锁提示】添加解锁条件显示 2021-12-27 09:58:34 +08:00
gaoxin ab3d7e939b 【解锁提示】添加功能解锁提示 2021-12-26 19:12:25 +08:00
gaoxin f0d9f4828f 【关卡新条件】条件显示在按钮上 2021-12-26 18:13:39 +08:00
gaoxin f920d4807c 【无用log删除】 2021-12-13 15:49:02 +08:00
gaoxin c46d18eb17 【关卡新条件】好感度等级获取方式修改,逍遥游完成次数协议添加 2021-12-13 15:48:26 +08:00
gaoxin 6c259fbf26 【关卡新条件】完善 2021-12-13 15:27:17 +08:00
gaoxin 3835273079 【关卡】条件新增 2021-12-10 17:37:07 +08:00
gaoxin 666e6f51a3 【开服福利】最后一档奖励变更为寻仙玉,外面入口还是猴子图片 2021-12-07 17:10:43 +08:00
ZhangBiao 9e83ce264d 【引导】升级后不弹引导修改 2021-11-30 15:43:02 +08:00
ZhangBiao d39153607b 【灵兽特惠】倒计时修改 2021-11-29 13:40:53 +08:00
gaoxin e2c42fcdb5 【关卡】修复剧情关卡后按钮状态刷新不及时的问题 2021-12-02 04:18:13 +08:00
gaoxin 8a960ece3b 【关卡】添加剧情关卡 2021-12-02 01:06:34 +08:00
gaoxin 93640449f3 【引导】副本前引导添加 2021-11-12 15:55:53 +08:00
gaoxin 1d22b10e61 【引导】通过关卡时引导添加 2021-11-12 14:52:30 +08:00
jiaoyangna 234c17cfe4 挂机奖励预览四舍五入显示
(cherry picked from commit 09ef1c8981)
2021-10-15 12:13:47 +08:00
jiaoyangna 101f406a4c 【ID1010469】
好感度优化
2021-10-14 20:15:53 +08:00
jiaoyangna 89f66bc294 特权收益描述修改提交 2021-10-09 14:53:22 +08:00
jiaoyangna e3bb67c8a1 特权收益显示修改提交 2021-10-09 14:34:34 +08:00
jiaoyangna d58e38fcea 【ID1018684】
【好感度】好感度挂机加成没在挂机奖励预览处显示数量
2021-10-09 12:04:01 +08:00
jiaoyangna 4dfdc507f7 绿色修改提交 2021-09-29 16:19:29 +08:00
jiaoyangna ad35e1646c 特权显示修改 2021-09-27 17:46:43 +08:00
jiaoyangna 4e17b829ba 红点修改提交,挂机界面预览修改提交 2021-09-27 10:58:41 +08:00
jiaoyangna 3a5e3cf17e 好感度提交 2021-09-26 21:32:04 +08:00
jiaoyangna d39ef472dc 好感度提交 2021-09-26 20:23:08 +08:00
gaoxin fcc1e17cad 【红点】无用红点绑定事件删除 2021-09-14 17:37:44 +08:00
zhangqiang 6ad43f93ed 【飘邈之旅】玩法入口文字错误 2021-08-20 10:56:14 +08:00
gaoxin cd5ee0a6e0 【挂机奖励】修复满级后领取挂机奖励会弹出升级提示的问提 2021-08-02 17:47:43 +08:00
wangzhenxing ef714577e8 [bug]========称号显示修改 2021-07-28 16:10:58 +08:00
zhangqiang 71f7e8a469 Merge branch 'china/dev' into china/jumpserver
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-07-27 11:26:30 +08:00
ZhangBiao 31e8aa5d00 【山河社稷图】关闭关卡界面入口 2021-07-23 15:22:51 +08:00
zhangqiang b395410ac1 Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-20 18:09:07 +08:00
zhangqiang c723fa04af 【飘邈之旅】页签的入口文字要与图片统一成“飘邈之旅”字 2021-07-08 16:20:22 +08:00
zhangqiang 73a4eee31b 【缥缈之旅】提交8 2021-07-05 15:04:46 +08:00
zhangqiang de844aea18 【缥缈之旅】提交5 2021-07-03 19:23:15 +08:00
zhangqiang fbda34d678 Merge branch 'china/dev' into china/dev_缥缈之旅
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-07-03 16:53:42 +08:00
zhangqiang 2f269ebfa8 【缥缈之旅】提交2 2021-07-03 12:37:56 +08:00
zhangqiang a2528a3ded 【去掉无用打印】 2021-07-01 21:07:53 +08:00
zhangqiang 1be2dc60eb 【缥缈之旅】提交1 2021-07-01 20:13:47 +08:00
ZhangBiao 53567ea586 【Log】清除带颜色的Log 2021-07-01 16:33:40 +08:00
zhangqiang 4438ad6a72 【跨服天梯】国内首提 2021-06-15 20:08:14 +08:00
jiaoyangna 65860bb337 删除剧情对话挂机地图音效 2021-06-10 22:59:26 +08:00