ZhangBiao
|
478d8a66a5
|
【社稷大典】社稷大典商店里点开任意道具跳转其他页面在返回页面显示空
|
2021-01-14 16:43:50 +08:00 |
ZhangBiao
|
03dc5fd16f
|
【新活动】在每周活动要结束的时候进行皮肤预览或抽卡操作,结束后页面变黑报错 修改
|
2021-01-14 14:22:32 +08:00 |
jiaoyangna
|
bfef1e2e03
|
【ID1012269】
【新活动】在每周活动要结束的时候进行皮肤预览或抽卡操作,结束后页面变黑报错
|
2021-01-14 10:18:09 +08:00 |
jiaoyangna
|
5809df035a
|
主题活动
|
2021-01-12 10:59:04 +08:00 |
jiaoyangna
|
4627e88c2f
|
主题活动提交
|
2021-01-12 10:39:41 +08:00 |
zhangqiang
|
ec07753463
|
【灵兽宝阁】再次收取提示修复
|
2021-01-09 11:01:19 +08:00 |
jiaoyangna
|
3cecf72861
|
铜墙铁壁
|
2021-01-07 16:22:36 +08:00 |
ZhangBiao
|
510c18226a
|
【抽卡】降妖夺宝
(cherry picked from commit 06ec0f40eb )
|
2021-01-07 09:30:11 +08:00 |
ZhangBiao
|
9d88f435ab
|
【抽卡】降妖夺宝抽卡显示错误修改
(cherry picked from commit b960e57716 )
|
2021-01-07 09:30:05 +08:00 |
zhangqiang
|
c96aedc923
|
Merge branch 'master_xma_local' into 0功能/本周版本优化内容
|
2021-01-05 10:33:58 +08:00 |
ZhangBiao
|
8187dce467
|
狭路相逢
|
2021-01-04 15:21:46 +08:00 |
ZhangBiao
|
dfafed683d
|
【乾坤宝盒】点击商店报错修改
|
2021-01-04 15:04:24 +08:00 |
zhangqiang
|
ed65735dc5
|
【重置优化】将游戏中的各个玩法重置时间统一调整至0点
|
2021-01-04 14:27:18 +08:00 |
ZhangBiao
|
853b541fb5
|
【抽卡提示】六个抽卡分别加上妖晶提示
(cherry picked from commit 73aeaf3d89 )
(cherry picked from commit 56cf5e10600a72ca635592f4ae6a2298542c7cc9)
|
2020-12-31 10:50:14 +08:00 |
jiaoyangna
|
223c23f4bd
|
[狭路相逢] 提交
|
2020-12-30 15:56:11 +08:00 |
jiaoyangna
|
186906ed2c
|
灵兽宝阁假战斗id修改为读GlobalActivity表的ExpertDec 这一列
|
2020-12-30 11:21:13 +08:00 |
zhangqiang
|
739f390115
|
Merge branch 'master_xma_local' into 0功能/1月6_版本优化
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
|
2020-12-29 17:00:08 +08:00 |
ZhangBiao
|
73aeaf3d89
|
【抽卡提示】六个抽卡分别加上妖晶提示
|
2020-12-29 14:24:45 +08:00 |
zhangqiang
|
680d112657
|
【乾坤宝盒】 修改
|
2020-12-28 15:56:33 +08:00 |
jiaoyangna
|
9fc20a2663
|
Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化
|
2020-12-28 11:53:29 +08:00 |
jiaoyangna
|
82f3aff140
|
限时召唤报错修改
|
2020-12-28 11:53:07 +08:00 |
ZhangBiao
|
9d3b560c50
|
【主题活动】点击页签打开,第一个活动不是选中状态
|
2020-12-28 10:56:02 +08:00 |
gaoxin
|
bf6fd2d13d
|
Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-12-26 20:22:23 +08:00 |
ZhangBiao
|
6befa383c8
|
【降妖夺宝】界面调整
|
2020-12-24 18:36:38 +08:00 |
ZhangBiao
|
601eefb120
|
【降妖夺宝】点击抽卡时可以切换其他界面修复
|
2020-12-24 16:57:39 +08:00 |
ZhangBiao
|
8f9a58468f
|
【新将来袭】左上货币刷新不及时修复
|
2020-12-24 14:06:51 +08:00 |
jiaoyangna
|
d0982716b3
|
[所向披靡] 提交
|
2020-12-24 10:24:11 +08:00 |
jiaoyangna
|
5a0bece22e
|
所向披靡修改
|
2020-12-24 10:23:02 +08:00 |
ZhangBiao
|
8801a84c2b
|
【新将活动】商店跳转修复
|
2020-12-23 17:28:20 +08:00 |
ZhangBiao
|
8477ecf347
|
【降妖夺宝】抽卡妖晶限购计数错误修复
|
2020-12-23 16:33:41 +08:00 |
ZhangBiao
|
d0b94a1c3b
|
【新将活动】新将来袭、新疆招募、升星有礼 提交
|
2020-12-23 14:36:15 +08:00 |
ZhangBiao
|
6fc63af086
|
【增加跳转】增加跳转id
|
2020-12-23 11:31:58 +08:00 |
ZhangBiao
|
38a1eeee9a
|
Merge branch '0活动开发聚集地/升星有礼' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-23 11:29:12 +08:00 |
ZhangBiao
|
e40364082c
|
Merge branch '0活动开发聚集地/降妖夺宝' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-23 11:21:27 +08:00 |
ZhangBiao
|
30f8049ef5
|
Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2020-12-23 11:13:48 +08:00 |
ZhangBiao
|
f7f0d4099f
|
【降妖夺宝】结束
|
2020-12-23 10:34:47 +08:00 |
ZhangBiao
|
8d245aab44
|
【降妖夺宝】开坑
|
2020-12-21 17:13:05 +08:00 |
ZhangBiao
|
12760d7cb1
|
【升星有礼】完成
|
2020-12-21 15:41:31 +08:00 |
ZhangBiao
|
3262a6203c
|
【社稷大典】连续捐献-1修复
(cherry picked from commit 1d5551eee7 )
|
2020-12-21 14:19:41 +08:00 |
jiaoyangna
|
22785d4675
|
[天相几人]图片提交
|
2020-12-18 11:23:00 +08:00 |
jiaoyangna
|
9f01de23ea
|
[主题活动]
|
2020-12-18 11:22:54 +08:00 |
ZhangBiao
|
4da5b2ac46
|
【易经宝库】
|
2020-12-12 17:53:34 +08:00 |
zhangqiang
|
475badacc1
|
博闻强识图片修改
|
2020-12-12 17:21:28 +08:00 |
jiaoyangna
|
0a1e1666f7
|
【博文多识】
|
2020-12-12 17:21:13 +08:00 |
ZhangBiao
|
9b58c897bf
|
【易经宝库】最中间的未开启 拿到大奖报错修改
|
2020-12-09 18:11:58 +08:00 |
ZhangBiao
|
b3e374e336
|
【神将来袭】基本完事儿
|
2020-12-03 18:36:01 +08:00 |
ZhangBiao
|
b2e53f8ae5
|
【新将来袭】战斗血条
|
2020-12-03 15:11:24 +08:00 |
ZhangBiao
|
86d190572a
|
【神将来袭】加战斗了
|
2020-12-02 17:14:52 +08:00 |
ZhangBiao
|
ecb948a613
|
【神将来袭】真·差战斗 和为小游戏转盘增加log
|
2020-12-02 15:42:38 +08:00 |
ZhangBiao
|
2f07beaa08
|
【新将来袭】差战斗了
|
2020-12-02 09:51:17 +08:00 |