Commit Graph

56 Commits (994d2602845afe8d9202a1f7a758f0a3ed454527)

Author SHA1 Message Date
xiejun f1b9b526c1 代码修改 2023-08-30 20:33:29 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
xiejun 937ec44bf5 立绘和代码修改 2023-07-13 14:38:34 +08:00
xiejun b47c16dcb7 test 2023-06-20 18:01:51 +08:00
gaoxin eebd99883b 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +08:00
gaoxin b45278e389 【version】删除AssetBundles中无用的version配置 2021-07-09 11:57:46 +08:00
jiaoyangna 11fe33f664 【ID1016973】
【高帧模式】设置界面显示了中文和越南语的切换
2021-07-02 11:53:51 +08:00
jiaoyangna 2f88dbace4 config 添加帧率 2021-07-01 11:26:45 +08:00
jiaoyangna 0f309447c2 【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
2021-06-21 10:53:24 +08:00
gaoxin 06a1d63a1e 【配置】本地添加ccid的配置 2021-06-10 10:17:18 +08:00
JieLing 2024f8173e 【添加播放视频的配置】 2021-06-03 12:32:25 +08:00
gaoxin 24800d9f27 【配置】添加称号大小配置 2021-06-02 15:27:02 +08:00
gaoxin c76a7052a0 【配置】打开语音 2021-05-31 18:18:49 +08:00
gaoxin cdb9e35fd1 【config】修改serverversion = 0 2021-04-12 18:19:56 +08:00
gaoxin 0c29596eb1 【配置】服务器配置还原到version.txt中 2021-03-04 20:19:26 +08:00
gaoxin d3a1cba41c 【管理】包配置管理加入 2021-03-04 19:29:15 +08:00
gaoxin 7d2a90fd90 Merge remote-tracking branch 'origin/gx/local_热更配置' into xma/dev
# Conflicts:
#	AssetBundles/version.txt
2021-03-04 13:47:59 +08:00
jiaoyangna f2d3f3b0ad version 文件修改 2021-02-20 16:26:07 +08:00
gaoxin 0ed62b7032 【version】version文件添加 2021-01-27 18:18:37 +08:00
gaoxin 1dafda4b44 【热更配置】结构搭建 2021-01-22 14:17:08 +08:00
gaoxin d4e3d2b8f9 测试服包版本修改 2020-09-05 17:24:09 +08:00
gaoxin dc0c3940aa 修改测试服热更路径 2020-08-27 20:53:42 +08:00
gaoxin b2ed38aaac 添加海外正式服路径 2020-08-27 20:52:58 +08:00
JieLing f8e5ba9dfe version文件添加 2020-08-26 14:09:00 +08:00
gaoxin af532fce6e 海外相关修改合并 2020-08-22 16:19:50 +08:00
gaoxin eead87dfbb 版署version文件提交 2020-08-07 17:40:51 +08:00
JieLing cd43d2417f 内网测试 0.16.1 2020-07-25 15:13:59 +08:00
JieLing 2164aacc49 内网包配置修改 2020-07-25 14:52:41 +08:00
JieLing 7b2bc16abe bugly添加 2020-07-23 21:10:35 +08:00
ZhangBiao ae502e8322 bug修复 2020-07-21 16:04:07 +08:00
gaoxin 70149e951d version文件回滚 2020-07-21 14:10:49 +08:00
JieLing bd8e859703 猕猴桃测试0.1.0 2020-07-20 20:52:30 +08:00
gaoxin 6d3338d6b1 配置修改,version文件修改 2020-07-20 20:30:49 +08:00
JieLing 7350a1cf85 测试version文件修改 2020-07-18 21:06:23 +08:00
JieLing 6a317d3f7b 测试热更0.15.25、svn逻辑同步 2020-07-03 11:52:23 +08:00
JieLing ab411b3d0d svn逻辑同步 2020-07-02 17:04:46 +08:00
JieLing 5154fdbac0 外网0.16.14 内网0.15.25 2020-07-01 09:40:20 +08:00
JieLing d08552ca2f 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
JieLing 7382b2db77 版本开发提交 2020-06-28 17:52:29 +08:00
JieLing 8c61581548 外网 0.16.10 内网 0.15.23 2020-06-28 17:48:49 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing e3b6de5404 内网0.15.17 外网 0.16.8 2020-06-19 21:44:27 +08:00
JieLing 75a3f83194 内网0.15.16 外网 0.16.7 2020-06-19 20:19:35 +08:00
JieLing 7a410e1b60 内网测试 0.15.5 2020-06-19 16:18:05 +08:00
JieLing e189462ac9 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
JieLing 90e12f1a4a 外网0.16.5,测试0.15.11 2020-06-08 20:18:49 +08:00
JieLing b499b77bbe 外网0.16.4版本热更 2020-06-08 13:57:30 +08:00
JieLing 59db757cf9 六月三号开发提交 2020-06-03 19:09:01 +08:00
JieLing 9a7de6479c 外网0.16.3 2020-06-03 19:01:14 +08:00
JieLing 6019de7c1e 外网0.16.2 2020-05-25 19:55:27 +08:00