jiaoyangna
|
76fad397de
|
【ID1017708】
【无尽副本】购买秘宝后等待下一期秘宝刷新,上一期购买秘宝获得的积分不清,导致下期秘宝无法正常领取奖励
|
2021-07-26 11:23:26 +08:00 |
jiaoyangna
|
7959f803c4
|
取消注释
|
2021-07-22 16:15:47 +08:00 |
jiaoyangna
|
b0f868485e
|
无尽秘宝推送
|
2021-07-22 16:05:58 +08:00 |
ZhangBiao
|
b0e53312e7
|
【心愿抽卡】增加英雄加入卡池的天数条件
|
2021-07-21 17:35:38 +08:00 |
ZhangBiao
|
effe3bdfa1
|
【十绝阵】跨天状态刷新
|
2021-07-19 17:30:17 +08:00 |
gaoxin
|
e34f6a79cb
|
【log】关闭鸿蒙阵推送log
|
2021-07-16 14:49: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 |
wangzhenxing
|
e0d680da50
|
[乾坤宝盒]=============功能提交
|
2021-07-14 18:20:04 +08:00 |
ZhangBiao
|
e250223aa2
|
【鸿蒙阵】增加logerror
(cherry picked from commit 30f2a8cb1a )
|
2021-07-08 15:55:04 +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 |
zhangqiang
|
a2528a3ded
|
【去掉无用打印】
|
2021-07-01 21:07:53 +08:00 |
ZhangBiao
|
53567ea586
|
【Log】清除带颜色的Log
|
2021-07-01 16:33:40 +08:00 |
wangzhenxing
|
b3650db6ae
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 18:01:13 +08:00 |
wangzhenxing
|
4ad64a41f2
|
[bug]==========福利红包红点修改
|
2021-06-30 18:00:52 +08:00 |
ZhangBiao
|
37e854190b
|
【心愿抽卡】增加所有抽卡类型和输出
|
2021-06-30 10:36:48 +08:00 |
ZhangBiao
|
ecb43803f4
|
【心愿抽卡】提交
|
2021-06-30 10:23:57 +08:00 |
ZhangBiao
|
cc16057438
|
【心愿抽卡】接协议
|
2021-06-29 15:25:05 +08:00 |
jiaoyangna
|
10e4552c4f
|
Merge branch 'china/dev-c' into 0功能/玲珑宝镜
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-06-28 10:31:22 +08:00 |
JieLing
|
84a42dd0ef
|
Merge branch 'china/dev' into china/local
|
2021-06-15 18:09:51 +08:00 |
gaoxin
|
3f47beac93
|
【支付】透传参数添加cc值
|
2021-06-10 15:20:31 +08:00 |
jiaoyangna
|
733b11e1bd
|
Revert "Revert "玲珑宝镜提交""
This reverts commit f0b9e1d8e6 .
|
2021-06-09 17:11:13 +08:00 |
jiaoyangna
|
f0b9e1d8e6
|
Revert "玲珑宝镜提交"
This reverts commit 8c0a90ef78 .
|
2021-06-09 17:09:14 +08:00 |
jiaoyangna
|
719bfe5a1a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-09 17:08:05 +08:00 |
jiaoyangna
|
8c0a90ef78
|
玲珑宝镜提交
|
2021-06-09 17:07:48 +08:00 |
gaoxin
|
06d6e90b49
|
【添加CC值】用于判断渠道
|
2021-06-09 16:04:38 +08:00 |
jiaoyangna
|
9681a00816
|
【ID1009395】
点将台增加剩余保底次数显示
|
2021-06-08 15:15:13 +08:00 |
JieLing
|
607da17ceb
|
Merge branch 'china/dev' into china/local
# Conflicts:
# Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
# Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua
# Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-06-07 14:18:09 +08:00 |
ZhangBiao
|
8c6ec719f0
|
【名字颜色】排行榜首页颜色
|
2021-06-01 14:02:25 +08:00 |
wangzhenxing
|
10f97f9b8b
|
[许愿神将]===活动修改
|
2021-05-31 11:31:15 +08:00 |
ZhangBiao
|
2a552d0730
|
【踏碎凌霄】引导增加活动是否开启检测
|
2021-05-29 15:39:21 +08:00 |
wangzhenxing
|
347341ca02
|
[福利]红包修改提交
|
2021-05-28 12:36:39 +08:00 |
wangzhenxing
|
675ef2efd7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-28 10:47:07 +08:00 |
wangzhenxing
|
21574bebf1
|
【限时祈愿】==祈愿活动提交
|
2021-05-28 10:36:55 +08:00 |
ZhangBiao
|
458ab29053
|
【清除Log】清楚部分Log
|
2021-05-28 10:33:53 +08:00 |
gaoxin
|
bccaf6557c
|
【巅峰赛】巅峰赛赛程界面报错
|
2021-05-27 11:04:44 +08:00 |
wangzhenxing
|
b7eaf9a65a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 16:03:40 +08:00 |
wangzhenxing
|
d821836909
|
福利红包修改提交
|
2021-05-26 16:03:28 +08:00 |
zhangqiang
|
fcc00ee1d7
|
【心魔试炼】提交
|
2021-05-25 20:50:23 +08:00 |
zhangqiang
|
a1c4a6aa5c
|
【心魔】 + 山河社稷图修改
|
2021-05-25 14:51:26 +08:00 |
wangzhenxing
|
769042a739
|
master_test_gn协议提交
|
2021-05-24 14:14:11 +08:00 |
zhangqiang
|
a30616a9fc
|
【山河社稷图】修改
|
2021-05-22 15:26:30 +08:00 |
wangzhenxing
|
ead8668479
|
福利红包修改提交
|
2021-05-21 17:32:52 +08:00 |
wangzhenxing
|
db3b58ea8e
|
合并冲突提交
|
2021-05-21 15:05:09 +08:00 |
wangzhenxing
|
6ab70e6e8d
|
【功能】==========公会红包
|
2021-05-21 14:47:04 +08:00 |
jiaoyangna
|
1e247043ac
|
Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-05-27 19:42:22 +08:00 |
jiaoyangna
|
b1cf308eeb
|
无尽修改提交
|
2021-05-27 18:08:26 +08:00 |
jiaoyangna
|
666f77c3db
|
无尽修改提交
|
2021-05-27 17:34:59 +08:00 |
jiaoyangna
|
35d0927881
|
无尽副本修改提交
|
2021-05-26 22:00:33 +08:00 |
jiaoyangna
|
736293cbe9
|
头像框颜色提交
|
2021-05-26 20:53:18 +08:00 |
jiaoyangna
|
bb2cd6a263
|
无尽副本修改提交
|
2021-05-26 14:57:28 +08:00 |