gaoxin
|
c3c485b209
|
【资源】云游商人资源修改
|
2021-05-15 17:36:47 +08:00 |
gaoxin
|
8e1da10b52
|
【剧情】注释打开
|
2021-05-15 17:06:04 +08:00 |
jiaoyangna
|
3c0131d7b1
|
每日豪礼修改提交
|
2021-05-15 16:46:08 +08:00 |
jiaoyangna
|
9662b5f236
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/ArtFont_vi/x_xianshishangshi_banner_png_vi.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity3/shenjiang33_change.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_shangdian_xingchen_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png.meta
# Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner_solgan_zh.png.meta
# Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png.meta
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua
|
2021-05-15 16:37:00 +08:00 |
jiaoyangna
|
5ad6b8d92d
|
【活动优化】福星高照奖励调整
|
2021-05-15 16:25:58 +08:00 |
zhangqiang
|
78e1a2b5a4
|
【山河社稷图】提交
|
2021-05-15 16:16:46 +08:00 |
jiaoyangna
|
269d1c4ae7
|
每日豪礼修改提交
|
2021-05-15 16:14:39 +08:00 |
gaoxin
|
96e08c7025
|
【红包】提示文字修改
|
2021-05-15 16:07:45 +08:00 |
gaoxin
|
502eb112c0
|
【红包】删除红包购买提示
|
2021-05-15 15:50:52 +08:00 |
jiaoyangna
|
58b2beb015
|
文字曲线提交
|
2021-05-15 15:39:53 +08:00 |
zhangqiang
|
9ccd6f9002
|
【车迟斗法】倒计时问题
|
2021-05-15 14:40:43 +08:00 |
jiaoyangna
|
585677c65b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-15 14:34:03 +08:00 |
jiaoyangna
|
b54c907427
|
商店名称提交
|
2021-05-15 14:33:49 +08:00 |
zhangqiang
|
54fa0110e5
|
【山河社稷图】提交
|
2021-05-15 13:49:18 +08:00 |
zhangqiang
|
11f17fca87
|
【山河社稷图】提交
|
2021-05-14 19:55:28 +08:00 |
jiaoyangna
|
6a13a56902
|
两个礼包预设修改
(cherry picked from commit 2bd439879b )
|
2021-05-14 19:10:05 +08:00 |
jiaoyangna
|
896a52a6a1
|
乾坤宝盒弹窗提交
|
2021-05-14 19:06:12 +08:00 |
wangzhenxing
|
bcc175ea8f
|
【战斗】==========被动107 被动321 修改
|
2021-05-14 17:48:57 +08:00 |
ZhangBiao
|
87f18cb049
|
【修行】提交
|
2021-05-14 17:48:47 +08:00 |
zhangqiang
|
5292b1441b
|
【山河社稷图】提交
|
2021-05-14 16:44:40 +08:00 |
jiaoyangna
|
c62a293740
|
结束修改
|
2021-05-14 16:02:14 +08:00 |
gaoxin
|
6b9cfdd6c2
|
【资源】新增物品资源
|
2021-05-14 15:54:28 +08:00 |
zhangqiang
|
57e1e32e32
|
【山河社稷图】提交
|
2021-05-14 15:03:48 +08:00 |
ZhangBiao
|
b3e40bac95
|
【修行】提交
|
2021-05-14 14:54:57 +08:00 |
ZhangBiao
|
410262cee8
|
Merge branch 'china/dev' into 0功能/修行玩法
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-14 13:27:01 +08:00 |
ZhangBiao
|
3229d0693b
|
【修行】提交
|
2021-05-14 13:21:38 +08:00 |
jiaoyangna
|
fac4b21c6b
|
活动结束报错修改
|
2021-05-14 13:21:01 +08:00 |
jiaoyangna
|
3905116205
|
活动结束 修改提交
(cherry picked from commit 5018ba2d9b )
|
2021-05-14 13:14:12 +08:00 |
gaoxin
|
519a12a214
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-14 10:36:57 +08:00 |
gaoxin
|
112f7b551d
|
【活动】所有tab图片都设置为正常大小
|
2021-05-14 10:36:51 +08:00 |
jiaoyangna
|
c855739dd6
|
嫦娥修改提交
|
2021-05-14 10:08:04 +08:00 |
jiaoyangna
|
0a18fd2c77
|
刷新修改
|
2021-05-14 09:59:11 +08:00 |
zhangqiang
|
364ce0526b
|
【山河社稷图】提交
|
2021-05-13 22:50:34 +08:00 |
jiaoyangna
|
acffbdc9e1
|
跳过按钮修改
|
2021-05-13 21:15:24 +08:00 |
jiaoyangna
|
4e05a30da5
|
活动界面点击点金 刷新
|
2021-05-13 21:06:45 +08:00 |
ZhangBiao
|
4b20254ddd
|
【修行】提交
|
2021-05-13 21:03:27 +08:00 |
jiaoyangna
|
d08e051590
|
神医天降任务重叠修改
|
2021-05-13 21:01:35 +08:00 |
jiaoyangna
|
bc1a22a1f9
|
跳转提交
|
2021-05-13 20:59:29 +08:00 |
jiaoyangna
|
1732d1e2db
|
红点变灰修改 剩余时间文字描述修改
|
2021-05-13 20:31:47 +08:00 |
zhangqiang
|
e4eda3017e
|
【山河社稷图】提交
|
2021-05-13 20:30:10 +08:00 |
jiaoyangna
|
138f3d2ff1
|
时间修改
|
2021-05-13 20:17:02 +08:00 |
jiaoyangna
|
2ed525a64d
|
限时兑换预设修改
|
2021-05-13 20:06:07 +08:00 |
jiaoyangna
|
22eeef86f3
|
灵兽特惠修改提交
|
2021-05-13 19:46:50 +08:00 |
jiaoyangna
|
401e90dd85
|
嫦娥修改提交
(cherry picked from commit 644d9d7d10 )
|
2021-05-13 19:27:26 +08:00 |
jiaoyangna
|
644d9d7d10
|
嫦娥修改提交
|
2021-05-13 19:26:23 +08:00 |
jiaoyangna
|
3b72644446
|
乾坤宝盒提交
|
2021-05-13 18:28:51 +08:00 |
jiaoyangna
|
b7dbc1919a
|
乾坤宝盒预设修改
|
2021-05-13 18:17:41 +08:00 |
jiaoyangna
|
de6d728dd4
|
乾坤宝盒描述修改
|
2021-05-13 18:04:35 +08:00 |
jiaoyangna
|
efdd57a103
|
修改描述
|
2021-05-13 18:00:35 +08:00 |
jiaoyangna
|
6393a76658
|
按钮修改
|
2021-05-13 17:57:19 +08:00 |