Commit Graph

638 Commits (b743ccd296ca9dc0bb5056b51c27960a0d5d76c0)

Author SHA1 Message Date
wangzhenxing ac32149aa8 [立绘朝向]=====皮肤,敌方立绘朝向修改 2021-11-29 17:07:28 +08:00
ZhangBiao b90afb39f2 【灵兽特惠】提交 2021-11-29 14:08:07 +08:00
ZhangBiao 38f70b2c8d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 13:41:02 +08:00
ZhangBiao d39153607b 【灵兽特惠】倒计时修改 2021-11-29 13:40:53 +08:00
wangzhenxing 1eb6115bc9 [角色朝向]=======立绘朝向修改 2021-11-29 13:21:23 +08:00
jiaoyangna 9a61491b90 资源条修改提交 2021-11-27 18:28:11 +08:00
jiaoyangna 07057901bc 十连抽修改 2021-11-27 17:59:07 +08:00
jiaoyangna dfb79c03d7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:14:47 +08:00
jiaoyangna 37de4c4450 文字显示报错修改 2021-11-27 17:13:28 +08:00
ZhangBiao a8e619b8c6 【乾坤宝盒】去除珍奇宝阁 2021-11-27 17:03:58 +08:00
ZhangBiao d8956e0fe2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:31:17 +08:00
ZhangBiao b83dc76f7b 【灵兽特惠】时间显示修改 2021-11-27 15:30:49 +08:00
jiaoyangna e9862a7046 抽卡提示修改提交 2021-11-27 15:29:46 +08:00
wangzhenxing 69e30d908c [立绘朝向]===============我方立绘展示朝向修改 2021-11-26 16:55:13 +08:00
ZhangBiao c8fa05d5a0 【固定活动】提交 2021-11-26 11:09:22 +08:00
ZhangBiao f83bffaf75 【固定活动】提交 2021-11-26 10:16:46 +08:00
ZhangBiao fd97f584cb 【固定活动】调整 2021-11-25 18:51:36 +08:00
ZhangBiao bd4ce88486 【乾坤宝盒】报错修改 2021-11-25 16:16:39 +08:00
ZhangBiao 8da0a81588 【寻仙抽】提交 2021-11-25 15:59:31 +08:00
ZhangBiao 1c9d113a86 【活动、修为】界面调整 2021-11-25 11:52:35 +08:00
ZhangBiao 855f658a93 【灵兽宝阁】错误修改 2021-11-25 11:03:08 +08:00
ZhangBiao ac768ff163 【常驻活动】提交 2021-11-24 18:14:25 +08:00
gaoxin f22f47202a 【太初密卷】获取网络图片错误时,无法进入游戏 2021-11-22 14:06:23 +08:00
jiaoyangna 2de1c704f0 灵兽宝阁进度icon点击显示错误修改 2021-11-19 17:28:20 +08:00
ZhangBiao 9fca63f5a1 【成长基金】配合后端修改 2021-11-15 15:44:02 +08:00
jiaoyangna 89cf7cacfe 灵兽宝阁 假战斗报错修改 2021-11-11 17:36:53 +08:00
jiaoyangna d37ed44478 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-11 10:52:15 +08:00
jiaoyangna d1cb61fc18 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-11 10:48:59 +08:00
jiaoyangna ceb7ee3602 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-10 18:35:38 +08:00
ZhangBiao 104f5cbda8 【降妖夺宝】修改提交 2021-11-05 18:09:14 +08:00
ZhangBiao e86a0c04a6 【乾坤宝盒】跳转进入乾坤宝盒界面,查看魂印特效穿透 2021-10-16 15:37:58 +08:00
ZhangBiao 4ccaca133e 【牛气冲天】修改提交 2021-10-15 16:49:00 +08:00
ZhangBiao e8bfd73a9d 【织女】立绘不动修改 2021-10-09 11:14:24 +08:00
jiaoyangna a8eeec83f6 Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	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/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
2021-09-22 20:53:08 +08:00
jiaoyangna 529094b6ad 好感度第一次提交 2021-09-22 20:47:13 +08:00
gaoxin 7e954b997a 【易经宝库】修复查看剩余奖励报错 2021-09-18 15:15:22 +08:00
gaoxin aa6bb5d606 【易经宝库】修复数据表BasicPoolId列无法读取,将数据格式改为字符串 2021-09-18 10:45:31 +08:00
jiaoyangna 415eb7a947 【寻宝迷踪】寻宝返回后默认返回显示活动第一个页签 2021-09-16 14:06:37 +08:00
ZhangBiao 95adcb6b1d Revert "【寻宝迷踪】修改提交"
This reverts commit 31304cc252.
2021-09-16 13:39:23 +08:00
ZhangBiao 31304cc252 【寻宝迷踪】修改提交 2021-09-16 13:25:15 +08:00
gaoxin 7462f02cfd Revert Revert 回滚错误的合并 4f19f12612 2021-09-15 14:29:14 +08:00
jiaoyangna 4727998055 没有图片问题修改
(cherry picked from commit 76d8399ac9ecd0c999ed6e8b53c7b7e231b73a16)
2021-09-09 10:55:42 +08:00
jiaoyangna f07b92346a www下载错误卡死修改
(cherry picked from commit 8c146837d826d97820a4eef73f1a125bf448dd39)
2021-09-09 10:43:08 +08:00
gaoxin c4bced89f7 【战斗校验】山河社稷图,跨服战斗,地图战斗添加战斗校验 2021-09-08 18:27:20 +08:00
ZhangBiao 00bd84f77c 【升星有礼】增加新将例会 2021-09-02 09:57:17 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
ZhangBiao bd7383f063 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-23 16:47:26 +08:00
jiaoyangna 6ea8e96e59 太初秘卷红点修改提交
(cherry picked from commit c69a23be4ab0f01ab2dafe00ed1d9db3574e7314)
2021-08-23 14:34:08 +08:00
jiaoyangna 6a36e5ffd3 太初秘卷红点提交
(cherry picked from commit 8d99139640ed01e9ed692d0f74f2923dac24f839)
2021-08-23 14:27:49 +08:00
jiaoyangna 16ca4f84d6 太初秘卷红点修改提交
(cherry picked from commit b11e01a2972353c71d7c90c3a6443ded59892981)
2021-08-23 14:27:41 +08:00
jiaoyangna ca656636ac 太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
2021-08-23 14:09:43 +08:00
ZhangBiao 7d93e96d9b 【易经宝库】商店特效 2021-08-20 16:28:38 +08:00
ZhangBiao 52bf5c79f2 【寻宝迷踪】增加音效 2021-08-18 15:31:52 +08:00
ZhangBiao fab5388536 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-08-17 13:47:27 +08:00
jiaoyangna 7a6935eb42 太初秘卷修改提交 2021-08-16 14:45:13 +08:00
jiaoyangna ab89dcfd17 去掉字符串前后空格 2021-08-16 14:22:58 +08:00
jiaoyangna a9d05bf258 修改报错日志 2021-08-16 14:05:29 +08:00
jiaoyangna 74f1bc4d4f 太初秘卷适配修改提交 2021-08-16 13:57:13 +08:00
jiaoyangna 5c4696ad6c 太初秘卷修改提交 2021-08-12 17:32:34 +08:00
ZhangBiao a0ef88e58d Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-08-12 14:56:26 +08:00
jiaoyangna 792b533fa0 太初秘卷修改提交 2021-08-12 11:02:21 +08:00
jiaoyangna b83ee5e000 太初秘卷修改 2021-08-11 17:14:20 +08:00
ZhangBiao 939d577624 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-10 20:21:06 +08:00
ZhangBiao edc728227c 【寻宝密宗】提交 2021-08-10 14:57:45 +08:00
jiaoyangna 278530583d 牛气冲天跳转返回之后页签跳到第一个修改 2021-08-09 16:49:41 +08:00
ZhangBiao d86921d5a3 【降妖夺宝】次数修改提交 2021-08-05 14:33:07 +08:00
ZhangBiao cad9409314 【万象商会】upview调整 2021-08-04 18:46:59 +08:00
ZhangBiao 92f3ee123c 【升星有礼】界面调整 2021-07-30 17:51:25 +08:00
ZhangBiao a40ccb1510 【新将来袭、降妖夺宝】增加按钮特效 2021-07-30 16:22:59 +08:00
ZhangBiao ffd0685d97 【任务跳转】未解锁灵兽山,灵兽招募任务前往提示活动未开启,应提示功能未解锁
【红点】车迟斗法的红点仍绑在副本入口处,而非公会按钮
2021-07-28 11:20:27 +08:00
ZhangBiao 74c713c65b 【主题活动】加强限时商市,珍奇宝阁入口按钮的辨识度 2021-07-26 19:00:41 +08:00
ZhangBiao 1ba38242ad 【主题活动】提交 2021-07-26 12:29:13 +08:00
ZhangBiao 1634345c1e 【清除log】 2021-07-26 09:48:18 +08:00
jiaoyangna 06dfb74d33 活动修改提交 2021-07-24 19:33:54 +08:00
jiaoyangna e5d387c37d 主题活动任务修改提交 2021-07-24 19:07:56 +08:00
jiaoyangna 1e70bdb2ca 活动修改提交 2021-07-24 17:38:48 +08:00
ZhangBiao 38bbb808b4 【主题活动】商店 2021-07-23 19:05:53 +08:00
ZhangBiao 93469872a7 【主题活动】提交 2021-07-23 17:15:04 +08:00
DESKTOP-98AVA47\Administrator 022681face 红点修改提交 2021-07-23 11:36:44 +08:00
ZhangBiao 8981c707ba 【主题活动】分页提交 2021-07-23 11:27:28 +08:00
jiaoyangna 457ee33353 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 14:17:44 +08:00
jiaoyangna ce8751bbee 乾坤宝盒 提示修改 2021-07-22 14:17:40 +08:00
ZhangBiao 63c2a33c84 【报错修改】 2021-07-22 11:40:13 +08:00
ZhangBiao b7d7b3270a 【主题活动】分页处理 2021-07-22 10:36:35 +08:00
DESKTOP-98AVA47\Administrator 9331a9916d 概率修改提交 2021-07-19 11:31:13 +08:00
DESKTOP-98AVA47\Administrator 13e6b5e522 乾坤宝盒报错修改提交 2021-07-19 10:59:13 +08:00
jiaoyangna 360a8d3cae 主题活动限时召唤,乾坤宝盒卡死提交 2021-07-16 16:23:35 +08:00
wangzhenxing a70f45e7a5 [乾坤宝盒]==========提示文字颜色修改 2021-07-16 16:19:59 +08:00
wangzhenxing d6226e77bf [乾坤宝盒]=====魂印详情修改提交 2021-07-16 15:11:53 +08:00
wangzhenxing 65a6edeba5 [乾坤宝盒]======改成只能选择3个 2021-07-16 14:20:25 +08:00
wangzhenxing 908f15bf49 [乾坤宝盒]===========预设特效修改提交 2021-07-15 20:17:51 +08:00
wangzhenxing fe8714f7fa [乾坤宝盒]========优化提交 2021-07-15 16:43:35 +08:00
DESKTOP-98AVA47\Administrator 4bd4f1f483 Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
#	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/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-15 16:24:35 +08:00
DESKTOP-98AVA47\Administrator 55607708df 资源修改提交 2021-07-15 16:19:27 +08:00
wangzhenxing 5985853669 [乾坤宝盒]========功能修改 2021-07-15 15:12:40 +08:00
wangzhenxing fcaa098564 [乾坤宝盒]===========功能修改 2021-07-15 14:57:34 +08:00
wangzhenxing c3da0a2df8 [乾坤宝盒]=============优化提交 2021-07-15 11:14:32 +08:00
wangzhenxing e0d680da50 [乾坤宝盒]=============功能提交 2021-07-14 18:20:04 +08:00
jiaoyangna 21b85bedff 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移  调整间距

(cherry picked from commit eae0af74e5)
2021-07-09 14:47:17 +08:00
jiaoyangna 2042f3ace8 Merge branch '0优化/主题活动' into china/dev 2021-07-07 11:57:31 +08:00
gaoxin 8297176603 Merge remote-tracking branch 'origin/china/quick' into china/dev
# Conflicts:
#	Assets/Editor/AutoPack.cs
#	Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.atlas.txt
#	Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.png
#	Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2021-07-06 15:37:43 +08:00
jiaoyangna 8dfb6ac056 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 11:41:01 +08:00
jiaoyangna 4ba69227f5 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 11:17:49 +08:00
jiaoyangna 1fedb95da6 主题活动 心愿招募 描述修改 2021-07-05 11:37:29 +08:00
ZhangBiao 01a6f7f277 【抽卡概率】增加显示概率 2021-07-02 14:48:29 +08:00
jiaoyangna 349404d50e 【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
2021-06-30 19:28:43 +08:00
jiaoyangna 3fadc63852 商店物品添加特效 2021-06-30 18:12:24 +08:00
JieLing da2bf20585 Merge branch 'china/local' into china/test 2021-06-26 19:15:40 +08:00
jiaoyangna 35523560c0 乾坤宝盒 提交 2021-06-26 15:28:47 +08:00
jiaoyangna 0423ac27de 乾坤宝盒修改提交 2021-06-26 15:28:41 +08:00
wangzhenxing 129768154c [bug]============【心愿抽卡】道具不足时抽卡,显示特效 2021-06-26 14:04:45 +08:00
jiaoyangna 6b70f85740 Merge branch 'china/dev' into china/dev-c 2021-06-24 14:05:01 +08:00
jiaoyangna 08588974a9 心愿抽卡单抽动画修改 2021-06-23 16:43:41 +08:00
jiaoyangna 622ea5c6a2 乾坤宝盒 提交 2021-06-23 16:13:26 +08:00
jiaoyangna 4abdfba82a 乾坤宝盒修改提交 2021-06-23 16:11:30 +08:00
jiaoyangna 7f7a534a2f 主题活动修改提交
(cherry picked from commit e7352701e7)
2021-06-23 15:12:42 +08:00
jiaoyangna e7352701e7 主题活动修改提交 2021-06-23 15:11:32 +08:00
JieLing 05f9f121d1 Merge branch 'china/local' into china/test 2021-06-21 14:14:19 +08:00
gaoxin 3f320f1e89 【降妖夺宝】修复协程导致报错 2021-06-21 14:12:33 +08:00
ZhangBiao 428df0c41d 【降妖夺宝】限时商市道具光效穿透 2021-06-21 10:51:55 +08:00
jiaoyangna 46efd9b960 关闭帮助界面 2021-06-19 17:50:23 +08:00
jiaoyangna f4fe155533 大圣修改 2021-06-19 17:47:35 +08:00
JieLing b0be50ccb8 Merge branch 'china/local' into china/test 2021-06-19 17:26:46 +08:00
gaoxin 6d4d1fc49b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-19 15:28:27 +08:00
gaoxin b423005b6e 【活动】页签使用原图大小 2021-06-19 15:28:22 +08:00
ZhangBiao 9e5819433e 【新将来袭】 2021-06-18 18:45:56 +08:00
ZhangBiao 70a90b0148 【新将来袭】在线刷新修改 2021-06-18 18:38:17 +08:00
ZhangBiao 165a724ba3 【升星有理】 2021-06-18 17:29:00 +08:00
ZhangBiao 15172dab87 【升星有礼】 2021-06-18 17:17:52 +08:00
ZhangBiao 3744d8b901 【降妖夺宝】剩余时间限时修改 2021-06-18 17:06:20 +08:00
ZhangBiao a277f4578c 【升星有礼】重构提交 2021-06-18 17:00:52 +08:00
jiaoyangna e593381b77 降妖夺宝修改提交
(cherry picked from commit 106647a69c)
2021-06-18 14:48:23 +08:00
ZhangBiao 6e617123b7 【新将来袭降妖夺宝】 2021-06-18 14:47:13 +08:00
ZhangBiao 958f2774e5 【新将来袭、降妖夺宝】重构提交 2021-06-17 20:31:47 +08:00
JieLing 91bf6b36af Merge branch 'china/local' into china/test 2021-06-15 18:10:18 +08:00
zhangqiang 9a1f0078df 【部分美术效果无法展示】1 2021-06-09 15:58:04 +08:00
JieLing 8614a86275 Merge branch 'china/local' into china/test 2021-06-08 14:51:19 +08:00
jiaoyangna 8df928f686 【ID1016261】
【灵兽宝阁】灵兽宝阁白泽假战斗结束报错
2021-06-08 14:29:58 +08:00
jiaoyangna 0d5c47f347 【ID1016261】
【灵兽宝阁】灵兽宝阁白泽假战斗结束报错
2021-06-08 11:40:40 +08:00
jiaoyangna 24e2646bb8 心愿抽卡十连 报错修改 2021-06-07 18:06:23 +08:00
JieLing 197f661868 Merge branch 'china/local' into china/test 2021-06-07 14:25:23 +08:00
ZhangBiao 4b708011bc 【玩家信息】红点问题修复 和log清楚 2021-06-04 16:10:17 +08:00
ZhangBiao 326b790bcf 【抽卡】界面报错修改 2021-06-03 19:44:39 +08:00
wangzhenxing 2cde942f47 [限时祈愿]=====红点逻辑修改 2021-06-03 12:04:04 +08:00
wangzhenxing 2de61d062d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 11:29:45 +08:00
wangzhenxing ba04ea8e71 【心愿抽卡】====修改概率显示,必得剩余次数修改 2021-06-02 11:29:26 +08:00
ZhangBiao 681b3b63bb 【每日礼包】特效问题修改 2021-06-01 20:02:48 +08:00
wangzhenxing aa3171aef7 [抽卡祈愿]======活动报错修改 2021-06-01 14:41:28 +08:00
jiaoyangna 1f1d9f6ff2 活动页签修改提交 2021-06-01 14:12:49 +08:00
jiaoyangna d82bbbf579 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 13:54:05 +08:00