Commit Graph

1896 Commits (a20217223a9d95105d6118a57bf49d577be820df)

Author SHA1 Message Date
zhangqiang 291cddbb3f 灵兽提交 2020-10-23 19:10:00 +08:00
wangzhenxing 7072f53fab 合并冲突提交 2020-10-23 19:53:45 +09:00
wangzhenxing bfaed0d937 灵兽放生提交 2020-10-23 19:45:14 +09:00
zhangqiang e7c981763a language 修改 2020-10-23 15:58:38 +08:00
zhangqiang 2cf881c4d5 灵兽提交 2020-10-23 15:12:21 +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 a39bc32ef6 灵兽羁绊提交 2020-11-04 23:00:32 +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
jiaoyangna dbccde8b77 累计充值修改提交 2020-11-04 05:30:12 +08:00
jiaoyangna b6e5225bcf 累计充值修改提交 2020-11-04 05:23:46 +08:00
jiaoyangna aac7afa586 主题活动修改 2020-11-04 04:34:51 +08:00
jiaoyangna 205340e73a 累计充值修改 2020-11-04 04:05:20 +08:00
jiaoyangna fca650d5b3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-04 03:51:10 +08:00
jiaoyangna 14b7b6f4cf 累计充值修改 2020-11-04 03:51:04 +08:00
zhangqiang 6d200caf1d 灵兽提交 战力改变 2020-10-22 18:32:11 +08:00
wangzhenxing c5b73fed7f 抽卡灵兽修改 2020-10-22 16:25:40 +09:00
wangzhenxing b49c3f220d Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-22 16:15:57 +09:00
zhangqiang eb153fdaa6 灵兽提交 2020-10-22 16:13:44 +08:00
wangzhenxing e193bc2c21 灵兽抽卡剩余时间修改 2020-10-22 16:15:09 +09:00
wangzhenxing 1dbfab0029 灵兽抽卡显示修改 2020-10-22 16:07:38 +09:00
wangzhenxing e516aa6c14 被动效果修改 2020-10-22 14:53:49 +09:00
zhangqiang 0270d54e10 灵兽提交 2020-10-22 12:41:44 +08:00
jiaoyangna b93bef6237 剔除id为0 的礼包 2020-10-22 11:26:00 +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
jiaoyangna 420cef2355 无效的红点检测 2020-10-21 18:24:17 +08:00
wangzhenxing 11ccf2ab6f 灵兽分解预设提交 2020-10-21 17:25:12 +09:00
jiaoyangna d555d983ea 累计充值修改提交, 灵兽提交 2020-10-21 16:05:33 +08:00
wangzhenxing 02c55bcdb3 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-21 16:41:22 +09:00
wangzhenxing 80ebcccbbc 灵兽放生提交 2020-10-21 16:41:11 +09:00
zhangqiang 74858bdbe7 灵兽提交 2020-10-21 15:40:23 +08:00
jiaoyangna b26ba765bc 勇往直前 提交 2020-10-21 14:16:02 +08:00
zhangqiang f8d6c63368 灵兽提交 上阵提交 2020-10-21 11:58:16 +08:00
gaoxin b72d6b46bb Revert "【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题"
This reverts commit b8eabfe641.
2020-10-20 21:17:26 +08:00
gaoxin b8eabfe641 【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题 2020-10-20 20:36:44 +08:00
gaoxin 8081350fbe 【战斗0.0.6】修复判断数据是否存在接口错误 2020-10-20 20:26:44 +08:00
zhangqiang 3a6c14f607 灵兽提交 2020-10-20 20:18:02 +08:00
gaoxin 711b240235 骰子音效遴选提交 2020-10-20 18:10:07 +08:00
yuanshuai 8cb68ceaa4 逍遥游地图界面优化:1.自动游历返回时提示二级确认弹窗 2.记录自动游历状态 2020-10-20 18:05:33 +08:00
jiaoyangna ecd0cc8f22 逍遥游云游宝玉修改提交 2020-10-20 17:40:47 +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 a3b8be0abe 技能期间只触发一次被动触发条件修改 2020-10-20 16:20:14 +09: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 3666441445 【逍遥游】修复行动力不会恢复满的问题 2020-10-20 15:16:07 +08:00
ZhangBiao 23f4b9c65d 【推送礼包】推送最新礼包的拍脸
(cherry picked from commit 958234c826)
2020-10-20 14:59:25 +08:00
gaoxin 8aa4abdbeb 【逍遥游】云游值自动恢复修改 2020-10-20 00:23:42 +08:00
gaoxin 7ea442ff5d Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
2020-10-19 23:52:22 +08:00
gaoxin 27eaa02a88 修复部分奖励不刷新的问题 2020-10-19 23:51:15 +08:00
yuanshuai 92af021625 倒计时云游值回复问题修改 2020-10-19 23:49:21 +08:00
yuanshuai 7e0f32ec1f 逍遥游bug修改 2020-10-19 23:24:07 +08:00
gaoxin 4eb846d8c3 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 22:56:22 +08:00
gaoxin ba87f5c181 【逍遥游】功能入口随功能开启添加 2020-10-19 22:56:05 +08:00
yuanshuai 8f4464e693 骰子动画添加提交 2020-10-19 22:54:59 +08:00
ZhangBiao 9bde86217d Revert "逍遥游 兑换界面修改"
This reverts commit 8bed258441.
2020-10-19 22:23:28 +08:00
ZhangBiao acfccff38a Revert "兑换界面修改"
This reverts commit 0467627fe8.
2020-10-19 22:23:18 +08:00
ZhangBiao 072ab2ba46 逍遥游 commit 2020-10-19 22:18:31 +08:00
ZhangBiao ddfca80c45 逍遥 commit 2020-10-19 21:59:48 +08:00
jiaoyangna 2d4ce422da monterr gift patface 2020-10-19 21:59:07 +08:00
jiaoyangna 1d8ac73a44 拍脸commit 2020-10-19 21:57:56 +08:00
jiaoyangna 1677642f3b tuisonglibao patface 2020-10-19 21:57:39 +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 d97142bb6d 逍遥游脚本修改 2020-10-19 21:35:12 +08:00
yuanshuai 4f0f06b359 逍遥游红点提交 2020-10-19 21:30:31 +08:00
ZhangBiao 27f8331e62 轩辕 修改 提交 2020-10-19 21:21:54 +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
wangzhenxing 63adfc1097 修改188被动 义结金兰不触发其他被动 2020-10-19 21:28:47 +09:00
wangzhenxing 4a21eae8f4 188被动普攻排序修改 2020-10-19 21:22:13 +09:00
jiaoyangna 0467627fe8 兑换界面修改 2020-10-19 20:21:36 +08:00
jiaoyangna 8bed258441 逍遥游 兑换界面修改 2020-10-19 20:21:01 +08:00
wangzhenxing cddd7a8824 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-19 21:08:17 +09:00
gaoxin f006531707 【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题 2020-10-19 21:05:05 +08:00
wangzhenxing f7865231ef 被动188 改为血量百分比排序 2020-10-19 21:07:53 +09:00
jiaoyangna f72b3d8fe0 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 18:33:40 +08:00
jiaoyangna 875ed67864 购买 commit 2020-10-19 18:33:29 +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
zhangqiang 034230ffc9 提交 2020-10-19 16:57:30 +08:00
gaoxin 0e19f21805 【自动恢复物品】物品恢复机制改为前端计算 2020-10-19 16:48:42 +08:00
gaoxin 27d9738696 【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题 2020-10-19 16:48:23 +08:00
gaoxin 539be2d810 【自动恢复物品】物品恢复机制改为前端计算 2020-10-19 16:46:24 +08:00
jiaoyangna 56898d9c26 逍遥commit 2020-10-19 16:41:04 +08:00
yuanshuai 911bacc56c 逍遙游預設脚本提交 2020-10-19 16:00:48 +08:00
yuanshuai b1c9e0a986 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 15:13:07 +08:00
yuanshuai 1297d0682b 資源提交 2020-10-19 15:12:47 +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
gaoxin be2230ba6d 【战斗 0.0.3】尝试修复偶现战斗卡死得问题 2020-10-19 14:38:57 +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
gaoxin 5e12a55f33 【战斗0.0.2】修复新增的被动技能非技能出发时报错的问题 2020-10-19 14:19:48 +08:00
gaoxin 00a39a450b Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 14:08:36 +08:00
gaoxin 7a540133bd 【逍遥游】优化返回逍遥游界面时重置滚动位置的问题 2020-10-19 14:08:28 +08:00
jiaoyangna 01f5227c72 xiaoyao commit 2020-10-19 13:50:23 +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
jiaoyangna 707e824aed Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 11:42:22 +08:00
gaoxin 3b62c91c69 优化逍遥游地图进度显示,添加暂不开放的地图处理 2020-10-19 11:40:05 +08:00
jiaoyangna be359476d4 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 11:39:30 +08:00
jiaoyangna 86ca33c7a4 xiaoyao commit 2020-10-19 11:39:11 +08:00
gaoxin f3e675903a 优化逍遥游地图界面显示, 2020-10-19 11:15:32 +08:00
wangzhenxing 84faff7246 Assets/ManagedResources/~Lua/Data/UIData.lua 合并冲突 2020-10-19 11:44:43 +09:00
zhangqiang 92b2c3d6fb 提交 2020-10-19 10:56:55 +08:00
gaoxin fc3a8f78f2 逍遥游地图界面提交 2020-10-19 10:36:40 +08:00
wangzhenxing 5c6634d8d8 灵兽抽卡提交 2020-10-19 11:30:47 +09:00
jiaoyangna 4077683aaf Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 10:24:48 +08:00
jiaoyangna f62f3de37c xiaoyao tijiao 2020-10-19 10:24:42 +08:00
yuanshuai 8735fcf83e Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-17 20:05:28 +08:00
yuanshuai 8a9b32f050 逍遥游显示优化 2020-10-17 20:05:16 +08:00
jiaoyangna 633761b2a4 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-17 20:00:15 +08:00
jiaoyangna d4bcdd2975 xiaoyao boss xiugai 2020-10-17 19:59:11 +08:00
gaoxin 538660584e 【战斗0.0.1】删除log接口参数 2020-10-17 18:42:09 +08:00
gaoxin fecc48acc2 修复关卡推送礼包报错的问题 2020-10-17 18:36:29 +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 5341483985 刷新界面 2020-10-17 17:09:48 +08:00
jiaoyangna 00da9f73a7 添加次数 2020-10-17 17:06:27 +08:00
gaoxin 8b24a89d56 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-17 16:34:34 +08:00
ZhangBiao d029e1866e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-23 17:35:59 +08:00
ZhangBiao 90a5c3f28d 限时召唤 更换主Up神将 2020-10-23 17:35:47 +08:00
gaoxin 149a1f09ac 修复治疗暴击时治疗量为0的问题 2020-10-17 16:34:24 +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
jiaoyangna 3ccf8c0dc2 xiaoyaoyou 修改 2020-10-17 14:27:19 +08:00
jiaoyangna 8635a61e78 转盘,boss 修改 2020-10-17 13:48:38 +08:00
jiaoyangna 93218d9e62 时间返回修改 2020-10-17 13:37:54 +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 6db6317da2 添加剩余时间接口 2020-10-16 18:01:29 +08:00
jiaoyangna 2a5a23f3ed 显示优化提交 2020-10-16 17:37:54 +08:00