Skip to content

A
ar_volunteer
Switch branch/tag
  1. 08 Feb, 2018 4 commits
    • 梁璟强's avatar
      Merge branch 'master' of git@gitlab.sd-zeus.com:ccj/ar_volunteer.git · ecf1bffa
      梁璟强 authored 
      # Conflicts:
#	ar_game1/Assets/GameObject (1)Timeline.playable
#	ar_game1/Assets/Scenes/New_Year_Dog 2.unity
#	ar_game1/Library/CurrentLayout.dwlt
#	ar_game1/Library/ScriptAssemblies/Assembly-UnityScript.dll
#	ar_game1/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
#	ar_game1/Library/Timeline/51c6f537f0ce8d94bbdd1eac6256904f.pref
#	ar_game1/Library/assetDatabase3
#	ar_game1/Library/expandedItems
#	ar_game1/Library/metadata/00/00000000000000004000000000000000
#	ar_game1/Library/metadata/00/00000000000000005100000000000000
#	ar_game1/Library/metadata/00/00000000000000008000000000000000
#	ar_game1/Library/metadata/00/00000000000000009000000000000000
#	ar_game1/Library/metadata/00/0000000000000000b000000000000000
#	ar_game1/Library/shadercompiler-UnityShaderCompiler.exe0.log
      ecf1bffa
    • 梁璟强's avatar
      添加桃花，元宝礼物等新年元素和动画 · 59f36c29
      梁璟强 authored
      59f36c29
    • liang-jia-hui's avatar
      更改春联动画和狗的动画 · f1fb3f48
      liang-jia-hui authored
      f1fb3f48
    • 梁璟强's avatar
      创建新场景scene/....dog2 , 修改狗动画 · cb12371e
      梁璟强 authored
      cb12371e
  3. 07 Feb, 2018 4 commits