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 |