ZhangBiao
|
de85b844e5
|
【逐圣商店】取消主胜商店红点
|
2021-04-14 17:41:44 +08:00 |
gaoxin
|
839a9e4d1d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 17:03:11 +08:00 |
wangzhenxing
|
443ba942cf
|
[功能]================称号功能提交
|
2021-04-12 16:23:57 +08:00 |
JLIOSM1
|
e99b368abb
|
【adjust】修复打点错误
|
2021-04-11 04:21:55 +08:00 |
gaoxin
|
196dfa34dd
|
【GM】添加红点数据查看工具
|
2021-04-09 16:14:24 +08:00 |
jiaoyangna
|
071a91773a
|
导出 文本提交
|
2021-04-09 12:26:35 +08:00 |
jiaoyangna
|
8291a48e73
|
Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
# Assets/ManagedResources/Icon/ChengHao.meta
# Assets/ManagedResources/Icon/ZuoQi.meta
# Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/View/FetterItem.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-04-09 12:24:01 +08:00 |
jiaoyangna
|
0ab7c3177a
|
还原文字提交
|
2021-04-09 12:06:17 +08:00 |
jiaoyangna
|
38e64fb774
|
还原文字提交
|
2021-04-09 11:39:09 +08:00 |
jiaoyangna
|
ce8ffa9607
|
充值界面充值跳转月卡页签之后切换其他页签 界面显示错误 修改
|
2021-04-08 10:50:19 +08:00 |
ZhangBiao
|
bfaa5195b5
|
Revert "【表删除】报错处理"
This reverts commit b163fc3035.
|
2021-04-07 11:54:39 +08:00 |
ZhangBiao
|
58d20c0bd3
|
【限时活动】没东西有红点
|
2021-04-07 11:05:26 +08:00 |
gaoxin
|
9033d47109
|
【本地化】文本导出
|
2021-04-06 22:33:57 +08:00 |
ZhangBiao
|
63bcee6168
|
Merge branch '0活动开发聚集地/十五日登录' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-04-06 15:51:24 +08:00 |
gaoxin
|
b163fc3035
|
【表删除】报错处理
|
2021-04-06 15:16:37 +08:00 |
ZhangBiao
|
d69d96a321
|
【十五日登陆】红点
|
2021-04-02 11:53:07 +08:00 |
gaoxin
|
b53717c9ee
|
【本地化】还原文本
|
2021-04-01 18:41:50 +08:00 |
gaoxin
|
cbb28ebeae
|
【本地化】文本导出
|
2021-04-01 18:36:34 +08:00 |
ZhangBiao
|
e86078ce69
|
【十五日登陆】
|
2021-04-01 16:04:13 +08:00 |
jiaoyangna
|
a6428eaaed
|
红点 修改提交
|
2021-04-01 13:44:05 +08:00 |
gaoxin
|
01aacccfaf
|
【红点】修复方法名错误
|
2021-03-31 22:31:36 +08:00 |
jiaoyangna
|
784ace13b5
|
红点提交
|
2021-03-31 22:22:53 +08:00 |
jiaoyangna
|
7d055c4e3a
|
红点提交
|
2021-03-31 21:46:14 +08:00 |
zhangqiang
|
4c7bd53d20
|
【称号坐骑时装】战力向后的发送请求
|
2021-03-31 10:16:52 +08:00 |
jiaoyangna
|
0494e55215
|
Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
|
2021-03-30 20:41:32 +08:00 |
ZhangBiao
|
62a064b33e
|
Merge branch 'china/dev' into 0活动开发聚集地/福星高照
|
2021-03-30 20:21:32 +08:00 |
zhangqiang
|
ea9d0ba287
|
【称号坐骑时装】 激活时 向后的发送战力改变
|
2021-03-30 20:20:00 +08:00 |
jiaoyangna
|
23b46ba218
|
活动 修改提交
|
2021-03-30 20:17:26 +08:00 |
ZhangBiao
|
d61c55d24d
|
Merge branch 'china/dev' into 0活动开发聚集地/福星高照
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-03-30 18:55:35 +08:00 |
jiaoyangna
|
c2fac79eca
|
活动 提交
|
2021-03-30 18:26:10 +08:00 |
jiaoyangna
|
87e724d19d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Common/functions.lua
|
2021-03-30 13:48:08 +08:00 |
jiaoyangna
|
ed1d9a2b1f
|
Merge branch '0功能/天书秘卷' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-03-30 13:46:49 +08:00 |
zhangqiang
|
2122997c3d
|
【称号坐骑时装】修改
|
2021-03-30 11:38:20 +08:00 |
zhangqiang
|
25e351dba3
|
【称号坐骑时装】修改
|
2021-03-30 10:28:03 +08:00 |
ZhangBiao
|
8796bf4957
|
【福星高照】提交
|
2021-03-30 10:27:18 +08:00 |
zhangqiang
|
76c9760993
|
Merge branch 'china/dev' into 0功能/称号坐骑皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab
|
2021-03-29 17:56:19 +08:00 |
zhangqiang
|
db6f2d0b32
|
【称号坐骑时装】提交
|
2021-03-29 17:53:40 +08:00 |
zhangqiang
|
cbdfb75576
|
【称号坐骑时装】提交
|
2021-03-29 16:45:04 +08:00 |
gaoxin
|
2a0ce862ae
|
【红点添加】限时兑换添加红点提示-关闭红点log
|
2021-03-29 14:54:13 +08:00 |
gaoxin
|
a599ef10f9
|
【红点添加】限时兑换添加红点提示
|
2021-03-29 14:37:15 +08:00 |
zhangqiang
|
51bb90edce
|
【称号坐骑时装】 协议 无尽副本修改
|
2021-03-29 12:07:28 +08:00 |
zhangqiang
|
9637337c39
|
【称号坐骑时装】 修改提交
|
2021-03-27 20:01:39 +08:00 |
JieLing
|
5883b66fca
|
【十绝阵】开服3天内通过公会御令获取途径可以进入
|
2021-03-27 17:44:05 +08:00 |
zhangqiang
|
095701c33f
|
【称号时装坐骑】初提
|
2021-03-26 20:06:08 +08:00 |
ZhangBiao
|
24fa8c17e2
|
Merge branch '0活动开发聚集地/牛气冲天' into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-03-25 11:13:37 +08:00 |
zhangqiang
|
d00236d6d0
|
【称号 时装 坐骑】 协议数据提交
|
2021-03-24 21:05:31 +08:00 |
ZhangBiao
|
e8219c11b0
|
【牛气冲天】提交
|
2021-03-24 20:19:40 +08:00 |
jiaoyangna
|
298946dd2d
|
Merge branch 'china/dev' into 0功能/天书秘卷
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-03-23 16:54:46 +08:00 |
jiaoyangna
|
44806a302d
|
红点提交
|
2021-03-23 16:52:19 +08:00 |
jiaoyangna
|
9e19cd5322
|
红点提交
|
2021-03-23 14:13:02 +08:00 |