Commit Graph

1019 Commits (bdb9eeba2dab0f3627bdefdb50ca6dcd27f836f9)

Author SHA1 Message Date
jiaoyangna 37259287a4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 16:43:37 +08:00
jiaoyangna 94858e80ff 【主题活动-累计充值】 文字提示修改 2020-10-26 16:43:22 +08:00
jiaoyangna 1ebd6a5727 灵兽召唤提交 2020-10-26 16:00:34 +08:00
wangzhenxing 443bdab87f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 16:27:38 +09:00
ZhangBiao d4b75e0d73 【社稷大典】时间弹跳修复,物品边框颜色修改
(cherry picked from commit 709dc1a5bd)
2020-10-26 16:24:16 +08:00
wangzhenxing 91ed513602 人物信息修改提交 2020-10-26 16:26:21 +09:00
jiaoyangna bdfb518274 乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改 2020-10-26 15:11:44 +08:00
yuanshuai afd0b542fe 骰子动画修改 2020-10-26 15:04:44 +08:00
gaoxin 9ac7e7b9a3 Merge branch 'master_develop' into 0功能/灵兽战斗
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua
2020-10-26 14:33:22 +08:00
gaoxin 7b64ca48d3 【灵兽】战斗界面结构修改 2020-10-26 11:41:51 +08:00
zhangqiang aff128d50a 灵兽提交 2020-10-24 19:46:10 +08:00
wangzhenxing a0270d471b 灵兽提交 2020-10-24 18:41:20 +09:00
ZhangBiao d36645cc7f 【社稷大典】资源修改 2020-10-24 17:36:51 +08:00
zhangqiang b569a35aea 预设合并提交 2020-10-24 16:55:06 +08:00
wangzhenxing e381b9e771 灵兽放生修改提交 2020-10-24 16:51:09 +09:00
ZhangBiao d2bc65ec48 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-24 16:47:57 +08:00
ZhangBiao 7b4f959687 Merge branch '0活动开发聚集地/社稷大典' into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2020-10-24 16:47:45 +08:00
zhangqiang c791399431 灵兽提交 2020-10-24 16:44:05 +08:00
ZhangBiao c768775e06 【社稷大典】加完红点完事了 2020-10-24 16:18:57 +08:00
zhangqiang 3d72b9c0ea 灵兽提交 添加羁绊红点预设 2020-10-24 16:11:58 +08:00
wangzhenxing e30de8da3f 灵兽提交 2020-10-24 15:32:39 +09:00
jiaoyangna 2238dc5db4 灵兽抽卡 修改 2020-10-29 15:08:22 +08:00
zhangqiang 0f4cd6d43e Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-24 14:15:45 +08:00
zhangqiang 7a4cd7ba8f 零售品升级升星红点 2020-10-24 14:15:35 +08:00
ZhangBiao ce11afc1e8 添加公会检查 和排行细节修改,初始的进度条积分有问题 2020-10-24 13:18:04 +08:00
ZhangBiao d57fc60aa1 社稷大典,差个加工会限制和领奖界面 2020-10-23 19:34:03 +08:00
jiaoyangna 7bfec03778 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-23 19:14:31 +08:00
jiaoyangna f882c9c70c 抽卡提交 2020-10-23 19:14:24 +08:00
jiaoyangna 2f83fdfd95 灵兽抽卡回滚提交 2020-11-05 05:54:10 +08:00
zhangqiang 291cddbb3f 灵兽提交 2020-10-23 19:10:00 +08:00
zhangqiang 2cf881c4d5 灵兽提交 2020-10-23 15:12:21 +08:00
jiaoyangna eee353cc4e generalpopup commit 2020-11-05 03:06:53 +08:00
jiaoyangna c1b227c26b Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-11-05 03:03:16 +08:00
jiaoyangna da88485b4c lingshou zhaohuan tijiao 2020-11-05 03:03:08 +08:00
jiaoyangna e9f42ce609 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
2020-11-04 22:27:36 +08:00
jiaoyangna d49c1b97cb 灵兽羁绊提交 2020-11-04 22:25:59 +08:00
zhangqiang 6767828cdc Merge branch 'master_develop' into 0功能/灵兽系统
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/Spine/ls_06_baize.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.atlas.txt.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.png.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.skel.bytes.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-10-23 14:38:50 +08:00
wangzhenxing 91ee82c5e1 涅槃提交 2020-10-23 14:05:50 +09:00
wangzhenxing 1466227510 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-23 09:55:02 +09:00
wangzhenxing 22a2789d08 灵兽涅槃提交 2020-10-23 09:54:49 +09:00
zhangqiang 7452d795e8 灵兽提交 2020-10-22 20:50:11 +08:00
zhangqiang eb153fdaa6 灵兽提交 2020-10-22 16:13:44 +08:00
zhangqiang 0270d54e10 灵兽提交 2020-10-22 12:41:44 +08:00
jiaoyangna 7931e3ed1c Merge branch 'master_develop' into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
2020-10-22 11:12:17 +08:00
zhangqiang 83088ea429 提交 2020-10-22 10:03:46 +08:00
wangzhenxing 11ccf2ab6f 灵兽分解预设提交 2020-10-21 17:25:12 +09:00
jiaoyangna d555d983ea 累计充值修改提交, 灵兽提交 2020-10-21 16:05:33 +08:00
zhangqiang 74858bdbe7 灵兽提交 2020-10-21 15:40:23 +08:00
zhangqiang f8d6c63368 灵兽提交 上阵提交 2020-10-21 11:58:16 +08:00
zhangqiang 3a6c14f607 灵兽提交 2020-10-20 20:18:02 +08:00
yuanshuai c3a67ef9aa Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-20 16:07:02 +08:00
yuanshuai 85507e2f6a 逍遙游自动游历开启 相关脚本资源提交 2020-10-20 16:06:52 +08:00
wangzhenxing ab4fa7925d Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-20 16:17:21 +09:00
zhangqiang c6f34794f3 灵兽提交 2020-10-20 16:08:51 +08:00
wangzhenxing 4e047140a8 灵兽提交 2020-10-20 16:17:08 +09:00
JieLing e3cac704d0 【逍遥游】优化奖励界面显示 2020-10-20 15:16:01 +08:00
yuanshuai 8f4464e693 骰子动画添加提交 2020-10-19 22:54:59 +08:00
ZhangBiao 072ab2ba46 逍遥游 commit 2020-10-19 22:18:31 +08:00
ZhangBiao ddfca80c45 逍遥 commit 2020-10-19 21:59:48 +08:00
ZhangBiao ec0f15f489 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 21:40:24 +08:00
ZhangBiao bfc4e834e4 修改boss 奖励 2020-10-19 21:40:17 +08:00
yuanshuai 7b40a855b9 自动游历功能屏蔽 2020-10-19 21:31:33 +08:00
yuanshuai 4f0f06b359 逍遥游红点提交 2020-10-19 21:30:31 +08:00
zhangqiang e47a1d5a45 灵兽提交 2020-10-19 20:30:28 +08:00
yuanshuai fab7ff6557 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 20:29:57 +08:00
yuanshuai 4316c30bf2 逍遥游红点和帮助弹窗提交 2020-10-19 20:29:49 +08:00
gaoxin 8f1601a573 重复资源删除 2020-10-19 20:19:45 +08:00
jiaoyangna 4a32348f90 yushe xiugai 2020-10-19 20:10:19 +08:00
zhangqiang 086292c67e 提交 2020-10-19 18:28:29 +08:00
yuanshuai 95ed2ba352 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 18:19:22 +08:00
yuanshuai fdf1fe5724 逍遥游脚本修改 2020-10-19 18:19:05 +08:00
jiaoyangna 66a3754adb boss commit 2020-10-19 18:03:58 +08:00
gaoxin affdfb81aa 【逍遥游】地图界面3、4、5位置调整 2020-10-19 17:15:16 +08:00
zhangqiang 034230ffc9 提交 2020-10-19 16:57:30 +08:00
yuanshuai 911bacc56c 逍遙游預設脚本提交 2020-10-19 16:00:48 +08:00
jiaoyangna 8baa135cba Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 15:06:33 +08:00
jiaoyangna b93b5eaedb xiaoyao commit 2020-10-19 15:06:27 +08:00
yuanshuai 773fb4085e Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 14:38:56 +08:00
yuanshuai d844a36917 逍遥游脚本提交 2020-10-19 14:38:44 +08:00
jiaoyangna 00cef72905 prefab 修改提交 2020-10-19 14:25:13 +08:00
jiaoyangna a2f23a825f 灵兽 提交 2020-10-19 14:14:52 +08:00
jiaoyangna c45d8ac743 灵兽 提交 2020-10-19 14:10:46 +08:00
yuanshuai 9143bd4236 yushetijiao 2020-10-19 12:16:20 +08:00
yuanshuai aff5e01480 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
2020-10-19 11:57:59 +08:00
yuanshuai 964abba2a0 逍遥游脚本预设提交 2020-10-19 11:53:47 +08:00
gaoxin 3b62c91c69 优化逍遥游地图进度显示,添加暂不开放的地图处理 2020-10-19 11:40:05 +08:00
gaoxin f3e675903a 优化逍遥游地图界面显示, 2020-10-19 11:15:32 +08:00
zhangqiang 92b2c3d6fb 提交 2020-10-19 10:56:55 +08:00
gaoxin fc3a8f78f2 逍遥游地图界面提交 2020-10-19 10:36:40 +08:00
yuanshuai 8a9b32f050 逍遥游显示优化 2020-10-17 20:05:16 +08:00
yuanshuai 82d6754cd0 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-17 18:10:10 +08:00
yuanshuai 69ed1376aa Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
2020-10-17 18:09:45 +08:00
jiaoyangna efa085707d 逍遥commit 2020-10-17 18:09:06 +08:00
yuanshuai 966822040f 逍遥游优化 2020-10-17 18:06:29 +08:00
jiaoyangna a90bb04673 添加云游值消耗 2020-10-17 16:07:05 +08:00
yuanshuai a7abe7aee5 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
2020-10-17 14:32:31 +08:00
yuanshuai ecd4695a7b 逍遥游地图界面预设脚本修改 2020-10-17 14:31:23 +08:00
wangzhenxing 711986c6a9 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-17 14:11:47 +09:00
wangzhenxing bd4f93309f 灵兽涅槃,召唤,商店提交 2020-10-17 14:11:34 +09:00
jiaoyangna cb6e29076a Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-16 19:19:41 +08:00
jiaoyangna 0703ea4f45 逍遥提交 2020-10-16 19:19:37 +08:00
yuanshuai f25854797e 逍遥游 资源脚本预设提交 2020-10-16 18:39:49 +08:00
jiaoyangna 2a5a23f3ed 显示优化提交 2020-10-16 17:37:54 +08:00
zhangqiang 179242de4c 提交 2020-10-16 16:50:27 +08:00
yuanshuai 7498b4dc01 脚本預設提交 2020-10-16 15:39:48 +08:00
yuanshuai 4017b81bd3 逍遙游脚本於是提交 2020-10-16 15:04:31 +08:00
jiaoyangna e2ebe3ee18 逍遥游事件数据提交 2020-10-16 10:06:48 +08:00
zhangqiang 425023d697 提交 2020-10-15 20:52:15 +08:00
jiaoyangna 63ea323a06 修改提交 2020-10-15 20:30:11 +08:00
jiaoyangna 6180692b3f Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-15 19:42:44 +08:00
jiaoyangna 598ca9e91f 修改提交 2020-10-15 19:41:47 +08:00
yuanshuai c3e8e60af2 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
2020-10-15 19:31:46 +08:00
wangzhenxing 45be005e63 灵兽抽卡放生功能提交 2020-10-15 20:27:41 +09:00
yuanshuai feb8aa2f9f 逍遥游脚本预设提交 2020-10-15 19:26:17 +08:00
jiaoyangna e76b41d784 预设资源提交 2020-10-15 17:08:54 +08:00
jiaoyangna 7d485277aa Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-10-15 16:52:38 +08:00
jiaoyangna 7a86931564 转盘,招募提交 2020-10-15 16:50:56 +08:00
yuanshuai a052877b1b 逍遥游功能完善 2020-10-15 16:30:51 +08:00
zhangqiang b93d7d0435 提交 2020-10-15 15:43:35 +08:00
yuanshuai faff35373b 预设提交 2020-10-15 14:28:27 +08:00
jiaoyangna e12a075e2c bosstij 2020-10-15 14:16:57 +08:00
zhangqiang eaf610e9c2 提交 2020-10-14 19:41:33 +08:00
zhangqiang b37b584d68 提交 2020-10-14 17:10:36 +08:00
ZhangBiao 74b9f4ec3a Merge branch 'master_develop' into 0活动开发聚集地/社稷大典
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
2020-10-14 14:39:04 +08:00
ZhangBiao f45e820dad Merge branch 'master_develop' into 0活动开发聚集地/社稷大典 2020-10-14 14:03:57 +08:00
jiaoyangna aa4c2a3f9c 势不可挡 提交 2020-10-13 20:36:01 +08:00
zhangqiang c939bab156 提交 2020-10-13 19:14:34 +08:00
zhangqiang f28501a893 提交 2020-10-13 16:32:50 +08:00
ZhangBiao 3b19043f34 森罗幻境 炸弹使用描述修改 2020-10-13 14:00:41 +08:00
zhangqiang bf2804f080 提交 2020-10-13 13:56:41 +08:00
jiaoyangna bd99b9c1ec 限时兑换层级错误修改 2020-10-12 18:30:14 +08:00
jiaoyangna 864535ca9b Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
2020-10-11 11:11:49 +08:00
yuanshuai 8487c445a3 逍遥游资源预设脚本提交 2020-10-15 10:53:00 +08:00
jiaoyangna db5dbbf700 boss 提交 2020-10-11 11:10:07 +08:00
jiaoyangna 5bf0f64989 boss 和 转盘数据 提交 2020-10-11 09:40:22 +08:00
jiaoyangna ba75aab424 仙缘事件界面提交 2020-10-10 19:18:27 +08:00
yuanshuai 57c7fd0890 逍遥游脚本资源预设提交 2020-10-14 16:57:35 +08:00
jiaoyangna a2cd90016f Merge branch 'master_develop' into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-10-10 15:07:52 +08:00
zhangqiang d2f9ffd2db 线上活动 森罗幻境达人前端显示 2020-10-10 14:51:50 +08:00
jiaoyangna 85dbe2d053 主题活动修改 2020-10-10 14:37:04 +08:00
ZhangBiao a40150c3cd 通用排名奖励界面创建 2020-10-10 11:54:13 +08:00
ZhangBiao 46edb1a00c 中心部分点击领取奖励 2020-10-09 19:38:15 +08:00
ZhangBiao 533dc2a8fd 修改了图片下方显示,下一步增加长按 2020-10-09 17:11:02 +08:00
ZhangBiao 927cc43b0d 社稷大典代码完善提交v1 2020-10-09 14:59:14 +08:00
ZhangBiao 1112953786 社稷大典 2020-10-09 09:30:02 +08:00
jiaoyangna 5e97e20e57 十绝阵特效修改 2020-09-30 17:10:58 +08:00
yuanshuai f4879ab650 逍遥游地图相关预设脚本修改 2020-09-29 18:19:15 +08:00
ZhangBiao d15da5d1e7 主题活动预设修改 2020-09-29 15:59:16 +08:00
ZhangBiao f0ccc8caf5 丹心碧血 预设提交 2020-09-29 15:54:26 +08:00
ZhangBiao 71cd037aa4 Merge branch 'master_develop' into 0活动开发聚集地/社稷大典 2020-09-29 15:52:38 +08:00
ZhangBiao 6524be790b 设计大点界面 2020-09-29 15:51:25 +08:00
wangzhenxing ed1d0e6150 灵兽修改提交 2020-09-29 16:13:06 +09:00
zhangqiang ef70664094 适配 2020-09-28 16:57:03 +08:00
yuanshuai 42d8a70a24 逍遥游地图界面提交 2020-09-28 16:30:52 +08:00
zhangqiang cccab99a11 灵兽提交 2020-09-28 11:22:47 +08:00
ZhangBiao 22832d895e 社稷大典 2020-09-27 16:00:15 +08:00
zhangqiang 0a3f59befa 灵兽提交 2020-09-27 11:46:09 +08:00
ZhangBiao d527c81d11 2020-09-27 10:15:05 +08:00
gaoxin 96ac81c098 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-27 13:33:39 +08:00
gaoxin 525e229273 部分界面头像特效添加 2020-09-27 13:33:10 +08:00
zhangqiang 637d910b5c 灵 受 2020-09-25 18:41:07 +08:00
ZhangBiao 5b47c9c889 虚位以待字体颜色修改 2020-09-25 18:16:37 +08:00
ZhangBiao af8e68da78 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-02 00:18:39 +08:00
ZhangBiao 90cab5221d 三界降魔 2020-10-02 00:18:17 +08:00
yuanshuai 9a5846943a 逍遥游入口界面预设脚本提交 2020-09-25 17:02:38 +08:00
jiaoyangna af8b461b50 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-10 16:39:53 +08:00
jiaoyangna de81143689 积天豪礼修改 2020-10-10 16:39:30 +08:00
ZhangBiao 9b9c094f3b Merge branch '0活动开发聚集地/三界除魔' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
2020-09-25 15:28:37 +08:00
ZhangBiao bec9ecf6d3 三界降魔 2020-09-25 15:24:59 +08:00
jiaoyangna cae421024a 积天豪礼添加动画 2020-09-25 14:59:05 +08:00
zhangqiang f40b2050ad 灵兽培养部分初始脚本 2020-09-25 14:48:10 +08:00
wangzhenxing 3bf0fbc623 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-09-25 11:46:12 +09:00
zhangqiang d485681b07 灵兽出战界面预设提交 2020-09-25 11:40:57 +08:00
wangzhenxing e92fb73587 灵兽逻辑提交 2020-09-25 11:45:43 +09:00
ZhangBiao e98973ff5a 三界降魔 2020-09-24 20:47:16 +08:00
gaoxin 69563a13c7 每日一键购买礼包金额显示添加 2020-09-24 20:25:27 +08:00
gaoxin 142d8ccf0e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 19:16:43 +08:00
gaoxin 293a4baaa5 优化挂机时长特权显示,涉及表:PrivilegeTypeConfig 2020-09-24 19:16:38 +08:00
jiaoyangna d600c57b0f 【挂机宝箱优化】挂机宝箱上显示当前挂机时长,精确到分 2020-09-24 17:55:36 +08:00
jiaoyangna c9c943da32 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 17:53:53 +08:00
jiaoyangna bfc32b4541 百宝商会时间修改 2020-09-24 17:53:48 +08:00
zhangqiang 65e5b41dee 竞技场排序 车迟抢夺排序 试炼节点缩小 2020-09-24 17:15:57 +08:00
ZhangBiao 665a5483eb 三界降魔 2020-09-24 17:07:12 +08:00
ZhangBiao 551dcaa01d 三界降魔 2020-09-23 20:27:29 +08:00
jiaoyangna 4389beca87 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-23 16:56:53 +08:00
jiaoyangna 2269c50897 【活动需求】百宝商会,免费礼包红点 2020-09-23 16:56:06 +08:00
zhangqiang 5f8b1027ee 线上活动 : 三周活动 寻宝达人 四周 天宫达人 2020-09-23 14:51:33 +08:00
zhangqiang 6a5eb99853 灵兽资源提交 2020-09-21 11:01:49 +08:00
jiaoyangna cfd1f8d51b 添加动画 2020-09-18 13:43:52 +08:00
ZhangBiao 5cd8e621dc 限时活动,限时兑换、礼包抢购增加动效 2020-09-16 14:09:31 +08:00
ZhangBiao 60172f3089 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 10:52:16 +08:00
ZhangBiao 13fff17277 在线奖励一键领取 2020-09-16 10:52:09 +08:00
jiaoyangna 35c5de3561 适配修改提交 2020-09-18 18:34:02 +08:00
jiaoyangna 3d5ebd7f61 送神祠修改提交 2020-09-15 17:42:32 +08:00
ZhangBiao 8fab058727 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 14:55:46 +08:00
ZhangBiao a217f483d2 成长基金"已达成"按钮消失 问题修改 2020-09-15 14:55:40 +08:00
jiaoyangna aacf1d029d 【十绝阵】敌人编队卡牌应使用无血条版本的边框 2020-09-15 14:47:15 +08:00
jiaoyangna 050df9638f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 10:28:39 +08:00
jiaoyangna 4d2c5e15ba 【碎片显示】确认购买和碎片合成时,不显示碎片道具的属性和碎片边框 2020-09-15 10:28:34 +08:00
ZhangBiao af96f69236 设置界面增加动效 2020-09-15 10:28:11 +08:00
jiaoyangna ff3c5f147e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 18:31:33 +08:00
jiaoyangna 9745834de4 添加动画 2020-09-14 18:31:21 +08:00
ZhangBiao 44f6f55d19 月卡增加动效 2020-09-17 00:09:06 +08:00
ZhangBiao 72601bff4f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 23:30:29 +08:00
ZhangBiao 6aebe6f49e 周月卡 点将台动效添加 2020-09-16 23:30:21 +08:00
jiaoyangna 93dbd1648a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 15:31:54 +08:00
jiaoyangna 9846aebcf2 图鉴2460适配修改,【十绝阵】开启后没有显示主城入口,十绝阵活动结束后吗,入口显示0000不关闭,【青龙秘宝】活动描述和背景重叠 2020-09-14 15:31:33 +08:00
zhangqiang 4489d67d8e 积天豪礼修改显示数字 2020-09-14 15:29:04 +08:00
zhangqiang e7918aa3dc 排行榜适配 2020-09-22 14:51:27 +08:00
zhangqiang 078906049f 巅峰战适配 2020-09-22 13:59:11 +08:00
jiaoyangna 6a47476673 公会副本 添加动画 2020-09-12 15:24:20 +08:00
jiaoyangna 68b1628c8c 破阵诛仙 2020-09-11 17:48:55 +08:00
jiaoyangna b0280552a1 chichafengyun icon 提交,开服福利添加动画 2020-09-11 11:47:55 +08:00
ZhangBiao 70c535e1d8 限时兑换 奖励错误修改 2020-09-11 11:04:04 +08:00
jiaoyangna 8b8e390a8a 邮件添加动画 2020-09-10 18:40:22 +08:00
ZhangBiao dd4c91a46c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 16:53:23 +08:00
ZhangBiao ca65ebbe49 限时兑换添加到叱咤风云中 2020-09-10 16:53:06 +08:00
jiaoyangna 3d99e2a46c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 18:08:26 +08:00
jiaoyangna 89f937e9ac 破阵诛仙提交 2020-09-10 18:08:21 +08:00
jiaoyangna 6eed7b719d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 15:37:34 +08:00
jiaoyangna f2015e8c98 日常任务修改 2020-09-10 15:36:17 +08:00
gaoxin bccc1204e7 兑换码功能开启 2020-09-10 14:28:28 +08:00
jiaoyangna 3e5e41b8ff 破阵诛仙提交 2020-09-10 13:40:07 +08:00
ZhangBiao e557130da8 十绝阵奖励偏移修改 2020-09-09 17:57:54 +08:00
ZhangBiao b209b5ae28 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 10:52:58 +08:00
ZhangBiao 462ad7b96b 主题活动界面适配调整 2020-09-09 10:52:50 +08:00
jiaoyangna d84b25c7a6 限时召唤提交 2020-09-10 09:33:27 +08:00
zhangqiang 6e04bd3404 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 10:37:02 +08:00
zhangqiang bf541ed4b0 寻宝达人替换资源 2020-09-09 10:36:55 +08:00
jiaoyangna fb9b646553 限时召唤提交 2020-09-08 16:57:19 +08:00
gaoxin 37316136f1 剧情添加转场效果 2020-09-08 15:31:38 +08:00
gaoxin b65581fe71 引导战斗添加 2020-09-08 11:58:34 +08:00
jiaoyangna 53524225f9 动画添加提交 2020-09-08 10:09:21 +08:00
gaoxin 32b8705ab1 引导战斗流程添加 2020-09-07 18:25:31 +08:00
zhangqiang 604de656df 巅峰赛战斗结束界面适配 2020-09-07 15:39:57 +08:00
gaoxin a46ee1c52c 修复引导急速探索报错的问题 2020-09-07 15:26:37 +08:00
zhangqiang 5a917b1374 巅峰赛详情适配 2020-09-07 15:02:16 +08:00
gaoxin 06afe99236 宽屏边缘用图片代替黑边 2020-09-05 19:02:20 +08:00
gaoxin 7afe25a5d2 界面适配修改,引导添加网络延时检测 2020-09-05 17:21:09 +08:00
gaoxin 338b7b4375 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-05 16:44:07 +08:00
gaoxin 3103a4122b 设置,几天好礼界面内容修改 2020-09-05 16:43:53 +08:00
zhangqiang f8508a8663 shipei 2020-09-05 16:43:25 +08:00
gaoxin 68c9726917 屏幕适配修改 2020-09-05 16:39:10 +08:00
zhangqiang 21e7bf2e80 shi pei 2020-09-05 16:28:52 +08:00
zhangqiang f36b3c7879 shi pei 2020-09-05 16:16:10 +08:00
zhangqiang 0d82f376b0 shi pei 2020-09-05 15:28:44 +08:00
zhangqiang c35058767b shi pei 2020-09-05 15:20:30 +08:00
zhangqiang 96e795c7c5 全屏界面 背景图片适配脚本 自行挂载 2020-09-05 14:22:53 +08:00
gaoxin fb6a6c9da5 添加cmdbuffer的使用,优化RenderTexture渲染消耗,未开启使用,为以后优化做准备 2020-09-05 12:30:00 +08:00
gaoxin 92a8b93b50 修改屏幕的适配方式,修改计算屏幕位置的方法 2020-09-05 12:15:58 +08:00